mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-15 03:53:32 +01:00
conf/jcs, make, tmpl/doxygen: Align equal signs in makefiles to column 30
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
parent
e3142c9624
commit
0eaef0c326
59 changed files with 2065 additions and 2032 deletions
134
make/rpmdist.mk
134
make/rpmdist.mk
|
|
@ -1,107 +1,107 @@
|
|||
RPM_PROJECT ?= $(FLAVOUR_PREFIX)$(PROJECT)
|
||||
RPM_PROJECT ?= $(FLAVOUR_PREFIX)$(PROJECT)
|
||||
|
||||
ifeq ($(filter pkg-%,$(MAKECMDGOALS)),)
|
||||
# also to be used from proj.mk, typically
|
||||
BUILD_PROJECT_PACKAGE = false
|
||||
BUILD_PROJECT_PACKAGE = false
|
||||
endif
|
||||
|
||||
RPM_VERSION ?= $(DIST_VERSION)
|
||||
RPM_VERSION ?= $(DIST_VERSION)
|
||||
|
||||
ifneq ($(BUILD_PROJECT_PACKAGE),false)
|
||||
UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
|
||||
LOCAL_MKSPEC_SH ?= $(TOPDIR)/make/mkspec.sh
|
||||
MKSPEC_SH ?= $(MOD_SCRIPT_DIR)/mkspec-wrapper.sh $(LOCAL_MKSPEC_SH)
|
||||
FTP_SRC_GROUP ?= $(shell id -g)
|
||||
FTP_SRC_USER ?= $(shell whoami)
|
||||
FTP_RUN_GROUP ?= $(shell id -g)
|
||||
FTP_RUN_USER ?= $(shell whoami)
|
||||
FTP_DEV_GROUP ?= $(shell id -g)
|
||||
FTP_DEV_USER ?= $(shell whoami)
|
||||
FTP_HOST ?= pkg.janware.com
|
||||
FTP_FILE_MODE ?= 644
|
||||
FTP_DIR_MODE ?= 755
|
||||
FTP_HOST_LOGIN ?= root
|
||||
RELEASES_FILE = $(TOPDIR)/RELEASES$(FLAVOUR_SUFFIX)
|
||||
RELEASES ?= $(shell $(PKG_SH_EXE) version \
|
||||
UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh
|
||||
LOCAL_MKSPEC_SH ?= $(TOPDIR)/make/mkspec.sh
|
||||
MKSPEC_SH ?= $(MOD_SCRIPT_DIR)/mkspec-wrapper.sh $(LOCAL_MKSPEC_SH)
|
||||
FTP_SRC_GROUP ?= $(shell id -g)
|
||||
FTP_SRC_USER ?= $(shell whoami)
|
||||
FTP_RUN_GROUP ?= $(shell id -g)
|
||||
FTP_RUN_USER ?= $(shell whoami)
|
||||
FTP_DEV_GROUP ?= $(shell id -g)
|
||||
FTP_DEV_USER ?= $(shell whoami)
|
||||
FTP_HOST ?= pkg.janware.com
|
||||
FTP_FILE_MODE ?= 644
|
||||
FTP_DIR_MODE ?= 755
|
||||
FTP_HOST_LOGIN ?= root
|
||||
RELEASES_FILE = $(TOPDIR)/RELEASES$(FLAVOUR_SUFFIX)
|
||||
RELEASES ?= $(shell $(PKG_SH_EXE) version \
|
||||
-p $(OS_NAME_VERSION)/$(RPM_ARCH) $(RELEASES_FILE) read | $(SED) 's/-dev//')
|
||||
RPMBUILD ?= pkgbuild
|
||||
CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true
|
||||
HASH = $(shell $(cvs_files) -z | \
|
||||
RPMBUILD ?= pkgbuild
|
||||
CHECK_CVS_SYNC_BEFORE_RPM_RELEASE?= true
|
||||
HASH = $(shell $(cvs_files) -z | \
|
||||
grep -vz "CHANGES\|VERSION\|HASH\|MD5SUMS\|RELEASES" | \
|
||||
xargs -0 md5sum | md5sum | $(SED) 's/ .*//')
|
||||
LOCAL_REPO ?= /srv/dav/pub/local/packages/suse/$(OS_NAME_VERSION)
|
||||
LOCAL_REPO ?= /srv/dav/pub/local/packages/suse/$(OS_NAME_VERSION)
|
||||
|
||||
include $(MODDIR)/make/tag-defs.mk
|
||||
|
||||
DIST_DIR = dist
|
||||
DIST_SRC_DIR = $(DIST_DIR)/src/$(RPM_PROJECT)-$(RPM_VERSION)
|
||||
DIST_PCKG_DIR = $(DIST_DIR)/pckg
|
||||
#DIST_FILE = $(DIST_PCKG_DIR)/$(PROJECT)-$(DIST_VERSION).tar.gz
|
||||
DIST_DIR = dist
|
||||
DIST_SRC_DIR = $(DIST_DIR)/src/$(RPM_PROJECT)-$(RPM_VERSION)
|
||||
DIST_PCKG_DIR = $(DIST_DIR)/pckg
|
||||
#DIST_FILE = $(DIST_PCKG_DIR)/$(PROJECT)-$(DIST_VERSION).tar.gz
|
||||
|
||||
UPLOAD_SRC_DIR = $(DIST_PCKG_DIR)
|
||||
PCKG_TAR ?= $(RPM_PROJECT)-$(RPM_VERSION).tar.gz
|
||||
UPLOAD_SRC_DIR = $(DIST_PCKG_DIR)
|
||||
PCKG_TAR ?= $(RPM_PROJECT)-$(RPM_VERSION).tar.gz
|
||||
|
||||
ifeq ($(PKG_FORMAT),debian)
|
||||
# too bad: debian Requires: somepkg = 1.2.3 isn't satisfied by somepkg-1.2.3-5
|
||||
PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS = --dont-strip-revision
|
||||
PCKG_RPM_RUN_I386 ?= $(RPM_PROJECT)-run_$(RPM_VERSION)_$(RPM_ARCH).deb
|
||||
PCKG_RPM_RUN_I386 ?= $(RPM_PROJECT)-run_$(RPM_VERSION)_$(RPM_ARCH).deb
|
||||
ifeq ($(CREATE_DEVEL),true)
|
||||
PCKG_RPM_DEVEL_I386 ?= $(RPM_PROJECT)-devel_$(RPM_VERSION)_$(RPM_ARCH).deb
|
||||
PCKG_RPM_DEVEL_I386 ?= $(RPM_PROJECT)-devel_$(RPM_VERSION)_$(RPM_ARCH).deb
|
||||
endif
|
||||
PCKG_RPM_SRC ?= $(RPM_PROJECT)-$(RPM_VERSION).src.deb.keinplan
|
||||
PCKG_RPM_SRC ?= $(RPM_PROJECT)-$(RPM_VERSION).src.deb.keinplan
|
||||
else
|
||||
PCKG_RPM_RUN_I386 ?= $(RPM_PROJECT)-run-$(RPM_VERSION).$(RPM_ARCH).rpm
|
||||
PCKG_RPM_RUN_I386 ?= $(RPM_PROJECT)-run-$(RPM_VERSION).$(RPM_ARCH).rpm
|
||||
ifeq ($(CREATE_DEVEL),true)
|
||||
PCKG_RPM_DEVEL_I386 ?= $(RPM_PROJECT)-devel-$(RPM_VERSION).$(RPM_ARCH).rpm
|
||||
PCKG_RPM_DEVEL_I386 ?= $(RPM_PROJECT)-devel-$(RPM_VERSION).$(RPM_ARCH).rpm
|
||||
endif
|
||||
PCKG_RPM_SRC ?= $(RPM_PROJECT)-$(RPM_VERSION).src.rpm
|
||||
PCKG_RPM_SRC ?= $(RPM_PROJECT)-$(RPM_VERSION).src.rpm
|
||||
endif
|
||||
|
||||
include $(MODDIR)/make/upload-defs-rpm.mk
|
||||
|
||||
DIST_FILES = $(shell echo $(REMOTE_TARGETS) | $(SED) 's/\b.*\///g; s/:.*\b//g')
|
||||
GENERATED = $(sort $(shell find . -name '*.in' | \
|
||||
DIST_FILES = $(shell echo $(REMOTE_TARGETS) | $(SED) 's/\b.*\///g; s/:.*\b//g')
|
||||
GENERATED = $(sort $(shell find . -name '*.in' | \
|
||||
$(SED) "s/\.in$$//; s%$(DIST_SRC_DIR)%%; s%^[./]*%%"))
|
||||
ifeq ($(PKG_FORMAT),debian)
|
||||
RPMS_DIR = $(TOPDIR)/dist/src
|
||||
SRPMS_DIR = $(TOPDIR)/dist/src
|
||||
RPMS_DIR = $(TOPDIR)/dist/src
|
||||
SRPMS_DIR = $(TOPDIR)/dist/src
|
||||
else
|
||||
ifeq ($(BUILD_USER),root)
|
||||
RPMS_BUILD_DIR = /usr/src/packages
|
||||
RPMS_BUILD_DIR = /usr/src/packages
|
||||
else
|
||||
RPMS_BUILD_DIR = $(HOME)/rpmbuild
|
||||
RPMS_BUILD_DIR = $(HOME)/rpmbuild
|
||||
endif
|
||||
RPMS_DIR = $(RPMS_BUILD_DIR)/RPMS/$(RPM_ARCH)
|
||||
SRPMS_DIR = $(RPMS_BUILD_DIR)/SRPMS
|
||||
RPMS_DIR = $(RPMS_BUILD_DIR)/RPMS/$(RPM_ARCH)
|
||||
SRPMS_DIR = $(RPMS_BUILD_DIR)/SRPMS
|
||||
endif
|
||||
|
||||
DIST_DIRS = $(DIST_SRC_DIR) $(DIST_PCKG_DIR)
|
||||
BINARY_RPM = $(DIST_PCKG_DIR)/$(PCKG_RPM_RUN_I386)
|
||||
DIST_DIRS = $(DIST_SRC_DIR) $(DIST_PCKG_DIR)
|
||||
BINARY_RPM = $(DIST_PCKG_DIR)/$(PCKG_RPM_RUN_I386)
|
||||
ifeq ($(CREATE_DEVEL),true)
|
||||
BINARY_RPM += $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386)
|
||||
BINARY_RPM += $(DIST_PCKG_DIR)/$(PCKG_RPM_DEVEL_I386)
|
||||
endif
|
||||
DIST_PCKG_SRPM = $(BINARY_RPM) $(DIST_PCKG_DIR)/$(PCKG_RPM_SRC)
|
||||
DIST_PCKG_SRPM = $(BINARY_RPM) $(DIST_PCKG_DIR)/$(PCKG_RPM_SRC)
|
||||
|
||||
RPM_REQUIRES_DEVEL += $(call proj_query, pkg-requires --dont-expand-version-macros $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS) devel $(PROJECT))
|
||||
RPM_REQUIRES_RUN += $(call proj_query, pkg-requires --dont-expand-version-macros $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS) run $(PROJECT))
|
||||
RPM_CONFLICTS_DEVEL += $(call proj_query, pkg-conflicts --dont-expand-version-macros $(PROJ_QUERY_PKG_CONFLICTS_EXTRA_ARGS) devel $(PROJECT))
|
||||
RPM_CONFLICTS_RUN += $(call proj_query, pkg-conflicts --dont-expand-version-macros $(PROJ_QUERY_PKG_CONFLICTS_EXTRA_ARGS) run $(PROJECT))
|
||||
RPM_PROVIDES_DEVEL += $(call proj_query, pkg-provides --dont-expand-version-macros $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS) devel $(PROJECT))
|
||||
RPM_PROVIDES_RUN += $(call proj_query, pkg-provides --dont-expand-version-macros $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS) run $(PROJECT))
|
||||
RPM_REQUIRES_DEVEL += $(call proj_query, pkg-requires --dont-expand-version-macros $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS) devel $(PROJECT))
|
||||
RPM_REQUIRES_RUN += $(call proj_query, pkg-requires --dont-expand-version-macros $(PROJ_QUERY_PKG_REQUIRES_EXTRA_ARGS) run $(PROJECT))
|
||||
RPM_CONFLICTS_DEVEL += $(call proj_query, pkg-conflicts --dont-expand-version-macros $(PROJ_QUERY_PKG_CONFLICTS_EXTRA_ARGS) devel $(PROJECT))
|
||||
RPM_CONFLICTS_RUN += $(call proj_query, pkg-conflicts --dont-expand-version-macros $(PROJ_QUERY_PKG_CONFLICTS_EXTRA_ARGS) run $(PROJECT))
|
||||
RPM_PROVIDES_DEVEL += $(call proj_query, pkg-provides --dont-expand-version-macros $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS) devel $(PROJECT))
|
||||
RPM_PROVIDES_RUN += $(call proj_query, pkg-provides --dont-expand-version-macros $(PROJ_QUERY_PKG_PROVIDES_EXTRA_ARGS) run $(PROJECT))
|
||||
|
||||
RPM_UPLOAD_OS_NAME = $(shell echo $(OS_NAME_VERSION) | sed 's/-.*//')
|
||||
RPM_UPLOAD_OS_VERSION = $(shell echo $(OS_NAME_VERSION) | sed 's/[^-]\+-//')
|
||||
RPM_UPLOAD_URLPREFIX ?= rsync_ssh://root@pkg.janware.com:/srv/dav/pub/packages/linux/$(RPM_UPLOAD_OS_NAME)/$(RPM_UPLOAD_OS_VERSION)
|
||||
RPM_UPLOAD_USER ?= $(shell id -un)
|
||||
RPM_UPLOAD_GROUP ?= $(shell id -gn)
|
||||
RPM_UPLOAD_FILE_ATTRIB ?= 644:755:$(RPM_UPLOAD_USER).$(RPM_UPLOAD_GROUP)
|
||||
RPM_UPLOAD_OS_NAME = $(shell echo $(OS_NAME_VERSION) | sed 's/-.*//')
|
||||
RPM_UPLOAD_OS_VERSION = $(shell echo $(OS_NAME_VERSION) | sed 's/[^-]\+-//')
|
||||
RPM_UPLOAD_URLPREFIX ?= rsync_ssh://root@pkg.janware.com:/srv/dav/pub/packages/linux/$(RPM_UPLOAD_OS_NAME)/$(RPM_UPLOAD_OS_VERSION)
|
||||
RPM_UPLOAD_USER ?= $(shell id -un)
|
||||
RPM_UPLOAD_GROUP ?= $(shell id -gn)
|
||||
RPM_UPLOAD_FILE_ATTRIB ?= 644:755:$(RPM_UPLOAD_USER).$(RPM_UPLOAD_GROUP)
|
||||
|
||||
unexport RPM_VERSION VERSION DIST_SRC_DIR
|
||||
|
||||
include $(MODDIR)/make/tag-rules.mk
|
||||
include $(MODDIR)/make/upload-rules.mk
|
||||
|
||||
PKG_SH = $(PKG_SH_EXE) \
|
||||
PKG_SH = $(PKG_SH_EXE) \
|
||||
-N $(RPM_PROJECT) -P $(PROJECT) \
|
||||
-R "$(RPM_REQUIRES_RUN)" -D "$(RPM_REQUIRES_DEVEL)" \
|
||||
-X "$(RPM_CONFLICTS_RUN)" -Y "$(RPM_CONFLICTS_DEVEL)" \
|
||||
|
|
@ -229,10 +229,10 @@ update-repo.dist: upload.dist
|
|||
|
||||
ifeq ($(wildcard $(TOPDIR)/.git),)
|
||||
|
||||
SCM_COMMIT = cvs commit
|
||||
SCM_ADD = cvs add
|
||||
SCM_PUSH =
|
||||
SCM_PULL = cvs update -dP
|
||||
SCM_COMMIT = cvs commit
|
||||
SCM_ADD = cvs add
|
||||
SCM_PUSH =
|
||||
SCM_PULL = cvs update -dP
|
||||
|
||||
define check_scm_sync
|
||||
echo + checking cvs ;\
|
||||
|
|
@ -255,10 +255,10 @@ endef
|
|||
|
||||
else
|
||||
|
||||
SCM_COMMIT = git commit
|
||||
SCM_ADD = git add
|
||||
SCM_PUSH = git push
|
||||
SCM_PULL = git pull
|
||||
SCM_COMMIT = git commit
|
||||
SCM_ADD = git add
|
||||
SCM_PUSH = git push
|
||||
SCM_PULL = git pull
|
||||
|
||||
define check_scm_sync
|
||||
echo + checking git ;\
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue