janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

Everywhere: Rename MOD_SCRIPT_DIR -> JWB_SCRIPT_DIR

Browse source 
Follow name change of MODDIR -> JWBDIR.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-06-29 21:45:24 +00:00
commit bdd66dbc26
25 changed files with 65 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/packaging/add-pkg-conflicts-support.patch
View file

@ -24,7 +24,7 @@ diff -u -r1.137 rpmdist.mk
+ -N $(RPM_PROJECT) -P $(PROJECT) \ + -N $(RPM_PROJECT) -P $(PROJECT) \
+ -R "$(RPM_REQUIRES_RUN)" -D "$(RPM_REQUIRES_DEVEL)" \ + -R "$(RPM_REQUIRES_RUN)" -D "$(RPM_REQUIRES_DEVEL)" \
+ -X "$(RPM_CONFLICTS_RUN)" -Y "$(RPM_CONFLICTS_DEVEL)" \ + -X "$(RPM_CONFLICTS_RUN)" -Y "$(RPM_CONFLICTS_DEVEL)" \
-m $(MOD_SCRIPT_DIR) -a $(RPM_ARCH) -p $(DIST_PCKG_DIR) -F $(PKG_FORMAT) \ -m $(JWB_SCRIPT_DIR) -a $(RPM_ARCH) -p $(DIST_PCKG_DIR) -F $(PKG_FORMAT) \
-B $(RPM_UPLOAD_URLPREFIX) -A $(RPM_UPLOAD_FILE_ATTRIB) -B $(RPM_UPLOAD_URLPREFIX) -A $(RPM_UPLOAD_FILE_ATTRIB)
Index: scripts/create-mkdebian.sh Index: scripts/create-mkdebian.sh

2
make/dav.mk
View file

@ -6,7 +6,7 @@ DAV_SERVER ?= cvs.janware.com
DAV_RSYNC_SERVER ?= $(DAV_SERVER) DAV_RSYNC_SERVER ?= $(DAV_SERVER)
DAV_RSYNC_DIR ?= /srv/dav/pub/groups/$(DAV_GROUP)/$(DAV_GROUP_PROJECT) DAV_RSYNC_DIR ?= /srv/dav/pub/groups/$(DAV_GROUP)/$(DAV_GROUP_PROJECT)
DAV_RSYNC_URL = $(DAV_RSYNC_SERVER):$(DAV_RSYNC_DIR) DAV_RSYNC_URL = $(DAV_RSYNC_SERVER):$(DAV_RSYNC_DIR)
DAV_RSYNC_EXCLUDE ?= $(shell bash $(MOD_SCRIPT_DIR)/scm.sh ls-files) DAV_RSYNC_EXCLUDE ?= $(shell bash $(JWB_SCRIPT_DIR)/scm.sh ls-files)
DAV_RSYNC_EXCLUDE_OPTS = $(addprefix --exclude , $(DAV_RSYNC_EXCLUDE) '*.done') DAV_RSYNC_EXCLUDE_OPTS = $(addprefix --exclude , $(DAV_RSYNC_EXCLUDE) '*.done')
DAV_RSYNC_EXTRA_OPTS ?= DAV_RSYNC_EXTRA_OPTS ?=
DAV_RSYNC ?= rsync $(DAV_RSYNC_EXCLUDE_OPTS) DAV_RSYNC ?= rsync $(DAV_RSYNC_EXCLUDE_OPTS)

8
make/defs.mk
View file

