Commit graph

1,941 commits

Author SHA1 Message Date
c12b242a72 upload-*.mk: Remove redundant variable definitions
Merge redundant upload definitions from upload.mk / upload-defs.mk.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-08 07:26:59 +00:00
f502fcd9c2 defs.mk: Remove some unnecessary invocations of /bin/pwd
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-08 07:14:44 +00:00
f28afc777c make, scripts: Add support for [pkg.provides.xxx]
Add Support for manually specifying arbitrary package capabilities in
project.conf.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-07 14:34:58 +00:00
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
c17d563991 topdir.mk: Run make git-update-project-description after initializing git repo
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-03 11:33:31 +00:00
ed8b3918cc py-defs.mk: Allow PY_INSTALL_DIR to be overridden (?=)
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-28 13:46:23 +00:00
f8b575f42d bin.mk: Fix missing include $(MODDIR)/make/defs.mk
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-28 13:22:03 +00:00
d436ed880e rpmdist.mk: Minimal code beautification
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-27 22:33:17 +00:00
07e71c6710 defs.mk: Add RELEASES file to installed documentation
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-27 22:12:17 +00:00
46e653a391 swig.mk: Add basic support for SWIG_TARGET java
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-27 17:31:30 +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
14c451854b projects.mk, topdir.mk: Minor code beautification
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-27 17:03:53 +00:00
4d8ff72147 make: Add multiple inclusion preventers around makefile rules
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-27 17:02:19 +00:00
621c39f076 rules.mk: Pass -D to /usr/bin/install $(BUILD_XXX)/%
This is an experimental commit, mostly facilitating creation of more intricate
include file structures below $(TOPDIR)/include. Probably doesn't hurt but is
only part of the story, since proper clean target support isn't provided per
se.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-27 16:59:29 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
75fb193ad7 CentOS: Change dependency rpmbuild to rpm-build
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-12 21:00:36 +00:00
4c84148c7e project.conf: Add rpmbuild to release dependencies
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-12 20:54:58 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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