Merge pull request #219 from clementbera/pharo.sista.spur-build

Added pharo.sista.spur builds

.appveyor.yml

@@ -38,6 +38,11 @@ environment:
       CYG_ROOT: C:\cygwin
       CYG_SETUP: setup-x86.exe
       MINGW_ARCH: i686
+    - FLAVOR: pharo.sista.spur
+      ARCH: win32x86
+      CYG_ROOT: C:\cygwin
+      CYG_SETUP: setup-x86.exe
+      MINGW_ARCH: i686
     - FLAVOR: pharo.cog.spur.lowcode
       ARCH: win32x86
       CYG_ROOT: C:\cygwin
@@ -63,6 +68,11 @@ environment:
       CYG_ROOT: C:\cygwin64
       CYG_SETUP: setup-x86_64.exe
       MINGW_ARCH: x86_64
+    # - FLAVOR: pharo.sista.spur
+    #   ARCH: win64x64
+    #   CYG_ROOT: C:\cygwin64
+    #   CYG_SETUP: setup-x86_64.exe
+    #   MINGW_ARCH: x86_64
     - FLAVOR: newspeak.cog.spur
       ARCH: win64x64
       CYG_ROOT: C:\cygwin64

.travis.yml

@@ -23,18 +23,22 @@ jobs:
   - env: ARCH="linux64x64" FLAVOR="squeak.cog.spur"
   - env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" HEARTBEAT="threaded"
   - env: ARCH="linux64x64" FLAVOR="pharo.cog.spur" HEARTBEAT="itimer"
+  # - env: ARCH="linux64x64" FLAVOR="pharo.sista.spur" HEARTBEAT="threaded"
   - env: ARCH="linux32x86" FLAVOR="newspeak.cog.spur"
   - env: ARCH="linux32x86" FLAVOR="squeak.cog.spur"
   - env: ARCH="linux32x86" FLAVOR="squeak.cog.v3"
   - env: ARCH="linux32x86" FLAVOR="squeak.sista.spur"
   - env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" HEARTBEAT="threaded"
   - env: ARCH="linux32x86" FLAVOR="pharo.cog.spur" HEARTBEAT="itimer"
+  - env: ARCH="linux32x86" FLAVOR="pharo.sista.spur" HEARTBEAT="threaded"
 
   - stage: "Mac builds"
     env: ARCH="macos64x64" FLAVOR="newspeak.cog.spur"
     <<: *mac-build
   - env: ARCH="macos64x64" FLAVOR="pharo.cog.spur"
     <<: *mac-build
+  # - env: ARCH="macos64x64" FLAVOR="pharo.sista.spur"
+  #   <<: *mac-build
   - env: ARCH="macos64x64" FLAVOR="pharo.cog.spur.lowcode"
     <<: *mac-build
   - env: ARCH="macos64x64" FLAVOR="squeak.cog.spur"
@@ -43,6 +47,8 @@ jobs:
     <<: *mac-build
   - env: ARCH="macos32x86" FLAVOR="pharo.cog.spur"
     <<: *mac-build
+  - env: ARCH="macos32x86" FLAVOR="pharo.sista.spur"
+    <<: *mac-build
   - env: ARCH="macos32x86" FLAVOR="pharo.cog.spur.lowcode"
     <<: *mac-build
   - env: ARCH="macos32x86" FLAVOR="squeak.cog.spur"

build.linux32x86/pharo.sista.spur/build.assert.itimerheartbeat/mvm

