Revision: 3391 Author: eliot Date: 2015-06-27 11:55:10 -0700 (Sat, 27 Jun 2015) Log Message: ----------- Update HowToBuild to cover raspbian. Have the ARM Newspeak builds change the VM name from squeak to nsvm as required.
Modified Paths: -------------- branches/Cog/build.linux32ARM/HowToBuild branches/Cog/build.linux32ARM/newspeak.cog.spur/build/mvm branches/Cog/build.linux32ARM/newspeak.cog.spur/build.assert/mvm branches/Cog/build.linux32ARM/newspeak.cog.spur/build.debug/mvm branches/Cog/build.linux32ARM/newspeak.stack.spur/build/mvm branches/Cog/build.linux32ARM/newspeak.stack.spur/build.assert/mvm branches/Cog/build.linux32ARM/newspeak.stack.spur/build.debug/mvm
Added Paths: ----------- branches/Cog/build.linux32ARM/editnewspeakinstall.sh
Modified: branches/Cog/build.linux32ARM/HowToBuild =================================================================== --- branches/Cog/build.linux32ARM/HowToBuild 2015-06-27 04:28:55 UTC (rev 3390) +++ branches/Cog/build.linux32ARM/HowToBuild 2015-06-27 18:55:10 UTC (rev 3391) @@ -252,4 +252,11 @@ sudo apt-get install libcairo2-dev sudo apt-get install libpango1.0-dev
+Raspbian +sudo apt-get install libcairo2-dev +sudo apt-get install libpango1.0-dev +sudo apt-get install libssl-dev +sudo apt-get install uuid-dev uuid-runtime +sudo apt-get install libasound2-dev + More advice and examples for other distros gratefully received.
Copied: branches/Cog/build.linux32ARM/editnewspeakinstall.sh (from rev 3335, branches/Cog/build.linux32x86/editnewspeakinstall.sh) =================================================================== --- branches/Cog/build.linux32ARM/editnewspeakinstall.sh (rev 0) +++ branches/Cog/build.linux32ARM/editnewspeakinstall.sh 2015-06-27 18:55:10 UTC (rev 3391) @@ -0,0 +1,28 @@ +#!/bin/bash +# Edit the installed directory tree to rename squeak to nsvm and install source +INSTALLDIR="$1" +cd $INSTALLDIR +SOURCE=../../sources/SqueakV41.sources +test -f $SOURCE || SOURCE=../../../sources/SqueakV41.sources +if [ -f squeak ]; then + mv squeak nsvm + ex -u NONE "+g/squeak/s/squeak/nsvm/g" +w +q nsvm +fi +if [ -f bin/squeak ]; then + mv bin/squeak bin/nsvm + ex -u NONE "+g/squeak/s/squeak/nsvm/g" "+/nsvm vm-dev/s//squeak vm-dev/" +w +q bin/nsvm +fi +rm -rf man doc +LIBDIR="`echo lib/squeak/[0-9.-]*`" +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 + cp $SOURCE $LIBDIR +elif [ -h $SOURCE ]; then + ln "`readlink $SOURCE`" $LIBDIR +elif [ -f $SOURCE ]; then + ln $SOURCE $LIBDIR +else + echo "can't find `basename $SOURCE`" 1>&2 +fi
Modified: branches/Cog/build.linux32ARM/newspeak.cog.spur/build/mvm =================================================================== --- branches/Cog/build.linux32ARM/newspeak.cog.spur/build/mvm 2015-06-27 04:28:55 UTC (rev 3390) +++ branches/Cog/build.linux32ARM/newspeak.cog.spur/build/mvm 2015-06-27 18:55:10 UTC (rev 3391) @@ -29,3 +29,4 @@ # prefer make install prefix=`readlink -f `pwd`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag and Raspbian lacks `readlinks` make -j4 install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"
Modified: branches/Cog/build.linux32ARM/newspeak.cog.spur/build.assert/mvm =================================================================== --- branches/Cog/build.linux32ARM/newspeak.cog.spur/build.assert/mvm 2015-06-27 04:28:55 UTC (rev 3390) +++ branches/Cog/build.linux32ARM/newspeak.cog.spur/build.assert/mvm 2015-06-27 18:55:10 UTC (rev 3391) @@ -29,3 +29,4 @@ # prefer make install prefix=`readlink -f `pwd`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag and Raspbian lacks `readlinks` make -j4 install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"
Modified: branches/Cog/build.linux32ARM/newspeak.cog.spur/build.debug/mvm =================================================================== --- branches/Cog/build.linux32ARM/newspeak.cog.spur/build.debug/mvm 2015-06-27 04:28:55 UTC (rev 3390) +++ branches/Cog/build.linux32ARM/newspeak.cog.spur/build.debug/mvm 2015-06-27 18:55:10 UTC (rev 3391) @@ -29,3 +29,4 @@ # prefer make install prefix=`readlink -f `pwd`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag and Raspbian lacks `readlinks` make -j4 install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"
Modified: branches/Cog/build.linux32ARM/newspeak.stack.spur/build/mvm =================================================================== --- branches/Cog/build.linux32ARM/newspeak.stack.spur/build/mvm 2015-06-27 04:28:55 UTC (rev 3390) +++ branches/Cog/build.linux32ARM/newspeak.stack.spur/build/mvm 2015-06-27 18:55:10 UTC (rev 3391) @@ -29,3 +29,4 @@ # prefer make install prefix=`readlink -f `pwd`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag and Raspbian lacks `readlinks` make -j4 install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"
Modified: branches/Cog/build.linux32ARM/newspeak.stack.spur/build.assert/mvm =================================================================== --- branches/Cog/build.linux32ARM/newspeak.stack.spur/build.assert/mvm 2015-06-27 04:28:55 UTC (rev 3390) +++ branches/Cog/build.linux32ARM/newspeak.stack.spur/build.assert/mvm 2015-06-27 18:55:10 UTC (rev 3391) @@ -29,3 +29,4 @@ # prefer make install prefix=`readlink -f `pwd`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag and Raspbian lacks `readlinks` make -j4 install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"
Modified: branches/Cog/build.linux32ARM/newspeak.stack.spur/build.debug/mvm =================================================================== --- branches/Cog/build.linux32ARM/newspeak.stack.spur/build.debug/mvm 2015-06-27 04:28:55 UTC (rev 3390) +++ branches/Cog/build.linux32ARM/newspeak.stack.spur/build.debug/mvm 2015-06-27 18:55:10 UTC (rev 3391) @@ -29,3 +29,4 @@ # prefer make install prefix=`readlink -f `pwd`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag and Raspbian lacks `readlinks` make -j4 install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@"