Commit graph

3,206 commits

Author SHA1 Message Date
2ffe744709 create-mkspec.sh: Heavy beautification and simplification
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-07 10:50:25 +00:00
0d14436afb create-mkspec.sh: Create-mkspec.sh remove %exclude opt/$NAME/make/*.mk from spec
Not exactly sure why this was needed in the first place. It apparently
was introduced on 2013-03-18, and already then denoted as a kludge.

Also some more code beautification

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-07 10:06:58 +00:00
2a88f1ceca create-mk(spec|debian).sh: Code beautication
Beautify code and fix backtick and backslash escaping of package scripts

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-07 09:32:14 +00:00
1a27f6ecf5 create-mkspec.sh: Fix SUBPACKAGES selection
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-05 08:23:38 +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
0371cec047 create-mkspec.sh, pkg.sh: Fix RPM specs missing files from devel packages
This commit makes pkg.sh and create-mkspec.sh check, if a -devel package is
specified, and if not, adds the contents of the -devel file list from the
install log to the -run file list.

This also involves adding a [-s subpackage] option to the
pkg.sh milk-install-log command.

Not implemented for debian packages.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-08-31 11:19:44 +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
e6b5712931 Release 1.0.0-49@suse-tumbleweed/x86_64
Signed-off-by: Janware DevOps <devops@janware.com>
2018-05-04 22:35:54 +00:00
41901a2d93 Start version: 1.0.0-49
Signed-off-by: janware DevOps <devops@janware.com>
2018-05-04 22:34:32 +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
1c992bfd3c build.py: Remove build.py, superseded now by projects.py build
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-16 14:03:18 +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
d8115e6b22 projects.py, pkg_relations(): Fix --no-subpackages, support multiple flavours
- --no-subpackages sometimes doesn\'t strip off -devel -run
- Flavours can now be comma-separated

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-15 10:13:17 +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
9d2e192256 projects.py: Add support for --skip-excluded to command requires-pkg
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 17:28:20 +00:00
8ef3c06234 projects.py: Optimize os_cascade()
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 16:58:32 +00:00
3b77b5ae55 projects.py: Fix and re-enable reading dependencies in-memory
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 15:59:36 +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
775795c8fa projects.py: Add support for [build.exclude]
Also disable recent switch to in-memory dependency detection, because
it is buggy and messes up the order

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 14:26:21 +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
fd2ca4f6ff projects.py: Disable superfluous invocations of projects.py
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 11:40:58 +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
4d016534d9 projects.py: Merge build.py
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 10:51:50 +00:00
dbe88a7bfa projects.py: Merge build.py
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 10:51:23 +00:00
4fc4fc3c62 build.py: Encapsulate build functionality in class Build
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-03-07 10:32:37 +00:00