Use SF_USERNAME for uploads to docbook.sf.net

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index 8bb8a2fc2d0af17d087fe8c6d802307872fd597f..55695b62c4b957d8be1aa85675b74e35c45710c5 100644 (file)
--- 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 d87991993a57d408bc3b171fd077d908b475d285..f690d4ff6312da41841a03129403608d37d5db02 100644 (file)
--- 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