janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 20:13:32 +01:00
Code Activity
3,562 commits 1 branch 0 tags 3.2 MiB
Commit graph

203 commits

Author SHA1 Message Date
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
68f25261ba make: Clean-indented makefiles 
Signed-off-by: Jan Lindemann <jan@janware.com>
 2019-03-17 16:24:26 +00:00
Jan Lindemann
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
Jan Lindemann
aa85417a17 Everywhere: Purge spaces in text files 
Signed-off-by: Jan Lindemann <jan@janware.com>
 2019-03-06 12:38:20 +00:00
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
e984d011c5 projects-dir.mk: Add variable OFFLINE 
Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-12-16 12:02:33 +00:00
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
bd7f22e54e projects-dir.mk: Minor code beautification 
Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-12-13 18:18:12 +00:00
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
6addff64f9 projects-dir.mk: Add target git-status 
Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-11-03 09:17:38 +00:00
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
78a0b5fa1c projects-dir.mk: Add target build-order-% 
Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-10-22 21:14:33 +00:00
Jan Lindemann
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
Jan Lindemann
20f675c280 make, scripts: Fix CentOS 7 build 
Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-10-13 10:46:02 +00:00
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
eda929892d projects-dir.mk: Clarify JANWARE_USER warning 
Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-09-07 12:06:31 +00:00
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
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
Jan Lindemann
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