[Vm-dev] [commit][2630] Add -DMULTIPLEBYTECODESETS= 1 to Newspeak Windows & linux build scripts/Makefiles

[commits at squeakvm.org]

Revision: 2630
Author:   eliot
Date:     2012-12-04 09:53:23 -0800 (Tue, 04 Dec 2012)
Log Message:
-----------
Add -DMULTIPLEBYTECODESETS=1 to Newspeak Windows & linux build scripts/Makefiles
as appropriate. Allow uploadvms script to take a REV arg.

Modified Paths:
--------------
    branches/Cog/nscogbuild/cygwinbuild/Makefile
    branches/Cog/nscogbuild/unixbuild/astbld/mvm
    branches/Cog/nscogbuild/unixbuild/bld/mvm
    branches/Cog/nscogbuild/unixbuild/dbgbld/mvm
    branches/Cog/scripts/uploadvms

Modified: branches/Cog/nscogbuild/cygwinbuild/Makefile
===================================================================
--- branches/Cog/nscogbuild/cygwinbuild/Makefile	2012-12-03 00:55:57 UTC (rev 2629)
+++ branches/Cog/nscogbuild/cygwinbuild/Makefile	2012-12-04 17:53:23 UTC (rev 2630)
@@ -119,15 +119,15 @@
 
 # Set minimum version to WindowsXP (see /cygwin/usr/include//w32api/w32api.h)
 WINVER:=-D_WIN32_WINNT=0x0501 -DWINVER=0x0501
+WINDEFS:=$(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_STD_FILE_SUPPORT
 
 INCLUDEPATH:= -isystem/usr/include/mingw -I/usr/include/w32api
 # define _MT to eliminate the inline versions of printf et al in mingw/stdio.h
 NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf
 CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \
 	-mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN)
-DEFS:=	-DDEBUGVM=$(DEBUGVM) $(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_ISNAN \
-		-DNO_SERVICE -DNO_STD_FILE_SUPPORT \
-		$(NDEBUG) -DLSB_FIRST -D'VM_NAME="$(VM_NAME)"' -DX86 $(XDEFS)
+DEFS:=	-DMULTIPLEBYTECODESETS=1 -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \
+		$(WINDEFS) -DNO_ISNAN -DNO_SERVICE $(NDEBUG) -DLSB_FIRST -DX86 $(XDEFS)
 XDEFS:=	-DSQUEAK_BUILTIN_PLUGIN
 INCLUDES:= -I. -I$(VMDIR) -I$(WIN32DIR) -I$(CROSSDIR) -I$(DXDIR) $(XINC)
 

Modified: branches/Cog/nscogbuild/unixbuild/astbld/mvm
===================================================================
--- branches/Cog/nscogbuild/unixbuild/astbld/mvm	2012-12-03 00:55:57 UTC (rev 2629)
+++ branches/Cog/nscogbuild/unixbuild/astbld/mvm	2012-12-04 17:53:23 UTC (rev 2630)
@@ -8,7 +8,7 @@
 n|no|N|NO)	echo "ok but this isn't safe!!";;
 *)			make reallyclean
 esac
-test -f config.h || ../../../platforms/unix/config/configure --with-src=nscogsrc --without-vm-display-fbdev --without-npsqueak CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DDEBUGVM=0 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" LIBS="-lpthread -luuid"
+test -f config.h || ../../../platforms/unix/config/configure --with-src=nscogsrc --without-vm-display-fbdev --without-npsqueak CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DMULTIPLEBYTECODESETS=1 -DDEBUGVM=0 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" LIBS="-lpthread -luuid"
 ../../../scripts/nukeversion
 rm -rf ../../../$INSTALLDIR
 # would prefer make install prefix=`readlink -f \`pwd\`/../../../$INSTALLDIR`

Modified: branches/Cog/nscogbuild/unixbuild/bld/mvm
===================================================================
--- branches/Cog/nscogbuild/unixbuild/bld/mvm	2012-12-03 00:55:57 UTC (rev 2629)
+++ branches/Cog/nscogbuild/unixbuild/bld/mvm	2012-12-04 17:53:23 UTC (rev 2630)
@@ -12,7 +12,7 @@
 n|no|N|NO)	echo "ok but this isn't safe!!";;
 *)			make reallyclean
 esac
-test -f config.h || ../../../platforms/unix/config/configure --with-src=nscogsrc --without-vm-display-fbdev --without-npsqueak CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DDEBUGVM=0" LIBS="-lpthread -luuid"
+test -f config.h || ../../../platforms/unix/config/configure --with-src=nscogsrc --without-vm-display-fbdev --without-npsqueak CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DMULTIPLEBYTECODESETS=1 -DDEBUGVM=0" LIBS="-lpthread -luuid"
 ../../../scripts/nukeversion
 rm -rf ../../../$INSTALLDIR
 # would prefer make install prefix=`readlink -f \`pwd\`/../../../$INSTALLDIR`

Modified: branches/Cog/nscogbuild/unixbuild/dbgbld/mvm
===================================================================
--- branches/Cog/nscogbuild/unixbuild/dbgbld/mvm	2012-12-03 00:55:57 UTC (rev 2629)
+++ branches/Cog/nscogbuild/unixbuild/dbgbld/mvm	2012-12-04 17:53:23 UTC (rev 2630)
@@ -8,7 +8,7 @@
 n|no|N|NO)	echo "ok but this isn't safe!!";;
 *)			make reallyclean
 esac
-test -f config.h || ../../../platforms/unix/config/configure --with-src=nscogsrc --without-vm-display-fbdev --without-npsqueak CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DDEBUGVM=1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" LIBS="-lpthread -luuid"
+test -f config.h || ../../../platforms/unix/config/configure --with-src=nscogsrc --without-vm-display-fbdev --without-npsqueak CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DMULTIPLEBYTECODESETS=1 -DDEBUGVM=1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" LIBS="-lpthread -luuid"
 ../../../scripts/nukeversion
 rm -rf ../../../$INSTALLDIR
 # would prefer make install prefix=`readlink -f \`pwd\`/../../../$INSTALLDIR`

Modified: branches/Cog/scripts/uploadvms
===================================================================
--- branches/Cog/scripts/uploadvms	2012-12-03 00:55:57 UTC (rev 2629)
+++ branches/Cog/scripts/uploadvms	2012-12-04 17:53:23 UTC (rev 2630)
@@ -11,6 +11,10 @@
 	esac
 	REV="`svnversion | sed 's/^.*://' | sed 's/M//'`";;
 esac
+if [ "$1" = "-r" -a -n "$2" ]; then
+	REV="$2"
+	shift;shift
+fi
 TAG=`date +%g.%U.`$REV
 echo REV=$REV TAG=$TAG