@ -16,7 +16,7 @@ comma := ,
include $(JWBDIR)/make/projects.mk include $(JWBDIR)/make/projects.mk
ifeq ($(MAKE_BENCHMARK),true) ifeq ($(MAKE_BENCHMARK),true)
export SHELL := /bin/bash $(MOD_SCRIPT_DIR)/timed-make-shell.sh export SHELL := /bin/bash $(JWB_SCRIPT_DIR)/timed-make-shell.sh
else else
export SHELL := /bin/bash export SHELL := /bin/bash
endif endif
@ -85,7 +85,7 @@ ifndef PRINTF
PRINTF := $(shell $(WHICH) printf) PRINTF := $(shell $(WHICH) printf)
endif endif
PKG_SH_EXE := /bin/bash $(MOD_SCRIPT_DIR)/pkg.sh PKG_SH_EXE := /bin/bash $(JWB_SCRIPT_DIR)/pkg.sh
LOG_INSTALL_SH := $(PKG_SH_EXE) log-install LOG_INSTALL_SH := $(PKG_SH_EXE) log-install
UPDATE_REPO_SH := /opt/packager-server/bin/packager-server schedule-rebuild UPDATE_REPO_SH := /opt/packager-server/bin/packager-server schedule-rebuild
@ -115,7 +115,7 @@ reverse = $(if $(wordlist 2,2,$(1)),$(call reverse,$(wordli
make_subdirs = set -e; for D in $(SUBDIRS) ; do make -C $$D ; done make_subdirs = set -e; for D in $(SUBDIRS) ; do make -C $$D ; done
make_subdirs_target = set -e; for D in $(SUBDIRS) ; do make -C $$D $@; done make_subdirs_target = set -e; for D in $(SUBDIRS) ; do make -C $$D $@; done
install_local_cfg = $(INSTALL) -p -o $(CFGOWNER) -g $(CFGGROUP) -m $(CFGMODE) $< $@ install_local_cfg = $(INSTALL) -p -o $(CFGOWNER) -g $(CFGGROUP) -m $(CFGMODE) $< $@
cvs_files = sh $(MOD_SCRIPT_DIR)/scm.sh ls-files -f cvs_files = sh $(JWB_SCRIPT_DIR)/scm.sh ls-files -f
add_flavour_prefix = $(SED) "s/\([^ ][^ ]*\) *\([<>=]*\) *\([^ ]*\)/$(FLAVOUR_PREFIX)\1 \2 \3/g" add_flavour_prefix = $(SED) "s/\([^ ][^ ]*\) *\([<>=]*\) *\([^ ]*\)/$(FLAVOUR_PREFIX)\1 \2 \3/g"
beautify_lib_path = $(SED) 's/:/\n + /g' beautify_lib_path = $(SED) 's/:/\n + /g'
find_files = $(wildcard $(addsuffix /$(1),$(patsubst :, ,$(2)))) find_files = $(wildcard $(addsuffix /$(1),$(patsubst :, ,$(2))))
@ -196,7 +196,7 @@ else
endif endif
ifeq ($(PKG_FORMAT),debian) ifeq ($(PKG_FORMAT),debian)
RPM ?= /bin/bash $(MOD_SCRIPT_DIR)/dpm.sh RPM ?= /bin/bash $(JWB_SCRIPT_DIR)/dpm.sh
RPM_ARCH := $(shell dpkg --print-architecture) RPM_ARCH := $(shell dpkg --print-architecture)
RPM_SUFFIX ?= deb RPM_SUFFIX ?= deb
else else

2
make/isolinux.mk
View file

@ -55,7 +55,7 @@ unpack.done: $(URL_FILE) dload.done
mv $(SYSLINUX_BASE) $(UNPACK_DIR) mv $(SYSLINUX_BASE) $(UNPACK_DIR)
touch $@ touch $@
GENERATE = /bin/bash $(MOD_SCRIPT_DIR)/generate-boot-medium.sh GENERATE = /bin/bash $(JWB_SCRIPT_DIR)/generate-boot-medium.sh
BOOT_CONF = boot.conf BOOT_CONF = boot.conf
$(ISO_IMAGE): $(BOOT_CONF) dirs.done $(CD_FILES) $(ISO_IMAGE): $(BOOT_CONF) dirs.done $(CD_FILES)

2
make/list-files.mk
View file

@ -1,4 +1,4 @@
LIST_VCS_FILES := /bin/bash $(MOD_SCRIPT_DIR)/scm.sh ls-files LIST_VCS_FILES := /bin/bash $(JWB_SCRIPT_DIR)/scm.sh ls-files
ifndef LIST_FILES_MK_INCLUDED ifndef LIST_FILES_MK_INCLUDED
LIST_FILES_MK_INCLUDED := true LIST_FILES_MK_INCLUDED := true

4
make/make.mk
View file

@ -60,8 +60,8 @@ ifeq ($(CREATE_PKG_CONFIG),true)
CREATE_PKG_CONFIG_OPTS += -l "-L$(PROJECT_DIRPATH)/lib -l$(PROJECT)" CREATE_PKG_CONFIG_OPTS += -l "-L$(PROJECT_DIRPATH)/lib -l$(PROJECT)"
endif endif
$(LOCAL_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(JWBDIR)/make/make.mk $(MOD_SCRIPT_DIR)/create-pkg-config.sh $(LOCAL_PKG_CONFIG): $(PROJECT_DESCR_FILE) $(JWBDIR)/make/make.mk $(JWB_SCRIPT_DIR)/create-pkg-config.sh
/bin/bash $(MOD_SCRIPT_DIR)/create-pkg-config.sh \ /bin/bash $(JWB_SCRIPT_DIR)/create-pkg-config.sh \
-F $< \ -F $< \
-n $(PROJECT) \ -n $(PROJECT) \
-v $(DIST_VERSION) \ -v $(DIST_VERSION) \

4
make/platform.mk
View file

@ -16,9 +16,9 @@ $(eval $(call try_include,$(JWBDIR)/make/pre-local.mk))
$(eval $(call try_include,$(TOPDIR)/make/pre-local.mk)) $(eval $(call try_include,$(TOPDIR)/make/pre-local.mk))
$(eval $(call try_include,pre-local.mk)) $(eval $(call try_include,pre-local.mk))
MOD_SCRIPT_DIR := $(firstword $(wildcard $(JWBDIR)/scripts $(JWBDIR)/bin)) JWB_SCRIPT_DIR := $(firstword $(wildcard $(JWBDIR)/scripts $(JWBDIR)/bin))
ifndef GET_OS_SH ifndef GET_OS_SH
GET_OS_SH := $(SHELL) $(MOD_SCRIPT_DIR)/get-os.sh GET_OS_SH := $(SHELL) $(JWB_SCRIPT_DIR)/get-os.sh
endif endif
# -- product # -- product

2
make/profile.mk
View file

@ -23,4 +23,4 @@ path-%.sh:
@echo "export PATH=\$$PATH:$(INSTALL_EXEDIR)" > $@.tmp @echo "export PATH=\$$PATH:$(INSTALL_EXEDIR)" > $@.tmp
mv $@.tmp $@ mv $@.tmp $@
clean.profile: clean.profile:
/bin/bash $(MOD_SCRIPT_DIR)/scm.sh clean -f $(PROFILE) /bin/bash $(JWB_SCRIPT_DIR)/scm.sh clean -f $(PROFILE)

18
make/projects-dir.mk
View file

@ -46,8 +46,8 @@ export JW_BUILD_VERBOSE
# ------------ external programs I # ------------ external programs I
CWD := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) CWD := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
MOD_SCRIPT_DIR = ./jw-build/scripts JWB_SCRIPT_DIR = ./jw-build/scripts
GET_OS_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/get-os.sh /opt/jw-build/bin/get-os.sh) get-os-sh-not-found) GET_OS_SH = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/get-os.sh /opt/jw-build/bin/get-os.sh) get-os-sh-not-found)
SSH_WRAPPER_SH := $(CWD)/ssh-wrapper.sh SSH_WRAPPER_SH := $(CWD)/ssh-wrapper.sh
EXCLUDES_FILE ?= exclude.txt EXCLUDES_FILE ?= exclude.txt
@ -116,14 +116,14 @@ EDITOR ?= xdg-open
ifeq ($(TIME),) ifeq ($(TIME),)
TIME = $(shell which time) -p TIME = $(shell which time) -p
endif endif
PROJECTS_PY = python3 $(MOD_SCRIPT_DIR)/projects.py --prefix $(shell pwd) $(PROJECTS_PY_EXTRA_OPTS) PROJECTS_PY = python3 $(JWB_SCRIPT_DIR)/projects.py --prefix $(shell pwd) $(PROJECTS_PY_EXTRA_OPTS)
PROJECTS_PY_BUILD = $(PROJECTS_PY) build $(PROJECTS_PY_EXTRA_BUILD_OPTS) PROJECTS_PY_BUILD = $(PROJECTS_PY) build $(PROJECTS_PY_EXTRA_BUILD_OPTS)
PGIT_SH = /bin/bash $(MOD_SCRIPT_DIR)/pgit.sh PGIT_SH = /bin/bash $(JWB_SCRIPT_DIR)/pgit.sh
PURGE_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/purge-stale-projects.sh /opt/jw-build/bin/purge-stale-projects.sh) purge-not-found) PURGE_SH = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/purge-stale-projects.sh /opt/jw-build/bin/purge-stale-projects.sh) purge-not-found)
PKG_MANAGER_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/pkg-manager.sh /opt/jw-build/bin/pkg-manager.sh) pkg-manager-not-found) PKG_MANAGER_SH ?= /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/pkg-manager.sh /opt/jw-build/bin/pkg-manager.sh) pkg-manager-not-found)
CREATE_PROJECT_SH ?= /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jw-build-create-project.sh /opt/jw-build/bin/jw-build-create-project.sh) jw-build-create-project-not-found) CREATE_PROJECT_SH ?= /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/jw-build-create-project.sh /opt/jw-build/bin/jw-build-create-project.sh) jw-build-create-project-not-found)
LIST_VCS_FILES_SH = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/scm.sh /opt/jw-build/bin/scm.sh) scm-sh-not-found) ls-files LIST_VCS_FILES_SH = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/scm.sh /opt/jw-build/bin/scm.sh) scm-sh-not-found) ls-files
JW_PKG = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/jw-pkg /opt/jw-build/bin/jw-pkg) jw-pkg-not-found) JW_PKG = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/jw-pkg /opt/jw-build/bin/jw-pkg) jw-pkg-not-found)
GIT_SRV_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.janware.com /opt/jw-build/bin/git-srv-admin.sh GIT_SRV_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.janware.com /opt/jw-build/bin/git-srv-admin.sh
CVS_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@cvs.janware.com /opt/jw-build/bin/cvs-admin.sh CVS_ADMIN_SH = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@cvs.janware.com /opt/jw-build/bin/cvs-admin.sh