@@ -0,0 +1,46 @@
+#!/bin/bash -e
+case "`uname -m`" in # ensure we see x86 as machine type
+i*86) ;; # we're good
+*) if type i386 2>&1 >/dev/null; then
+	echo "Re-exec as x86"
+	exec i386 "$0" "$@"
+fi ;;
+esac
+# assert VM with VM profiler and threaded heartbeat
+INSTALLDIR=assert/phsistaspurlinuxht
+OPT="-g3 -O1 -fwrapv -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0 -DPharoVM -DIMMUTABILITY=1"
+
+if [ $# -ge 1 ]; then
+	INSTALLDIR="$1"; shift
+fi
+
+echo -n "clean? "
+read a
+case $a in
+n|no|N|NO)	echo "ok but this isn't safe!!";;
+*)			test -f Makefile && make reallyclean
+esac
+
+test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
+test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
+
+test -f config.h || ../../../platforms/unix/config/configure \
+		--without-npsqueak \
+		--with-vmversion=5.0 \
+		--with-src=spursistasrc \
+	CC="gcc -m32" \
+	CXX="g++ -m32" \
+	CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0  -DITIMER_HEARTBEAT=1" \
+	LIBS="-lpthread -luuid -Wl,-rpath,'\$\$ORIGIN' " \
+	LDFLAGS=-Wl,-z,now
+rm -f vm/sqUnixMain.o # nuke version info
+rm -rf ../../../products/$INSTALLDIR
+# 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
+productDir=`find ../../../products/$INSTALLDIR -name "5.0*"`
+productDir=`(cd $productDir;pwd)`
+for lib in ${THIRDPARTYLIBS}; do
+	../../third-party/mvm ${lib} install $productDir
+done
+../../editpharoinstall.sh ../../../products/$INSTALLDIR "$@"

build.linux32x86/pharo.sista.spur/build.assert/mvm

@@ -0,0 +1,46 @@
+#!/bin/bash -e
+case "`uname -m`" in # ensure we see x86 as machine type
+i*86) ;; # we're good
+*) if type i386 2>&1 >/dev/null; then
+	echo "Re-exec as x86"
+	exec i386 "$0" "$@"
+fi ;;
+esac
+# assert VM with VM profiler and threaded heartbeat
+INSTALLDIR=assert/phsistaspurlinuxht
+OPT="-g3 -O1 -fwrapv -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0 -DPharoVM -DIMMUTABILITY=1"
+
+if [ $# -ge 1 ]; then
+	INSTALLDIR="$1"; shift
+fi
+
+echo -n "clean? "
+read a
+case $a in
+n|no|N|NO)	echo "ok but this isn't safe!!";;
+*)			test -f Makefile && make reallyclean
+esac
+
+test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
+test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
+
+test -f config.h || ../../../platforms/unix/config/configure \
+		--without-npsqueak \
+		--with-vmversion=5.0 \
+		--with-src=spursistasrc \
+	CC="gcc -m32" \
+	CXX="g++ -m32" \
+	CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0" \
+	LIBS="-lpthread -luuid -Wl,-rpath,'\$\$ORIGIN' " \
+	LDFLAGS=-Wl,-z,now
+rm -f vm/sqUnixMain.o # nuke version info
+rm -rf ../../../products/$INSTALLDIR
+# 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
+productDir=`find ../../../products/$INSTALLDIR -name "5.0*"`
+productDir=`(cd $productDir;pwd)`
+for lib in ${THIRDPARTYLIBS}; do
+	../../third-party/mvm ${lib} install $productDir
+done
+../../editpharoinstall.sh ../../../products/$INSTALLDIR "$@"

build.linux32x86/pharo.sista.spur/build.debug.itimerheartbeat/mvm

@@ -0,0 +1,49 @@
+#!/bin/bash -e
+case "`uname -m`" in # ensure we see x86 as machine type
+i*86) ;; # we're good
+*) if type i386 2>&1 >/dev/null; then
+	echo "Re-exec as x86"
+	exec i386 "$0" "$@"
+fi ;;
+esac
+# debug Spur VM with VM profiler and threaded heartbeat
+INSTALLDIR=debug/phsistaspurlinuxht
+OPT="-g3 -O0 -fwrapv -DDEBUGVM=1 -DPharoVM -DIMMUTABILITY=1"
+
+if [ $# -ge 1 ]; then
+	INSTALLDIR="$1"; shift
+fi
+
+echo -n "clean? "
+read a
+case $a in
+n|no|N|NO)	echo "ok but this isn't safe!!";;
+*)			test -f Makefile && make reallyclean
+#	for lib in ${THIRDPARTYLIBS}; do
+#		../../third-party/mvm ${lib} clean
+#	done
+esac
+
+test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
+test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
+
+test -f config.h || ../../../platforms/unix/config/configure \
+		--without-npsqueak \
+		--with-vmversion=5.0 \
+		--with-src=spursistasrc \
+	CC="gcc -m32" \
+	CXX="g++ -m32" \
+	CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0 -DITIMER_HEARTBEAT=1" \
+	LIBS="-lpthread -luuid -Wl,-rpath,'\$\$ORIGIN' " \
+	LDFLAGS=-Wl,-z,now
+rm -f vm/sqUnixMain.o # nuke version info
+rm -rf ../../../products/$INSTALLDIR
+# 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
+productDir=`find ../../../products/$INSTALLDIR -name "5.0*"`
+productDir=`(cd $productDir;pwd)`
+for lib in ${THIRDPARTYLIBS}; do
+	../../third-party/mvm ${lib} install $productDir
+done
+../../editpharoinstall.sh ../../../products/$INSTALLDIR "$@"

