Commit graph

3,239 commits

Author SHA1 Message Date
ba8bd6d942 projects-dir.mk: Add target pkg-exclude-installed
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-23 14:40:25 +00:00
4e6a237865 projects.py: Beautify logging ([] around iteration count)
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-23 13:09:58 +00:00
fb7df55e6f pgit.sh: Add iteration counter to logging
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-23 11:45:10 +00:00
51884a3f7e jw-pkg: Add command info-projects to help message
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-23 11:45:09 +00:00
3511b0dc02 projects-dir.mk: Run pgit.sh without CLONE_PROJECTS
Remove bogus CLONE_PROJECTS environment variable from pgit.sh invocation.

CLONE_PROJECTS doesn't have any effect. PGIT_CLONE_PROJECTS would have, but it
doesn't make sense to set it to $(PROJECTS), since that would include the
non-git projects, too.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-23 11:45:08 +00:00
16e0db76f9 projects-dir.mk: Rename jannet executable to jw-pkg
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-23 10:48:54 +00:00
bd28a1d41d scripts/Makefile, jw-pkg, jw-sw: Rename jw-sw to jw-pkg
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-23 10:48:25 +00:00
169e04a2f4 scripts/Makefile, jw-sw: Add jw-sw
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-23 10:45:31 +00:00
6224f48900 projects.py: Remove messages for build-order output
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-23 09:48:33 +00:00
78a0b5fa1c projects-dir.mk: Add target build-order-%
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-22 21:14:33 +00:00
83631eafc5 projects.py: Add support for --build-order
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-22 21:13:59 +00:00
f7db38275f projects.py: Protect against null-string dependencies
A dependency of the form run = a, b, (trailing comma) led to the attempt
to build an empty project and, hence, infinite recursion

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-22 20:02:48 +00:00
a00941feb8 projects-dir.mk: Fix stalling target list-text-files
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-22 12:06:38 +00:00
ce08110e2b pkg.sh log-install: Fix handling of links
- Links are installed with file attributes
  - Sometimes links are wrongly logged as directories

Fix that.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-21 20:23:32 +00:00
39ffefb285 install-files.mk: Links to directories were not installed as empty directories
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-21 13:11:06 +00:00
56afe21ee0 install-files.mk: Fix installation of filenames with whitespace
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-19 19:23:43 +00:00
853d401d62 topdir.mk: Add target git-ssh-%
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-18 18:30:17 +00:00
1d0d09d11c topdir.mk: Add target git-ssh
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-18 18:26:02 +00:00
0fb3ae486d defs-dev.mk, defs-dist.mk: Redefine CGI_DIR to $(PROJECT_HTMLDIR)/cgi-bin
CGI scripts are now installed in a project-specific directory,
 rather than a system-wide directory

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-18 12:03:49 +00:00
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
cea7078fae Release 1.0.0-50@suse-tumbleweed/x86_64
Signed-off-by: Janware DevOps <devops@janware.com>
2018-10-13 15:57:38 +00:00
b68f97ca74 Start version: 1.0.0-50
Signed-off-by: janware DevOps <devops@janware.com>
2018-10-13 15:56:27 +00:00
65c77e1d3f pkg-manager.sh: Cut -tumbleweed off $ID for platform identification
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-13 15:51:38 +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
bfe28086c7 get-os.sh: Replace cut with bash-internal pattern substitution
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-08 09:57:08 +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
193db3ecdb create-mkspec.sh: Some output beautification
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-09-07 11:02:48 +00:00
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