Skip to content

Commit

Permalink
CogVM source as per VMMaker.oscog-eem.759.
Browse files Browse the repository at this point in the history
Move the MULTIPLEBYTECODESETS define into interp.h (in the Newspeak VMs) to move
it out of the build scripts.

Include the first cut at the new build directory structure for linux32.

Add a sources directory for packaging and include the Squeak4.1 sources.

Move the ALSA sources into it (these are only used in Terf linux builds).

Factor the image scripts to pull out env var defs into envvars.sh and downloading
Squeak 4.5 into getsqueak45.sh.


git-svn-id: http://squeakvm.org/svn/squeak/branches/Cog@2950 fa1542d4-bde8-0310-ad64-8ed1123d492a

Former-commit-id: 93d2e042fd97e4b385060a7632ade0ae3260b76c
  • Loading branch information
eliotmiranda committed Jun 6, 2014
1 parent d63f09f commit 3131cf8
Show file tree
Hide file tree
Showing 1,246 changed files with 3,575 additions and 456,523 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#!/bin/sh
# VM with VM profiler and itimer heartbeat
INSTALLDIR=nsspurastlinux
if [ $# -ge 1 ]; then
case "$1" in
-*) ;;
*) INSTALLDIR="$1"; shift
esac
fi
echo -n "clean? "
read a
case $a in
n|no|N|NO) echo "ok but this isn't safe!!";;
*) rm config.h; test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure \
--with-src=nsspursrc --with-plugins=nscogsrc/plugins \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
CFLAGS="-g3 -O1 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0 -DITIMER_HEARTBEAT=1 -DDEBUGVM=0" \
LIBS="-lpthread -luuid" \
LDFLAGS=-Wl,-z,now
../../../scripts/nukeversion
rm -rf ../../../products/$INSTALLDIR
make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR
(cd ../../../$INSTALLDIR
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" +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 [ "$1" = -copysource ]; then
cp ../../../sources/SqueakV41.sources $LIBDIR
elif [ -h ../../../sources/SqueakV41.sources ]; then
ln "`readlink ../../../sources/SqueakV41.sources`" $LIBDIR
elif [ -f ../../../sources/SqueakV41.sources ]; then
ln ../../../sources/SqueakV41.sources $LIBDIR
else
echo "can't find SqueakV41.sources" 1>&2
fi)
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Copied, perhaps edited, from ../../src/examplePlugins.ext
EXTERNAL_PLUGINS = \
B3DAcceleratorPlugin \
BochsIA32Plugin \
SqueakFFIPrims \
SqueakSSL \
LocalePlugin \
UnixOSProcessPlugin \
UUIDPlugin
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int
INTERNAL_PLUGINS = \
AsynchFilePlugin \
BMPReadWriterPlugin \
B2DPlugin \
BitBltPlugin \
DSAPrims \
DropPlugin \
FileCopyPlugin \
FilePlugin \
FloatArrayPlugin \
FloatMathPlugin \
ZipPlugin \
JPEGReadWriter2Plugin \
JPEGReaderPlugin \
LargeIntegers \
Matrix2x3Plugin \
MiscPrimitivePlugin \
IA32ABI \
RePlugin \
SecurityPlugin \
SocketPlugin \
SurfacePlugin \
UUIDPlugin \
UnixOSProcessPlugin \
VMProfileLinuxSupportPlugin
48 changes: 48 additions & 0 deletions build.linux32x86/newspeak.cog.spur/build.assert/mvm
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#!/bin/sh
# VM with VM profiler and threaded heartbeat
INSTALLDIR=nsspurastlinuxht
if [ $# -ge 1 ]; then
case "$1" in
-*) ;;
*) INSTALLDIR="$1"; shift
esac
fi
echo -n "clean? "
read a
case $a in
n|no|N|NO) echo "ok but this isn't safe!!";;
*) rm config.h; test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure \
--with-src=nsspursrc --with-plugins=nscogsrc/plugins \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
CFLAGS="-g3 -O1 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0 -DDEBUGVM=0" \
LIBS="-lpthread -luuid" \
LDFLAGS=-Wl,-z,now
../../../scripts/nukeversion
rm -rf ../../../products/$INSTALLDIR
make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR
(cd ../../../$INSTALLDIR
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" +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 [ "$1" = -copysource ]; then
cp ../../../sources/SqueakV41.sources $LIBDIR
elif [ -h ../../../sources/SqueakV41.sources ]; then
ln "`readlink ../../../sources/SqueakV41.sources`" $LIBDIR
elif [ -f ../../../sources/SqueakV41.sources ]; then
ln ../../../sources/SqueakV41.sources $LIBDIR
else
echo "can't find SqueakV41.sources" 1>&2
fi)
9 changes: 9 additions & 0 deletions build.linux32x86/newspeak.cog.spur/build.assert/plugins.ext
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Copied, perhaps edited, from ../../src/examplePlugins.ext
EXTERNAL_PLUGINS = \
B3DAcceleratorPlugin \
BochsIA32Plugin \
SqueakFFIPrims \
SqueakSSL \
LocalePlugin \
UnixOSProcessPlugin \
UUIDPlugin
26 changes: 26 additions & 0 deletions build.linux32x86/newspeak.cog.spur/build.assert/plugins.int
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int
INTERNAL_PLUGINS = \
AsynchFilePlugin \
BMPReadWriterPlugin \
B2DPlugin \
BitBltPlugin \
DSAPrims \
DropPlugin \
FileCopyPlugin \
FilePlugin \
FloatArrayPlugin \
FloatMathPlugin \
ZipPlugin \
JPEGReadWriter2Plugin \
JPEGReaderPlugin \
LargeIntegers \
Matrix2x3Plugin \
MiscPrimitivePlugin \
IA32ABI \
RePlugin \
SecurityPlugin \
SocketPlugin \
SurfacePlugin \
UUIDPlugin \
UnixOSProcessPlugin \
VMProfileLinuxSupportPlugin
48 changes: 48 additions & 0 deletions build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat/mvm
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#!/bin/sh
# VM with VM profiler and itimer heartbeat
INSTALLDIR=nsspurdbglinux
if [ $# -ge 1 ]; then
case "$1" in
-*) ;;
*) INSTALLDIR="$1"; shift
esac
fi
echo -n "clean? "
read a
case $a in
n|no|N|NO) echo "ok but this isn't safe!!";;
*) rm config.h; test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure \
--with-src=nsspursrc --with-plugins=nscogsrc/plugins \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
CFLAGS="-g3 -O0 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0 -DITIMER_HEARTBEAT=1 -DDEBUGVM=1" \
LIBS="-lpthread -luuid" \
LDFLAGS=-Wl,-z,now
../../../scripts/nukeversion
rm -rf ../../../products/$INSTALLDIR
make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR
(cd ../../../$INSTALLDIR
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" +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 [ "$1" = -copysource ]; then
cp ../../../sources/SqueakV41.sources $LIBDIR
elif [ -h ../../../sources/SqueakV41.sources ]; then
ln "`readlink ../../../sources/SqueakV41.sources`" $LIBDIR
elif [ -f ../../../sources/SqueakV41.sources ]; then
ln ../../../sources/SqueakV41.sources $LIBDIR
else
echo "can't find SqueakV41.sources" 1>&2
fi)
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Copied, perhaps edited, from ../../src/examplePlugins.ext
EXTERNAL_PLUGINS = \
B3DAcceleratorPlugin \
BochsIA32Plugin \
SqueakFFIPrims \
SqueakSSL \
LocalePlugin \
UnixOSProcessPlugin \
UUIDPlugin
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int
INTERNAL_PLUGINS = \
AsynchFilePlugin \
BMPReadWriterPlugin \
B2DPlugin \
BitBltPlugin \
DSAPrims \
DropPlugin \
FileCopyPlugin \
FilePlugin \
FloatArrayPlugin \
FloatMathPlugin \
ZipPlugin \
JPEGReadWriter2Plugin \
JPEGReaderPlugin \
LargeIntegers \
Matrix2x3Plugin \
MiscPrimitivePlugin \
IA32ABI \
RePlugin \
SecurityPlugin \
SocketPlugin \
SurfacePlugin \
UUIDPlugin \
UnixOSProcessPlugin \
VMProfileLinuxSupportPlugin
48 changes: 48 additions & 0 deletions build.linux32x86/newspeak.cog.spur/build.debug/mvm
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
#!/bin/sh
# VM with VM profiler and threaded heartbeat assuming multiple thread priorities
INSTALLDIR=nsspurdbglinuxht
if [ $# -ge 1 ]; then
case "$1" in
-*) ;;
*) INSTALLDIR="$1"; shift
esac
fi
echo -n "clean? "
read a
case $a in
n|no|N|NO) echo "ok but this isn't safe!!";;
*) rm config.h; test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure \
--with-src=nsspursrc --with-plugins=nscogsrc/plugins \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
CFLAGS="-g3 -O0 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0 -DDEBUGVM=1" \
LIBS="-lpthread -luuid" \
LDFLAGS=-Wl,-z,now
../../../scripts/nukeversion
rm -rf ../../../products/$INSTALLDIR
make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR
(cd ../../../$INSTALLDIR
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" +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 [ "$1" = -copysource ]; then
cp ../../../sources/SqueakV41.sources $LIBDIR
elif [ -h ../../../sources/SqueakV41.sources ]; then
ln "`readlink ../../../sources/SqueakV41.sources`" $LIBDIR
elif [ -f ../../../sources/SqueakV41.sources ]; then
ln ../../../sources/SqueakV41.sources $LIBDIR
else
echo "can't find SqueakV41.sources" 1>&2
fi)
9 changes: 9 additions & 0 deletions build.linux32x86/newspeak.cog.spur/build.debug/plugins.ext
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Copied, perhaps edited, from ../../src/examplePlugins.ext
EXTERNAL_PLUGINS = \
B3DAcceleratorPlugin \
BochsIA32Plugin \
SqueakFFIPrims \
SqueakSSL \
LocalePlugin \
UnixOSProcessPlugin \
UUIDPlugin
26 changes: 26 additions & 0 deletions build.linux32x86/newspeak.cog.spur/build.debug/plugins.int
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Copied, perhaps edited, from ../../../nscogsrc/examplePlugins.int
INTERNAL_PLUGINS = \
AsynchFilePlugin \
BMPReadWriterPlugin \
B2DPlugin \
BitBltPlugin \
DSAPrims \
DropPlugin \
FileCopyPlugin \
FilePlugin \
FloatArrayPlugin \
FloatMathPlugin \
ZipPlugin \
JPEGReadWriter2Plugin \
JPEGReaderPlugin \
LargeIntegers \
Matrix2x3Plugin \
MiscPrimitivePlugin \
IA32ABI \
RePlugin \
SecurityPlugin \
SocketPlugin \
SurfacePlugin \
UUIDPlugin \
UnixOSProcessPlugin \
VMProfileLinuxSupportPlugin
54 changes: 54 additions & 0 deletions build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/mvm
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
#!/bin/sh
# VM with VM profiler and itimer heartbeat
INSTALLDIR=nsspurlinux
if [ $# -ge 1 ]; then
case "$1" in
-*) ;;
*) INSTALLDIR="$1"; shift
esac
fi
# Some gcc versions create a broken VM using -O2
case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in
3.4.*) OPT=-O1;;
*) OPT=-O2;;
esac

echo -n "clean? "
read a
case $a in
n|no|N|NO) echo "ok but this isn't safe!!";;
*) rm config.h; test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure \
--with-src=nsspursrc --with-plugins=nscogsrc/plugins \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DCOGMTVM=0 -DITIMER_HEARTBEAT=1 -DDEBUGVM=0" \
LIBS="-lpthread -luuid" \
LDFLAGS=-Wl,-z,now
../../../scripts/nukeversion
rm -rf ../../../products/$INSTALLDIR
make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR
(cd ../../../$INSTALLDIR
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" +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 [ "$1" = -copysource ]; then
cp ../../../sources/SqueakV41.sources $LIBDIR
elif [ -h ../../../sources/SqueakV41.sources ]; then
ln "`readlink ../../../sources/SqueakV41.sources`" $LIBDIR
elif [ -f ../../../sources/SqueakV41.sources ]; then
ln ../../../sources/SqueakV41.sources $LIBDIR
else
echo "can't find SqueakV41.sources" 1>&2
fi)
Loading

0 comments on commit 3131cf8

Please sign in to comment.