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>

Makefile

@@ -1,6 +1,6 @@
 TOPDIR                     = .
 SUBDIRS                    = make scripts bin htdocs tmpl conf
-RPM_UPLOAD_URLPREFIX      ?= rsync_ssh://$(JANWARE_USER)@pkg.janware.com:/srv/ftp/pub/packages/jw-foss/$(RPM_UPLOAD_OS_NAME)/$(RPM_UPLOAD_OS_VERSION)
+RPM_UPLOAD_URLPREFIX      ?= rsync_ssh://$(JANWARE_USER)@pkg.janware.com:/srv/dav/pub/packages/jw-foss/$(RPM_UPLOAD_OS_NAME)/$(RPM_UPLOAD_OS_VERSION)
 
 include $(TOPDIR)/make/proj.mk
 include $(MODDIR)/make/topdir.mk

make/git-cvs-bridge.mk

@@ -13,9 +13,3 @@ else ifeq ($(VCS),git)
 cvs2git:
 	git cvsimport -o $(CVS_HEAD_BRANCH) -v -kk proj/$(PROJECT)
 endif
-
-$(WD_PKG_DIR):
-	mkdir -p $@
-
-pkg-upload-wd: | $(WD_PKG_DIR)
-	make -s list-files | xargs echo $(WD_PKG_VCS_FILES) | xargs tar --transform "s|^|$(WD_PKG_BASE_NAME)/|" -cjf $(WD_PKG_PATH)

make/rpmdist.mk

@@ -1,5 +1,12 @@
 RPM_PROJECT              ?= $(FLAVOUR_PREFIX)$(PROJECT)
 
+ifeq ($(filter pkg-%,$(MAKECMDGOALS)),)
+  # also to be used from proj.mk, typically
+  BUILD_PROJECT_PACKAGE   = false
+endif
+
+RPM_VERSION              ?= $(DIST_VERSION)
+
 ifneq ($(BUILD_PROJECT_PACKAGE),false)
 UPLOAD_SH                 = $(MOD_SCRIPT_DIR)/upload.sh
 LOCAL_MKSPEC_SH          ?= $(TOPDIR)/make/mkspec.sh
@@ -14,7 +21,6 @@ FTP_HOST                 ?= pkg.janware.com
 FTP_FILE_MODE            ?= 644
 FTP_DIR_MODE             ?= 755
 FTP_HOST_LOGIN           ?= root
-RPM_VERSION              ?= $(DIST_VERSION)
 RELEASES_FILE     = $(TOPDIR)/RELEASES$(FLAVOUR_SUFFIX)
 RELEASES         ?= $(shell $(PKG_SH_EXE) version \
 	-p $(OS)/$(RPM_ARCH) $(RELEASES_FILE) read | $(SED) 's/-dev//')
@@ -32,6 +38,7 @@ 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
 
 ifeq ($(PKG_FORMAT),debian)
@@ -369,4 +376,3 @@ pkg-upload-stable:
 	@echo "This project doesn't support building packages, ignoring request to $(patsubst pkg-%,%,$@)."
 
 endif # ifneq ($(BUILD_PROJECT_PACKAGE),false)
-

make/srcdist.mk

@@ -6,9 +6,28 @@ else ifeq ($(VCS),git)
   WD_PKG_VCS_FILES         = .git
 endif
 
-WD_PKG_DIR                 = $(TOPDIR)/dist/wd
+WD_PKG_DIR                 = dist/wd
 WD_PKG_BASE_NAME           = $(RPM_PROJECT)$(WD_PKG_VCS_SUFFIX)-$(RPM_VERSION)
 WD_PKG                     = $(WD_PKG_BASE_NAME).tar.bz2
 WD_PKG_PATH                = $(WD_PKG_DIR)/$(WD_PKG)
-WD_PKG_UPLOAD_SERVER       = pkg.janware.com
+
-WD_PKG_UPLOAD_PATH         = /srv/dav/pub/clients/jw
+# -- upload-defs.mk variables
+UPLOAD_FILES              += $(WD_PKG_PATH)
+UPLOAD_SRC_DIR             = $(WD_PKG_DIR)
+
+include $(MODDIR)/make/upload-defs.mk
+
+all:
+clean: wd-clean
+
+wd-clean:
+	rm -rf $(WD_PKG_DIR)
+
+$(WD_PKG_DIR):
+	mkdir -p $@
+
+$(WD_PKG_PATH): | $(WD_PKG_DIR)
+	make -s list-files | xargs echo $(WD_PKG_VCS_FILES) | xargs tar --transform "s|^|$(WD_PKG_BASE_NAME)/|" -cjf $(WD_PKG_PATH)
+
+wd-upload: $(WD_PKG_PATH)
+	make $(REMOTE_TARGETS)

make/tag-rules.mk

@@ -1,8 +1,7 @@
-ifneq ($(wildcard CVS),)
+ifeq ($(VCS),cvs)
 tag.dist:
 	cvs tag $(TAG_VERSION)
 
 ftag.dist:
 	cvs tag -F $(TAG_VERSION)
 endif
-

make/upload-defs.mk

@@ -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_HOST           ?= files.janware.com
-UPLOAD_VHOST_ROOT     ?= /srv/www/jannet.de_443
+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_MODULE_ROOT    ?= $(UPLOAD_FILES_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_MODULE_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))
+	$(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')
+	make $(shell echo $(addprefix $(UPLOAD_SRC_DIR)/,$(notdir $@)) | $(SED) 's/:.*//g')
-	$(UPLOAD_SH) $(shell echo $(notdir $@) $@ | $(SED) 's/:.*//g') $@
+	$(UPLOAD_SH) $(shell echo $(addprefix $(UPLOAD_SRC_DIR)/,$(notdir $@)) $@ | $(SED) 's/:.*//g') $@

make/upload-rules.mk

@@ -1,7 +1,4 @@
-rsync_ssh\://% ftp\://% scp\://%:
+all:
-	make $(shell echo $(addprefix $(DIST_PCKG_DIR)/,$(notdir $@)) | $(SED) 's/:.*//g')
-	$(UPLOAD_SH) $(shell echo $(addprefix $(DIST_PCKG_DIR)/,$(notdir $@)) $@ | $(SED) 's/:.*//g') $@
-	
 upload.dist:
 	if [ -f configure -o -f configure.ac -o -f configure.ac.tmpl ]; then make config; fi
 	make $(REMOTE_TARGETS)

make/upload.mk

@@ -1,5 +1,8 @@
 include $(MODDIR)/make/upload-defs.mk
 
+UPLOAD_LAST_VERSION_FILE   ?= LAST_UPLOADED_VERSION
+UPLOAD_LAST_VERSION        ?= $(shell $(CAT) $(UPLOAD_LAST_VERSION_FILE) 2>/dev/null)
+
 all:
 upload: upload.dist