Added various changes to automate parts of the release build that

hadn't yet been automated, and to better integrate the
docbook-xsl-ns upload/install into the release build:

  - we now build a "partial" text version of the release notes,
    RELEASE-NOTES-PARTIAL.text, to use in the release
    announcements and SF release notes

  - now use a copy of the freshmeat-submit script in the
    releasetools dir (so that others don't have to separately
    download and install it)

  - added an "announce" target that calls the "release-announce"
    script, which sends announcement mail to docbook-apps

diff --git a/releasetools/Makefile b/releasetools/Makefile
index 7caf5ffc044ca29b5dcb5ab64119036ebfe83536..2bcd0458759ffc8976d9187b92efcd667b85cdd3 100644 (file)
--- a/releasetools/Makefile
+++ b/releasetools/Makefile
@@ -8,7 +8,7 @@ XTANGLE_PARAMS=suppress.doctype.in.output=1
 MAKE_DOCBOOK_RNG=.make-docbook-rng.xsl
 MAKE_LITPROG=.make-litprog.xsl
 
-all: modified-markup.xsl docbook.rng xtangle.xsl w2docbook.xsl cldocbook.xsl ldocbook.xsl
+all: modified-markup.xsl docbook.rng xtangle.xsl w2docbook.xsl freshmeat-submit
 
 modified-markup.xsl:
        $(MAKE) -C ../contrib/tools/tennison $@
@@ -26,8 +26,13 @@ w2docbook.xsl:
        $(MAKE) -C ../litprog XTANGLE_PARAMS=$(XTANGLE_PARAMS)
        $(XSLT) $(XSLTOPT) ../litprog/$@ $(MAKE_LITPROG) filename=$@ > $@
 
+freshmeat-submit:
+       $(MAKE) -C ../contrib/tools/freshmeat-submit
+       cp ../contrib/tools/freshmeat-submit/freshmeat-submit-1.6/$@ .
+
 clean:
        $(RM) modified-markup.xsl
        $(RM) docbook.rng
        $(RM) VERSION
-       $(RM) xtangle.xsl w2docbook.xsl cldocbook.xsl ldocbook.xsl
+       $(RM) xtangle.xsl w2docbook.xsl
+       $(RM) freshmeat-submit

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index b9c489890f110b0bc73e5dbcc8b5422085b869f3..83edd53dc5094c6dc0cbb1c48c720231a4195863 100644 (file)
--- a/releasetools/Targets.mk
+++ b/releasetools/Targets.mk
@@ -16,6 +16,17 @@ RELEASE-NOTES.html: RELEASE-NOTES.xml NEWS.xml
 RELEASE-NOTES.txt: RELEASE-NOTES.html
        LANG=C $(BROWSER) $(BROWSER_OPTS) $< > $@
 
+RELEASE-NOTES-PARTIAL.html: RELEASE-NOTES.xml NEWS.xml
+       $(XINCLUDE) $< > RELEASE-NOTES-PARTIAL-TMP.xml
+       $(XSLT) RELEASE-NOTES-PARTIAL-TMP.xml $(DOC_LINK_STYLE) $@ \
+       doc-baseuri="http://docbook.sourceforge.net/release/xsl/current/doc/" \
+       rootid="V$(RELVER)"
+       $(RM) RELEASE-NOTES-PARTIAL-TMP.xml
+
+RELEASE-NOTES-PARTIAL.txt: RELEASE-NOTES-PARTIAL.html
+       LANG=C $(BROWSER) $(BROWSER_OPTS) $< > $@
+       $(RM) $<
+
 RELEASE-NOTES.pdf: RELEASE-NOTES.xml NEWS.xml
        $(XINCLUDE) $< > RELEASE-NOTES-TMP.xml
 ifeq ($(PDF_MAKER),xep)
@@ -132,7 +143,7 @@ ifeq ($(SFRELID),)
        exit 1
 else
        $(XSLT) VERSION VERSION $(TMP)/fm-docbook-$(DISTRO) sf-relid=$(SFRELID)
-       grep -v "<?xml" $(TMP)/fm-docbook-$(DISTRO) | freshmeat-submit $(FMGO)
+       grep -v "<?xml" $(TMP)/fm-docbook-$(DISTRO) | $(FRESHMEAT_SUBMIT) $(FMGO)
 endif
 
 ifeq ($(OFFLINE),yes)
@@ -211,32 +222,46 @@ ifneq ($(DISTRIB_PACKAGES),)
 endif
 endif
 
