47221aabdb
defs-dirs.mk: Add support for EXTRA_SUBDIR_TARGETS
...
Signed-off-by: Jan Lindemann <jan@janware.com>
2020-04-10 12:03:42 +00:00
5f3c4a6320
jw-build-create-project.sh: Add __init__.py and __pychache__ to .gitignore
...
Signed-off-by: Jan Lindemann <jan@janware.com>
2020-04-06 07:03:32 +00:00
5f9258bdf8
jw-build-create-project.sh: Add *.swp to .gitignore
...
Signed-off-by: Jan Lindemann <jan@janware.com>
2020-04-05 12:54:49 +00:00
7fb117a4c4
python-tools.sh: Make __init__py recognize multiple package modules
...
import my.mod.thing, my.mod.thang wouldn't work, if the modules where not in the same directory hierarchy, e.g. in $(HOME)/blah/my/mod/thing.py and $(HOME)/blub/my/mod/thang.py, not even with PYTHONPATH=$(HOME)/blah:$(HOME)/blub.
This commit fixes that.
See https://stackoverflow.com/questions/1675734
Signed-off-by: Jan Lindemann <jan@janware.com>
2020-04-05 12:51:11 +00:00
477d4e2d8d
rpmdist.mk: Remove make/.cache.mk with clean target
...
make rpm-build sometimes fails because RPM_VERSION is taken from .cache.mk. Not sure if this commit always resolves that entirely, but it mitigates the problem.
Signed-off-by: Jan Lindemann <jan@janware.com>
2020-04-05 12:51:10 +00:00
d8542717b1
py-defs.mk: Add PY_PREREQ_RUN in PYTHONPATH
...
This allows to specify modules in a test directory which a given module does _not_ depend on and doesn't want to depend on.
Signed-off-by: Jan Lindemann <jan@janware.com>
2020-04-05 12:51:08 +00:00
3e99fe51cd
projects-dir.mk: Don't do git-pull.done before git-pull-%
...
Use cvs-update.done instead of git-pull.done as prerequisite of git-pull-%, because otherwise broken remote own repos might not be recoverable
Signed-off-by: Jan Lindemann <jan@janware.com>
2020-03-23 08:13:14 +00:00
1239fb9f34
projects.py: Support line continuation in project.conf
...
This commit makes lines with backslashes at the end behave as if the next line was appended
Signed-off-by: Jan Lindemann <jan@janware.com>
2020-03-19 17:36:58 +00:00
e71661425c
projects.py: Fix integer comparison
...
Python 3.8 complains about integers compared with 'is not' instead of '!=', fix that
Signed-off-by: Jan Lindemann <jan@janware.com>
2020-03-19 17:34:35 +00:00
79465cfb6a
Release 1.0.0-100@suse-tumbleweed/x86_64
...
Signed-off-by: Janware DevOps <devops@janware.com>
2020-03-11 14:39:37 +00:00
689b980e58
Start version: 1.0.0-100
...
Signed-off-by: janware DevOps <devops@janware.com>
2020-03-11 14:38:45 +00:00
74fd246e81
header.ger.tmpl, header.tex.tmpl: Disable LaTeX package portland
...
portland has been removed from TexLive upstream due to licensing issues, see https://bugzilla.redhat.com/show_bug.cgi?id=1192705 . It is, however, very short, and still on CPAN, see https://ctan.kako-dev.de/macros/latex209/contrib/misc/portland.sty , so it can be included again if need be, given a test case.
Signed-off-by: Jan Lindemann <jan@janware.com>
2020-03-01 17:24:53 +00:00
1c7ef88936
Release 1.0.0-99@ubuntu-18.04/amd64
...
Signed-off-by: Janware DevOps <devops@janware.com>
2020-02-25 11:57:45 +00:00
640dc4ffad
git-submod.mk: Check a couple of variables before taking action
...
Add checks to the git-init-submod-remote target, to keep it from starting a job which fails halfway through
Signed-off-by: Jan Lindemann <jan@janware.com>
2020-02-25 10:39:24 +00:00
17244e9a3f
pgit.sh: Add support for target refspec to PGIT_CLONE_FROM_USER
...
PGIT_CLONE_CLONE_FROM_USER now supports optional suffixes of the form [:src-ref[:dst-ref]]. If present, src-ref specifies the remote branch pgit.sh tries to fetch, and dst-ref the local branch it tries to fetch into. src-ref defaults to "master" (as it was before) and dst-ref to nothing, i.e. no head-update of any local branch.
Signed-off-by: Jan Lindemann <jan@janware.com>
2020-02-24 14:35:26 +00:00
34c5d3ec21
proj.mk: Set JANWARE_URL_DOC_PROJECT to jw-build cheat sheet
...
Signed-off-by: Jan Lindemann <jan@janware.com>
2020-02-24 12:19:05 +00:00
f5f18f6b04
Release 1.0.0-99@suse-tumbleweed/x86_64
...
Signed-off-by: Janware DevOps <devops@janware.com>
2020-02-10 20:32:52 +00:00
a39a49c753
Start version: 1.0.0-99
...
Signed-off-by: janware DevOps <devops@janware.com>
2020-02-10 20:32:07 +00:00
f8765bf0f2
qt-defs.mk: Fix QT_BIN_PREFIX
...
pkg-config --variable=host_bins <modules> returns a trailing whitespace, which breaks QT_BIN_PREFIX, fix that.
Signed-off-by: Jan Lindemann <jan@janware.com>
2020-02-10 19:52:56 +00:00
825277a46d
Release 1.0.0-98@suse-tumbleweed/x86_64
...
Signed-off-by: Jan Lindemann <jan@janware.com>
2020-02-10 18:58:39 +00:00
fec28f982b
Start version: 1.0.0-98
...
Signed-off-by: janware DevOps <devops@janware.com>
2020-02-10 18:58:08 +00:00
23c9fa8db8
Release 1.0.0-97@suse-tumbleweed/x86_64
...
Signed-off-by: Jan Lindemann <jan@janware.com>
2020-02-10 13:48:31 +00:00
efbf03cb2c
Start version: 1.0.0-97
...
Signed-off-by: janware DevOps <devops@janware.com>
2020-02-10 13:47:51 +00:00
f400886a81
Release 1.0.0-96@suse-tumbleweed/x86_64
...
Signed-off-by: Janware DevOps <devops@janware.com>
2020-02-08 20:50:17 +00:00
e901c33d72
Start version: 1.0.0-96
...
Signed-off-by: janware DevOps <devops@janware.com>
2020-02-08 20:49:29 +00:00
3a0d85ff89
git-srv-admin.sh: Fix group ownership
...
Fix group ownership of newly created git directories.
Signed-off-by: Jan Lindemann <jan@janware.com>
2020-01-21 15:35:06 +00:00
9370121c65
Fix: Tried to purge on first download without jw-build present
...
Signed-off-by: Jan Lindemann <jan@janware.com>
2020-01-20 09:21:35 +00:00
a93758c99c
Release 1.0.0-95@suse-tumbleweed/x86_64
...
Signed-off-by: Janware DevOps <devops@janware.com>
2019-12-27 18:37:00 +00:00
b641f52467
Start version: 1.0.0-95
...
Signed-off-by: janware DevOps <devops@janware.com>
2019-12-27 18:36:14 +00:00
d4a9bad14e
jw-pkg compile-templates: Fix slashes in passwords
...
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-12-27 18:27:12 +00:00
9f5527a28e
Release 1.0.0-94@suse-tumbleweed/x86_64
...
Signed-off-by: Janware DevOps <devops@janware.com>
2019-12-27 15:12:49 +00:00
f3687d276e
Start version: 1.0.0-94
...
Signed-off-by: janware DevOps <devops@janware.com>
2019-12-27 14:44:16 +00:00
f8df5c6825
projects.py: Make dep flavour "build" a superset of "run"
...
If P1 build-needs P2, make it run-need P2, too, since with the current dependency resolution algorithm, this also adds everything needed to _run_ P2. Which is the only thing this commit is after. It actually does too much, and enables P1 to run, too, at least WRT P2. But that's the easiest way to resolve the problem for now.
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-12-27 14:43:29 +00:00
db06828ec4
dev-utils.mk indent-makefiles: Only current directory
...
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-12-20 10:57:43 +00:00
20e599c049
projects-dir.mk: Add python3 to BASE_PKGS
...
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-12-10 18:51:39 +00:00
2a57902480
projects-dir.mk: Mention help target in comment
...
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-12-09 09:57:16 +00:00
82f48a4630
projects-dir.mk: Add help target
...
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-12-09 09:52:31 +00:00
3ce6eac53f
projects.py: Add -dev as a possible package suffix
...
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-12-08 10:39:55 +00:00
36bf04a4d2
projects-dir.mk: Do pull.done before git-pull-%
...
This might fix a situation where make git-pull-<user> fails, because jw-build isn't there, yet
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-12-07 19:22:53 +00:00
6bdb16878a
make: Replace "pereq" in targets by "deps"
...
"prereq" is simply impossible to use in explanations with a straight face.
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-12-07 19:21:08 +00:00
6327f67683
Release 1.0.0-93@ubuntu-18.04/amd64
...
Signed-off-by: Janware DevOps <devops@janware.com>
2019-12-07 14:49:49 +00:00
92726d14a4
cache.mk: Replace $(RM) by rm
...
$(RM) is a cached variable, so it's not a good idea to use it in cache.mk to get to a clean state
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-11-19 13:13:22 +00:00
9e936455fc
py-rules.mk: Remove *.rep with clean target
...
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-11-19 13:12:16 +00:00
2a0694a497
defs.mk: Add PRISTINE_MAKE
...
make carries MAKEFLAGS, PATH, LD_LIBRARY_PATH and umask from the environment to sub-makes, which sometimes is undesirable. So, instead of make -C, $(PRISTINE_MAKE) -C will start a sub-make with a minimal environment consisting of MINIMAL_UMASK, MINIMAL_PATH, MINIMAL_LD_LIBRARY_PATH and MINIMAL_MAKEFLAGS
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-11-19 13:11:51 +00:00
0186d346a5
project.conf: Add inkscape to pkg.requires.os.build
...
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-11-19 09:28:15 +00:00
83eeb7a2f9
Fix: Realpath is not a package anymore in Ubuntu 18.04
...
/usr/bin/realpath is part of coreutils in Ubuntu 18.04
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-11-19 09:07:57 +00:00
785b1929be
cvs-admin.sh: Remove trailing empty lines
...
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-11-13 20:14:25 +00:00
f9e73b54a2
project.conf: Add release package dependencies for Ubuntu
...
Add release dependencies devscripts, debhelper, dput, libparse-debcontrol-perl, fakeroot, pkg-config, tested on Ubuntu 18.04.
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-11-13 12:51:43 +00:00
86d95a97f6
create-mkdebian.sh: Fix staging path
...
Staging path by default is debian/tmp, and the packager (dh_install) looks there and in . for staged files, e.g. ./dist/src/jw-build-1.0.0-93/debian/tmp. This doesn't match the file system layout as created by jw-build's make install, which installs to ./dist/src/jw-build-1.0.0-93/debian/tmp/inst-root.
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-11-13 12:49:28 +00:00
921a929cd3
Ubuntu: Fix PY_SITE_PACKAGES_PATH
...
PY_SITE_PACKAGES_PATH is set to the first element site.getsitepackages(), which (correctly, but in this case undesirably) is below /usr/local. Use the first path which is not.
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-11-13 12:49:27 +00:00
