Commit graph

1,714 commits

Author SHA1 Message Date
e37e7f91c1 pkg.sh and defs.mk: Add pkg.sh install-log -N, fix links
pkg.sh install-log now supports a -N option, meaning no-log-directories. This
installs directories, but doesn't log then in the install log, effectively
excluding them from being packaged. This is necessary for directories provided
by other packages. -N can be activated by adding LOG_INSTALL_EXTRA_OPTS += -N
to a Makefile, see changes in defs.mk.

pgk.sh install-log now also omits addition of %attr tags to symbolic links.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-18 12:02:23 +00:00
20f675c280 make, scripts: Fix CentOS 7 build
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-13 10:46:02 +00:00
f5c33174fb swig.mk: Try to fix CentOS 7 perl target
Detect PERL_CORE_DIR /usr/lib64/perl5/CORE, as in CentOS 7. Still
doesn't work, as compilation fails on the generated C++ code.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-13 10:45:36 +00:00
f4ea4b5537 vim.mk: Change INSTALL_VIM_SYSTEM_PLUGIN_PATH
Used to be $(shell readlink -f /usr/share/vim/current) and is now
/usr/share/vim/site/plugin, because vim seems to ignore the former

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-29 13:34:31 +00:00
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
49890fd09b defs.mk: Improve HTML installation
- Make LOCAL_HTML and INSTALL_HTMLDIR pre-definable via ?=

- Add *.cgi to LOCAL_HTML by default
  Don't know if that's a good move. Will be treated as regular HTML, and, hence
  installed without execute permission bit set.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-27 12:47:57 +00:00
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
eda929892d projects-dir.mk: Clarify JANWARE_USER warning
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-07 12:06:31 +00:00
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
a87704025a js.mk: Functionally irrelevant code beautification
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-05 08:23:36 +00:00
d9d054e2db js.mk: Add support or specifying externs to closure-compiler
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-04 13:27:19 +00:00
f17ce9570c js.mk: Add JS_MINIFY_FILTER_IN
Not so great. Doesn't remove console.log(innerfunc()). Another approach would
be to use a global debug() function and set debug to null in an included
javascript file

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-03 12:29:00 +00:00
4a42edbc1b htdocs.mk, js.mk: Add js.mk, providing minification
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-03 11:52:45 +00:00
1b7645f67e rules.mk: Add sudo systemctl restart \$(RESTART_SERVICES) after install-to-system
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-08-27 17:24:23 +00:00
ff9c1f0aff git-submod.mk: Fix commit in target git-init-submod-remote
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-08-27 17:24:22 +00:00
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
7f15eb44a2 vim.mk: Add vim.mk for installation of vim plugins
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-06-28 12:26:45 +00:00
5459f98adc Define PATH and LD_LIBRARY_PATH with := rather than =
For performance reasons, define PATH and LD_LIBRARY_PATH with := instead of =
This is a risky commit as it might break testing due to missing libraries

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-05-04 22:30:58 +00:00
f7113a166d profile.mk: Allow generation of path-$(PROJECT).mk along with other scripts
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-05-04 10:29:25 +00:00
518855db43 defs-dev.mk, defs-dist.mk: HTML_PROJECT from PROJECT_DIRNAME
Define HTML_PROJECT from $(PROJECT_DIRNAME), not from $(PROJECT).

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-04-21 10:33:28 +00:00
b7fe4793ee swig.mk: Add support for SWIG_LANG = perl
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-04-09 19:45:13 +00:00
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