Automate postgis_download_url setting in doc/postgis.xml

Drop manual step from HOWTO_RELEASE (and change list to unnumbered)
Closes #2735

git-svn-id: http://svn.osgeo.org/postgis/trunk@12562 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/HOWTO_RELEASE b/HOWTO_RELEASE
index accaae949d760625f7c7f7ffe23348ccda5696aa..3b459e44ffb5ad0b3caad5675608988703a475b9 100644 (file)
--- a/HOWTO_RELEASE
+++ b/HOWTO_RELEASE
@@ -44,35 +44,32 @@ documentation -- that means having the required software:
 Release procedure
 -----------------
 
-1) Re-generate the ChangeLog (make ChangeLog)
-2) Edit NEWS: set release date and check all notable changes have
-   been reported (extract from ChangeLog).
-3) Edit README.postgis and set release date and version.
-4) Add release notes in doc/release_notes.xml
-5) make sure to run the extensions/make_unpackaged.sql on 
-    about to release version  and copy contents to  
-    (TODO: we need to automate this) 
-      postgis/sql_bits/postgis--unpackages.sql.in
-      postgis_topology/sql_bits/topology_unpackaged.sql.in
-      postgis_tiger_geocoder/sql_bits/tiger_geocoder--unpackaged.sql.in
-6) Update Version.config to drop the "dev" suffix
-7) Update doc/postgis.xml to download.osgeo.org link 
-  (note: unreleased are on postgis.net, and released download.osgeo.org )
-   Also make sure the correct minimum and lastest geos etc are noted.
-8) Commit all changes
-9) Tag branch:  
+- Re-generate the ChangeLog (make ChangeLog)
+- Edit NEWS: set release date and check all notable changes have
+  been reported (extract from ChangeLog).
+- Edit README.postgis and set release date and version.
+- Add release notes in doc/release_notes.xml
+- make sure to run the extensions/make_unpackaged.sql on 
+  about to release version  and copy contents to  
+  (TODO: we need to automate this) 
+    postgis/sql_bits/postgis--unpackages.sql.in
+    postgis_topology/sql_bits/topology_unpackaged.sql.in
+    postgis_tiger_geocoder/sql_bits/tiger_geocoder--unpackaged.sql.in
+- Update Version.config to drop the "dev" suffix
+- Commit all changes
+- Tag branch:  
    $ base=http://svn.osgeo.org/postgis/
    $ rev=x.x.0
    $ svn copy -m "Tagged release $rev" $base/trunk $base/tags/$rev
-10) Run: sh make_dist.sh $rev (or use debbie for this)
-11) Build and test generated tarball (including extension upgrade)
-12) Copy tarball to web site and edit downloads page
-13) Announce on e-mail 
+- Run: sh make_dist.sh $rev (or use debbie for this)
+- Build and test generated tarball (including extension upgrade)
+- Copy tarball to web site and edit downloads page
+- Announce on e-mail 
     - postgis-users
     - postgis-devel
     - pgsql-announce
     - osgeo-discuss
-14) Update web sites
+- Update web sites
     - PostGIS News
     - https://svn.osgeo.org/postgis/web/_content/posts
        a) create a new Post for current year making sure the page name starts with mm-dd
@@ -88,9 +85,9 @@ Release procedure
     - Wikipedia
     - Twitter (we all love twitter don't we)
     - PlanetPostGIS
-15) Update Trac and make old Milestone as completed
-16) Push the revision number forward (see Versioning Scheme)
-17) Ensure all the previous released minor versions are listed in
-    extension/upgradeable_versions.mk including the one you just released
+- Update Trac and make old Milestone as completed
+- Push the revision number forward (see Versioning Scheme)
+- Ensure all the previous released minor versions are listed in
+  extension/upgradeable_versions.mk including the one you just released
 
 

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 2368f965fb31df355a31d1da609afa3fe88304cd..b1a1bacb8e15e5caba42cc88e60c398a44119641 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -27,6 +27,12 @@ POSTGIS_MAJOR_VERSION=@POSTGIS_MAJOR_VERSION@
 POSTGIS_MINOR_VERSION=@POSTGIS_MINOR_VERSION@
 POSTGIS_MICRO_VERSION=@POSTGIS_MICRO_VERSION@
 
+ifneq (,$(findstring dev,$(POSTGIS_MICRO_VERSION)))
+  POSTGIS_DOWNLOAD_URL=http://postgis.net/stuff
+else
+  POSTGIS_DOWNLOAD_URL=http://download.osgeo.org/postgis/source
+endif
+
 INSTALL=@INSTALL@
 INSTALL_DATA=@INSTALL_DATA@
 
@@ -195,7 +201,7 @@ tiger_geocoder_cheatsheet.html: ./xsl/tiger_geocoder_cheatsheet.html.xsl $(XML_I
        $(XSLTPROC) --novalid ./xsl/tiger_geocoder_cheatsheet.html.xsl postgis-out.xml > $@
 
 postgis-out.xml: postgis.xml Makefile
-       $(PERL) -lpe "s'@@LAST_RELEASE_VERSION@@'${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}'g" $< > $@
+       $(PERL) -lpe "s'@@LAST_RELEASE_VERSION@@'${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}'g;s'@@POSTGIS_DOWNLOAD_URL@@'${POSTGIS_DOWNLOAD_URL}'g;" $< > $@
 
 chunked-html: postgis-out.xml Makefile images $(XML_INPUTS)
        $(XSLTPROC) $(XSLTPROC_COMMONOPTS) $(XSLTPROC_HTMLOPTS) \

diff --git a/doc/postgis.xml b/doc/postgis.xml
index 555087229518829655b3439e4d52834bc49920bf..9b79282c499464b52e8b05d9bcbbdb9fb3a05b5d 100644 (file)
--- a/doc/postgis.xml
+++ b/doc/postgis.xml
@@ -8,7 +8,7 @@
 
 <!-- ONCE Tagged, this need to change to http://download.osgeo.org/postgis/source/postgis-@@LAST_RELEASE_VERSION@@.tar.gz -->
 <!-- In dev should be, this need to change to http://postgis.net/stuff/postgis-@@LAST_RELEASE_VERSION@@.tar.gz -->
-<!ENTITY postgis_download_url "http://postgis.net/stuff/postgis-@@LAST_RELEASE_VERSION@@.tar.gz">
+<!ENTITY postgis_download_url "@@POSTGIS_DOWNLOAD_URL@@/postgis-@@LAST_RELEASE_VERSION@@.tar.gz">
 
 <!-- Change these values to update the version numbers referenced within the documentation -->
 <!ENTITY last_proj_release_version "4.8.0">