2
make/projects.mk
View file

@ -35,7 +35,7 @@ else
endif endif
ifneq ($(TOPDIR),) ifneq ($(TOPDIR),)
proj_query_cmd = $(PYTHON) $(MOD_SCRIPT_DIR)/projects.py -p $(PROJECTS_DIR) -t $(TOPDIR) $(PROJECTS_PY_EXTRA_ARGS) proj_query_cmd = $(PYTHON) $(JWB_SCRIPT_DIR)/projects.py -p $(PROJECTS_DIR) -t $(TOPDIR) $(PROJECTS_PY_EXTRA_ARGS)
proj_query = $(shell $(proj_query_cmd) $(1)) proj_query = $(shell $(proj_query_cmd) $(1))
proj_dir = $(call proj_query,proj-dir $(1)) proj_dir = $(call proj_query,proj-dir $(1))
htdocs_dir = $(call proj_query,htdocs-dir $(1)) htdocs_dir = $(call proj_query,htdocs-dir $(1))

2
make/py-mod.mk
View file

@ -18,5 +18,5 @@ include $(JWBDIR)/make/py-rules.mk
__init__.py: $(PY_INIT_TMPL) $(filter-out __init__.py,$(PY_SRC_PY)) __init__.py: $(PY_INIT_TMPL) $(filter-out __init__.py,$(PY_SRC_PY))
if [ "$(PY_INIT_TMPL)" ]; then cat "$(PY_INIT_TMPL)" > $@.tmp; else > $@.tmp; fi if [ "$(PY_INIT_TMPL)" ]; then cat "$(PY_INIT_TMPL)" > $@.tmp; else > $@.tmp; fi
/bin/bash +H $(MOD_SCRIPT_DIR)/python-tools.sh create-init -m $(PY_MOD) -e "$(PY_SED_EXTRACT_EXPORT)" *.py | tee -a $@.tmp /bin/bash +H $(JWB_SCRIPT_DIR)/python-tools.sh create-init -m $(PY_MOD) -e "$(PY_SED_EXTRACT_EXPORT)" *.py | tee -a $@.tmp
mv $@.tmp $@ mv $@.tmp $@

