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

1,777 commits

Author SHA1 Message Date
Jan Lindemann
eb97f44ddb rpmdist.mk: Make pkg-build.dist depend on $(VERSION_FILE) 
Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-12-27 16:59:28 +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
823840d823 topdir.mk: Add target echo-hash to topdir.mk 
Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-12-16 18:45:24 +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
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
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
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
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
266c97949d proj.mk, project.conf: Move dependencies from proj.mk into project.conf 
Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-12-14 12:13:59 +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
378e46f8b6 defs.mk: Beautify gcc and ld version parsing 
And be compatible with CentOS while at it

Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-12-13 10:42:56 +00:00
Jan Lindemann
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
Jan Lindemann
75fb193ad7 CentOS: Change dependency rpmbuild to rpm-build 
Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-12-12 21:00:36 +00:00
Jan Lindemann
4c84148c7e project.conf: Add rpmbuild to release dependencies 
Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-12-12 20:54:58 +00:00
Jan Lindemann
f4cce5000c js.mk: Allow --externs from build directores for closure compiler 
Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-12-12 20:33:38 +00:00
Jan Lindemann
c5fe87b13f js.mk: Try in-tree closure compiler first as JS_MINIFY_EXE 
Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-12-12 16:53:20 +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
4cb7ff2fdd gettext.mk: Fix typo in GETTEXT_PROJECT_PO 
Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-12-11 14:02:18 +00:00
Jan Lindemann
68aab5227c lo.mk: Add dev-utils.mk to lo.mk 
Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-11-30 13:42:38 +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
af2455cd52 gettext.mk: Add dev-utils.mk to gettext.mk 
Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-11-28 21:08:19 +00:00
Jan Lindemann
d684f198b2 make: Add dev-utils.mk for convenience targets 
dev-utils.mk is meant to provide targets like install-to-system,
which will be invoked during development

Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-11-27 15:10:18 +00:00
Jan Lindemann
ab7413ab73 conf.mk: Don't install /etc/init.d any longer 
Remove /etc/init.d from packages, only install files below (i.e. *.init)
if present.

Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-11-25 18:05:05 +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
e4bf491d31 defs.mk: Add support for LOCAL_EXTRA_CFG 
Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-11-24 23:23:13 +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
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
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
8c3afd272e svg.mk: Remove greater default image widths in favour of icon sizes 
Trade the bigger images generated by default by a greater variety of PNG icons,
in the sizes 16 32 48 64 72 96 128 144 168 192. I took these from an example
manifest, but I'm not sure about what typical sizes are. The following images
aren't generated anylonger by default: 50 100 200 300 400 500 600 700 800 546.

Also introduce new variable GENERATED_EXTRA_WIDTHS.

Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-11-19 21:01:39 +00:00
Jan Lindemann
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
Jan Lindemann
75bf600518 defs.mk: Point INSTALL_DOCDIR to DOC_PREFIX 
This used to point to $(PREFIX). Changing it broke the build,
as it expected the VERSION file below PREFIX. This should work
now, as /usr/share/doc/packages was added to the search path
of the VERSION file.

Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-11-18 12:35:38 +00:00
Jan Lindemann
9d7875b5c8 gettext.mk: Add variable GETTEXT_EXTRA_KEYWORDS 
Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-11-14 16:56:24 +00:00
Jan Lindemann
01d16a397a make/Makefile: Replace echo-vars by grep-vars 
echo-vars is already defined in defs.mk and uses make -p

Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-11-13 13:53:00 +00:00
Jan Lindemann
185fe85ac0 gettext.mk: Add support for multiple .po and .pot files 
Up to now, generating and installing gettext .mo files worked
for exactly one .po file. Now all files in the directory are
compiled by default.

Editing only targets $(PROJECT).po, though, so this works
as before.

Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-11-13 13:51:28 +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
567dc2295a git-submod.mk, topdir.mk: Replace git.jannet.de by git.janware.com 
Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-11-11 15:07:39 +00:00
Jan Lindemann
a8ccd12503 defs.mk: Add *.jw-tmpl to LOCAL_CFG 
Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-11-10 07:57:27 +00:00
Jan Lindemann
2ad26b7a3c js.mk: Remove variable JS_LOCAL 
Somewhat redundant to JS_SRC

Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-11-08 17:07:17 +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
dd4e5e613e defs-dev.mk, defs-dist.mk: Add variable APACHE_SPIPPETS_DIR 
Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-10-31 14:02:49 +00:00
Jan Lindemann
709eab9a03 rpmdist.mk: Fix pgk-remote-install-run 
Signed-off-by: Jan Lindemann <jan@janware.com>
 2018-10-27 22:57:48 +00:00