Commit graph

685 commits

Author SHA1 Message Date
d173f91eda projects.py: Fix ignored --prefix option
--prefix was ignored because the default was set after the commandline options
were evaluated. This commit fixes that.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-15 10:01:33 +00:00
458fe33260 conf/profile, make, scripts: Search-and-replace cvs.jannet.de -> cvs.janware.com
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-15 08:15:28 +00:00
430a2173b2 projects.py: Ongoing code beautification
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-12 13:11:19 +00:00
fbf75b1220 projects.py: Ongoing code beautification
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-12 13:04:07 +00:00
298398af2b projects.py: Remove dead code
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-12 11:28:20 +00:00
a629faab93 projects.py: Dissolve class Build into class Projects
This commit is the next code cleanup step. Needs more testing and more fixing.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-12 11:26:15 +00:00
7d12ad7f8c projects.py: Introduce class Projects
The Projects class wraps all global variables. This is mostly a
text-replace job and results in horrible class design.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-11 19:03:43 +00:00
187a3343c3 projects.py/get_modules_from_project_txt(): Support multiple sections
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-11 15:42:20 +00:00
a85640e58c projects.py / pkg-relations(): Add option --recursive
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-11 11:45:20 +00:00
7abbf1d044 projects.py: Rename command requires-pkg to required-os-pkg
Rename command requires-pkg to required-os-pkg to avoid confusion with
pkg-reqires. The command could be merged into pkg-requires at a later time.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-11 10:46:23 +00:00
2e3f046477 projects.py: Add option --os
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-11 10:20:16 +00:00
263820370c projects.py: Allow import of projects.py
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-10 13:55:55 +00:00
fbdca1e418 jw-build-create-project.sh: Add mkspec.sh to .gitignore
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-03 08:31:46 +00:00
13fa28e23f make, scripts: Flip some more switches from pathon 2 to 3 (untested!)
This commit flips some more switches from Python 2 to Python 3 in makefiles and
Python code. Build runs through, but it's still likely to break things.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-02 12:28:13 +00:00
022d78c98d jw-pkg fix: List-template-tables output templates
This patch fixes jw-pkg. It output templates, not template-tables.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-05-16 16:00:34 +00:00
d3c5b11923 jw-build-create-project.sh: Add .cache.mk to template .gitignore
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-04-08 13:58:09 +00:00
18e0fe0d28 pkg.sh: Default wrappers installed with log-install -L to Python 3
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-15 19:05:47 +00:00
367dfb90c2 Fix: Basestring missing from python 3
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-10 15:34:08 +00:00
1e3d0f2c60 projects.py: Fix python3 glitches
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-10 15:23:23 +00:00
6c0c3af50f projects.py: Remove reference to deprecated sets module
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-10 14:58:16 +00:00
e0adaa815d projects.py: Remove bogus tabs
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-10 14:53:32 +00:00
aa85417a17 Everywhere: Purge spaces in text files
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-06 12:38:20 +00:00
51e1d2a246 get-os.sh: Add support for command tuple
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-02-27 11:56:54 +00:00
34fbea1876 pkg.sh log-install: Fix -A option
Switch -A was passed with a bogus : to getopt

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-02-07 11:04:46 +00:00
098653aed2 pgit.sh: Add --recurse-submodules to all git fetch, pull and push
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-02-07 11:04:45 +00:00
019dd47c02 pkg.sh log-install: Fix link-in target for shared libraries
Shared libraries were detected as executables, which is true in a way, but
still the log-install target shouldn't wrap them into scripts.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-02-05 15:02:36 +00:00
eecc030d74 create-mkspec.sh: Add support for global.vendor config entry
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-30 16:23:40 +00:00
522eb228ce scm.sh: Automatically activate opt_no_submodules for git 1.x
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-30 16:23:11 +00:00
d7da4f1cb8 mkspec-wrapper.sh: Fix append() for special characters
The append() shell function was unable to cope with special
characters, notably with () in RPM provides libnnz12.so()(64bit),
this commit fixes that. And introduces some (disabled) debug code
into projects.py.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-30 16:23:03 +00:00
8d30bbf748 defs.mk, get-os.sh: Define OSTYPE as linux on Linux
The environment variable OSTYPE contains different values
on Linux: Linux on OpenSUSE and linux-gnu on RHEL / CentOS

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-30 16:22:58 +00:00
f28afc777c make, scripts: Add support for [pkg.provides.xxx]
Add Support for manually specifying arbitrary package capabilities in
project.conf.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-07 14:34:58 +00:00
c6f81d4f4c mkspec-wrapper.sh: Support for --provides-run and --provides-devel
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-07 13:36:28 +00:00
6b740f72ff mkspec-wrappper.sh: Simplify getopt code
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-07 10:06:00 +00:00
0cb3f38258 mkspec-wrappper.sh: Minor code beautification
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-07 09:41:51 +00:00
559198f765 pgit.sh: Run update-descriptions after push during clone
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-04 18:06:00 +00:00
53a75a70a7 git-srv-admin.sh: Beautify code
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-04 18:04:17 +00:00
98e7606029 defs.mk, rpmdist.mk, pkg.sh: Fix detection of rpmbuild path
$HOME/rpmbuild was not correctly assumed as build directory if it doesn't exist.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-03 20:00:01 +00:00
00a52c9039 pgit.sh: Don't pull fetchuser into current master, only fetch
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-03 12:10:00 +00:00
f195f1c366 create-mkdebian.sh: Fix broken double quotes
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-28 13:33:08 +00:00
a8b958b7cf pkg.sh: More tweaks to filter_devel
filter_devel now identifies more intricate directory structures below /include/
as belonging into development packages. The filter is dynamically amended,
based on whether or not the directories contain .h or .hpp files.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-27 16:59:30 +00:00
b67c221eaa pkg.sh: Make filter_devel more specific
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-23 13:32:09 +00:00
182053be29 pkg.sh: Fix project hash value calculation
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-16 18:41:54 +00:00
f4efde3377 $(TOPDIR), make, scripts: Ftp.jannet.de / ftp.janware.com -> pkg.janware.com
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-16 16:11:11 +00:00
ce5111e7eb pgit.sh: Fix detection of pending commits
git diff exit status just catches file changes, not
not file additions, removals or renames.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-16 11:12:22 +00:00
0d4394df94 jw-build-create-project.sh: Output code beautification
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-16 11:10:40 +00:00
74a62bfda9 $(TOPDIR), make, scripts: Rename LAST_RPM_VERSION to RELEASES
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-16 11:07:20 +00:00
75bc87ad44 make, scripts: Rename CVS_PROJ_DIR to PROJECTS_DIR
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-16 10:42:23 +00:00
e827efadd5 make, scripts: Replace list-vcs-files.sh by scm.sh ls-files
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-16 10:30:49 +00:00
ea295dde6d git-srv-admin.sh: Support flavours "test" and "proj"
Add support for flavours "test" and "proj".

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-15 12:32:30 +00:00
2c038f7e2d Add CentOS fix: %define debug_package %{nil}
The last commit disabled automatic addition of commands
to the %install scriptlet. That in turn broke the build
on a debugfiles.list missing from the %files section.

Added %define debug_package %{nil} to the SPEC file to
work around that.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-14 11:35:52 +00:00