Revision: 3570 Author: eliot Date: 2016-01-24 17:07:09 -0800 (Sun, 24 Jan 2016) Log Message: ----------- Allow one to specify which source file to install via editnewspeakinstall.sh. Make the no access control builds install V41.sources, for Cadence debugging.
Modified Paths: -------------- branches/Cog/build.linux32ARM/editnewspeakinstall.sh branches/Cog/build.linux32x86/editnewspeakinstall.sh branches/Cog/build.linux32x86/nsnac.cog.spur/build/mvm branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert/mvm branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert.itimerheartbeat/mvm branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug/mvm branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug.itimerheartbeat/mvm branches/Cog/build.linux32x86/nsnac.cog.spur/build.itimerheartbeat/mvm branches/Cog/build.linux64x64/editnewspeakinstall.sh
Modified: branches/Cog/build.linux32ARM/editnewspeakinstall.sh =================================================================== --- branches/Cog/build.linux32ARM/editnewspeakinstall.sh 2016-01-24 19:07:04 UTC (rev 3569) +++ branches/Cog/build.linux32ARM/editnewspeakinstall.sh 2016-01-25 01:07:09 UTC (rev 3570) @@ -1,9 +1,17 @@ #!/bin/bash # Edit the installed directory tree to rename squeak to nsvm and install source INSTALLDIR="$1" +shift cd $INSTALLDIR -SOURCE=../../sources/SqueakV50.sources -test -f $SOURCE || SOURCE=../../../sources/SqueakV50.sources + +if [ "$1" = -source ]; then + SourceFile="$2" + shift; shift +else + SourceFile=SqueakV50 +fi +SOURCE=../../sources/$SourceFile.sources +test -f $SOURCE || SOURCE=../../../sources/$SourceFile.sources if [ -f squeak ]; then mv squeak nsvm ex -u NONE "+g/squeak/s/squeak/nsvm/g" +w +q nsvm @@ -17,7 +25,7 @@ test -f $LIBDIR/squeak && mv $LIBDIR/squeak $LIBDIR/nsvm test -d lib/squeak && mv lib/squeak lib/nsvm LIBDIR="`echo lib/nsvm/[0-9.-]*`" -if [ "$2" = -copysource ]; then +if [ "$1" = -copysource ]; then cp $SOURCE $LIBDIR elif [ -h $SOURCE ]; then ln "`readlink $SOURCE`" $LIBDIR
Modified: branches/Cog/build.linux32x86/editnewspeakinstall.sh =================================================================== --- branches/Cog/build.linux32x86/editnewspeakinstall.sh 2016-01-24 19:07:04 UTC (rev 3569) +++ branches/Cog/build.linux32x86/editnewspeakinstall.sh 2016-01-25 01:07:09 UTC (rev 3570) @@ -1,9 +1,17 @@ #!/bin/bash # Edit the installed directory tree to rename squeak to nsvm and install source INSTALLDIR="$1" +shift cd $INSTALLDIR -SOURCE=../../sources/SqueakV50.sources -test -f $SOURCE || SOURCE=../../../sources/SqueakV50.sources + +if [ "$1" = -source ]; then + SourceFile="$2" + shift; shift +else + SourceFile=SqueakV50 +fi +SOURCE=../../sources/$SourceFile.sources +test -f $SOURCE || SOURCE=../../../sources/$SourceFile.sources if [ -f squeak ]; then mv squeak nsvm ex -u NONE "+g/squeak/s/squeak/nsvm/g" +w +q nsvm @@ -17,7 +25,7 @@ test -f $LIBDIR/squeak && mv $LIBDIR/squeak $LIBDIR/nsvm test -d lib/squeak && mv lib/squeak lib/nsvm LIBDIR="`echo lib/nsvm/[0-9.-]*`" -if [ "$2" = -copysource ]; then +if [ "$1" = -copysource ]; then cp $SOURCE $LIBDIR elif [ -h $SOURCE ]; then ln "`readlink $SOURCE`" $LIBDIR
Modified: branches/Cog/build.linux32x86/nsnac.cog.spur/build/mvm =================================================================== --- branches/Cog/build.linux32x86/nsnac.cog.spur/build/mvm 2016-01-24 19:07:04 UTC (rev 3569) +++ branches/Cog/build.linux32x86/nsnac.cog.spur/build/mvm 2016-01-25 01:07:09 UTC (rev 3570) @@ -36,4 +36,4 @@ # prefer make install prefix=`readlink -f `pwd`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG -../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" +../../editnewspeakinstall.sh ../../../products/$INSTALLDIR -source SqueakV41 "$@"
Modified: branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert/mvm =================================================================== --- branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert/mvm 2016-01-24 19:07:04 UTC (rev 3569) +++ branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert/mvm 2016-01-25 01:07:09 UTC (rev 3570) @@ -32,4 +32,4 @@ # prefer make install prefix=`readlink -f `pwd`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG -../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" +../../editnewspeakinstall.sh ../../../products/$INSTALLDIR -source SqueakV41 "$@"
Modified: branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert.itimerheartbeat/mvm 2016-01-24 19:07:04 UTC (rev 3569) +++ branches/Cog/build.linux32x86/nsnac.cog.spur/build.assert.itimerheartbeat/mvm 2016-01-25 01:07:09 UTC (rev 3570) @@ -30,4 +30,4 @@ rm -f vm/sqUnixMain.o # nuke version info rm -rf ../../../products/$INSTALLDIR make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG -../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" +../../editnewspeakinstall.sh ../../../products/$INSTALLDIR -source SqueakV41 "$@"
Modified: branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug/mvm =================================================================== --- branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug/mvm 2016-01-24 19:07:04 UTC (rev 3569) +++ branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug/mvm 2016-01-25 01:07:09 UTC (rev 3570) @@ -32,4 +32,4 @@ # prefer make install prefix=`readlink -f `pwd`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG -../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" +../../editnewspeakinstall.sh ../../../products/$INSTALLDIR -source SqueakV41 "$@"
Modified: branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug.itimerheartbeat/mvm 2016-01-24 19:07:04 UTC (rev 3569) +++ branches/Cog/build.linux32x86/nsnac.cog.spur/build.debug.itimerheartbeat/mvm 2016-01-25 01:07:09 UTC (rev 3570) @@ -30,4 +30,4 @@ rm -f vm/sqUnixMain.o # nuke version info rm -rf ../../../products/$INSTALLDIR make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG -../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" +../../editnewspeakinstall.sh ../../../products/$INSTALLDIR -source SqueakV41 "$@"
Modified: branches/Cog/build.linux32x86/nsnac.cog.spur/build.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/nsnac.cog.spur/build.itimerheartbeat/mvm 2016-01-24 19:07:04 UTC (rev 3569) +++ branches/Cog/build.linux32x86/nsnac.cog.spur/build.itimerheartbeat/mvm 2016-01-25 01:07:09 UTC (rev 3570) @@ -34,4 +34,4 @@ rm -f vm/sqUnixMain.o # nuke version info rm -rf ../../../products/$INSTALLDIR make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG -../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" +../../editnewspeakinstall.sh ../../../products/$INSTALLDIR -source SqueakV41 "$@"
Modified: branches/Cog/build.linux64x64/editnewspeakinstall.sh =================================================================== --- branches/Cog/build.linux64x64/editnewspeakinstall.sh 2016-01-24 19:07:04 UTC (rev 3569) +++ branches/Cog/build.linux64x64/editnewspeakinstall.sh 2016-01-25 01:07:09 UTC (rev 3570) @@ -1,9 +1,17 @@ #!/bin/bash # Edit the installed directory tree to rename squeak to nsvm and install source INSTALLDIR="$1" +shift cd $INSTALLDIR -SOURCE=../../sources/SqueakV50.sources -test -f $SOURCE || SOURCE=../../../sources/SqueakV50.sources + +if [ "$1" = -source ]; then + SourceFile="$2" + shift; shift +else + SourceFile=SqueakV50 +fi +SOURCE=../../sources/$SourceFile.sources +test -f $SOURCE || SOURCE=../../../sources/$SourceFile.sources if [ -f squeak ]; then mv squeak nsvm ex -u NONE "+g/squeak/s/squeak/nsvm/g" +w +q nsvm @@ -17,7 +25,7 @@ test -f $LIBDIR/squeak && mv $LIBDIR/squeak $LIBDIR/nsvm test -d lib/squeak && mv lib/squeak lib/nsvm LIBDIR="`echo lib/nsvm/[0-9.-]*`" -if [ "$2" = -copysource ]; then +if [ "$1" = -copysource ]; then cp $SOURCE $LIBDIR elif [ -h $SOURCE ]; then ln "`readlink $SOURCE`" $LIBDIR