Commit graph

699 commits

Author SHA1 Message Date
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
62643ed446 create-mkspec.sh: Exit 0 at the end of install section
Cut short CentOS magic appended to %install scriptlet, which
would generates .pyo files and other cruft.

See also https://stackoverflow.com/questions/30317213

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-14 11:18:08 +00:00
b7772630cf cvsroot.sh, cvs-admin.sh, integrate-distro.sh: Replace /home/jannet/arc -> /srv
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-14 09:18:17 +00:00
9b532fd601 make, scripts: Rename list-cvs-files.sh to list-vcs-files.sh
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-13 18:15:12 +00:00
d125b20fad purge-stale-projects.sh: Fix premature exit
purge-stale-projects.sh exited prematurely because of set -e, fixed that

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-13 18:08:21 +00:00
536d128f91 make, scripts: Remove /inst-source from RPM installation sources
Remove /inst-source from RPM installation sources, following
that same action within all repositories and mirrors

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-13 10:04:58 +00:00
6e14ee930f pkg.sh: Fix target directory layout for CentOS
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-13 10:03:19 +00:00
be98a4049c pgit.sh: Don't uncoditionally set -e
Base that on whether or not PGIT_KEEP_GOING is defined

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-12 16:53:27 +00:00
c3d38b67b5 Make CVSROOT point to cvs.janware.com:/srv/cvs
Change the following occurrences:

  cvs.jannet.de        -> cvs.janware.com
  /home/jannet/arc/cvs -> /srv/cvs
  git.jannet.de        -> git.janware.com

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-11 16:44:29 +00:00
d78768b8b8 rpmdist.mk, pkg.sh: Fix whitespace handling in HASH file generation
Generating the $(TOPDIR)/HASH file produced a warning for every
package file containing a whitespace character. Hopefully, this
build fixes the problem, by working on zero-delimited lists
of file names

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-21 13:47:38 +00:00
7ee054b9e8 jw-pkg: Add command rm-template-output
Also add lots of small fixes and beautifications all over the place.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-19 12:34:36 +00:00
0b8dc4bbfd jw-pkg: Add command list-template-output
This should come in handy for removing generated files. Do some
code-cleanup, too.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-19 09:55:41 +00:00
adb18caa13 make, scripts: git submodule update --init --recursive
Consistently run git submodule update with --init --recursive.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-18 18:31:30 +00:00
82a3f4dc92 projects.py: Read /usr/share/doc/packages/<name>/VERSION, too
Add support for searching VERSION below the project root
_and_ below /usr/share/doc/packages/

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-18 12:32:31 +00:00
3349767c2e jw-pkg: Add support for query options VPUD
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-13 12:13:25 +00:00
3e95eb58e3 jw-pkg info-projects: Rename to list-xxx
Rename jw-pkg commands "info" and "info-projects" to "list-info" and
"list-projects", respectively.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-13 11:50:27 +00:00
a1183a216e create-mkspec.sh: Add support for entry url in [global] of project.conf
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-13 11:17:43 +00:00
d56c3b98c5 jw-pkg: Add command line to warning about missing templates
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-12 12:54:52 +00:00
ac4d0964d7 jw-build-create-project.sh: Add *.dist and dist to gitignore by default
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-11 17:02:53 +00:00
a836719a51 jw-pkg: Add command list-template-tables
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-11 12:48:07 +00:00
2e42b36728 jw-pkg compile-templates: Support options -ogm
Make jw-pkg compile-templates support options -o owner, -g group
and -m mode

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-11 12:27:23 +00:00
44373a7832 jw-pkg: Add command list-templates
- Add command list-templates, showing all template files.
- Fixes and improvements to compile-templates

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-10 07:53:30 +00:00
246246573f jw-pkg: Add command compile-templates
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-09 13:18:48 +00:00
4c54a52c66 jw-pkg: Introduce package argument to commands
Many commands can now be limited to a list of packages

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-09 11:48:50 +00:00
52db897dbb list-cvs-files.sh: Use git ls-files --recurse-submodules
Use --recurse-submodules option to git ls-files instead of implementing that
own our own.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-09 11:11:02 +00:00
38fd8e7d4d pkg.sh log-install: Fix bogus -a option replacement
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-09 11:09:57 +00:00
c1c38e1458 git-srv-admin.sh update-descriptions: Use summary instead of description
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-04 10:56:13 +00:00
5a85b5ce97 jcs.conf: Work around often disfunctional /usr/bin/hostname
/usr/bin/hostname often returns nonsense, especially during early phases
of installation. Rely on the contents of /etc/hostname for determining
jcs_dir

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-28 10:13:43 +00:00
8f196287af projects.py: Fix bogus interpretation of os dep package version
requires.os.run = java-headless = 1.8.0 led to an attempt to
look up ../java-headless/VERSION

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-24 11:00:22 +00:00
4e6a237865 projects.py: Beautify logging ([] around iteration count)
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-23 13:09:58 +00:00
fb7df55e6f pgit.sh: Add iteration counter to logging
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-23 11:45:10 +00:00
51884a3f7e jw-pkg: Add command info-projects to help message
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-23 11:45:09 +00:00
bd28a1d41d scripts/Makefile, jw-pkg, jw-sw: Rename jw-sw to jw-pkg
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-23 10:48:25 +00:00
169e04a2f4 scripts/Makefile, jw-sw: Add jw-sw
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-23 10:45:31 +00:00
6224f48900 projects.py: Remove messages for build-order output
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-23 09:48:33 +00:00
83631eafc5 projects.py: Add support for --build-order
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-22 21:13:59 +00:00
f7db38275f projects.py: Protect against null-string dependencies
A dependency of the form run = a, b, (trailing comma) led to the attempt
to build an empty project and, hence, infinite recursion

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-22 20:02:48 +00:00