-install: zip
+upload-to-sf-incoming: 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)
+endif
+
+upload-to-project-webspace: 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 $(SF_USERNAME)@$(PROJECT_HOST):$(RELEASE_DIR)/$(DISTRO)/
-       -$(SCP) $(SCP_OPTS) $(TMP)/docbook-$(DISTRO)-*-$(ZIPVER).tar.bz2 $(SF_USERNAME)@$(PROJECT_HOST):$(RELEASE_DIR)/$(DISTRO)/
+       -$(SCP) $(SCP_OPTS) $(TMP)/docbook-$(DISTRO)-doc-$(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) docbook-$(DISTRO)-$(ZIPVER).tar.bz2; \
-          $(TAR) xfj$(TARFLAGS) docbook-$(DISTRO)-*-$(ZIPVER).tar.bz2; \
+          $(TAR) xfj$(TARFLAGS) docbook-$(DISTRO)-doc-$(ZIPVER).tar.bz2; \
           mv docbook-$(DISTRO)-$(ZIPVER) $(ZIPVER); \
           gunzip $(ZIPVER)/doc/reference.pdf.gz; \
           gunzip $(ZIPVER)/doc/reference.txt.gz; \
-          rm -rf docbook-$(DISTRO)-$(ZIPVER).tar.bz2; \
-          rm -rf docbook-$(DISTRO)-*-$(ZIPVER).tar.bz2; \
           chmod -R g+w $(ZIPVER); \
           $(RM) current; \
           ln -s $(ZIPVER) current; \
+          rm -f docbook-$(DISTRO)-$(ZIPVER).tar.bz2; \
+          rm -f docbook-$(DISTRO)-doc-$(ZIPVER).tar.bz2; \
           )"
 endif
 
+install: upload-to-sf-incoming upload-to-project-webspace
+       @echo "The docbook-$(DISTRO) and docbook-$(DISTRO)-doc packages have been uploaded to the SF incoming area."
+       @echo "Use the following form to move the uploaded files to the project release area."
+       @echo
+       @echo "  http://sourceforge.net/project/admin/editpackages.php?group_id=21935"
+
+announce: RELEASE-NOTES-PARTIAL.txt
+       $(RELEASE_ANNOUNCE) $(RELVER) $(ANNOUNCE_RECIPIENTS)
+
 release-clean: clean
        $(MAKE) -C docsrc release-clean
        $(RM) TERMS.xml

diff --git a/releasetools/Variables.mk b/releasetools/Variables.mk
index a3ddd719278f123bd70d8aa5eb74d6e8963f20bd..f1d5648ad56266bc5a332d8d7cea442c854727d5 100644 (file)
--- a/releasetools/Variables.mk
+++ b/releasetools/Variables.mk
@@ -10,6 +10,10 @@
 
 include $(DOCBOOK_SVN)/buildtools/Makefile.incl
 
+RELEASE_ANNOUNCE=$(DOCBOOK_SVN)/releasetools/release-announce
+ANNOUNCE_RECIPIENTS=docbook-apps@lists.oasis-open.org
+FRESHMEAT_SUBMIT=$(DOCBOOK_SVN)/releasetools/freshmeat-submit
+
 CATALOGMANAGER=$(DOCBOOK_SVN)/releasetools/.CatalogManager.properties.example
 INSTALL_SH=$(DOCBOOK_SVN)/releasetools/install.sh
 MAKECATALOG=$(DOCBOOK_SVN)/releasetools/make-catalog.xsl

diff --git a/releasetools/xslns.mk b/releasetools/xslns.mk
index 592bc4749fde90b712617fc69518013f2e99071a..b5438bccebb9860eb6374ff0aea55be6a51d1ea9 100644 (file)
--- a/releasetools/xslns.mk
+++ b/releasetools/xslns.mk
@@ -4,15 +4,14 @@
 
 # $Id$
 
-debug:
-
 freshmeat-ns:
 ifeq ($(SFRELID),)
        @echo "You must specify the sourceforge release identifier in SFRELID"
        exit 1
 else
-       $(XSLT) VERSION VERSION $(TMP)/fm-docbook-$(DISTRO)-ns sf-relid=$(SFRELID)
-       grep -v "<?xml" $(TMP)/fm-docbook-$(DISTRO)-ns | freshmeat-submit $(FMGO)
+       $(XSLT) $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER)/VERSION $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER)/VERSION \
+         $(TMP)/fm-docbook-$(DISTRO)-ns sf-relid=$(SFRELID)
+       grep -v "<?xml" $(TMP)/fm-docbook-$(DISTRO)-ns | $(FRESHMEAT_SUBMIT) $(FMGO)
 endif
 
 zip-ns: zip
