Commit graph

179 commits

Author SHA1 Message Date
c49a3cbd03 Cleanup: Rename variables, remove edge-cases
- Rename some variables for clarity - BASE_PACKAGES -> PREREQ_BASE - BUILD_PROJECTS -> TARGET_PROJECTS - BUILD_PROJECTS now contains $(TARGET_PROJECTS) and their dependencies
- Remove almost all special treatment of packages, notably remove as many explicit project names from Makefile as possible
- Work further towards making all targets work off the the current $(PROJECTS) definitions

- Add target cloc, remove loc

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-30 13:18:44 +00:00
ecdf9ac867 projects-dir.mk: Further reduce PGIT_CLONE_PROJECTS use

Only use PGIT_CLONE_PROJECTS new target git-pull-mini.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-25 10:01:10 +00:00
64fdbeaffb projects-dir.mk: Fix PGIT_CLONE_PROJECTS definition
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-24 15:52:20 +00:00
ac476f10c2 projects-dir.mk: Introduce and evalutate JW_BUILD_VERBOSE

Most notably, ssh-wrapper.sh doesn't run ssh with -x anylonger, if JW_BUILD_VERBOSE is not set to true

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-21 13:34:10 +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
daa9774afc defs-dist.mk: Change HTML*OWNER to wwwrun and HTML*GROUP to www

Change HTMLOWNER and HTMLDIROWNER to wwwrun, and HTMLGROUP and HTMLDIRGROUP to www. This was made necessary by the dokuwiki package, which installs directories with these file ownerships, and which disallows RPM-installing the same directories with other ownerships. Might not be a solution for all packages and platforms.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-04 17:21:46 +00:00
e49702bd5a projects-dir.mk: Make pkg-release-reinstall depend on fetch
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-04 09:06:04 +00:00
6addff64f9 projects-dir.mk: Add target git-status
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-03 09:17:38 +00:00
e00191a6e8 projects-dir.mk: Code beautification

Bigger diff, mostly because targets are reorganized into functional groups

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-02 11:40:00 +00:00
cb798d202a projects-dir.mk: Add target text-files-update-all
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-01 13:26:27 +00:00
7f95d89164 projects-dir.mk: Make projects.txt a variable (PROJECTS_TXT)

This mostly allows for a shortcut to disable an existing projects.txt on the command line: Make xyz PROJECTS_TXT=

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-24 19:25:56 +00:00
ba8bd6d942 projects-dir.mk: Add target pkg-exclude-installed
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-23 14:40:25 +00:00
3511b0dc02 projects-dir.mk: Run pgit.sh without CLONE_PROJECTS

Remove bogus CLONE_PROJECTS environment variable from pgit.sh invocation.

CLONE_PROJECTS doesn't have any effect. PGIT_CLONE_PROJECTS would have, but it doesn't make sense to set it to $(PROJECTS), since that would include the non-git projects, too.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-23 11:45:08 +00:00
16e0db76f9 projects-dir.mk: Rename jannet executable to jw-pkg
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-23 10:48:54 +00:00
78a0b5fa1c projects-dir.mk: Add target build-order-%
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-22 21:14:33 +00:00
a00941feb8 projects-dir.mk: Fix stalling target list-text-files
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-22 12:06:38 +00:00
20f675c280 make, scripts: Fix CentOS 7 build
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-13 10:46:02 +00:00
14eec3069b projects-dir.mk: Add target sync-all

sync-all does pull all and push --all --recurse-submodules=on-demand

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-27 13:56:43 +00:00
087e2785fc [projects|projs]-dirs.mk: Beautify convenience targets

Add target edit-% and rename git-echo-link-% to git-echo-links-%.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-07 14:21:47 +00:00
eda929892d projects-dir.mk: Clarify JANWARE_USER warning
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-07 12:06:31 +00:00
749ab5273b projects-dir.mk: Add git-echo-link-% and friends

git-echo-link-<filename> returns a string functioning as hyperlink to the file in git if embedded into a janware wiki or ticket.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-07 12:00:28 +00:00
f675b5bf33 projects-dir.mk: $(info) -> $(warning)

