Commit graph

1,893 commits

Author SHA1 Message Date
e12f72d4b6 defs-dev.mk, defs-dist.mk: Add definition for JS_PREFIX and JS_DIR
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-04-07 19:03:43 +00:00
5809aed254 defs.mk: Add FONTS variable
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-04-02 13:42:26 +00:00
22b6236e6d dirs.mk: Fix empty PREREQ variable
The contents of this variable got lost somewhere along the way, don't
know when. This led to prerequisites not being checked, most notably
from topdir.mk, where the build should bail out if attempting a build
modules out of order. It's now filled in every directory by running
projects.py, which might be somehwat overkill.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-16 14:02:06 +00:00
0b80649f59 cleandirs.mk: Don't descend into subdirs if FORCE_REBUILD_SUBDIRS is true
Replace FORCE_REBUILD_SUBDIRS condition by FORCE_REBUILD_CLEANDIRS

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-09 11:33:00 +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
8e6345374b defs.mk: Fix default JANWARE_URL_DOC_MODULE and _PROJECT
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 20:27:27 +00:00
ff3a34b6ae defs.mk: Change default browser to xdg-open
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 20:25:40 +00:00
54321a8351 defs.mk: Change default browser to xdg-utils
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 20:25:19 +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
cd2efda598 topdir.mk: Replace jw-build's build.py by projects.py
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 11:26:10 +00:00
369a6b5dda project.conf: Add realpath to pkg.requires.ubuntu-14
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-06 20:37:54 +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
5b8c7fe738 topdir.mk: Fix wrong command in echo-prereq-build
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-06 16:36:05 +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
5b737e50f8 defs.mk, dirs.mk, topdir.mk: Beautify cat-makefiles target output
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-04 10:01:10 +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
59d3414550 swig.mk: Using PHP5 on ubuntu, since swig doesn't support the -php7 switch
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-01-04 15:08:42 +00:00
e9ceaeff66 defs.mk: Add OS_NAME variable defs.mk
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-01-04 15:07:42 +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
cd82a0d1fc swig.mk: Add -DJW_PHP_MAJOR to swig to allow conditional compilation
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-01-03 16:44:34 +00:00
bc9a159275 project.conf: Add archlinux package dependencies
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-01-02 18:56:13 +00:00
098a5f2a80 topdir.mk, pkg-manager.sh: Add archlinux package dependencies
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-01-02 14:10:48 +00:00
e68d4eb83b make, scripts: Now excplicitly calling python2 executable instead of python
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-01-02 13:12:00 +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
ca3db118fe swig.mk: Detect PHP major version with php-config
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-12-29 14:42:28 +00:00
989200f584 Fix: Conditional use of override directives
-Wsuggest-override and -Winconsistent-missing-override support
depends on compiler version

Signed-off-by: Jan Lindemann <jan@janware.com>
2017-12-29 14:37:42 +00:00
b5c054d5d5 project.conf: Add dependency on python
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-12-29 13:12:54 +00:00
98c39336be lo.mk: Add U flag to ar to avoid ranlib warning on Debian
The warning was the following:

make: Warning: Archive 'liblocal.a' seems to have been created in deterministic
mode. 'WSlider.o' will always be updated. Please consider passing the U flag to
ar to avoid the problem.

Signed-off-by: Jan Lindemann <jan@janware.com>
2017-12-28 21:20:07 +00:00
7ffe0c4b81 rules.mk, swig.mk: Add dependencies for Debian Stretch / Unstable
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-12-28 20:07:25 +00:00
d15cf9797c defs.mk: Fix absolute paths of sed, rm, pwd for Debian
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-12-27 17:39:22 +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
6a40259c3e defs.mk, timed-make-shell.sh: Beautify make benchmark
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-12-27 12:59:55 +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
6bfa55481c make: Speed up clean targets
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-12-27 11:43:01 +00:00