Commit graph

85 commits

Author SHA1 Message Date
1759266dd6 defs-dist.mk: HTMLDIROWNER wwwrun -> root

Change HTMLDIROWNER from wwwrun to root for the same reason as with HTMLOWNER: Better security.

Signed-off-by: Jan Lindemann <jan@janware.com>
2026-01-13 15:41:46 +01:00
6c315f027e defs-dist.mk: HTMLOWNER wwwrun -> root

HTMLOWNER wwwrun is not a good idea with file mode 0644. The web server process should not be allowed to write its own executable files.

Signed-off-by: Jan Lindemann <jan@janware.com>
2025-12-23 20:59:47 +01:00
5ffaf8c680 defs-[dev|dist].mk: Add DATA_DIR, JSON_DIR

Define DATA_DIR, the directory where read-only, non-executable and non-configurable resources should be stored. And define JSON_DIR as $(DATA_DIR)/json.

Signed-off-by: Jan Lindemann <jan@janware.com>
2025-12-03 20:48:32 +01:00
9217d38964 Everywhere: Rename package "jw-build" to "jw-pkg"

jw-build doesn't stop at building software, packaging it afterwards is also a core feature, so this commit gives the package a better name.

The commit replaces strings s/jw-build/jw-pkg/ in text files and file names. Fallout to the functionality is fixed, variable names are left as they are, though. To be adjusted by later commits.

Signed-off-by: Jan Lindemann <jan@janware.com>
2025-11-28 13:35:56 +01:00
336d1a5133 make: Add definitions and rules for *.tmpfiles

Add support for *.tmpfiles. xxx.tmpfiles gets installed by conf.mk as /usr/lib/tmpfiles.d/xxx.conf.

Signed-off-by: Jan Lindemann <jan@janware.com>
2025-09-14 13:29:04 +00:00
a1bf4d9562 make: Remove variables referencing other janware-projects

jw-build is meant as a generic set of tools for building other projects, so references to projects being built by jw-build introduce a circular dependency. Remove those references from defs.mk and rules.mk.

Variables removed by this commit:

BTOOLS_DIR FEEDFSD_DIR FEEDFS_DIR FEEDFS_GUI_DIR FEEDFS_OBJECTS_DIR FEEDFS_UTILS_DIR FEEDFS_WT_DIR JUX_SHARED_DIR SITE_DIR VALDI_DIR XCHANGE_DIR
Signed-off-by: Jan Lindemann <jan@janware.com>
2024-07-16 10:41:20 +00:00
e06ead38cc swig.mk, defs-(dist|dev).mk: Fix Python 3 support

python38.pc doesn't exist on OpenSUSE Tumbleweed, python-38.pc does, so use that naming scheme. Also allow installation with DEVELOPMENT=true, failed with the attempt to install as root user before.

Signed-off-by: Jan Lindemann <jan@janware.com>
2020-11-21 13:09:15 +00:00
b2d6e6f554 Everywhere: Rename MODDIR -> JWBDIR

Rename the omnipresent MODDIR variable to JWBDIR, since that's more to the point.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-29 21:34:18 +00:00
458fe33260 conf/profile, make, scripts: Search-and-replace cvs.jannet.de -> cvs.janware.com
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-06-15 08:15:28 +00:00
68f25261ba make: Clean-indented makefiles
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-17 16:24:26 +00:00
5aee508df9 defs-*.mk: Add USE_DISABLE_COMPILER_OPTIMISATION_OPTS

USE_DISABLE_COMPILER_OPTIMISATION_OPTS = true disables options targeted at disabling optimization features, which were introduced to facilitate debugging in the first place, but make the commandline harder to compare to others while troubleshooting the compile process

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-13 08:53:56 +00:00
aa85417a17 Everywhere: Purge spaces in text files
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-06 12:38:20 +00:00
0eaef0c326 conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-03-03 18:12:28 +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
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
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
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
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
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
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
5882227628 make: Clean up profiling options
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-12-17 14:48:21 +00:00
d49340917b make: Add py-defs.mk py-mod.mk py-run.mk
Signed-off-by: Jan Lindemann <jan@janware.com>
2017-07-21 15:34:16 +00:00
55fa0eaec5 $(TOPDIR), make, scripts: Search-and-replace ytools -> jw-build

This project was copied from ytools, with anything not related to providing build-functionality left out. This commit replaces the occurences of ytools with jw-build, and removes some but most certainly not all legacy ytools references.

Signed-off-by: Jan Lindemann <jan@janware.com>
2017-04-07 12:15:48 +00:00
cb1e735f9c make: Add projects.mk and prefixed win32 objects with win32-

- Add new makefile projects.mk, which is the place to define the minimally required set of variables to get a project's makefile oriented about the build machinery itself, mostly its locations in the file system. This also includes querying other projects. It's been pushed into a seperate makefile includeable early in the Makefile hierarchy, so that other special build variables (i.e. TARGET) can be specialized from within the project later to define build characteristics. - Prefixed object files with $(FLAVOUR_PREFIX), to allow for building two targets from the same directory

