Commit graph

215 commits

Author SHA1 Message Date
2a57902480 projects-dir.mk: Mention help target in comment
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-12-09 09:57:16 +00:00
82f48a4630 projects-dir.mk: Add help target
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-12-09 09:52:31 +00:00
36bf04a4d2 projects-dir.mk: Do pull.done before git-pull-%
This might fix a situation where make git-pull-<user> fails,
because jw-build isn't there, yet

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-12-07 19:22:53 +00:00
6bdb16878a make: Replace "pereq" in targets by "deps"
"prereq" is simply impossible to use in explanations with a straight face.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-12-07 19:21:08 +00:00
bdd66dbc26 Everywhere: Rename MOD_SCRIPT_DIR -> JWB_SCRIPT_DIR
Follow name change of MODDIR -> JWBDIR.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-29 21:45:24 +00:00
b2d6e6f554 Everywhere: Rename MODDIR -> JWBDIR
Rename the omnipresent MODDIR variable to JWBDIR, since that's more to the
point.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-29 21:34:18 +00:00
7fc3e196e9 projects.mk: Minimal beautification
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-24 20:34:24 +00:00
48d1bd0256 projects-dir.mk: Comment beautification
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-24 12:34:42 +00:00
a627b1273e projects-dir.mk: Beautify header
Remove CVS macros, because that breaks using it as a symlink from projects-dir,
and add SPDX-License-Identifier GPL2.0+.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-19 08:10:35 +00:00
cbbd8011e3 projects-dir.mk: Remove links.done machinery
Remove legacy links.done, since dspider-shared and dspider-btools are now
converted to git projects below the toplevel directory.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-15 10:22:19 +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
0bf05a5959 projects-dir.mk: Add targets echo-projects and echo-target-projects
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-04 12:56:15 +00:00
ae48f6aab6 projects-dir.mk: Ditch auto-detection of interactive use
PS1 isn't set if make is run interactively, which is why auto-detection of
interactive use doesn't work. Ditch that and introduce the INTERACTIVE
variable, which can be passed as INTERACTIVE=[y|n]. Default value als of now
is "n".

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-03 07:41:43 +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
0d2e255bff projects-dir.mk: Only clean projects which have .done files lying around
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-05-30 13:33:12 +00:00
fb22c800dc projects-dir.mk: Add xdg-utils to BASE_PKGS (for xdg-open)
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-05-25 07:35:32 +00:00
91d7ba8aa4 projects-dir.mk: Add time to BASE_PKGS
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-05-16 20:34:07 +00:00
17a080138c make: Prefix BUILD_ to a couple of makefile variables
Rename variables to avoid collision:

  OBJ      -> BUILD_OBJ
  INCLUDE  -> BUILD_INCLUDE
  LIBFLAGS -> BUILD_LIBFLAGS
  LPPFLAGS -> BUILD_LPPFLAGS

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-04-08 18:26:45 +00:00
68f25261ba make: Clean-indented makefiles
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-17 16:24:26 +00:00
493be57057 projects-dir.mk Fix: JANWARE_USER from local.mk wasn't exported
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-09 11:03:45 +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
0eaef0c326 conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +00:00
22d89ef234 projects-dir.mk: Make clean target less aggressive
The clean target now doesn't remove meta files which enforce a new pull if
absent. distclean is the new clean.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 08:36:31 +00:00
2061d731f5 projects-dir.mk: Add time measurement to make all
The "all" target's command is now preceded by /usr/bin/time
by default

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-02-16 10:16:19 +00:00
f19831245f make: Support GNUmakefile too, where applicable
Add support for GNUmakefile, where originally only Makefile was supported.
Not done everywhere, as some of the code involving makefiles is dead
anyway.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-27 17:30:10 +00:00
626dde6388 projects-dir.mk: StrictHostKeyChecking=no
Add JW_BUILD_SSH_EXTRA_OPTS += -o StrictHostKeyChecking=no.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-26 13:05:02 +00:00
cad556cf37 Fix: Cvs-admin.sh was run on the wrong machine
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-16 17:25:19 +00:00
e984d011c5 projects-dir.mk: Add variable OFFLINE
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-16 12:02:33 +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
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
f34c97e96c projects-dir.mk: Include Makefile in list-text-files output
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-16 10:21:42 +00:00
34083e88e1 projects-dir.mk: Add variable PREREQ_RELEASE
This allows for pkg-release-reinstall to be run without pull

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-14 11:39:34 +00:00
bd7f22e54e projects-dir.mk: Minor code beautification
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-13 18:18:12 +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
0c496d051e defs.mk, projects-dir.mk, projs-dir.mk: Fix build on CentOS
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-12 15:24:13 +00:00
8e892e70db Make CVSROOT point to cvs.janware.com:/srv/cvs
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-11 16:45:49 +00:00
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