2
make/py-rules.mk
View file

@ -2,7 +2,7 @@ all:
py.clean: py.clean:
$(RM) -f *.done *.pyc $(RM) -f *.done *.pyc
/bin/bash $(MOD_SCRIPT_DIR)/scm.sh clean -f __init__.py /bin/bash $(JWB_SCRIPT_DIR)/scm.sh clean -f __init__.py
$(RM) -rf __pycache__ $(RM) -rf __pycache__
install-dirs.done: install-dirs.done:

12
make/rpmdist.mk
View file

@ -8,9 +8,9 @@ endif
RPM_VERSION ?= $(DIST_VERSION) RPM_VERSION ?= $(DIST_VERSION)
ifneq ($(BUILD_PROJECT_PACKAGE),false) ifneq ($(BUILD_PROJECT_PACKAGE),false)
UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh UPLOAD_SH = $(JWB_SCRIPT_DIR)/upload.sh
LOCAL_MKSPEC_SH ?= $(TOPDIR)/make/mkspec.sh LOCAL_MKSPEC_SH ?= $(TOPDIR)/make/mkspec.sh
MKSPEC_SH ?= $(MOD_SCRIPT_DIR)/mkspec-wrapper.sh $(LOCAL_MKSPEC_SH) MKSPEC_SH ?= $(JWB_SCRIPT_DIR)/mkspec-wrapper.sh $(LOCAL_MKSPEC_SH)
FTP_SRC_GROUP ?= $(shell id -g) FTP_SRC_GROUP ?= $(shell id -g)
FTP_SRC_USER ?= $(shell whoami) FTP_SRC_USER ?= $(shell whoami)
FTP_RUN_GROUP ?= $(shell id -g) FTP_RUN_GROUP ?= $(shell id -g)
@ -106,7 +106,7 @@ PKG_SH = $(PKG_SH_EXE) \
-R "$(RPM_REQUIRES_RUN)" -D "$(RPM_REQUIRES_DEVEL)" \ -R "$(RPM_REQUIRES_RUN)" -D "$(RPM_REQUIRES_DEVEL)" \
-X "$(RPM_CONFLICTS_RUN)" -Y "$(RPM_CONFLICTS_DEVEL)" \ -X "$(RPM_CONFLICTS_RUN)" -Y "$(RPM_CONFLICTS_DEVEL)" \
--provides-run "$(RPM_PROVIDES_RUN)" --provides-devel "$(RPM_PROVIDES_DEVEL)" \ --provides-run "$(RPM_PROVIDES_RUN)" --provides-devel "$(RPM_PROVIDES_DEVEL)" \
-m $(MOD_SCRIPT_DIR) -a $(RPM_ARCH) -p $(DIST_PCKG_DIR) -F $(PKG_FORMAT) \ -m $(JWB_SCRIPT_DIR) -a $(RPM_ARCH) -p $(DIST_PCKG_DIR) -F $(PKG_FORMAT) \
-B $(RPM_UPLOAD_URLPREFIX) -A $(RPM_UPLOAD_FILE_ATTRIB) -B $(RPM_UPLOAD_URLPREFIX) -A $(RPM_UPLOAD_FILE_ATTRIB)
# -t $(DIST_SRC_DIR) # wrong: contains $(RPM_PROJECT)-$(RPM_VERSION) but is expected differently # -t $(DIST_SRC_DIR) # wrong: contains $(RPM_PROJECT)-$(RPM_VERSION) but is expected differently
@ -143,7 +143,7 @@ clean.rpm:
#else #else
# #
#$(LOCAL_MKSPEC_SH): $(PROJECT_DESCR_FILE) #$(LOCAL_MKSPEC_SH): $(PROJECT_DESCR_FILE)
# sh $(MOD_SCRIPT_DIR)/create-mkspec.sh $< > $@.tmp # sh $(JWB_SCRIPT_DIR)/create-mkspec.sh $< > $@.tmp
# mv $@.tmp $@ # mv $@.tmp $@
# #
#clean.mkspec: #clean.mkspec:
@ -188,7 +188,7 @@ pkgbuild.dist: $(DIST_PCKG_RPM) $(DIST_PCKG_SRPM) $(DIST_FILES)
touch $@ touch $@
pkg-upload-local.dist: pkgbuild.dist pkg-upload-local.dist: pkgbuild.dist
$(MOD_SCRIPT_DIR)/suse-local-repo.sh add $(DIST_PCKG_SRPM) $(DIST_PCKG_RPM) $(JWB_SCRIPT_DIR)/suse-local-repo.sh add $(DIST_PCKG_SRPM) $(DIST_PCKG_RPM)
touch $@ touch $@
pkginstall.dist: pkg-build.dist pkginstall.dist: pkg-build.dist
@ -291,7 +291,7 @@ define increase_build_number
echo -n "+ increasing build number to " ;\ echo -n "+ increasing build number to " ;\
echo $(MAJOR_MINOR_RELEASE)-$(shell expr $(BUILD_NUMBER) + 1)-dev | tee VERSION ;\ echo $(MAJOR_MINOR_RELEASE)-$(shell expr $(BUILD_NUMBER) + 1)-dev | tee VERSION ;\
echo $(HASH) > HASH ;\ echo $(HASH) > HASH ;\
if ! /bin/bash $(MOD_SCRIPT_DIR)/scm.sh ls-files | grep -q '^HASH$$'; then \ if ! /bin/bash $(JWB_SCRIPT_DIR)/scm.sh ls-files | grep -q '^HASH$$'; then \
$(SCM_ADD) HASH ;\ $(SCM_ADD) HASH ;\
fi ;\ fi ;\
$(SCM_COMMIT) -m "$(MAJOR_MINOR_RELEASE)-$(shell expr $(BUILD_NUMBER) + 1)-dev" HASH VERSION $(SCM_COMMIT) -m "$(MAJOR_MINOR_RELEASE)-$(shell expr $(BUILD_NUMBER) + 1)-dev" HASH VERSION

