janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-25 23:13:54 +01:00
Code Activity

upload-*.mk: Remove redundant variable definitions

Browse source 
Merge redundant upload definitions from upload.mk / upload-defs.mk.

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2019-01-08 07:26:59 +00:00
commit c12b242a72
2 changed files with 20 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

22
make/upload-defs.mk
View file

@ -1,4 +1,4 @@
UPLOAD_SH ?= $(MOD_SCRIPT_DIR)/upload.sh UPLOAD_SH ?= /bin/bash $(MOD_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
@ -7,9 +7,25 @@ UPLOAD_GROUP ?= $(shell id -ng)
UPLOAD_USER ?= $(shell id -nu) UPLOAD_USER ?= $(shell id -nu)
UPLOAD_HOST_LOGIN ?= root UPLOAD_HOST_LOGIN ?= root
UPLOAD_HOST ?= www.jannet.de UPLOAD_HOST ?= www.jannet.de
UPLOAD_FILE_ROOT ?= /srv/www/jannet.de_443/proj/$(UPLOAD_MODULE) UPLOAD_VHOST_ROOT ?= /srv/www/jannet.de_443
#UPLOAD_TEST_PREFIX ?=
UPLOAD_MODULE_PATH ?= $(UPLOAD_TEST_PREFIX)proj/$(UPLOAD_MODULE)
UPLOAD_FILE_ROOT ?= $(UPLOAD_VHOST_ROOT)/$(UPLOAD_MODULE_PATH)
UPLOAD_TARGET_PREFIX ?= rsync_ssh://$(UPLOAD_HOST_LOGIN)@$(UPLOAD_HOST):$(UPLOAD_FILE_ROOT)/ UPLOAD_TARGET_PREFIX ?= rsync_ssh://$(UPLOAD_HOST_LOGIN)@$(UPLOAD_HOST):$(UPLOAD_FILE_ROOT)/
UPLOAD_FILES ?= UPLOAD_LAST_VERSION_FILE ?= LAST_UPLOADED_VERSION
UPLOAD_LAST_VERSION ?= $(shell $(CAT) $(UPLOAD_LAST_VERSION_FILE) 2>/dev/null)
#UPLOAD_FILES ?=
REMOTE_TARGETS ?= \ REMOTE_TARGETS ?= \
$(foreach f,$(UPLOAD_FILES),$(UPLOAD_TARGET_PREFIX)$f:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP)) $(foreach f,$(UPLOAD_FILES),$(UPLOAD_TARGET_PREFIX)$f:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP))
ifneq ($(wildcard CVS),)
UPLOAD_SCM = cvs
else
UPLOAD_SCM = git
endif
all:
rsync_ssh\://% ftp\://% scp\://%:
make $(shell echo $(notdir $@) | $(SED) 's/:.*//g')
$(UPLOAD_SH) $(shell echo $(notdir $@) $@ | $(SED) 's/:.*//g') $@

30
make/upload.mk
View file

@ -1,36 +1,8 @@
UPLOAD_SH ?= /bin/bash $(MOD_SCRIPT_DIR)/upload.sh include $(MODDIR)/make/upload-defs.mk
UPLOAD_PROJECT ?= $(PROJECT)
UPLOAD_MODULE ?= $(UPLOAD_PROJECT)
UPLOAD_FILE_MODE ?= 640
UPLOAD_DIR_MODE ?= 750
UPLOAD_GROUP ?= $(shell id -ng)
UPLOAD_USER ?= $(shell id -nu)
UPLOAD_HOST_LOGIN ?= root
UPLOAD_HOST ?= www.jannet.de
UPLOAD_VHOST_ROOT ?= /srv/www/jannet.de_443
#UPLOAD_TEST_PREFIX ?=
UPLOAD_MODULE_PATH ?= $(UPLOAD_TEST_PREFIX)proj/$(UPLOAD_MODULE)
UPLOAD_FILE_ROOT ?= $(UPLOAD_VHOST_ROOT)/$(UPLOAD_MODULE_PATH)
UPLOAD_TARGET_PREFIX ?= rsync_ssh://$(UPLOAD_HOST_LOGIN)@$(UPLOAD_HOST):$(UPLOAD_FILE_ROOT)/
UPLOAD_LAST_VERSION_FILE ?= LAST_UPLOADED_VERSION
UPLOAD_LAST_VERSION ?= $(shell $(CAT) $(UPLOAD_LAST_VERSION_FILE) 2>/dev/null)
#UPLOAD_FILES ?=
REMOTE_TARGETS ?= \
$(foreach f,$(UPLOAD_FILES),$(UPLOAD_TARGET_PREFIX)$f:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP))
ifneq ($(wildcard CVS),)
UPLOAD_SCM = cvs
else
UPLOAD_SCM = git
endif
all: all:
upload: upload.dist upload: upload.dist
rsync_ssh\://% ftp\://% scp\://%:
make $(shell echo $(notdir $@) | $(SED) 's/:.*//g')
$(UPLOAD_SH) $(shell echo $(notdir $@) $@ | $(SED) 's/:.*//g') $@
upload.dist: $(UPLOAD_FILES) upload.dist: $(UPLOAD_FILES)
ifneq ($(UPLOAD_LAST_VERSION),$(VERSION)) ifneq ($(UPLOAD_LAST_VERSION),$(VERSION))
make $(REMOTE_TARGETS) make $(REMOTE_TARGETS)