Merge branch 'master' of git://pyxb.git.sourceforge.net/gitroot/pyxb/pyxbHEADmaster

3 files changed, 81 insertions, 13 deletions

diff --git a/maintainer/howto-release.txt b/maintainer/howto-release.txt
new file mode 100644
index 0000000..3ebb19e
--- /dev/null
+++ b/maintainer/howto-release.txt
@@ -0,0 +1,63 @@
+* Update the release notes in doc/releases.txt.  All fixed DRs should be
+  noted, as well as any major new features.
+
+* Update the version number in setup.py.  Run:
+
+  ./setup.py update_version
+  hg commit -m 'Version number updated for release'
+
+* Run the maintainer/makedist script.  This exports the current directory's
+  repository into /tmp, then does a full setup, documentation build, and
+  test in that area.  It creates the variant bundles, and places them in
+  ~/pyxb/pre-release.
+
+* In ~/pyxb/pre-release, run the testdist.sh script.  This unpacks the full
+  distribution, builds, installs, and runs the full test sequence on three
+  versions of Python.  Check out the logs for any errors.
+
+* When all tests pass, move the release tar files into ~/pyxb/pyxb-release.
+  Create a file notice-A.B.C.txt containing the section of doc/releases.txt
+  relevant to the release.   Add all these to the repository, and push it.
+
+* Back in the development repository, update setup.py for the next release
+  series, run ./setup.py update_version, and commit the changes.
+
+* Log in to SourceForge, and under Project Admin enter File Manager.  Create
+  a new release directory under pyxb, then upload each files.  Later files
+  come earlier in the list, so a good order is: opengis, common, wssplat,
+  base, doc, full.
+
+* For each upload, click on the gear and set its properties:
+
+   notice-A.B.C.txt -- Release notes (mark as release notes)
+   full -- Full release with all overlays (mark as default download)
+   doc -- Documentation overlay
+   base -- Base release, no overlays
+   wssplt -- Web service bindings overlay
+   common -- Common schema bindings overlay
+   opengis -- OpenGIS bindings overlay
+
+  Also mark the full release as being the default download.
+
+* Associate the release notes with the folder and the full release.
+
+* Go to the Trac system. Under Milestones
+
+ - Edit the milestone for the new release, setting its Completed date
+ - Add the next beta series as a milestone, marking it as the default
+ - Add the new release as a version, marking it the default
+
+* Edit the main Trac page to select the correct versions for the DR tables.
+  An example of a full page is in maintainer/trac-source.
+
+* Log in to sourceforge and replace the homepage with the new documentation.
+
+  ssh -t pabigot,pyxb@shell.sourceforge.net create
+  cd /home/groups/p/py/pyxb/htdocs
+  mkdir PyXB-1.1.0
+  mv _* [a-z]* PyXB-1.1.0
+  tar xzf /home/frs/project/p/py/pyxb/pyxb/1.1.1\ \(Beta\)/PyXB-doc-1.1.1.tar.gz 
+  mv PyXB-1.1.1/doc/html/* .
+  rm -rf PyXB-1.1.1/
+
+* Mail the release notes to pyxb-users@lists.sourceforge.net
diff --git a/maintainer/makedist b/maintainer/makedist
index 8deb774..035cfc3 100755
--- a/maintainer/makedist
+++ b/maintainer/makedist
@@ -1,23 +1,28 @@
 #!/bin/sh
 
-exec 2>&1 | tee makedist.log
+BRANCH=${1:-next}
+
+exec | tee makedist.log 2>&1
+
+DIST_SUBDIR=pyxbdist
+cd /tmp
+rm -rf ${DIST_SUBDIR}
+git clone -b ${BRANCH} ~/pyxb/dev ${DIST_SUBDIR}
+cd ${DIST_SUBDIR}
+export PYXB_ROOT=`pwd`
 
 # Update the version numbers in the source
-./setup.py update_version
+version=$(grep ^version setup.py | cut -d= -f2 | sed -e "s@'@@g")
 
-hg_status=`hg status -q | grep -v makedist`
-if [ -n "${hg_status}" ] ; then
+echo $version
+
+./setup.py update_version
+if ( git status >/dev/null ) ; then
   echo 1>&2 ERROR: Unsaved deltas
-  echo ${hg_status}
+  git status -uno
   exit 1
 fi
 
-DISTDIR=/tmp/pyxbdist
-rm -rf ${DISTDIR}
-hg archive ${DISTDIR}
-cd ${DISTDIR}
-export PYXB_ROOT=`pwd`
-
 # First, the core:
 ./setup.py sdist
 ver=`ls -rt dist | tail -1 | sed -e 's@^PyXB-\(.*\).tar.gz$@\1@'`
@@ -72,7 +77,7 @@ build_overlay () {
   sdir=$1
   shift
   (
-    find ${DISTROOT}/${sdir} -type f -newer ${BASE_TGZ} ;
+    find ${DISTROOT}/${sdir} -type f -cnewer ${BASE_TGZ} ;
     for f in "${@}" ; do
       find ${DISTROOT}/${f} -type f
     done
diff --git a/maintainer/testdist.sh b/maintainer/testdist.sh
index 1042651..9af3e8b 100755
--- a/maintainer/testdist.sh
+++ b/maintainer/testdist.sh
@@ -6,7 +6,7 @@ TARFILE=PyXB-full-${RELEASE}.tar.gz
 
 export LANG=en_US.UTF-8
 
-for pv in 2.4.6 2.5.4 2.6.4 ; do
+for pv in 2.4.6 2.5.5 2.6.5 ; do
   (
   pt=python-${pv}
   pvs=`echo ${pv} | sed -e 's@..$@@'`