[Vm-dev] [commit][2733] Fix snafu typo in version printing.

commits at squeakvm.org commits at squeakvm.org
Fri Jun 7 17:53:56 UTC 2013 

Revision: 2733
Author:   eliot
Date:     2013-06-07 10:53:54 -0700 (Fri, 07 Jun 2013)
Log Message:
-----------
Fix snafu typo in version printing.  Add threaded-heartbeat linux build dirs for
newspeak.  Set svn:ignore for the threaded-heartbeat dirs.

Modified Paths:
--------------
    branches/Cog/platforms/Mac OS/vm/sqMacMain.c
    branches/Cog/platforms/unix/vm/sqUnixMain.c

Added Paths:
-----------
    branches/Cog/nscogbuild/unixbuild/astbldt/
    branches/Cog/nscogbuild/unixbuild/astbldt/mvm
    branches/Cog/nscogbuild/unixbuild/astbldt/plugins.int
    branches/Cog/nscogbuild/unixbuild/bldt/
    branches/Cog/nscogbuild/unixbuild/bldt/mvm
    branches/Cog/nscogbuild/unixbuild/bldt/plugins.int
    branches/Cog/nscogbuild/unixbuild/dbgbldt/
    branches/Cog/nscogbuild/unixbuild/dbgbldt/mvm
    branches/Cog/nscogbuild/unixbuild/dbgbldt/plugins.int

Property Changed:
----------------
    branches/Cog/unixbuild/abldt/
    branches/Cog/unixbuild/bldt/
    branches/Cog/unixbuild/dbldt/


Property changes on: branches/Cog/nscogbuild/unixbuild/astbldt
___________________________________________________________________
Added: svn:ignore
   + *


Added: branches/Cog/nscogbuild/unixbuild/astbldt/mvm
===================================================================
--- branches/Cog/nscogbuild/unixbuild/astbldt/mvm	                        (rev 0)
+++ branches/Cog/nscogbuild/unixbuild/astbldt/mvm	2013-06-07 17:53:54 UTC (rev 2733)
@@ -0,0 +1,43 @@
+#!/bin/bash
+# VM with VM profiler and threaded heartbeat assuming multiple thread priorities
+INSTALLDIR=nsvmlinuxastpt
+OPT=-O1
+
+echo -n "clean? "
+read a
+case $a in
+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 \
+	CC="gcc -m32" \
+	CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DMULTIPLEBYTECODESETS=1 -DDEBUGVM=0 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" \
+	LIBS="-lpthread -luuid" \
+	LDFLAGS=-Wl,-z,now
+../../../scripts/nukeversion
+rm -rf ../../../$INSTALLDIR
+# would prefer make install prefix=`readlink -f \`pwd\`/../../../$INSTALLDIR`
+# but older linux readlinks lack the -f flag
+make install prefix=`(cd ../../../;pwd)`/$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 [ -h ~/Squeak/SqueakV41.sources ]; then
+	ln "`readlink ~/Squeak/SqueakV41.sources`" $LIBDIR
+  elif [ -f ~/Squeak/SqueakV41.sources ]; then
+	ln ~/Squeak/SqueakV41.sources $LIBDIR
+  else
+	echo "can't find SqueakV41.sources" 1>&2
+  fi)


Property changes on: branches/Cog/nscogbuild/unixbuild/astbldt/mvm
___________________________________________________________________
Added: svn:executable
   + *

Added: branches/Cog/nscogbuild/unixbuild/astbldt/plugins.int
===================================================================
--- branches/Cog/nscogbuild/unixbuild/astbldt/plugins.int	                        (rev 0)
+++ branches/Cog/nscogbuild/unixbuild/astbldt/plugins.int	2013-06-07 17:53:54 UTC (rev 2733)
@@ -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


Property changes on: branches/Cog/nscogbuild/unixbuild/bldt
___________________________________________________________________
Added: svn:ignore
   + *


Added: branches/Cog/nscogbuild/unixbuild/bldt/mvm
===================================================================
--- branches/Cog/nscogbuild/unixbuild/bldt/mvm	                        (rev 0)
+++ branches/Cog/nscogbuild/unixbuild/bldt/mvm	2013-06-07 17:53:54 UTC (rev 2733)
@@ -0,0 +1,47 @@
+#!/bin/bash
+# VM with VM profiler and threaded heartbeat assuming multiple thread priorities
+INSTALLDIR=nsvmlinuxpt
+# 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!!";;
+*)			make reallyclean
+esac
+test -f config.h || ../../../platforms/unix/config/configure --with-src=nscogsrc \
+	--without-vm-display-fbdev --without-npsqueak \
+	CC="gcc -m32" \
+	CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DMULTIPLEBYTECODESETS=1 -DDEBUGVM=0" \
+	LIBS="-lpthread -luuid" \
+	LDFLAGS=-Wl,-z,now
+../../../scripts/nukeversion
+rm -rf ../../../$INSTALLDIR
+# would prefer make install prefix=`readlink -f \`pwd\`/../../../$INSTALLDIR`
+# but older linux readlinks lack the -f flag
+make install prefix=`(cd ../../../;pwd)`/$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 [ -h ~/Squeak/SqueakV41.sources ]; then
+	ln "`readlink ~/Squeak/SqueakV41.sources`" $LIBDIR
+  elif [ -f ~/Squeak/SqueakV41.sources ]; then
+	ln ~/Squeak/SqueakV41.sources $LIBDIR
+  else
+	echo "can't find SqueakV41.sources" 1>&2
+  fi)


