Commit graph

3,433 commits

Author SHA1 Message Date
eecc030d74 create-mkspec.sh: Add support for global.vendor config entry
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-30 16:23:40 +00:00
bcbc9f83bc defs.mk: Change build C|CPP|LDFLAGS order
Order is now: $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(COMPLILER_CFLAGS)
which resulted in header files specified in $(LOCAL_CFLAGS) found
after those of $(PROJECT_CFLAGS).

Still not optimal, as this way other general flags, e.g. optimization
flags, override more specialized ones. Maybe use INCLUDES instead.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-30 16:23:36 +00:00
f1d9bba070 targets-tools.mk: Fix HDRDIR_SCOPE_SUFFIX for nested include dir structure
The attempt to have local include directory with HDRDIR_SCOPE_SUFFIX
pointing to the working directory failed the last time around. This
commit tries to fix that.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-30 16:23:29 +00:00
88bf4b381b conf.mk, crontab.mk: Fix accidental cleanup of .h in conf.mk and crontab.mk
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-30 16:23:24 +00:00
9fd2f3f9ec topdir.mk: Remove *dist* with topdir.distclean
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-30 16:23:20 +00:00
bcebe4dbd3 defs.mk: Fix commit 6fc4125
Commit 6fc4125 introduced broken installation paths if PROJECT was
auto-detected. It included the version.

