From: Michael Smith Date: Thu, 18 Jan 2007 01:54:49 +0000 (+0000) Subject: Use SF_USERNAME for uploads to docbook.sf.net X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0876a8edbffda926a650cd6c3df9ce865381fbf7;p=docbook-dsssl Use SF_USERNAME for uploads to docbook.sf.net --- diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk index 8bb8a2fc2..55695b62c 100644 --- a/releasetools/Targets.mk +++ b/releasetools/Targets.mk @@ -196,11 +196,14 @@ endif endif install: zip +ifeq ($(SF_USERNAME),) + $(error You must specify a value for $$SF_USERNAME) +else -$(FTP) $(FTP_OPTS) "mput -O $(SF_UPLOAD_DIR) $(TMP)/docbook-$(DISTRO)-*-$(ZIPVER).*; quit" $(SF_UPLOAD_HOST) -$(FTP) $(FTP_OPTS) "mput -O $(SF_UPLOAD_DIR) $(TMP)/docbook-$(DISTRO)-$(ZIPVER).*; quit" $(SF_UPLOAD_HOST) - $(SCP) $(SCP_OPTS) $(TMP)/docbook-$(DISTRO)-$(ZIPVER).tar.bz2 $(PROJECT_USER)@$(PROJECT_HOST):$(RELEASE_DIR)/$(DISTRO)/ - $(SCP) $(SCP_OPTS) $(TMP)/docbook-$(DISTRO)-*-$(ZIPVER).tar.bz2 $(PROJECT_USER)@$(PROJECT_HOST):$(RELEASE_DIR)/$(DISTRO)/ - $(SSH) $(SSH_OPTS)-l $(PROJECT_USER) $(PROJECT_HOST) \ + $(SCP) $(SCP_OPTS) $(TMP)/docbook-$(DISTRO)-$(ZIPVER).tar.bz2 $(SF_USERNAME)@$(PROJECT_HOST):$(RELEASE_DIR)/$(DISTRO)/ + $(SCP) $(SCP_OPTS) $(TMP)/docbook-$(DISTRO)-*-$(ZIPVER).tar.bz2 $(SF_USERNAME)@$(PROJECT_HOST):$(RELEASE_DIR)/$(DISTRO)/ + $(SSH) $(SSH_OPTS)-l $(SF_USERNAME) $(PROJECT_HOST) \ "(\ umask 002; \ cd $(RELEASE_DIR)/$(DISTRO); \ @@ -216,6 +219,7 @@ install: zip $(RM) current; \ ln -s $(ZIPVER) current; \ )" +endif release-clean: clean $(MAKE) -C docsrc release-clean diff --git a/releasetools/Variables.mk b/releasetools/Variables.mk index d87991993..f690d4ff6 100644 --- a/releasetools/Variables.mk +++ b/releasetools/Variables.mk @@ -195,7 +195,7 @@ SF_UPLOAD_HOST=upload.sf.net SF_UPLOAD_DIR=incoming PROJECT_HOST=docbook.sf.net RELEASE_DIR=/home/groups/d/do/docbook/htdocs/release -PROJECT_USER:=`sed 's/^:.\+:\([^@]\+\)@.\+$$/\1/' CVS/Root` +SF_USERNAME= TAR=tar TARFLAGS=P ZIP=zip