SIP2: Return slightly more hold info
[working/Evergreen.git] / build / tools / make_release
index 583e7bf..c141ca7 100755 (executable)
@@ -165,9 +165,8 @@ if [ $PREV_BRANCH != "PACKAGE" ]; then
     fi
 
     echo "Applying to README:"
-    echo "Header with $VERSION"
     echo "STAMP_ID with $UNDER_VERSION"
-    sed -i -e "1 s/Evergreen.*/Evergreen $VERSION/;s/STAMP_ID=rel_[^ ]*/STAMP_ID=rel_$UNDER_VERSION/;1h;2g;2 s/./=/g" $GIT_ABS/README
+    sed -i -e "s/STAMP_ID=rel_[^ ]*/STAMP_ID=rel_$UNDER_VERSION/" $GIT_ABS/README
 
     if [ $PREV_BRANCH != "TAG" ]; then
         if [ "$(grep "$RELEASE_PREAMBLE_HEAD" $GIT_ABS/README )" ]; then
@@ -186,14 +185,14 @@ if [ $PREV_BRANCH != "PACKAGE" ]; then
 
     echo "Finding/updating old \$HeadURL\$ entries"
     HEADURLBASE=`echo ${HEADURLBASE} | sed 's/\?/\\?/'`
-    for file in `grep -Rl --exclude=make_release.sh "$HEADURLBASE" $GIT_ABS`
+    for file in `grep -Rl --exclude=make_release "$HEADURLBASE" $GIT_ABS`
     do
         echo $file
         sed -i "s|${HEADURLBASE}[A-Za-z0-9_]*|$HEADURL|" $file
     done
 
     echo "Applying \$HeadURL\$ - $HEADURL"
-    for file in `grep -Rl --exclude=apply_version.sh '\\$HeadURL\\$' $GIT_ABS`
+    for file in `grep -Rl --exclude=make_release '\\$HeadURL\\$' $GIT_ABS`
     do
         echo $file
         sed -i "s|\\\$HeadURL\\\$|$HEADURL|" $file
@@ -221,6 +220,7 @@ if [ $PREV_BRANCH != "PACKAGE" ]; then
         elif [ -n "$UPGRADE_CHECK" ]; then
             echo "Found Upgrade Files! Building Upgrade Script."
             echo "--Upgrade Script for $PREV_VERSION to $VERSION" > $UPGRADE_FILE
+            echo "\set eg_version '''$VERSION'''" >> $UPGRADE_FILE
             echo "BEGIN;" >> $UPGRADE_FILE
             grep "config.upgrade_log.*$VERSION" Open-ILS/src/sql/Pg/002.schema.config.sql >> $UPGRADE_FILE
             for NUM in $UPGRADE_CHECK; do
@@ -289,6 +289,7 @@ XULRUNNER_VERSION=`grep '^XULRUNNER_VERSION' Makefile.am`
 XULRUNNER_VERSION=${XULRUNNER_VERSION##XULRUNNER_VERSION=}
 wget http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$XULRUNNER_VERSION/runtimes/xulrunner-$XULRUNNER_VERSION.en-US.win32.zip
 wget http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$XULRUNNER_VERSION/runtimes/xulrunner-$XULRUNNER_VERSION.en-US.linux-i686.tar.bz2
+wget http://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/$XULRUNNER_VERSION/runtimes/xulrunner-$XULRUNNER_VERSION.en-US.linux-x86_64.tar.bz2
 
 echo "Prepping server download files"
 cd ../../../../
@@ -308,11 +309,15 @@ make rigrelease
 make STAFF_CLIENT_STAMP_ID=rel_$UNDER_VERSION build
 make win-client
 mv evergreen_staff_client_setup.exe ../../../../evergreen-setup-$VERSION.exe
-make linux-client
-mv evergreen_staff_client.tar.bz2 ../../../../evergreen-client-$VERSION.tar.bz2
+make linux32-client
+mv evergreen_staff_client_i686.tar.bz2 ../../../../evergreen-client-${VERSION}_i686.tar.bz2
+make linux64-client
+mv evergreen_staff_client_x86_64.tar.bz2 ../../../../evergreen-client-${VERSION}_x86_64.tar.bz2
 cd ../../../../
 md5sum evergreen-setup-$VERSION.exe > evergreen-setup-$VERSION.exe.md5
-md5sum evergreen-client-$VERSION.tar.bz2 > evergreen-client-$VERSION.tar.bz2.md5
+md5sum evergreen-client-${VERSION}_i686.tar.bz2 > evergreen-client-${VERSION}_i686.tar.bz2.md5
+md5sum evergreen-client-${VERSION}_x86_64.tar.bz2 > evergreen-client-${VERSION}_x86_64.tar.bz2.md5
+
 
 echo "Removing build directory"
 rm -rf Evergreen-ILS-$VERSION/