@@ -28,7 +27,7 @@ zip-ns: zip
          docbook-$(DISTRO)-ns-$(ZIPVER)); 
 
 # change branch info
-       sed -i "s/^\(.*\)<fm:Branch>XSL Stylesheets<\/fm:Branch>$$/\1<fm:Branch>XSL NS Stylesheets<\/fm:Branch>/" \
+       sed -i "s/^\(.*\)<fm:Branch>XSL Stylesheets<\/fm:Branch>$$/\1<fm:Branch>XSL-NS Stylesheets<\/fm:Branch>/" \
          $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER)/VERSION
 
 # change distro name
@@ -47,22 +46,49 @@ zip-ns: zip
        umask 022; cd $(TMP) && $(ZIP) $(ZIPFLAGS) docbook-$(DISTRO)-ns-$(ZIPVER).zip \
         docbook-$(DISTRO)-ns-$(ZIPVER)
 
-install-ns: zip-ns install
+upload-to-project-webspace-ns: zip-ns
 ifeq ($(SF_USERNAME),)
        $(error You must specify a value for $$SF_USERNAME)
 else
-       -$(FTP) $(FTP_OPTS) "mput -O $(SF_UPLOAD_DIR) $(TMP)/docbook-$(DISTRO)-ns-$(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)-doc-$(ZIPVER).tar.bz2 $(SF_USERNAME)@$(PROJECT_HOST):$(RELEASE_DIR)/$(DISTRO)/
        -$(SCP) $(SCP_OPTS) $(TMP)/docbook-$(DISTRO)-ns-$(ZIPVER).tar.bz2 $(SF_USERNAME)@$(PROJECT_HOST):$(RELEASE_DIR)/$(DISTRO)-ns/
        -$(SSH) $(SSH_OPTS)-l $(SF_USERNAME) $(PROJECT_HOST) \
          "(\
           umask 002; \
           cd $(RELEASE_DIR)/$(DISTRO)-ns; \
           rm -rf $(ZIPVER); \
+          cp -p ../$(DISTRO)/docbook-$(DISTRO)-doc-$(ZIPVER).tar.bz2 .; \
           $(TAR) xfj$(TARFLAGS) docbook-$(DISTRO)-ns-$(ZIPVER).tar.bz2; \
+          $(TAR) xfj$(TARFLAGS) docbook-$(DISTRO)-doc-$(ZIPVER).tar.bz2; \
           mv docbook-$(DISTRO)-ns-$(ZIPVER) $(ZIPVER); \
-          rm -rf docbook-$(DISTRO)-ns-$(ZIPVER).tar.bz2; \
+          mv docbook-$(DISTRO)-$(ZIPVER)/doc $(ZIPVER); \
+          rm -rf docbook-$(DISTRO)-$(ZIPVER); \
+          gunzip $(ZIPVER)/doc/reference.pdf.gz; \
+          gunzip $(ZIPVER)/doc/reference.txt.gz; \
+          chmod -R g+w $(ZIPVER); \
+          $(RM) current; \
+          ln -s $(ZIPVER) current; \
+          rm -f docbook-$(DISTRO)-ns-$(ZIPVER).tar.bz2; \
+          rm -f docbook-$(DISTRO)-doc-$(ZIPVER).tar.bz2; \
+          cd $(RELEASE_DIR)/$(DISTRO); \
+          rm -rf $(ZIPVER); \
+          $(TAR) xfj$(TARFLAGS) docbook-$(DISTRO)-$(ZIPVER).tar.bz2; \
+          $(TAR) xfj$(TARFLAGS) docbook-$(DISTRO)-doc-$(ZIPVER).tar.bz2; \
+          mv docbook-$(DISTRO)-$(ZIPVER) $(ZIPVER); \
+          gunzip $(ZIPVER)/doc/reference.pdf.gz; \
+          gunzip $(ZIPVER)/doc/reference.txt.gz; \
           chmod -R g+w $(ZIPVER); \
           $(RM) current; \
           ln -s $(ZIPVER) current; \
+          rm -f docbook-$(DISTRO)-$(ZIPVER).tar.bz2; \
+          rm -f docbook-$(DISTRO)-doc-$(ZIPVER).tar.bz2; \
           )"
 endif
+
+install-ns: upload-to-sf-incoming upload-to-project-webspace-ns
+       @echo "The docbook-$(DISTRO), docbook-$(DISTRO)-ns, docbook-$(DISTRO)-ns packages have been uploaded to"
+       @echo "the SF incoming area."
+       @echo "Use the following form to move the uploaded files to the project release area."
+       @echo
+       @echo "  http://sourceforge.net/project/admin/editpackages.php?group_id=21935"