Commit graph

646 commits

Author SHA1 Message Date
20f675c280 make, scripts: Fix CentOS 7 build
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-13 10:46:02 +00:00
bfe28086c7 get-os.sh: Replace cut with bash-internal pattern substitution
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-08 09:57:08 +00:00
193db3ecdb create-mkspec.sh: Some output beautification
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-07 11:02:48 +00:00
2ffe744709 create-mkspec.sh: Heavy beautification and simplification
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-07 10:50:25 +00:00
0d14436afb create-mkspec.sh: Create-mkspec.sh remove %exclude opt/$NAME/make/*.mk from spec
Not exactly sure why this was needed in the first place. It apparently
was introduced on 2013-03-18, and already then denoted as a kludge.

Also some more code beautification

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-07 10:06:58 +00:00
2a88f1ceca create-mk(spec|debian).sh: Code beautication
Beautify code and fix backtick and backslash escaping of package scripts

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-07 09:32:14 +00:00
1a27f6ecf5 create-mkspec.sh: Fix SUBPACKAGES selection
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-05 08:23:38 +00:00
0371cec047 create-mkspec.sh, pkg.sh: Fix RPM specs missing files from devel packages
This commit makes pkg.sh and create-mkspec.sh check, if a -devel package is
specified, and if not, adds the contents of the -devel file list from the
install log to the -run file list.

This also involves adding a [-s subpackage] option to the
pkg.sh milk-install-log command.

Not implemented for debian packages.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-08-31 11:19:44 +00:00
1c992bfd3c build.py: Remove build.py, superseded now by projects.py build
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-16 14:03:18 +00:00
d8115e6b22 projects.py, pkg_relations(): Fix --no-subpackages, support multiple flavours
- --no-subpackages sometimes doesn\'t strip off -devel -run
- Flavours can now be comma-separated

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-15 10:13:17 +00:00
9d2e192256 projects.py: Add support for --skip-excluded to command requires-pkg
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 17:28:20 +00:00
8ef3c06234 projects.py: Optimize os_cascade()
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 16:58:32 +00:00
3b77b5ae55 projects.py: Fix and re-enable reading dependencies in-memory
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 15:59:36 +00:00
775795c8fa projects.py: Add support for [build.exclude]
Also disable recent switch to in-memory dependency detection, because
it is buggy and messes up the order

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 14:26:21 +00:00
fd2ca4f6ff projects.py: Disable superfluous invocations of projects.py
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 11:40:58 +00:00
4d016534d9 projects.py: Merge build.py
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 10:51:50 +00:00
dbe88a7bfa projects.py: Merge build.py
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 10:51:23 +00:00
4fc4fc3c62 build.py: Encapsulate build functionality in class Build
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 10:32:37 +00:00
f7db567bff build.py, projects.py: Streamline both scripts
Make build.py and projects.py even more similar in preparation for
merging them.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 10:17:14 +00:00
f996726bae build.py: Eliminate another global variable
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 09:56:48 +00:00
49ec96eebb build.py: Preparare build.py for merge into projects.py
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-06 20:14:32 +00:00
6ec57849c3 projects.py: Make OS-cascade support distro version families
Now ubuntu-14.04 is also caught by ubuntu-14

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-06 16:35:16 +00:00
fce5e7b8c1 pgit.sh: Reduce verbosity
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-06 14:45:45 +00:00
a060823a7c build.py: Beautify logging
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-04 10:02:01 +00:00
f137257d3e get-os.sh: Fix opensuse leap detection
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-02-28 15:16:55 +00:00
77aabcc7d6 get-os.sh, pkg-manager.sh: Add dependencies for Ubuntu
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-01-04 01:45:24 +00:00
098a5f2a80 topdir.mk, pkg-manager.sh: Add archlinux package dependencies
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-01-02 14:10:48 +00:00
e68d4eb83b make, scripts: Now excplicitly calling python2 executable instead of python
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-01-02 13:12:00 +00:00
acc3c18e27 create-mkdebian.sh: Remove bogus content from Conflicts tag
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-12-29 13:05:41 +00:00
26b71bee5d create-mkdebian.sh: Fix lintian complaint about empty copyright file
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-12-29 12:51:45 +00:00
fc36bdefdc get-os.sh: Fix missing version number on debian/buster
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-12-29 12:50:44 +00:00
57711ab58d [projects|projs]-dirs.mk: Fix chroot pkg-install-prereq-build
Make pkg-install-prereq-build work in chroot environment.

Signed-off-by: Jan Lindemann <jan@janware.com>
2017-12-27 16:07:51 +00:00
6a40259c3e defs.mk, timed-make-shell.sh: Beautify make benchmark
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-12-27 12:59:55 +00:00
62a476ff52 Add Distribution: Tag to create-mkspec.sh
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-12-27 09:47:14 +00:00
7bb67d062a build.py: Change hung invocation to subprocess.Popen()
Pass an array to Popen(), shell=False, close_fds=True, stderr=None,
this fixes a hung zombie child.

Signed-off-by: Jan Lindemann <jan@janware.com>
2017-12-26 22:27:25 +00:00
8e879fb51a pgit.sh commit: Add support for --cvs
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-10-06 14:15:54 +00:00
5f6e494743 link-in target: Propagate python script error from pkg.sh
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-10-04 11:01:15 +00:00
579e05c198 jannet info: Select criteria is now URL
RPM vendor matches too many packages, since janware GmbH is the vendor
for a lot of third-party packages

Signed-off-by: Jan Lindemann <jan@janware.com>
2017-09-01 16:29:59 +00:00
92040c66e7 make, scripts: Preserve modification time on installation
Implemented -p switch on pkg.sh log-install and used it on standard
installation rules.

Signed-off-by: Jan Lindemann <jan@janware.com>
2017-08-31 19:40:39 +00:00
378feb60ec build.py and projects.py: Cache results queried from file system
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-08-31 18:57:13 +00:00
42e8e6522d projects.py: Fix cache_func(), evaluated one key short of what it should have
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-08-09 14:25:15 +00:00
da3089e5b7 projects.py: Add cache_func()
Add a generic cache for function calls, and use it on functions doing file I/O.
This speeds the build process up considerably.

Signed-off-by: Jan Lindemann <jan@janware.com>
2017-08-09 13:06:18 +00:00
55862e4bd7 projects.py ldflags: Also consider devel packages
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-08-01 21:57:13 +00:00
a01cfc4158 pkg.sh: Fix log-install invocation line
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-07-26 16:44:43 +00:00
a69a3938f2 pkg.sh: Use readlink -fm instead of realpath -m
Seems to be more universally available

Signed-off-by: Jan Lindemann <jan@janware.com>
2017-07-26 11:45:45 +00:00
6ddbcfc932 projects.py: Assume build.libname = none for missing projects.conf
projects.conf is only installed with devel packages. If no such
thing is created or installed, depending packages assume that
libname = packagename, which is wrong. This patch fixes that.

Signed-off-by: Jan Lindemann <jan@janware.com>
2017-07-25 16:01:29 +00:00
ba314df490 python-tools.mk: Fix __init__.py generation
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-07-25 15:05:21 +00:00
55f9b50562 py-defs.mk, py-mod.mk, python-tools.sh: Improve python module handling
- Fix superflous dots in module names
- Generate PYTHONPATH in projects.py
- Add support for __init__.py.tmpl

Signed-off-by: Jan Lindemann <jan@janware.com>
2017-07-24 10:59:08 +00:00
3ec49304a1 projects.py: Add support for command pythonpath
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-07-24 10:56:51 +00:00
82c41cd68d jw-build-create-project.sh: Fix typo
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-07-22 18:16:58 +00:00