Made fixes/refinements to docbook5-xsl packaging and install.

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index 4f98fd939a49032e6d46dffe85324539fc6e3ce0..1d8a242d11e04d066ad790dfe3481ce96672639f 100644 (file)
--- a/releasetools/Targets.mk
+++ b/releasetools/Targets.mk
@@ -205,9 +205,9 @@ ifeq ($(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 $(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) \
+       -$(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); \

diff --git a/releasetools/Variables.mk b/releasetools/Variables.mk
index 65b2faaadaba08195820cf4a6a60bbe6b852c53e..22ca1d92e790ef888aae402fae0b2f5e1b41274c 100644 (file)
--- a/releasetools/Variables.mk
+++ b/releasetools/Variables.mk
@@ -181,7 +181,6 @@ SF_UPLOAD_HOST=upload.sf.net
 SF_UPLOAD_DIR=incoming
 PROJECT_HOST=docbook.sf.net
 RELEASE_DIR=/home/groups/d/do/docbook/htdocs/release
-SF_USERNAME=
 TAR=tar
 TARFLAGS=P
 ZIP=zip

diff --git a/releasetools/db5.mk b/releasetools/db5.mk
index 1d65849015d854b9cb2273fb1e8e63b75c422bba..96b4934fe619b5cdcdf83e2425d15caf7ec02eae 100644 (file)
--- a/releasetools/db5.mk
+++ b/releasetools/db5.mk
@@ -21,11 +21,11 @@ zip5: zip
        $(RM)  $(TMP)/docbook5-$(DISTRO)-$(ZIPVER).tar.gz
        $(RM)  $(TMP)/docbook5-$(DISTRO)-$(ZIPVER).tar.bz2
        $(RM)  $(TMP)/docbook5-$(DISTRO)-$(ZIPVER).zip
-       (cd $(TMP); \
-         unzip $(TMP)/docbook-$(DISTRO)-$(ZIPVER).zip)
-       $(DOCBOOK_SVN)/releasetools/makedb5xsl \
-        $(TMP)/docbook-$(DISTRO)-$(ZIPVER) \
-        $(TMP)/docbook5-$(DISTRO)-$(ZIPVER)
+       (cd $(TMP) && \
+         unzip $(TMP)/docbook-$(DISTRO)-$(ZIPVER).zip && \
+         $(DOCBOOK_SVN)/releasetools/makedb5xsl \
+         docbook-$(DISTRO)-$(ZIPVER) \
+         docbook5-$(DISTRO)-$(ZIPVER)); 
 
 # change branch info
        sed -i "s/^\(.*\)<fm:Branch>XSL Stylesheets<\/fm:Branch>$$/\1<fm:Branch>v5 XSL Stylesheets<\/fm:Branch>/" \
@@ -40,35 +40,12 @@ zip5: zip
        chmod 755 $(TMP)/docbook5-$(DISTRO)-$(ZIPVER)/install.sh
 
 # gzip/bzip/zip it
-       umask 022; cd $(TMP) && $(TAR) cf$(TARFLAGS) - $(TMP)/docbook5-$(DISTRO)-$(ZIPVER) \
-       | gzip > $(TMP)/docbook5-$(DISTRO)-$(ZIPVER).tar.gz
-       umask 022; cd $(TMP) && $(TAR) cf$(TARFLAGS) - $(TMP)/docbook5-$(DISTRO)-$(ZIPVER) \
+       umask 022; cd $(TMP) && $(TAR) cf$(TARFLAGS) - docbook5-$(DISTRO)-$(ZIPVER) \
+       | gzip >  docbook5-$(DISTRO)-$(ZIPVER).tar.gz
+       umask 022; cd $(TMP) && $(TAR) cf$(TARFLAGS) - docbook5-$(DISTRO)-$(ZIPVER) \
        | bzip2 > docbook5-$(DISTRO)-$(ZIPVER).tar.bz2
-       umask 022; cd $(TMP) && $(ZIP) $(ZIPFLAGS) $(TMP)/docbook5-$(DISTRO)-$(ZIPVER).zip \
-       $(TMP)/docbook5-$(DISTRO)-$(ZIPVER)
+       umask 022; cd $(TMP) && $(ZIP) $(ZIPFLAGS) docbook5-$(DISTRO)-$(ZIPVER).zip \
+        docbook5-$(DISTRO)-$(ZIPVER)
 
 install5: zip5 install
-ifeq ($(SF_USERNAME),)
-       $(error You must specify a value for $$SF_USERNAME)
-else
-       -$(FTP) $(FTP_OPTS) "mput -O $(SF_UPLOAD_DIR) $(TMP)/docbook5-$(DISTRO)-*-$(ZIPVER).*; quit" $(SF_UPLOAD_HOST)
        -$(FTP) $(FTP_OPTS) "mput -O $(SF_UPLOAD_DIR) $(TMP)/docbook5-$(DISTRO)-$(ZIPVER).*; quit" $(SF_UPLOAD_HOST)
-       $(SCP) $(SCP_OPTS) $(TMP)/docbook5-$(DISTRO)-$(ZIPVER).tar.bz2 $(SF_USERNAME)@$(PROJECT_HOST):$(RELEASE_DIR)/$(DISTRO)/
-       $(SCP) $(SCP_OPTS) $(TMP)/docbook5-$(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); \
-          rm -rf $(ZIPVER); \
-          $(TAR) xfj$(TARFLAGS) docbook5-$(DISTRO)-$(ZIPVER).tar.bz2; \
-          $(TAR) xfj$(TARFLAGS) docbook5-$(DISTRO)-*-$(ZIPVER).tar.bz2; \
-          mv docbook-$(DISTRO)-$(ZIPVER) $(ZIPVER); \
-          gunzip $(ZIPVER)/doc/reference.pdf.gz; \
-          gunzip $(ZIPVER)/doc/reference.txt.gz; \
-          rm -rf docbook5-$(DISTRO)-$(ZIPVER).tar.bz2; \
-          rm -rf docbook5-$(DISTRO)-*-$(ZIPVER).tar.bz2; \
-          chmod -R g+w $(ZIPVER); \
-          $(RM) current; \
-          ln -s $(ZIPVER) current; \
-          )"
-endif