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
9d7875b5c8
gettext.mk: Add variable GETTEXT_EXTRA_KEYWORDS
...
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-14 16:56:24 +00:00
01d16a397a
make/Makefile: Replace echo-vars by grep-vars
...
echo-vars is already defined in defs.mk and uses make -p
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-13 13:53:00 +00:00
185fe85ac0
gettext.mk: Add support for multiple .po and .pot files
...
Up to now, generating and installing gettext .mo files worked for exactly one .po file. Now all files in the directory are compiled by default.
Editing only targets $(PROJECT).po, though, so this works as before.
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-13 13:51:28 +00:00
3e95eb58e3
jw-pkg info-projects: Rename to list-xxx
...
Rename jw-pkg commands "info" and "info-projects" to "list-info" and "list-projects", respectively.
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-13 11:50:27 +00:00
567dc2295a
git-submod.mk, topdir.mk: Replace git.jannet.de by git.janware.com
...
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-11 15:07:39 +00:00
a8ccd12503
defs.mk: Add *.jw-tmpl to LOCAL_CFG
...
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-10 07:57:27 +00:00
2ad26b7a3c
js.mk: Remove variable JS_LOCAL
...
Somewhat redundant to JS_SRC
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-08 17:07:17 +00:00
daa9774afc
defs-dist.mk: Change HTML*OWNER to wwwrun and HTML*GROUP to www
...
Change HTMLOWNER and HTMLDIROWNER to wwwrun, and HTMLGROUP and HTMLDIRGROUP to www. This was made necessary by the dokuwiki package, which installs directories with these file ownerships, and which disallows RPM-installing the same directories with other ownerships. Might not be a solution for all packages and platforms.
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-04 17:21:46 +00:00
e49702bd5a
projects-dir.mk: Make pkg-release-reinstall depend on fetch
...
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-04 09:06:04 +00:00
6addff64f9
projects-dir.mk: Add target git-status
...
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-03 09:17:38 +00:00
e00191a6e8
projects-dir.mk: Code beautification
...
Bigger diff, mostly because targets are reorganized into functional groups
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-02 11:40:00 +00:00
cb798d202a
projects-dir.mk: Add target text-files-update-all
...
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-11-01 13:26:27 +00:00
dd4e5e613e
defs-dev.mk, defs-dist.mk: Add variable APACHE_SPIPPETS_DIR
...
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-31 14:02:49 +00:00
709eab9a03
rpmdist.mk: Fix pgk-remote-install-run
...
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-27 22:57:48 +00:00
17b2c48a62
defs-dist.mk: Run jw-apache from /etc/jw-apache instead of /etc/apache2
...
/etc/apache2 is relatively crowded, because lots of packages dump their default configuration there, which makes the apache service configuration hard to control. This commit makes most apache2-reliant services by janware rely on jw-apache instead, and have jw-apache keep its own configuration directory /etc/jw-apache. Some hand-picked config files are still included from /etc/jw-apache/conf.d/etc-apache2.conf.
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-27 16:14:28 +00:00
7f95d89164
projects-dir.mk: Make projects.txt a variable (PROJECTS_TXT)
...
This mostly allows for a shortcut to disable an existing projects.txt on the command line: Make xyz PROJECTS_TXT=
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-24 19:25:56 +00:00
c2acba3ed8
make/Makefile: Add target echo-vars
...
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-23 17:39:30 +00:00
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
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
78a0b5fa1c
projects-dir.mk: Add target build-order-%
...
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-10-22 21:14:33 +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
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
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