Use $(warning) instead of $(info), in order to send messages to stderr instead of stdout.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-07-19 12:02:55 +00:00
d4dc71ae92 projects-dir.mk: Ditch cvs-check-useer

Abolish cvs-check-user target, since it forces superfluous rebuilds.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-08 13:32:06 +00:00
0c2d84e07b projects-dir.mk: Add -l $(JANWARE_USER) to JW_BUILD_SSH_EXTRA_OPTS

This allows successful cloning of submodules without a username@ in its URL.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-08 11:43:31 +00:00
f086a9b18a projects-dir.mk: Implement niftier fallback for undefined JANWARE_USER

Take JANWARE_USER from CVS/Root if it's there

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-08 10:33:59 +00:00
09edf15ea8 projects-dir.mk: Fix PROJECTS_PY_BUILD variable
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-08 09:48:03 +00:00
c352f8a15b projects-dir.mk: Splut up PROJECTS_PY_EXTRA_ARGS

Split up PROJECTS_PY_EXTRA_ARGS into _EXTRA_OPTS and _EXTRA_BUILD_OPTS.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-08 09:45:38 +00:00
dc23912d5b projects-dir.mk: Add safety target cvs-check-user
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-08 09:26:57 +00:00
384cf19d21 projects-dir.mk: Remove obsolete BUILD_PY variable
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 20:36:26 +00:00
a7a6862b6c projects-dir.mk: Use xdg-open as default browser
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 20:24:34 +00:00
fa1e805ea6 projects-dir.mk: Fix JANWARE_USE variable detection
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 20:01:36 +00:00
53eb77566b projects-dir.mk: Fix target pkg-init-% on Ubuntu 14.04
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 19:23:42 +00:00
620bc022f3 projects-dir.mk: Use --skip-excluded

Add --skip-excluded to targets installing or querying dependencies.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 17:29:15 +00:00
6e21928719 projects-dir.mk: Fix build for Ubuntu 14.04
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 15:26:02 +00:00
cda8e8e122 projects-dir.mk: Use projects.py instead of build.py for build
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 14:14:43 +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
0d1fd6f95a Fix: Don't detect pgit.sh any longer

Detection of pgit.sh is a bad idea, since at the time of detection, it's not even checked out

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-06 13:04:53 +00:00
58cccff875 projects-dir.mk: Fix JANWARE_USER auto-definition
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-06 11:35:23 +00:00
1c0416c8d4 Add CVS $Id:$ tag
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-06 10:58:28 +00:00
a200aa70b2 projects-dir.mk: Make ssh-wrapper.sh a variable
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-01-29 12:13:31 +00:00
e09a91418d projects-dir.mk: Add support for exclude-<os-suffix>.txt
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-01-04 17:01:59 +00:00
ec92490cbd projects-dir.mk: Add target echo-os
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-01-04 01:30:06 +00:00
6cc6139b13 projects-dir.mk: Add package dependencies for Arch Linux
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-01-04 00:31:04 +00:00
f9ef2c682c projects-dir.mk: Add a couple of base packages to central Makefile
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-01-03 22:01:29 +00:00
e9aafbdc85 projects-dir.mk: Replace /usr/bin/python by python2
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-12-29 21:29:00 +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
7acb5a11b1 projects-dir.mk: Make clean target more aggressive

Override build.py --exclude argument to nothing for clean target.

Signed-off-by: Jan Lindemann <jan@janware.com>
2017-12-27 12:59:09 +00:00
554dab52a6 Fix: Links.done is needed for target all even offline
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-12-18 13:12:48 +00:00
aef7edf737 projects-dir.mk: Fill PROJECTS by */Makefile

Make the PROJECTS variable default to all subdirectories containing Makefiles.

Signed-off-by: Jan Lindemann <jan@janware.com>
2017-12-17 20:45:11 +00:00
13255763fe projects-dir.mk: Be offline without JANWAR_USER

Keep Makefile from communicating with servers if JANWARE_USER is not set.

Signed-off-by: Jan Lindemann <jan@janware.com>
2017-12-17 16:30:44 +00:00