DOC: update notes in release script and reorganize paver script a little.

2 files changed, 47 insertions, 9 deletions

diff --git a/pavement.py b/pavement.py
index 5bef2253b..8537ab175 100644
--- a/pavement.py
+++ b/pavement.py
@@ -81,6 +81,22 @@ try:
 finally:
     sys.path.pop(0)
 
+
+#-----------------------------------
+# Things to be changed for a release
+#-----------------------------------
+
+# Source of the release notes
+RELEASE_NOTES = 'doc/release/2.0.0-notes.rst'
+
+# Start/end of the log (from git)
+LOG_START = 'svn/tags/1.5.0'
+LOG_END = 'master'
+
+
+#-------------------------------------------------------
+# Hardcoded build/install dirs, virtualenv options, etc.
+#-------------------------------------------------------
 DEFAULT_PYTHON = "2.6"
 
 # Where to put the final installers, as put on sourceforge
@@ -148,10 +164,6 @@ else:
     WINDOWS_ENV = os.environ
     MAKENSIS = ["wine", "makensis"]
 
-# Start/end of the log (from git)
-LOG_START = 'svn/tags/1.4.0'
-LOG_END = 'master'
-RELEASE_NOTES = 'doc/release/1.5.0-notes.rst'
 
 #-------------------
 # Windows installers
diff --git a/release.sh b/release.sh
index 060cbc526..c7ae6a645 100644
--- a/release.sh
+++ b/release.sh
@@ -1,11 +1,37 @@
 #! /bin/sh
-# script to build tarballs, mac os x and windows installers on mac os x
+# Script to build tarballs, windows and OS X installers on OS X
+
+# Note that we build the corresponding set of OS X binaries to the python.org
+# downloads, i.e. two versions for Python 2.7. The Intel 32/64-bit version is
+# for OS X 10.6+, the other dmg installers are for 10.3+ and are built on 10.5
+
 paver bootstrap
 source bootstrap/bin/activate
-CFLAGS="-arch x86_64" FFLAGS="-arch x86_64" python setupsconsegg.py install
+python setupsconsegg.py install
+
+
+#------------------------------------------------------------------
+# Build tarballs, Windows and 64-bit OS X installers (on OS X 10.6)
+#------------------------------------------------------------------
 paver sdist
-paver dmg -p 2.5
-paver dmg -p 2.6
-paver bdist_superpack -p 2.5
+
+export MACOSX_DEPLOYMENT_TARGET=10.6
+paver dmg -p 2.7   # 32/64-bit version
+
+paver bdist_superpack -p 3.1
+paver bdist_superpack -p 2.7
 paver bdist_superpack -p 2.6
+paver bdist_superpack -p 2.5
+
+
+#--------------------------------------------
+# Build 32-bit OS X installers (on OS X 10.5)
+#--------------------------------------------
+#export MACOSX_DEPLOYMENT_TARGET=10.3
+#paver dmg -p 2.6
+#paver dmg -p 2.7  # 32-bit version
+#export CC=/usr/bin/gcc-4.0  # necessary on 10.6, not sure about 10.5
+#paver dmg -p 2.5
+
+
 paver write_release_and_log