build.linux32x86/pharo.sista.spur/build.debug/mvm

@@ -0,0 +1,49 @@
+#!/bin/bash -e
+case "`uname -m`" in # ensure we see x86 as machine type
+i*86) ;; # we're good
+*) if type i386 2>&1 >/dev/null; then
+	echo "Re-exec as x86"
+	exec i386 "$0" "$@"
+fi ;;
+esac
+# debug Spur VM with VM profiler and threaded heartbeat
+INSTALLDIR=debug/phsistaspurlinuxht
+OPT="-g3 -O0 -fwrapv -DDEBUGVM=1 -DPharoVM -DIMMUTABILITY=1"
+
+if [ $# -ge 1 ]; then
+	INSTALLDIR="$1"; shift
+fi
+
+echo -n "clean? "
+read a
+case $a in
+n|no|N|NO)	echo "ok but this isn't safe!!";;
+*)			test -f Makefile && make reallyclean
+#	for lib in ${THIRDPARTYLIBS}; do
+#		../../third-party/mvm ${lib} clean
+#	done
+esac
+
+test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
+test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
+
+test -f config.h || ../../../platforms/unix/config/configure \
+		--without-npsqueak \
+		--with-vmversion=5.0 \
+		--with-src=spursistasrc \
+	CC="gcc -m32" \
+	CXX="g++ -m32" \
+	CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0" \
+	LIBS="-lpthread -luuid -Wl,-rpath,'\$\$ORIGIN' " \
+	LDFLAGS=-Wl,-z,now
+rm -f vm/sqUnixMain.o # nuke version info
+rm -rf ../../../products/$INSTALLDIR
+# 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
+productDir=`find ../../../products/$INSTALLDIR -name "5.0*"`
+productDir=`(cd $productDir;pwd)`
+for lib in ${THIRDPARTYLIBS}; do
+	../../third-party/mvm ${lib} install $productDir
+done
+../../editpharoinstall.sh ../../../products/$INSTALLDIR "$@"

build.linux32x86/pharo.sista.spur/build.itimerheartbeat/mvm

@@ -0,0 +1,54 @@
+#!/bin/bash -e
+case "`uname -m`" in # ensure we see x86 as machine type
+i*86) ;; # we're good
+*) if type i386 2>&1 >/dev/null; then
+	echo "Re-exec as x86"
+	exec i386 "$0" "$@"
+fi ;;
+esac
+# Spur VM with VM profiler and threaded heartbeat
+INSTALLDIR=phsistaspurlinuxht
+# Some gcc versions create a broken VM using -O2
+case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in
+3.4.*)	OPT="-g -O1 -fwrapv -DNDEBUG -DDEBUGVM=0";;
+*)		OPT="-g -O2 -DNDEBUG -DDEBUGVM=0";;
+esac
+OPT="$OPT -DPharoVM -DIMMUTABILITY=1"
+
+if [ $# -ge 1 ]; then
+	INSTALLDIR="$1"; shift
+fi
+
+echo -n "clean? "
+read a
+case $a in
+n|no|N|NO)	echo "ok but this isn't safe!!";;
+*)			test -f Makefile && make reallyclean
+#	for lib in ${THIRDPARTYLIBS}; do
+#		../../third-party/mvm ${lib} clean
+#	done
+esac
+
+test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
+test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
+
+test -f config.h || ../../../platforms/unix/config/configure \
+		--without-npsqueak \
+		--with-vmversion=5.0 \
+		--with-src=spursistasrc \
+	CC="gcc -m32" \
+	CXX="g++ -m32" \
+	CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0 -DITIMER_HEARTBEAT=1" \
+	LIBS="-lpthread -luuid -Wl,-rpath,'\$\$ORIGIN' " \
+	LDFLAGS=-Wl,-z,now
+rm -f vm/sqUnixMain.o # nuke version info
+rm -rf ../../../products/$INSTALLDIR
+# 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
+productDir=`find ../../../products/$INSTALLDIR -name "5.0*"`
+productDir=`(cd $productDir;pwd)`
+for lib in ${THIRDPARTYLIBS}; do
+	../../third-party/mvm ${lib} install $productDir
+done
+../../editpharoinstall.sh ../../../products/$INSTALLDIR "$@"

