From fe5fa7583c0eee0a809adf78fa4b18c337c99c7c 2006-06-03 22:17:24
From: fperez
Date: 2006-06-03 22:17:24
Subject: [PATCH] Minor updates to release scripts, new backup one using SVN (a lot simpler).

---

diff --git a/tools/bkp.sh b/tools/bkp.sh
new file mode 100755
index 0000000..5954e34
--- /dev/null
+++ b/tools/bkp.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Simple backup script for ipython, to keep around a static copy of the whole
+# project at the current version point.  We do this by exporting from SVN.
+
+# Config here
+IPYTHONSVN=$HOME/ipython/svn/ipython/trunk
+BACKUPDIR=$HOME/ipython/backup
+
+####
+# Code begins
+IPVERSION=`ipython -Version`
+IPX=ipython-$IPVERSION
+ARCHIVE=$BACKUPDIR/$IPX.tgz
+
+svn export $IPYTHONSVN $IPX
+
+tar czf $ARCHIVE $IPX
+
+rm -rf $IPX
+
+echo "Backup left in: $ARCHIVE"
diff --git a/tools/release b/tools/release
index b5168b3..676eb49 100755
--- a/tools/release
+++ b/tools/release
@@ -37,32 +37,25 @@ rm -rf $ipdir/dist/*
 
 # Perform local backup
 cd $ipdir/tools
-./bkp.py
+./bkp.sh
 
 # Build source and binary distros
 cd $ipdir
 ./setup.py sdist --formats=gztar
-#./setup.py bdist_rpm --release=py$PYVER
-python2.3 ./setup.py bdist_rpm --release=py23 --python=/usr/bin/python2.3
 
-# A 2.4-specific RPM, where we must use the --python option to ensure that
-# the resulting RPM is really built with 2.4 (so things go to
-# lib/python2.4/...)
+# Build version-specific RPMs, where we must use the --python option to ensure
+# that the resulting RPM is really built with the requested python version (so
+# things go to lib/python2.X/...)
+python2.3 ./setup.py bdist_rpm --release=py23 --python=/usr/bin/python2.3
 python2.4 ./setup.py bdist_rpm --release=py24 --python=/usr/bin/python2.4
 
-# Build eggs
-python2.3 ./eggsetup.py bdist_egg
-python2.4 ./eggsetup.py bdist_egg
+# Build egg
+./eggsetup.py bdist_egg
 
 # Call the windows build separately, so that the extra Windows scripts don't
 # get pulled into Unix builds (setup.py has code which checks for
 # bdist_wininst)
-#./setup.py bdist_wininst --install-script=ipython_win_post_install.py
-
-# For now, make the win32 installer with a hand-built 2.3.5 python, which is
-# the only one that fixes a crash in the post-install phase.
-$HOME/tmp/local/bin/python2.3 setup.py bdist_wininst \
-  --install-script=ipython_win_post_install.py
+./setup.py bdist_wininst --install-script=ipython_win_post_install.py
 
 # Register with the Python Package Index (PyPI)
 echo "Registering with PyPI..."
diff --git a/tools/testrel b/tools/testrel
index 46afe75..35d7c3c 100755
--- a/tools/testrel
+++ b/tools/testrel
@@ -11,12 +11,12 @@ cd ~/ipython/ipython
 
 ./setup.py sdist --formats=gztar
 
+# Build rpms
 python2.3 ./setup.py bdist_rpm --release=py23 --python=/usr/bin/python2.3
 python2.4 ./setup.py bdist_rpm --release=py24 --python=/usr/bin/python2.4
 
 # Build eggs
-python2.3 ./eggsetup.py bdist_egg
-python2.4 ./eggsetup.py bdist_egg
+./eggsetup.py bdist_egg
 
 # Call the windows build separately, so that the extra Windows scripts don't
 # get pulled into Unix builds (setup.py has code which checks for
@@ -24,5 +24,7 @@ python2.4 ./eggsetup.py bdist_egg
 
 # For now, make the win32 installer with a hand-built 2.3.5 python, which is
 # the only one that fixes a crash in the post-install phase.
-$HOME/tmp/local/bin/python2.3 setup.py bdist_wininst \
-  --install-script=ipython_win_post_install.py
+#$HOME/tmp/local/bin/python2.3 setup.py bdist_wininst \
+#  --install-script=ipython_win_post_install.py
+
+./setup.py bdist_wininst --install-script=ipython_win_post_install.py