janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-22 22:20:39 +01:00
Code Activity

srcdist.mk: Make wd-upload work with upload-defs.mk

Browse source 
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>
This commit is contained in:
Jan Lindemann 2019-01-08 10:53:32 +00:00
commit c713793e16
8 changed files with 44 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

17
make/upload-defs.mk
View file

@ -6,17 +6,16 @@ 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_HOST ?= files.janware.com
UPLOAD_FILES_ROOT ?= /srv/dav/pub/clients/$(JANWARE_CLIENT)
#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_MODULE_ROOT ?= $(UPLOAD_FILES_ROOT)/$(UPLOAD_MODULE_PATH)
UPLOAD_TARGET_PREFIX ?= rsync_ssh://$(UPLOAD_HOST_LOGIN)@$(UPLOAD_HOST):$(UPLOAD_MODULE_ROOT)/
#UPLOAD_FILES ?=
REMOTE_TARGETS ?= \
$(foreach f,$(UPLOAD_FILES),$(UPLOAD_TARGET_PREFIX)$f:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP))
$(foreach f,$(notdir $(UPLOAD_FILES)),$(UPLOAD_TARGET_PREFIX)$f:$(UPLOAD_FILE_MODE):$(UPLOAD_DIR_MODE):$(UPLOAD_USER).$(UPLOAD_GROUP))
UPLOAD_SRC_DIR ?= .
ifneq ($(wildcard CVS),)
UPLOAD_SCM = cvs
@ -27,5 +26,5 @@ endif
all:
rsync_ssh\://% ftp\://% scp\://%:
make $(shell echo $(notdir $@) | $(SED) 's/:.*//g')
$(UPLOAD_SH) $(shell echo $(notdir $@) $@ | $(SED) 's/:.*//g') $@
make $(shell echo $(addprefix $(UPLOAD_SRC_DIR)/,$(notdir $@)) | $(SED) 's/:.*//g')
$(UPLOAD_SH) $(shell echo $(addprefix $(UPLOAD_SRC_DIR)/,$(notdir $@)) $@ | $(SED) 's/:.*//g') $@