build.linux32x86/pharo.sista.spur/build/mvm

@@ -0,0 +1,54 @@
+#!/bin/bash -e
+case "`uname -m`" in # ensure we see x86 as machine type
+i*86) ;; # we're good
+*) if type i386 2>&1 >/dev/null; then
+	echo "Re-exec as x86"
+	exec i386 "$0" "$@"
+fi ;;
+esac
+# Spur VM with VM profiler and threaded heartbeat
+INSTALLDIR=phsistaspurlinuxht
+# Some gcc versions create a broken VM using -O2
+case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in
+3.4.*)	OPT="-g -O1 -fwrapv -DNDEBUG -DDEBUGVM=0";;
+*)		OPT="-g -O2 -DNDEBUG -DDEBUGVM=0";;
+esac
+OPT="$OPT -DPharoVM -DIMMUTABILITY=1"
+
+if [ $# -ge 1 ]; then
+	INSTALLDIR="$1"; shift
+fi
+
+echo -n "clean? "
+read a
+case $a in
+n|no|N|NO)	echo "ok but this isn't safe!!";;
+*)			test -f Makefile && make reallyclean
+#	for lib in ${THIRDPARTYLIBS}; do
+#		../../third-party/mvm ${lib} clean
+#	done
+esac
+
+test -f plugins.int || (test -f ../plugins.int && cp -p ../plugins.int . || cp -p ../../plugins.int .)
+test -f plugins.ext || (test -f ../plugins.ext && cp -p ../plugins.ext . || cp -p ../../plugins.ext .)
+
+test -f config.h || ../../../platforms/unix/config/configure \
+		--without-npsqueak \
+		--with-vmversion=5.0 \
+		--with-src=spursistasrc \
+	CC="gcc -m32" \
+	CXX="g++ -m32" \
+	CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DCOGMTVM=0" \
+	LIBS="-lpthread -luuid -Wl,-rpath,'\$\$ORIGIN' " \
+	LDFLAGS=-Wl,-z,now
+rm -f vm/sqUnixMain.o # nuke version info
+rm -rf ../../../products/$INSTALLDIR
+# 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
+productDir=`find ../../../products/$INSTALLDIR -name "5.0*"`
+productDir=`(cd $productDir;pwd)`
+for lib in ${THIRDPARTYLIBS}; do
+	../../third-party/mvm ${lib} install $productDir
+done
+../../editpharoinstall.sh ../../../products/$INSTALLDIR "$@"

build.linux32x86/pharo.sista.spur/makeallclean

@@ -0,0 +1,15 @@
+#!/bin/sh -e
+trap 'exit 2' HUP INT PIPE TERM
+if [ "$1" = -fork ]; then
+	shift
+	for d in `dirname $0`/build*; do
+		(cd ./$d
+		 echo y | ./mvm "$@") &
+	done
+	wait
+else
+	for d in `dirname $0`/build*; do
+		(cd ./$d
+		 echo y | ./mvm "$@")
+	done
+fi

build.linux32x86/pharo.sista.spur/makealldirty

@@ -0,0 +1,15 @@
+#!/bin/sh -e
+trap 'exit 2' HUP INT PIPE TERM
+if [ "$1" = -fork ]; then
+	shift
+	for d in `dirname $0`/build*; do
+		(cd ./$d
+		 echo n | ./mvm "$@") &
+	done
+	wait
+else
+	for d in `dirname $0`/build*; do
+		(cd ./$d
+		 echo n | ./mvm "$@")
+	done
+fi