[commit] r2509 - Modify archive/upload scripts to dated/versioned newspeak archives.

 
Author: eliot
Date: 2011-11-09 18:11:13 -0800 (Wed, 09 Nov 2011)
New Revision: 2509

Removed:
   branches/Cog/scripts/mknsvmlinuxarchive
Modified:
   branches/Cog/scripts/mkvmarchives
   branches/Cog/scripts/uploadvms
Log:
Modify archive/upload scripts to dated/versioned newspeak archives.


Deleted: branches/Cog/scripts/mknsvmlinuxarchive
===================================================================
--- branches/Cog/scripts/mknsvmlinuxarchive 2011-11-09 19:41:06 UTC (rev 2508)
+++ branches/Cog/scripts/mknsvmlinuxarchive 2011-11-10 02:11:13 UTC (rev 2509)
@@ -1,8 +0,0 @@
-#!/bin/sh
-REV=`grep 'SvnRawRevisionString.*Rev:' platforms/Cross/vm/sqSCCSVersion.h \
- | sed 's/^.*Rev: \([0-9][0-9]*\) $";/\1/'`
-echo $REV
-export REV
-rm nsvmlinux/lib/nsvm/{npsqueakregister,npsqueakrun}
-ln ~/Squeak/SqueakV41.sources nsvmlinux/lib/nsvm/*
-tar cvzf nsvmlinux-`date +%g.%U.$REV`.tgz nsvmlinux

Modified: branches/Cog/scripts/mkvmarchives
===================================================================
--- branches/Cog/scripts/mkvmarchives 2011-11-09 19:41:06 UTC (rev 2508)
+++ branches/Cog/scripts/mkvmarchives 2011-11-10 02:11:13 UTC (rev 2509)
@@ -45,6 +45,10 @@
  done
 fi
 EXES=
+REV=`grep 'SvnRawRevisionString.*Rev:' platforms/Cross/vm/sqSCCSVersion.h \
+ | sed 's/^.*Rev: \([0-9][0-9]*\) $";/\1/'`
+echo SVNREV=$REV
+export REV
 if [ -n "$CL" ]; then
  rm -rf coglinux.tgz
  COPYFILE_DISABLE=1 tar czf coglinux.tgz coglinux
@@ -98,9 +102,10 @@
  LIBDIR="`echo nsvmlinux/lib/nsvm/[0-9.-]*`"
  test -f $LIBDIR/squeak && mv $LIBDIR/squeak $LIBDIR/nsvm
  rm -f nsvmlinux/lib/nsvm/npsqueak* $LIBDIR/npsqueak.so
+ ln ~/Squeak/SqueakV41.sources $LIBDIR
 
- rm -rf nsvmlinux.tgz
- COPYFILE_DISABLE=1 tar czf nsvmlinux.tgz nsvmlinux
+ rm -rf nsvmlinux.tgz nsvmlinux-`date +%g.%U.$REV`.tgz
+ COPYFILE_DISABLE=1 tar czf nsvmlinux-`date +%g.%U.$REV`.tgz nsvmlinux
  EXES="$EXES $LIBDIR/nsvm"
 fi
 if [ -n "$NM" ]; then

Modified: branches/Cog/scripts/uploadvms
===================================================================
--- branches/Cog/scripts/uploadvms 2011-11-09 19:41:06 UTC (rev 2508)
+++ branches/Cog/scripts/uploadvms 2011-11-10 02:11:13 UTC (rev 2509)
@@ -1,16 +1,30 @@
 #!/bin/sh
 IFS="
 "
+REV="`svnversion | sed 's/^.*://'`"
+case $REV in
+*M) echo -n "source tree is modified, are you sure you want to continue? "
+ read a
+ case $a in
+ y|Y) ;;
+ *) exit 1
+ esac
+ REV="`svnversion | sed 's/^.*://' | sed 's/M//'`";;
+esac
+TAG=`date +%g.%U.`$REV
+echo REV=$REV TAG=$TAG
+
 CSARCS="Cog.app.tgz coglinux.tgz cogwin.zip"
 CMARCS="cogmtlinux.tgz CogMT.app.tgz cogmtwin.zip"
-NSARCS="Newspeak Virtual Machine.app.tgz nsvmlinux.tgz nsvmwin.zip"
-NMARCS="Newspeak Virtual MachineMT.app.tgz nsvmmtlinux.tgz nsvmmtwin.zip"
+NSARCS="Newspeak Virtual Machine-$TAG.dmg nsvmlinux-$TAG.tgz nsvm-$TAG.msi"
+NMARCS="Newspeak Virtual MachineMT-$TAG.dmg nsvmmtlinux-$TAG.tgz nsvmmt-$TAG.msi"
 if [ $# = 0 ]; then
 ARCHIVES="$CSARCS $CMARCS $NSARCS"
 else
 ARCHIVES=
  while [ -n "$1" ]; do
  case $1 in
+ -r) REV=$1;;
  -c) ARCHIVES="$ARCHIVES $CSARCS $CMARCS";;
  -cl) ARCHIVES="$ARCHIVES coglinux.tgz";;
  -cm) ARCHIVES="$ARCHIVES Cog.app.tgz";;
@@ -18,32 +32,21 @@
  -ctl) ARCHIVES="$ARCHIVES cogmtlinux.tgz";;
  -ctm) ARCHIVES="$ARCHIVES CogMT.app.tgz";;
  -ctw) ARCHIVES="$ARCHIVES cogmtwin.zip";;
- -nl) ARCHIVES="$ARCHIVES nsvmlinux.tgz";;
- -nm) ARCHIVES="$ARCHIVES Newspeak Virtual Machine.app.tgz";;
- -nw) ARCHIVES="$ARCHIVES nsvmwin.zip";;
+ -nl) ARCHIVES="$ARCHIVES nsvmlinux-$TAG.tgz";;
+ -nm) ARCHIVES="$ARCHIVES Newspeak Virtual Machine-$TAG.dmg";;
+ -nw) ARCHIVES="$ARCHIVES nsvm-$TAG.msi";;
  -n) ARCHIVES="$ARCHIVES $NSARCS";;
- -l) ARCHIVES="$ARCHIVES coglinux.tgz nsvmlinux.tgz";;
- -m) ARCHIVES="$ARCHIVES Cog.app.tgz Newspeak Virtual Machine.app.tgz";;
- -w) ARCHIVES="$ARCHIVES cogwin.tgz nsvmwin.tgz";;
+ -l) ARCHIVES="$ARCHIVES coglinux.tgz cogmtlinux.tgz nsvmlinux-$TAG.tgz";;
+ -m) ARCHIVES="$ARCHIVES Cog.app.tgz CogMT.app.tgz Newspeak Virtual Machine-$TAG.dmg";;
+ -w) ARCHIVES="$ARCHIVES cogwin.tgz cogmtwin.zip nsvm-$TAG.msi";;
  -?|-h)  echo usage: $0 [-l -m -w -cl -cm -cw -ctl -ctm -ctw -nl -nm -nw]; exit 0;;
  *) break
  esac
  shift
  done
 fi
-VER="`svnversion | sed 's/^.*://'`"
-case $VER in
-*M) echo -n "source tree is modified, are you sure you want to continue? "
- read a
- case $a in
- y|Y) ;;
- *) exit 1
- esac
- VER="`svnversion | sed 's/^.*://' | sed 's/M//'`";;
-esac
-echo $VER
-if [ ! -f README.$VER ]; then
- cat <<END >README.$VER
+if [ ! -f README.$REV ]; then
+ cat <<END >README.$REV
 N.B. For Squeak/Pharo/Croquet please use the archives whose names begin with
      Cog or cog.  The archives whose names begin with nsvm or Newspeak are
      for Newspeak and are missing plugins required by Squeak/Pharo/Croquet.
@@ -51,8 +54,9 @@
      non-blocking FFI calls.
 
 END
- svn log platforms/Cross/vm/sqSCCSVersion.h >>README.$VER
- vi README.$VER
+ svn log platforms/Cross/vm/sqSCCSVersion.h >>README.$REV
+ vi README.$REV
 fi
-ssh -x [hidden email] mkdir mirandabanda.org/files/Cog/VM/VM.r$VER
-scp README.$VER $ARCHIVES "$@" [hidden email]:mirandabanda.org/files/Cog/VM/VM.r$VER
+ssh -x [hidden email] mkdir mirandabanda.org/files/Cog/VM/VM.r$REV
+echo scp README.$REV $ARCHIVES "$@" [hidden email]:mirandabanda.org/files/Cog/VM/VM.r$REV
+scp README.$REV $ARCHIVES "$@" [hidden email]:mirandabanda.org/files/Cog/VM/VM.r$REV