[commit] r2456 - Newspeak Cog linux how to needs to specify using itimer.

 
Author: eliot
Date: 2011-07-12 15:52:15 -0700 (Tue, 12 Jul 2011)
New Revision: 2456

Modified:
   branches/Cog/nscogbuild/unixbuild/HowToBuild
   branches/Cog/scripts/mkvmarchives
Log:
Newspeak Cog linux how to needs to specify using itimer.
mkvmarchives should choose nscogbuild for Newspeak.


Modified: branches/Cog/nscogbuild/unixbuild/HowToBuild
===================================================================
--- branches/Cog/nscogbuild/unixbuild/HowToBuild 2011-07-12 21:07:35 UTC (rev 2455)
+++ branches/Cog/nscogbuild/unixbuild/HowToBuild 2011-07-12 22:52:15 UTC (rev 2456)
@@ -15,20 +15,20 @@
      svn co http://www.squeakvm.org/svn/squeak/branches/Cog/src
      svn co http://www.squeakvm.org/svn/squeak/branches/Cog/nsbuild
 3. Open a shell, cd into the unixbuild/bld directory and execute
-     ../../../platforms/unix/config/configure --with-src=nscogsrc CFLAGS="-g -O2 -msse2 -D_GNU_SOURCE -DNDEBUG -DNO_VM_PROFILE=1 -DDEBUGVM=0" LIBS=-lpthread
+     ../../../platforms/unix/config/configure --with-src=nscogsrc CFLAGS="-g -O2 -msse2 -D_GNU_SOURCE -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DDEBUGVM=0" LIBS=-lpthread
      make install prefix=WhereYouWantTheVmToGo
 
  N.B.  On Ubuntu *do not* supply "LIBS=-lpthread", i.e. use
-     ../../../platforms/unix/config/configure --with-src=nscogsrc CFLAGS="-g -O2 -msse2 -D_GNU_SOURCE -DNDEBUG -DNO_VM_PROFILE=1 -DDEBUGVM=0"
+     ../../../platforms/unix/config/configure --with-src=nscogsrc CFLAGS="-g -O2 -msse2 -D_GNU_SOURCE -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DDEBUGVM=0"
 
 4. At the end of it you'll get a new VM in the path provided via -prefix
 
 
 3a. For an assert-enabled VM do
-     ../../../platforms/unix/config/configure --without-vm-display-fbdev --without-npsqueak --with-src=nscogsrc CFLAGS="-g -O1 -msse2 -D_GNU_SOURCE -DNO_VM_PROFILE=1 -DDEBUGVM=0" LIBS=-lpthread
+     ../../../platforms/unix/config/configure --without-vm-display-fbdev --without-npsqueak --with-src=nscogsrc CFLAGS="-g -O1 -msse2 -D_GNU_SOURCE -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DDEBUGVM=0" LIBS=-lpthread
 
 3b. For a full debug VM do
-     ../../../platforms/unix/config/configure --without-vm-display-fbdev --without-npsqueak --with-src=nscogsrc CFLAGS="-g3 -msse2 -D_GNU_SOURCE -DNO_VM_PROFILE=1 -DDEBUGVM=1" LIBS=-lpthread
+     ../../../platforms/unix/config/configure --without-vm-display-fbdev --without-npsqueak --with-src=nscogsrc CFLAGS="-g3 -msse2 -D_GNU_SOURCE -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DDEBUGVM=1" LIBS=-lpthread
 
 3c. If you're building the VM on a 64-bit OS, you'll need a compiler which can
 compile and link to 32-bit binaries. On most Linuxes the gcc-multilib package
@@ -36,7 +36,7 @@
 You'll also have to add the -m32 switch to all gcc & g++ invocations.  The
 easiest way to do this is to add CC="gcc -m32" & CXX="g++ -m32" to the configure
 script:
-     ../../../platforms/unix/config/configure CC="gcc -m32" CXX="g++ -m32" --with-src=nscogsrc CFLAGS="-g -O2 -msse2 -D_GNU_SOURCE -DNDEBUG -DNO_VM_PROFILE=1" LIBS=-lpthread
+     ../../../platforms/unix/config/configure CC="gcc -m32" CXX="g++ -m32" --with-src=nscogsrc CFLAGS="-g -O2 -msse2 -D_GNU_SOURCE -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1" LIBS=-lpthread
 To run a 32-bit VM on a 64-bit OS, you'll also need the 32-bit libraries
 provided by the ia32-libs package.
 

Modified: branches/Cog/scripts/mkvmarchives
===================================================================
--- branches/Cog/scripts/mkvmarchives 2011-07-12 21:07:35 UTC (rev 2455)
+++ branches/Cog/scripts/mkvmarchives 2011-07-12 22:52:15 UTC (rev 2456)
@@ -1,6 +1,8 @@
 #!/bin/sh
 IFS="
 "
+NSB=nscogbuild
+#NSB=nsbuild
 if [ $# = 0 ]; then
 CL=1
 CM=1
@@ -60,15 +62,15 @@
 if [ -n "$NM" ]; then
  test -d Newspeak\ Virtual\ Machine.app || mkdir Newspeak\ Virtual\ Machine.app
  rm -rf Newspeak\ Virtual\ Machine.app/* Newspeak\ Virtual\ Machine.app.tgz
- (cd nsbuild/macbuild/Fast.app>/dev/null;tar cf - *)|(cd Newspeak\ Virtual\ Machine.app;tar xvf -)
+ (cd $NSB/macbuild/Fast.app>/dev/null;tar cf - *)|(cd Newspeak\ Virtual\ Machine.app;tar xvf -)
  tar czf Newspeak\ Virtual\ Machine.app.tgz Newspeak\ Virtual\ Machine.app
  EXES="$EXES Newspeak Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine"
 fi
 if [ -n "$NW" ]; then
  test -d nsvmwin || mkdir nsvmwin
  rm -rf nsvmwin/* nsvmwin.zip
- ln nsbuild/cygwinbuild/build/vm/{nsvm.exe,nsvm.map} nsvmwin
- ln nsbuild/cygwinbuild/build/vm/*.dll nsvmwin
+ ln $NSB/cygwinbuild/build/vm/{nsvm.exe,nsvm.map} nsvmwin
+ ln $NSB/cygwinbuild/build/vm/*.dll nsvmwin
  tar czf Newspeak\ Virtual\ Machine.app.tgz Newspeak\ Virtual\ Machine.app
  zip -vr nsvmwin.zip nsvmwin
  EXES="$EXES nsvmwin/nsvm.exe"