Property changes on: branches/Cog/nscogbuild/unixbuild/bldt/mvm
___________________________________________________________________
Added: svn:executable
   + *

Added: branches/Cog/nscogbuild/unixbuild/bldt/plugins.int
===================================================================
--- branches/Cog/nscogbuild/unixbuild/bldt/plugins.int	                        (rev 0)
+++ branches/Cog/nscogbuild/unixbuild/bldt/plugins.int	2013-06-07 17:53:54 UTC (rev 2733)
@@ -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


Property changes on: branches/Cog/nscogbuild/unixbuild/dbgbldt
___________________________________________________________________
Added: svn:ignore
   + *


Added: branches/Cog/nscogbuild/unixbuild/dbgbldt/mvm
===================================================================
--- branches/Cog/nscogbuild/unixbuild/dbgbldt/mvm	                        (rev 0)
+++ branches/Cog/nscogbuild/unixbuild/dbgbldt/mvm	2013-06-07 17:53:54 UTC (rev 2733)
@@ -0,0 +1,43 @@
+#!/bin/bash
+# VM with VM profiler and threaded heartbeat assuming multiple thread priorities
+INSTALLDIR=nsvmlinuxdbgpt
+OPT=-O0
+
+echo -n "clean? "
+read a
+case $a in
+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 \
+	CC="gcc -m32" \
+	CFLAGS="-g $OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DMULTIPLEBYTECODESETS=1 -DDEBUGVM=1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer" \
+	LIBS="-lpthread -luuid" \
+	LDFLAGS=-Wl,-z,now
+../../../scripts/nukeversion
+rm -rf ../../../$INSTALLDIR
+# would prefer make install prefix=`readlink -f \`pwd\`/../../../$INSTALLDIR`
+# but older linux readlinks lack the -f flag
+make install prefix=`(cd ../../../;pwd)`/$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 [ -h ~/Squeak/SqueakV41.sources ]; then
+	ln "`readlink ~/Squeak/SqueakV41.sources`" $LIBDIR
+  elif [ -f ~/Squeak/SqueakV41.sources ]; then
+	ln ~/Squeak/SqueakV41.sources $LIBDIR
+  else
+	echo "can't find SqueakV41.sources" 1>&2
+  fi)


Property changes on: branches/Cog/nscogbuild/unixbuild/dbgbldt/mvm
___________________________________________________________________
Added: svn:executable
   + *

Added: branches/Cog/nscogbuild/unixbuild/dbgbldt/plugins.int
===================================================================
--- branches/Cog/nscogbuild/unixbuild/dbgbldt/plugins.int	                        (rev 0)
+++ branches/Cog/nscogbuild/unixbuild/dbgbldt/plugins.int	2013-06-07 17:53:54 UTC (rev 2733)
@@ -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

Modified: branches/Cog/platforms/Mac OS/vm/sqMacMain.c
===================================================================
--- branches/Cog/platforms/Mac OS/vm/sqMacMain.c	2013-06-06 22:17:23 UTC (rev 2732)
+++ branches/Cog/platforms/Mac OS/vm/sqMacMain.c	2013-06-07 17:53:54 UTC (rev 2733)
@@ -1018,7 +1018,7 @@
 						CFBundleGetMainBundle(),
 						CFSTR("CFBundleVersion"))))
     CFStringGetCString(versionString, info+strlen(info), 4095-strlen(info), gCurrentVMEncoding);
-  sprintf(info+strlen(info), " %s [" BuildVariant " VM]\n", vmBuildString, BuildVariant);
+  sprintf(info+strlen(info), " %s [" BuildVariant " VM]\n", vmBuildString);
   if (verbose)
     sprintf(info+strlen(info), "Built from: ");
   sprintf(info+strlen(info), "%s\n", INTERP_BUILD);

Modified: branches/Cog/platforms/unix/vm/sqUnixMain.c
===================================================================
--- branches/Cog/platforms/unix/vm/sqUnixMain.c	2013-06-06 22:17:23 UTC (rev 2732)
+++ branches/Cog/platforms/unix/vm/sqUnixMain.c	2013-06-07 17:53:54 UTC (rev 2733)
@@ -1578,7 +1578,7 @@
 #if defined(USE_XSHM)
   sprintf(info+strlen(info), " XShm");
 #endif
-  sprintf(info+strlen(info), " %s %s [" BuildVariant HBID " VM]\n", vm_date, cc_version, BuildVariant);
+  sprintf(info+strlen(info), " %s %s [" BuildVariant HBID " VM]\n", vm_date, cc_version);
   if (verbose)
     sprintf(info+strlen(info), "Built from: ");
   sprintf(info+strlen(info), "%s\n", INTERP_BUILD);


Property changes on: branches/Cog/unixbuild/abldt
___________________________________________________________________
Added: svn:ignore
   + *



Property changes on: branches/Cog/unixbuild/bldt
___________________________________________________________________
Added: svn:ignore
   + *



Property changes on: branches/Cog/unixbuild/dbldt
___________________________________________________________________
Added: svn:ignore
   + *

More information about the Vm-dev mailing list