Also include *.ini into LOCAL_CFG by default.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-30 16:23:15 +00:00
522eb228ce scm.sh: Automatically activate opt_no_submodules for git 1.x
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-30 16:23:11 +00:00
6a4092b8af topdir.mk: Don't set default SUBDIRS if ORDERED_SUBDIRS is set
If ORDERED_SUBDIRS is set, SUBDIRS should by default start with
$(ORDERED_SUBDIRS), and filled up with what $(FIND_SUBDIRS) turns up.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-30 16:23:07 +00:00
d7da4f1cb8 mkspec-wrapper.sh: Fix append() for special characters
The append() shell function was unable to cope with special
characters, notably with () in RPM provides libnnz12.so()(64bit),
this commit fixes that. And introduces some (disabled) debug code
into projects.py.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-30 16:23:03 +00:00
8d30bbf748 defs.mk, get-os.sh: Define OSTYPE as linux on Linux
The environment variable OSTYPE contains different values
on Linux: Linux on OpenSUSE and linux-gnu on RHEL / CentOS

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-30 16:22:58 +00:00
19e4095c94 proj.mk: Define MODDIR with ?=, to allow external jw-build
jw-build can handle its own builds and releases, but fixing that can
be nicer if the development and the test directory are seperate

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-08 11:12:32 +00:00
bb58932e24 git-cvs-bridge.mk: Add support for GIT_CVSIMPORT_EXTRA_ARGS
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-08 11:03:36 +00:00
c713793e16 srcdist.mk: Make wd-upload work with upload-defs.mk
wd-upload doesn\'t work at all, because it clashed with rpmdist.mk defining
stuff used by the upload-*.mk files. The RPM-side of things is left untested.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-08 10:53:32 +00:00
c8e664bcb9 Makefile, git-cvs-bridge.mk, srcdist.mk: Add git-cvs-bridge.mk
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-08 08:55:17 +00:00
9f4d0adf5f srcdist.mk: Trade obsolete contents for VCS-aware tarball generation
Ditch the old and mostly dysfunctional contents of srcdist.mk and refill it
with rules to generate a source code tarball containing version control meta
files.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-08 08:09:06 +00:00
c12b242a72 upload-*.mk: Remove redundant variable definitions
Merge redundant upload definitions from upload.mk / upload-defs.mk.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-08 07:26:59 +00:00
f502fcd9c2 defs.mk: Remove some unnecessary invocations of /bin/pwd
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-08 07:14:44 +00:00
f28afc777c make, scripts: Add support for [pkg.provides.xxx]
Add Support for manually specifying arbitrary package capabilities in
project.conf.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-07 14:34:58 +00:00
c6f81d4f4c mkspec-wrapper.sh: Support for --provides-run and --provides-devel
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-07 13:36:28 +00:00
6b740f72ff mkspec-wrappper.sh: Simplify getopt code
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-07 10:06:00 +00:00
0cb3f38258 mkspec-wrappper.sh: Minor code beautification
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-07 09:41:51 +00:00
559198f765 pgit.sh: Run update-descriptions after push during clone
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-04 18:06:00 +00:00
53a75a70a7 git-srv-admin.sh: Beautify code
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-04 18:04:17 +00:00
98e7606029 defs.mk, rpmdist.mk, pkg.sh: Fix detection of rpmbuild path
$HOME/rpmbuild was not correctly assumed as build directory if it doesn't exist.

Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-03 20:00:01 +00:00
00a52c9039 pgit.sh: Don't pull fetchuser into current master, only fetch
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-03 12:10:00 +00:00
c17d563991 topdir.mk: Run make git-update-project-description after initializing git repo
Signed-off-by: Jan Lindemann <jan@janware.com>
2019-01-03 11:33:31 +00:00
412cba229e Release 1.0.0-84@centos-7/x86_64
Signed-off-by: Janware DevOps <devops@janware.com>
2018-12-28 14:17:42 +00:00
7c8bb4a6ab Release 1.0.0-84@debian-8/amd64
Signed-off-by: Janware DevOps <devops@janware.com>
2018-12-28 13:56:51 +00:00
ed8b3918cc py-defs.mk: Allow PY_INSTALL_DIR to be overridden (?=)
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-28 13:46:23 +00:00
0a63920e60 bin/Makefile:
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-28 13:33:48 +00:00
f195f1c366 create-mkdebian.sh: Fix broken double quotes
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-28 13:33:08 +00:00
f8b575f42d bin.mk: Fix missing include $(MODDIR)/make/defs.mk
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-28 13:22:03 +00:00
9b44eb7370 Release 1.0.0-84@suse-tumbleweed/x86_64
Signed-off-by: Janware DevOps <devops@janware.com>
2018-12-28 12:32:07 +00:00
25be0a91f1 Start version: 1.0.0-84
Signed-off-by: janware DevOps <devops@janware.com>
2018-12-28 12:31:35 +00:00
d436ed880e rpmdist.mk: Minimal code beautification
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-27 22:33:17 +00:00
07e71c6710 defs.mk: Add RELEASES file to installed documentation
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-27 22:12:17 +00:00
46e653a391 swig.mk: Add basic support for SWIG_TARGET java
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-27 17:31:30 +00:00
f19831245f make: Support GNUmakefile too, where applicable
Add support for GNUmakefile, where originally only Makefile was supported.
Not done everywhere, as some of the code involving makefiles is dead
anyway.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-27 17:30:10 +00:00
14c451854b projects.mk, topdir.mk: Minor code beautification
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-27 17:03:53 +00:00
4d8ff72147 make: Add multiple inclusion preventers around makefile rules
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-27 17:02:19 +00:00
a8b958b7cf pkg.sh: More tweaks to filter_devel
filter_devel now identifies more intricate directory structures below /include/
as belonging into development packages. The filter is dynamically amended,
based on whether or not the directories contain .h or .hpp files.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-27 16:59:30 +00:00
621c39f076 rules.mk: Pass -D to /usr/bin/install $(BUILD_XXX)/%
This is an experimental commit, mostly facilitating creation of more intricate
include file structures below $(TOPDIR)/include. Probably doesn't hurt but is
only part of the story, since proper clean target support isn't provided per
se.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-27 16:59:29 +00:00
eb97f44ddb rpmdist.mk: Make pkg-build.dist depend on $(VERSION_FILE)
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-27 16:59:28 +00:00
cecf8def7d Release 1.0.0-83@suse-tumbleweed/x86_64
Signed-off-by: Janware DevOps <devops@janware.com>
2018-12-26 14:06:02 +00:00
bd75774555 Start version: 1.0.0-83
Signed-off-by: janware DevOps <devops@janware.com>
2018-12-26 14:05:28 +00:00
626dde6388 projects-dir.mk: StrictHostKeyChecking=no
Add JW_BUILD_SSH_EXTRA_OPTS += -o StrictHostKeyChecking=no.

Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-26 13:05:02 +00:00
b67c221eaa pkg.sh: Make filter_devel more specific
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-23 13:32:09 +00:00
24f76372a3 Release 1.0.0-82@suse-tumbleweed/x86_64
Signed-off-by: Janware DevOps <devops@janware.com>
2018-12-16 18:46:37 +00:00
823840d823 topdir.mk: Add target echo-hash to topdir.mk
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-16 18:45:24 +00:00
182053be29 pkg.sh: Fix project hash value calculation
Signed-off-by: Jan Lindemann <jan@janware.com>
2018-12-16 18:41:54 +00:00