8
make/rules.mk
View file

@ -192,7 +192,7 @@ echo-libpath:
@echo LD_LIBRARY_PATH = :$(LD_LIBRARY_PATH) | $(beautify_lib_path) @echo LD_LIBRARY_PATH = :$(LD_LIBRARY_PATH) | $(beautify_lib_path)
echo-lddtree: echo-lddtree:
bash $(MOD_SCRIPT_DIR)/linktree.sh $(REAL_LDFLAGS) bash $(JWB_SCRIPT_DIR)/linktree.sh $(REAL_LDFLAGS)
echo-path: echo-path:
@echo PATH = :$(PATH) | $(beautify_lib_path) @echo PATH = :$(PATH) | $(beautify_lib_path)
@ -282,7 +282,7 @@ $(SO_PREFIX)%.so: %.o
endif endif
$(VERSION_SCRIPT): $(VERSION_SCRIPT):
sh $(MOD_SCRIPT_DIR)/make-version-script.sh $(BINARY_VERSION) > $@.tmp sh $(JWB_SCRIPT_DIR)/make-version-script.sh $(BINARY_VERSION) > $@.tmp
mv $@.tmp $@ mv $@.tmp $@
ifneq ($(TARGET),mingw) ifneq ($(TARGET),mingw)
@ -437,9 +437,9 @@ $(INSTALLED_PROFILE_PATH_SCRIPT): $(TOPDIR)/profiledir.done
$(INSTALL) -p -o $(PROFILEOWNER) -g $(PROFILEGROUP) -m $(PROFILEMODE) path_script.sh $@ $(INSTALL) -p -o $(PROFILEOWNER) -g $(PROFILEGROUP) -m $(PROFILEMODE) path_script.sh $@
find: find:
@bash $(MOD_SCRIPT_DIR)/scm.sh ls-files @bash $(JWB_SCRIPT_DIR)/scm.sh ls-files
collect: collect:
bash $(MOD_SCRIPT_DIR)/collect-installed-pkg-changes.sh -t $(TOPDIR) bash $(JWB_SCRIPT_DIR)/collect-installed-pkg-changes.sh -t $(TOPDIR)
endif # ifndef JW_BUILD_RULES_MK_INCLUDED endif # ifndef JW_BUILD_RULES_MK_INCLUDED

4
make/run.mk
View file

@ -134,11 +134,11 @@ supp.tmp:
valgrind --gen-suppressions=all $(EXE_PATH) $(EXE_ARGS) 2>$@.tmp; mv $@.tmp $@ || exit 0 valgrind --gen-suppressions=all $(EXE_PATH) $(EXE_ARGS) 2>$@.tmp; mv $@.tmp $@ || exit 0
vg-create-supp: supp.tmp vg-create-supp: supp.tmp
$(CAT) $< | $(MOD_SCRIPT_DIR)/parse-valgrind-suppressions.sh > local.supp $(CAT) $< | $(JWB_SCRIPT_DIR)/parse-valgrind-suppressions.sh > local.supp
$(RM) -f supp.tmp $(RM) -f supp.tmp
vg-add-supp: vg-add-supp:
$(CAT) | $(MOD_SCRIPT_DIR)/parse-valgrind-suppressions.sh >> local.supp $(CAT) | $(JWB_SCRIPT_DIR)/parse-valgrind-suppressions.sh >> local.supp
vg-clean-supp: vg-clean-supp:
$(RM) -f local.supp $(RM) -f local.supp

6
make/smart-selection.mk
View file

