Merge branch 'Cog' of github.com:OpenSmalltalk/opensmalltalk-vm into Cog

.gitattributes

@@ -1,3 +1,6 @@
+# Bash needs lf even on windows/cygwin
+/scripts/* eol=lf
+mvm eol=lf
 sq*SCCSVersion.h filter=RevDateURL ident
 *.changes -diff
 *.sources -diff

.travis_build.sh

@@ -68,7 +68,7 @@ case "$PLATFORM" in
     pushd "${build_directory}"
 
     travis_fold start build_vm "Building OpenSmalltalk VM..."
-    echo n | ./mvm
+    echo n | bash -e ./mvm
     travis_fold end build_vm
 
     # cat config.log
@@ -85,7 +85,7 @@ case "$PLATFORM" in
     pushd "${build_directory}"
 
     travis_fold start build_vm "Building OpenSmalltalk VM..."
-    ./mvm -f
+    bash -e ./mvm -f
     travis_fold end build_vm
 
     output_file="${output_file}.tar.gz"
@@ -94,15 +94,15 @@ case "$PLATFORM" in
     ;;
   "Windows")
     build_directory="./build.${ARCH}/${FLAVOR}/"
+    output_zip="${output_file}.zip"
 
     [[ ! -d "${build_directory}" ]] && exit 100
 
     pushd "${build_directory}"
     # remove bochs plugins
     sed -i 's/Bochs.* //g' plugins.ext
-    ./mvm -f
-    output_file="${output_file}.zip"
-    zip -r "${output_file}" "./builddbg/vm/" "./buildast/vm/" "./build/vm/"
+    bash -e ./mvm -f || exit 1
+    zip -r "${output_zip}" "./builddbg/vm/" "./buildast/vm/" "./build/vm/"
     popd
     ;;
   *)

build.linux32ARMv6/editnewspeakinstall.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 # Edit the installed directory tree to rename squeak to nsvm and install source
 INSTALLDIR="$1"
 shift
@@ -14,11 +14,11 @@ 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
+	sed -i.bak 's/squeak/nsvm/g' 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
+	sed -i.bak 's/squeak/nsvm/g' bin/nsvm
 fi
 rm -rf man doc
 LIBDIR="`echo lib/squeak/[0-9.-]*`"

build.linux32ARMv6/makeall

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 trap 'exit 2' HUP INT PIPE TERM
 for d in newspeak.* squeak.*; do
 	if test -d "$d"; then

build.linux32ARMv6/makeallclean

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 trap 'exit 2' HUP INT PIPE TERM
 for d in newspeak.* squeak.*; do
 	if test -d "$d"; then

build.linux32ARMv6/makeallmakefiles

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 trap 'exit 2' HUP INT PIPE TERM
 for td in *.v3 *.spur; do
 	for d in $td/build*; do

build.linux32ARMv6/makeproduct

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 trap 'exit 2' HUP INT PIPE TERM
 for d in newspeak.cog.spur squeak.cog.spur; do
 	if test -d "$d"; then

build.linux32ARMv6/makeproductclean

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 trap 'exit 2' HUP INT PIPE TERM
 for d in newspeak.cog.spur squeak.cog.spur; do
 	if test -d "$d"; then

build.linux32ARMv6/mkNamedPrims.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 # Generate a sqNamedPrims.h file from plugins.int.  The plugins.int used should
 # be the one and only argument.
 if [ $# != 1 -o ! -f "$1" ]; then

build.linux32ARMv6/newspeak.cog.spur/build.assert/mvm

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 # assert VM with VM profiler and threaded heartbeat
 INSTALLDIR=assert/nscogspurlinuxhtRPi
 OPT="-g3 -O1 -fwrapv -DDEBUGVM=0"

build.linux32ARMv6/newspeak.cog.spur/build.debug/mvm

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 # debug Spur VM with VM profiler and threaded heartbeat
 INSTALLDIR=debug/nscogspurlinuxhtRPi
 OPT="-g3 -O0 -fwrapv -DDEBUGVM=1"

build.linux32ARMv6/newspeak.cog.spur/build/mvm

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 # Spur VM with VM profiler and threaded heartbeat
 INSTALLDIR=nscogspurlinuxhtRPi
 OPT="-g -O2 -fwrapv -DNDEBUG -DDEBUGVM=0"

build.linux32ARMv6/newspeak.cog.spur/makeallclean

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 trap 'exit 2' HUP INT PIPE TERM
 if [ "$1" = -fork ]; then
 	shift

build.linux32ARMv6/newspeak.cog.spur/makealldirty

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 trap 'exit 2' HUP INT PIPE TERM
 if [ "$1" = -fork ]; then
 	shift

build.linux32ARMv6/newspeak.stack.spur/build.assert/mvm

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 # assert Stack Spur VM with VM profiler and threaded heartbeat
 INSTALLDIR=assert/nsstkspurlinuxhtRPi
 OPT="-g3 -O1 -fwrapv -DDEBUGVM=0"

build.linux32ARMv6/newspeak.stack.spur/build.debug/mvm

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 # debug Stack Spur VM with VM profiler and threaded heartbeat
 INSTALLDIR=debug/nsstkspurlinuxhtRPi
 OPT="-g3 -O0 -fwrapv -DDEBUGVM=1"

build.linux32ARMv6/newspeak.stack.spur/build/mvm

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 # Stack Spur VM and threaded heartbeat
 INSTALLDIR=nsstkspurlinuxhtRPi
 OPT="-g -O3 -fwrapv -DNDEBUG -DDEBUGVM=0 -DNO_VM_PROFILE=1"

build.linux32ARMv6/newspeak.stack.spur/makeallclean

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 trap 'exit 2' HUP INT PIPE TERM
 if [ "$1" = -fork ]; then
 	shift

build.linux32ARMv6/newspeak.stack.spur/makealldirty

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 trap 'exit 2' HUP INT PIPE TERM
 if [ "$1" = -fork ]; then
 	shift

build.linux32ARMv6/squeak.cog.spur/build.assert/mvm

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 # assert VM with VM profiler and threaded heartbeat
 INSTALLDIR=assert/cogspurlinuxhtRPi
 OPT="-g3 -O1 -fwrapv -DDEBUGVM=0"

build.linux32ARMv6/squeak.cog.spur/build.debug/mvm

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 # debug Spur VM with VM profiler and threaded heartbeat
 INSTALLDIR=debug/cogspurlinuxhtRPi
 OPT="-g3 -O0 -fwrapv -DDEBUGVM=1"

build.linux32ARMv6/squeak.cog.spur/build/mvm

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 # Spur VM with VM profiler and threaded heartbeat
 INSTALLDIR=cogspurlinuxhtRPi
 OPT="-g -O2 -fwrapv -DNDEBUG -DDEBUGVM=0"

build.linux32ARMv6/squeak.cog.spur/makeallclean

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 trap 'exit 2' HUP INT PIPE TERM
 if [ "$1" = -fork ]; then
 	shift

build.linux32ARMv6/squeak.cog.spur/makealldirty

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 trap 'exit 2' HUP INT PIPE TERM
 if [ "$1" = -fork ]; then
 	shift

build.linux32ARMv6/squeak.stack.spur/build.assert/mvm

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 # assert Stack Spur VM with VM profiler and threaded heartbeat
 INSTALLDIR=assert/stkspurlinuxhtRPi
 OPT="-g3 -O1 -fwrapv -DDEBUGVM=0"

build.linux32ARMv6/squeak.stack.spur/build.debug/mvm

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 # debug Stack Spur VM with VM profiler and threaded heartbeat
 INSTALLDIR=debug/stkspurlinuxhtRPi
 OPT="-g3 -O0 -fwrapv -DDEBUGVM=1"

build.linux32ARMv6/squeak.stack.spur/build/mvm

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 # Stack Spur VM and threaded heartbeat
 INSTALLDIR=stkspurlinuxhtRPi
 OPT="-g -O3 -fwrapv -DNDEBUG -DDEBUGVM=0 -DNO_VM_PROFILE=1"

build.linux32ARMv6/squeak.stack.spur/makeallclean

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 trap 'exit 2' HUP INT PIPE TERM
 if [ "$1" = -fork ]; then
 	shift

build.linux32ARMv6/squeak.stack.spur/makealldirty

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 trap 'exit 2' HUP INT PIPE TERM
 if [ "$1" = -fork ]; then
 	shift

build.linux32ARMv6/squeak.stack.v3/build.assert/mvm

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 # assert Stack VM with VM profiler and threaded heartbeat
 INSTALLDIR=assert/stklinuxhtRPi
 OPT="-g3 -O1 -fwrapv -DDEBUGVM=0"

build.linux32ARMv6/squeak.stack.v3/build.debug/mvm

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 # debug Stack VM with VM profiler and threaded heartbeat
 INSTALLDIR=debug/stklinuxhtRPi
 OPT="-g3 -O0 -fwrapv -DDEBUGVM=1"

build.linux32ARMv6/squeak.stack.v3/build/mvm

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 # Stack VM with VM profiler and threaded heartbeat
 INSTALLDIR=stklinuxhtRPi
 OPT="-g -O3 -fwrapv -DNDEBUG -DDEBUGVM=0 -DNO_VM_PROFILE=1"

build.linux32ARMv6/squeak.stack.v3/makeallclean

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 trap 'exit 2' HUP INT PIPE TERM
 if [ "$1" = -fork ]; then
 	shift

build.linux32ARMv6/squeak.stack.v3/makealldirty

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 trap 'exit 2' HUP INT PIPE TERM
 if [ "$1" = -fork ]; then
 	shift

build.linux32ARMv7/editnewspeakinstall.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 # Edit the installed directory tree to rename squeak to nsvm and install source
 INSTALLDIR="$1"
 shift
@@ -14,11 +14,11 @@ 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
+	sed -i.bak 's/squeak/nsvm/g' 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
+	sed -i.bak 's/squeak/nsvm/g' bin/nsvm
 fi
 rm -rf man doc
 LIBDIR="`echo lib/squeak/[0-9.-]*`"

build.linux32ARMv7/makeall

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 trap 'exit 2' HUP INT PIPE TERM
 for d in newspeak.* squeak.*; do
 	if test -d "$d"; then

build.linux32ARMv7/makeallclean

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 trap 'exit 2' HUP INT PIPE TERM
 for d in newspeak.* squeak.*; do
 	if test -d "$d"; then

build.linux32ARMv7/makeproduct

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 trap 'exit 2' HUP INT PIPE TERM
 for d in newspeak.cog.spur squeak.cog.spur; do
 	if test -d "$d"; then

build.linux32ARMv7/makeproductclean

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 trap 'exit 2' HUP INT PIPE TERM
 for d in newspeak.cog.spur squeak.cog.spur; do
 	if test -d "$d"; then

build.linux32ARMv7/mkNamedPrims.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 # Generate a sqNamedPrims.h file from plugins.int.  The plugins.int used should
 # be the one and only argument.
 if [ $# != 1 -o ! -f "$1" ]; then

build.linux32ARMv7/newspeak.cog.spur/build.assert/mvm

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 # assert VM with VM profiler and threaded heartbeat
 INSTALLDIR=assert/nscogspurlinuxhtARMv7
 OPT="-g3 -O1 -fwrapv -DDEBUGVM=0"

build.linux32ARMv7/newspeak.cog.spur/build.debug/mvm

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 # debug Spur VM with VM profiler and threaded heartbeat
 INSTALLDIR=debug/nscogspurlinuxhtARMv7
 OPT="-g3 -O0 -fwrapv -DDEBUGVM=1"

build.linux32ARMv7/newspeak.cog.spur/build/mvm

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 # Spur VM with VM profiler and threaded heartbeat
 INSTALLDIR=nscogspurlinuxhtARMv7
 OPT="-g -O2 -fwrapv -DNDEBUG -DDEBUGVM=0"

build.linux32ARMv7/newspeak.stack.spur/build.assert/mvm

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 # assert Stack Spur VM with VM profiler and threaded heartbeat
 INSTALLDIR=assert/nsstkspurlinuxhtARMv7
 OPT="-g3 -O1 -fwrapv -DDEBUGVM=0"

build.linux32ARMv7/newspeak.stack.spur/build.debug/mvm

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 # debug Stack Spur VM with VM profiler and threaded heartbeat
 INSTALLDIR=debug/nsstkspurlinuxhtARMv7
 OPT="-g3 -O0 -fwrapv -DDEBUGVM=1"

build.linux32ARMv7/newspeak.stack.spur/build/mvm

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 # Stack Spur VM and threaded heartbeat
 INSTALLDIR=nsstkspurlinuxhtARMv7
 OPT="-g -O3 -fwrapv -DNDEBUG -DDEBUGVM=0 -DNO_VM_PROFILE=1"

build.linux32x86/bochsx64/conf.COG

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 # Bochs x64 simulator for the BochsX64Alien plugin.
 # this sets up the x64 compile for Cog on linux.  Disable as much inessential

build.linux32x86/bochsx64/conf.COG.dbg

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 # Bochs x64 simulator for the BochsX64Alien plugin.
 # this sets up the x64 compile for Cog on linux.  Disable as much inessential

build.linux32x86/bochsx64/makeem

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/bin/bash -e
 exec ../../processors/IA32/bochs/makeem

build.linux32x86/bochsx86/conf.COG

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 # Bochs x86 simulator for the BochsIA32Alien plugin.
 # this sets up the x86 compile for Cog on linux.  Disable as much inessential

build.linux32x86/bochsx86/makeem

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/bin/bash -e
 exec ../../processors/IA32/bochs/makeem

build.linux32x86/editnewspeakinstall.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 # Edit the installed directory tree to rename squeak to nsvm and install source
 INSTALLDIR="$1"
 shift
@@ -14,11 +14,11 @@ 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
+	sed -i.bak 's/squeak/nsvm/g' 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
+	sed -i.bak 's/squeak/nsvm/g' bin/nsvm
 fi
 rm -rf man doc
 LIBDIR="`echo lib/squeak/[0-9.-]*`"

build.linux32x86/gdbarm32/conf.COG

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 CFLAGS="-g -O2 -m32"
 mkdir -p zlib bfd libiberty opcodes sim/common sim/arm
 for d in zlib; do

build.linux32x86/gdbarm32/makeem

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 for d in zlib bfd libiberty opcodes sim/arm; do
 	(cd ./$d; make COG=1)
 done

build.linux32x86/makeall

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -e
 trap 'exit 2' HUP INT PIPE TERM
 for d in newspeak.cog.* newspeak.stack.* squeak.*; do
 	if test -d "$d"; then