Signed-off-by: Jan Lindemann <jan@janware.com>
2016-12-25 13:45:12 +00:00
bc496450c2 defs-dev.mk, defs-dist.mk: Add APACHE_VHOSTS_DIR
Signed-off-by: Jan Lindemann <jan@janware.com>
2016-07-27 13:01:14 +00:00
ea02655437 defs-dist.mk: Support USE_STACK_PROTECTOR and USE_STACK_CHECKER

Add support for make variables USE_STACK_PROTECTOR and USE_STACK_CHECKER

Signed-off-by: Jan Lindemann <jan@janware.com>
2016-03-20 20:22:59 +00:00
c5d7109aae make: Add TMPL as installation file type
Signed-off-by: Jan Lindemann <jan@janware.com>
2016-02-11 13:35:43 +00:00
7436e9799b defs*.mk: Add PROJECTS_DIR

PROJECTS_DIR is a new variable to abstract away differences from DEVELOPMENT == true or false.

Signed-off-by: Jan Lindemann <jan@janware.com>
2016-01-28 13:02:42 +00:00
118c01e1ba defs-dist.mk, defs.mk, make.mk: Some more fixes to build system
Signed-off-by: Jan Lindemann <jan@janware.com>
2016-01-26 14:43:53 +00:00
38712ed260 make, scripts: Some additions to package-config creation
Signed-off-by: Jan Lindemann <jan@janware.com>
2016-01-24 16:05:55 +00:00
4bbc2206e5 defs-dist.mk and defs-dev.mk: HTML_PROJECT now defaults to PROJECT without www- prefix.
Signed-off-by: Jan Lindemann <jan@janware.com>
2015-04-07 13:18:00 +00:00
5206555d96 make: Add support for gettext.mk
Signed-off-by: Jan Lindemann <jan@janware.com>
2015-04-06 16:45:41 +00:00
a28d8f5f30 make/*.mk: Add support for systemd service files
Signed-off-by: Jan Lindemann <jan@janware.com>
2014-06-26 10:15:58 +00:00
0eb6520a66 defs-dev.mk, defs-dist.mk: Add variable HTML_PROJECT
Signed-off-by: Jan Lindemann <jan@janware.com>
2014-06-25 13:47:58 +00:00
96de2faade defs-[dev|dist].mk: Add PROJECT_HTML_[BASE|THEMES]_DIR

Add variables PROJECT_HTML_BASE_DIR and PROJECT_HTML_THEMES_DIR.

Signed-off-by: Jan Lindemann <jan@janware.com>
2014-06-25 12:46:40 +00:00
98b170bceb make: (hopefully) added support for .site installation
Signed-off-by: Jan Lindemann <jan@janware.com>
2014-06-24 19:19:41 +00:00
9ce0075e9b defs-dev.mk, defs-dist.mk: Change HTDOCS_PREFIX from /srv/www/htdocs to /srv/www
Signed-off-by: Jan Lindemann <jan@janware.com>
2014-06-24 18:49:04 +00:00
9e6d2f1ae3 defs-dist.mk, rules.mk: Fix some APACHE_CONF installation variables and rules
Signed-off-by: Jan Lindemann <jan@janware.com>
2014-06-24 15:53:37 +00:00
fec512fa91 defs-dist.mk: Install var files into /var/lib instead of /var/opt
Signed-off-by: Jan Lindemann <jan@janware.com>
2014-06-18 17:45:25 +00:00
a8e259870b defs-dev.mk, defs-dist.mk, defs.mk: Add support for installation type .apache-conf
Signed-off-by: Jan Lindemann <jan@janware.com>
2014-06-17 13:02:05 +00:00
24b75bdd6e defs-[dev|dist].mk: LOGROT_MODE -> 644

Change LOGROT_MODE to 644, since group writable log files are ignored by logrotate.

Signed-off-by: Jan Lindemann <jan@janware.com>
2014-06-14 15:44:14 +00:00
Jan Lindemann
c5db05b810 defs-dist.mk: Add (disabled) USE_MCHECK
Signed-off-by: Jan Lindemann <jan@jannet.de>
2012-11-16 16:14:31 +00:00
Jan Lindemann
05be1d8ead make: Add support for installation file type PKG_CONFIG 2012-04-28 16:01:18 +00:00
Jan Lindemann
d1857e8d77 $(TOPDIR), make, scripts: Merged changes from V_1_1_31_6_POST_ACCEPTANCE 2011-05-15 18:28:19 +00:00
Jan Lindemann
2939f8e3a8 Everywhere: Merge V_1_1_29_40_POST_ACCEPTANCE 2011-02-20 14:15:22 +00:00
Jan Lindemann
2f639cc609 defs-dev.mk, defs-dist.mk: Add support for KIO_PROTOCOL and friends 2010-12-13 17:26:46 +00:00
Jan Lindemann
d44ea911b8 defs-dist.mk: O (hopefully) fixed rsyslog installation stuff 2010-08-30 15:22:38 +00:00
Jan Lindemann
7d1e22cb76 make: Add support for RSYSLOG_XXX installation 2010-08-28 13:04:37 +00:00
Jan Lindemann
f90d98ed7d defs-dev.mk, defs-dist.mk: Change CRONTABMODE from 644 to 600 2010-06-26 10:12:14 +00:00
Jan Lindemann
7ea21115c0 defs-dev.mk, defs-dist.mk: Change CRONTABMODE to 644, otherwise cron complains 2010-06-10 10:51:11 +00:00