@ -1,7 +1,7 @@
# === variable definitions # === variable definitions
GET_OS_SH = sh $(MOD_SCRIPT_DIR)/get-os.sh GET_OS_SH = sh $(JWB_SCRIPT_DIR)/get-os.sh
GENERATE_SELECTION = sh $(MOD_SCRIPT_DIR)/generate_selection.sh GENERATE_SELECTION = sh $(JWB_SCRIPT_DIR)/generate_selection.sh
UPLOAD_SH = sh $(MOD_SCRIPT_DIR)/upload.sh UPLOAD_SH = sh $(JWB_SCRIPT_DIR)/upload.sh
DISTRIBUTOR = $(shell $(GET_OS_SH) | cut -d- -f1) DISTRIBUTOR = $(shell $(GET_OS_SH) | cut -d- -f1)
DISTRO_RELEASE = $(shell $(GET_OS_SH) | cut -d- -f2-) DISTRO_RELEASE = $(shell $(GET_OS_SH) | cut -d- -f2-)

4
make/suse-selection.mk
View file

@ -1,10 +1,10 @@
JWBDIR = $(HOME)/local/src/cvs.main/proj/jw-build JWBDIR = $(HOME)/local/src/cvs.main/proj/jw-build
include $(JWBDIR)/make/defs.mk include $(JWBDIR)/make/defs.mk
GENERATE_SELECTION = $(MOD_SCRIPT_DIR)/generate_selection.sh GENERATE_SELECTION = $(JWB_SCRIPT_DIR)/generate_selection.sh
SUSE_RELEASE = 10.1 SUSE_RELEASE = 10.1
UPLOAD_URL = root@pkg.janware.com:/srv/dav/pub/packages/linux/suse/$(SUSE_RELEASE)/setup/descr UPLOAD_URL = root@pkg.janware.com:/srv/dav/pub/packages/linux/suse/$(SUSE_RELEASE)/setup/descr
UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh UPLOAD_SH = $(JWB_SCRIPT_DIR)/upload.sh
SELECTION = $(shell sh $(GENERATE_SELECTION) -s).sel SELECTION = $(shell sh $(GENERATE_SELECTION) -s).sel

2
make/tagged-tmpl.mk
View file

@ -17,7 +17,7 @@ include $(JWBDIR)/make/defs.mk
#clean: tmpl.clean #clean: tmpl.clean
# #
#tmpl.clean: #tmpl.clean:
# /bin/bash $(MOD_SCRIPT_DIR)/scm.sh -f $(TAGGED_TMPL_GENERATED) # /bin/bash $(JWB_SCRIPT_DIR)/scm.sh -f $(TAGGED_TMPL_GENERATED)
# #
#%: %.tmpl #%: %.tmpl
# cat %< | $(TAGGED_TMPL_UNTEMPLATE) > $@.tmp # cat %< | $(TAGGED_TMPL_UNTEMPLATE) > $@.tmp

2
make/theme-images.mk
View file

@ -12,7 +12,7 @@ clean: doneclean
distclean: distclean:
%-greyed-out.png: %.png %-greyed-out.png: %.png
/bin/bash $(MOD_SCRIPT_DIR)/convert-to-greyed-out-image.sh $< $@.tmp /bin/bash $(JWB_SCRIPT_DIR)/convert-to-greyed-out-image.sh $< $@.tmp
mv $@.tmp $@ mv $@.tmp $@
basedir.done: basedir.done:

6
make/topdir.mk
View file

@ -64,7 +64,7 @@ include $(JWBDIR)/make/rules.mk
include $(JWBDIR)/make/doc-rules.mk include $(JWBDIR)/make/doc-rules.mk
include $(JWBDIR)/make/list-files.mk include $(JWBDIR)/make/list-files.mk
STREAMLINE_PROJECT ?= bash $(MOD_SCRIPT_DIR)/streamline-project.sh STREAMLINE_PROJECT ?= bash $(JWB_SCRIPT_DIR)/streamline-project.sh
INSTALLED_TOPDIR_FILES = $(addprefix $(INSTALL_DOCDIR)/, $(DOCS)) INSTALLED_TOPDIR_FILES = $(addprefix $(INSTALL_DOCDIR)/, $(DOCS))
@ -162,7 +162,7 @@ git-update-project-description:
ssh git.janware.com "/opt/jw-build/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) update-descriptions $(PROJECT)" ssh git.janware.com "/opt/jw-build/bin/git-srv-admin.sh $(OPT_JANWARE_PROJECT) update-descriptions $(PROJECT)"
projects-%: projects-%:
python2 $(MOD_SCRIPT_DIR)/projects.py build $* $(PROJECT) python2 $(JWB_SCRIPT_DIR)/projects.py build $* $(PROJECT)
install-deps-devel: install-deps-devel:
sudo zypper in $(shell echo $(RPM_REQUIRES_DEVEL) | sed "s/ *= */-/g; s/ [^ ]\+-__NEXT_VERSION__//") sudo zypper in $(shell echo $(RPM_REQUIRES_DEVEL) | sed "s/ *= */-/g; s/ [^ ]\+-__NEXT_VERSION__//")
@ -171,7 +171,7 @@ streamline:
$(STREAMLINE_PROJECT) $(STREAMLINE_PROJECT)
$(GIT_DESCR): $(PROJECT_DESCR_FILE) $(GIT_DESCR): $(PROJECT_DESCR_FILE)
/bin/bash $(MOD_SCRIPT_DIR)/ini-section.sh summary $< | tee $@.tmp /bin/bash $(JWB_SCRIPT_DIR)/ini-section.sh summary $< | tee $@.tmp
mv $@.tmp $@ mv $@.tmp $@
git-init.done: git-init.done:

6
make/upload-defs-rpm.mk
View file

@ -1,10 +1,10 @@
# this makefile needs # this makefile needs
# PCKG_ROOT # PCKG_ROOT
# VERSION # VERSION
# MOD_SCRIPT_DIR # JWB_SCRIPT_DIR
#UPLOAD_SH = $(MOD_SCRIPT_DIR)/upload.sh #UPLOAD_SH = $(JWB_SCRIPT_DIR)/upload.sh
#MKSPEC_SH = $(MOD_SCRIPT_DIR)/mkspec-wrapper.sh $(TOPDIR)/make/mkspec.sh #MKSPEC_SH = $(JWB_SCRIPT_DIR)/mkspec-wrapper.sh $(TOPDIR)/make/mkspec.sh
#FTP_FILE_MODE ?= 640 #FTP_FILE_MODE ?= 640
#FTP_DIR_MODE ?= 750 #FTP_DIR_MODE ?= 750

2
make/upload-defs.mk
View file

@ -1,4 +1,4 @@
UPLOAD_SH ?= /bin/bash $(MOD_SCRIPT_DIR)/upload.sh UPLOAD_SH ?= /bin/bash $(JWB_SCRIPT_DIR)/upload.sh
UPLOAD_PROJECT ?= $(PROJECT) UPLOAD_PROJECT ?= $(PROJECT)
UPLOAD_MODULE ?= $(UPLOAD_PROJECT) UPLOAD_MODULE ?= $(UPLOAD_PROJECT)
UPLOAD_FILE_MODE ?= 640 UPLOAD_FILE_MODE ?= 640

2
scripts/create-mkdebian.sh
View file

@ -123,7 +123,7 @@ override_dh_auto_install:
mkdir -p \`dirname \$INSTALL_LOG\` mkdir -p \`dirname \$INSTALL_LOG\`
> \$INSTALL_LOG > \$INSTALL_LOG
\\\$(MAKE) ENV_PREFIX=\\\$(ENV_PREFIX) INSTALL_LOG=\\\$(INSTALL_LOG) install \\\$(MAKE) ENV_PREFIX=\\\$(ENV_PREFIX) INSTALL_LOG=\\\$(INSTALL_LOG) install
PATH=$MOD_SCRIPT_DIR:\\\$(PATH) /bin/bash pkg.sh milk-install-log -p \\\$(ENV_PREFIX) -n \\\$(NAME) -t deb \$INSTALL_LOG \\\$(DEB_DIR) PATH=$JWB_SCRIPT_DIR:\\\$(PATH) /bin/bash pkg.sh milk-install-log -p \\\$(ENV_PREFIX) -n \\\$(NAME) -t deb \$INSTALL_LOG \\\$(DEB_DIR)
dh_installdirs dh_installdirs
override_dh_shlibdeps: override_dh_shlibdeps:

2
scripts/create-mkspec.sh
View file

@ -102,7 +102,7 @@ _cat <<- EOT
|echo "mkdir -p \`dirname \$INSTALL_LOG\`" |echo "mkdir -p \`dirname \$INSTALL_LOG\`"
|echo "> \$INSTALL_LOG" |echo "> \$INSTALL_LOG"
|echo "make install" |echo "make install"
|echo "export PATH=$MOD_SCRIPT_DIR:\\\$PATH" |echo "export PATH=$JWB_SCRIPT_DIR:\\\$PATH"
|echo "/bin/bash pkg.sh milk-install-log -p \\\$ENV_PREFIX -n \$NAME -t rpm -s \\"$subpackages\\" \$INSTALL_LOG \`dirname \$INSTALL_LOG\`" |echo "/bin/bash pkg.sh milk-install-log -p \\\$ENV_PREFIX -n \$NAME -t rpm -s \\"$subpackages\\" \$INSTALL_LOG \`dirname \$INSTALL_LOG\`"
|echo "exit 0" # <- Cut short CentOS magic appended to install scriptlet, which would generate .pyo files and other cruft. |echo "exit 0" # <- Cut short CentOS magic appended to install scriptlet, which would generate .pyo files and other cruft.
EOT EOT

24
scripts/pkg.sh
View file

@ -36,7 +36,7 @@ fatal()
os() os()
{ {
/bin/bash $MOD_SCRIPT_DIR/get-os.sh /bin/bash $JWB_SCRIPT_DIR/get-os.sh
} }
scm_commit() scm_commit()
@ -90,7 +90,7 @@ scm_files()
{ {
( (
cd $TOPDIR cd $TOPDIR
/bin/bash $MOD_SCRIPT_DIR/scm.sh ls-files -f $@ /bin/bash $JWB_SCRIPT_DIR/scm.sh ls-files -f $@
) )
} }
@ -448,18 +448,18 @@ build_pkg()
# --- generate spec file # --- generate spec file
local mkdef_sh=$TOPDIR/make/mk$deffmt.sh local mkdef_sh=$TOPDIR/make/mk$deffmt.sh
local mkdef_wrapper_sh=$MOD_SCRIPT_DIR/mkspec-wrapper.sh local mkdef_wrapper_sh=$JWB_SCRIPT_DIR/mkspec-wrapper.sh
[ ! -r $mkdef_wrapper_sh ] && \ [ ! -r $mkdef_wrapper_sh ] && \
fatal "Failed to read package definition deffmt wrapper script \"$mkdef_wrapper_sh\"." fatal "Failed to read package definition deffmt wrapper script \"$mkdef_wrapper_sh\"."
scm_files | grep -q make/mk$deffmt.sh || { scm_files | grep -q make/mk$deffmt.sh || {
local create_mkdef_sh=$MOD_SCRIPT_DIR/create-mk$deffmt.sh local create_mkdef_sh=$JWB_SCRIPT_DIR/create-mk$deffmt.sh
[ ! -r "$PROJECT_DESCR_FILE" ] && \ [ ! -r "$PROJECT_DESCR_FILE" ] && \
fatal "Failed to read project description file \"$PROJECT_DESCR_FILE\"." fatal "Failed to read project description file \"$PROJECT_DESCR_FILE\"."
[ ! -r "$create_mkdef_sh" ] && \ [ ! -r "$create_mkdef_sh" ] && \
fatal "Failed to read package build definition creation script \"$create_mkdef_sh\"." fatal "Failed to read package build definition creation script \"$create_mkdef_sh\"."
PATH=$MOD_SCRIPT_DIR:$PATH /bin/bash $create_mkdef_sh $PROJECT_DESCR_FILE > $mkdef_sh.tmp PATH=$JWB_SCRIPT_DIR:$PATH /bin/bash $create_mkdef_sh $PROJECT_DESCR_FILE > $mkdef_sh.tmp
mv $mkdef_sh.tmp $mkdef_sh mv $mkdef_sh.tmp $mkdef_sh
tmp_mkdef_sh="$tmp_mkdef_sh $mkdef_sh" tmp_mkdef_sh="$tmp_mkdef_sh $mkdef_sh"
} }
@ -469,7 +469,7 @@ build_pkg()
( (
cd $src_tree cd $src_tree
PATH=$MOD_SCRIPT_DIR:$PATH /bin/bash $mkdef_wrapper_sh $mkdef_sh \ PATH=$JWB_SCRIPT_DIR:$PATH /bin/bash $mkdef_wrapper_sh $mkdef_sh \
-V $version \ -V $version \
-S $tar_archive \ -S $tar_archive \
-N $RPM_PROJECT \ -N $RPM_PROJECT \
@ -503,7 +503,7 @@ build_pkg()
#exit #exit
#cp $DIST_PCKG_DIR/$tar_archive $src_tree/../$tar_archive_orig #cp $DIST_PCKG_DIR/$tar_archive $src_tree/../$tar_archive_orig
( (
local mod_script_dir=`readlink -f $MOD_SCRIPT_DIR` local mod_script_dir=`readlink -f $JWB_SCRIPT_DIR`
cd $src_tree cd $src_tree
#export ENV_PREFIX=`readlink -f $TOPDIR`/$DIST_INST_DIR #export ENV_PREFIX=`readlink -f $TOPDIR`/$DIST_INST_DIR
#export INSTALL_LOG=blah #export INSTALL_LOG=blah
@ -566,7 +566,7 @@ upload_file()
esac esac
esac esac
echo "+ uploading $target" echo "+ uploading $target"
RSYNC_RSH=$SSH /bin/bash $MOD_SCRIPT_DIR/upload.sh $DIST_PCKG_DIR/$f $target RSYNC_RSH=$SSH /bin/bash $JWB_SCRIPT_DIR/upload.sh $DIST_PCKG_DIR/$f $target
} }
upload_pkg() upload_pkg()
@ -1068,7 +1068,7 @@ while [ ${1:0:1} = - ]; do
shift shift
;; ;;
-m) -m)
eval MOD_SCRIPT_DIR=\"$2\" eval JWB_SCRIPT_DIR=\"$2\"
shift shift
;; ;;
-N) -N)
@ -1127,13 +1127,13 @@ while [ ${1:0:1} = - ]; do
shift shift
done done
[ "$MOD_SCRIPT_DIR" ] || MOD_SCRIPT_DIR=`dirname $0` [ "$JWB_SCRIPT_DIR" ] || JWB_SCRIPT_DIR=`dirname $0`
[ "$PROJECT" ] || PROJECT=`abspath $TOPDIR | xargs basename` [ "$PROJECT" ] || PROJECT=`abspath $TOPDIR | xargs basename`
cmd=$1 cmd=$1
shift shift
export MOD_SCRIPT_DIR=`readlink -f $MOD_SCRIPT_DIR` export JWB_SCRIPT_DIR=`readlink -f $JWB_SCRIPT_DIR`
export PKG_SH=`readlink -f $0` export PKG_SH=`readlink -f $0`
@ -1157,7 +1157,7 @@ rpm)
RPM=/bin/rpm RPM=/bin/rpm
;; ;;
deb|debian) deb|debian)
RPM="/bin/bash $MOD_SCRIPT_DIR/dpm.sh" RPM="/bin/bash $JWB_SCRIPT_DIR/dpm.sh"
;; ;;
*) *)
fatal "Unknown package format \"$PKG_FORMAT\"" fatal "Unknown package format \"$PKG_FORMAT\""