[Vm-dev] [commit][3063] CogVM source as per VMMaker.oscog-eem.860 (
except for Newspeak VMs *).
commits at squeakvm.org
commits at squeakvm.org
Thu Aug 14 19:43:40 UTC 2014
Revision: 3063
Author: eliot
Date: 2014-08-14 12:43:38 -0700 (Thu, 14 Aug 2014)
Log Message:
-----------
CogVM source as per VMMaker.oscog-eem.860 (except for Newspeak VMs *).
Spur:
Convert Spur to use only the alternate CompiledMethod header format
(65536 literals, primitive in a bytecode). 3+4 evaluated in the simulator.
Update build scripts to set VM version number to 5.0 (V3 remain at 4.0).
Fix system crash on using basicNew: on CompiledMethod.
Have instantiateClass:indexableSize: refuse to instantiate a
CompiledMethod, and add instantiateCompiledMethodClass:indexableSize:.
Get the error code right for primitiveNew et al.`
Alter the SqueakV3 Cogit bytecode table initializers to add the
callPrimitiveBytecode: at 139 if in a Spur VM.
Update the prim numbers for inlined prims in genCallPrimitiveBytecode
to match the latest EncoderForSistaV1 class comment.
Moved literal count methods from StackInterpreter hierarchy to ObjectMemories. Rename headerOf: to methodHeaderOf: & literalCountOfHeader: to literalCountOfMethodHeader: Abstract out lastPointerOfMethodHeader:
Cogits:
Fix offset of first special selector to not presume SqueakV3 and/or NewspeakV4.
Sista:
Update build scripts to set VM version number to 6.0 (Sista V3 i set ot 4.5).
Partially implement genCallPrimitiveBytecode.
Slang:
Eliminate double negatives translating ifFalse: (for primErrorCode).
Scripts:
Update getGoodVM scripts, and add a maker for getting Newspeak VMs.
Update envvars to use provided curl on Mac OS X instead of non-native wget.
Add rev and tag args to the mkarchive and uploadvm scripts. Fix uploadvms script
to upload Newspeak Spur Windows VM.
*Newspeak Spur VMs appear funcitonal but not checking in because the bootstrap is
not finished and taking too long to fix.
Modified Paths:
--------------
branches/Cog/build.linux32x86/newspeak.cog.spur/build/mvm
branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert/mvm
branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbeat/mvm
branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug/mvm
branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat/mvm
branches/Cog/build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/mvm
branches/Cog/build.linux32x86/newspeak.stack.spur/build/mvm
branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/mvm
branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/mvm
branches/Cog/build.linux32x86/squeak.cog.spur/build/mvm
branches/Cog/build.linux32x86/squeak.cog.spur/build.assert/mvm
branches/Cog/build.linux32x86/squeak.cog.spur/build.assert.itimerheartbeat/mvm
branches/Cog/build.linux32x86/squeak.cog.spur/build.debug/mvm
branches/Cog/build.linux32x86/squeak.cog.spur/build.debug.itimerheartbeat/mvm
branches/Cog/build.linux32x86/squeak.cog.spur/build.itimerheartbeat/mvm
branches/Cog/build.linux32x86/squeak.stack.spur/build/mvm
branches/Cog/build.linux32x86/squeak.stack.spur/build.assert/mvm
branches/Cog/build.linux32x86/squeak.stack.spur/build.debug/mvm
branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.plist
branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.plist
branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.plist
branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.plist
branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.plist
branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.plist
branches/Cog/build.win32x86/newspeak.cog.spur/Makefile
branches/Cog/build.win32x86/newspeak.cog.spur/nsvm.rc
branches/Cog/build.win32x86/newspeak.cog.v3/Makefile
branches/Cog/build.win32x86/newspeak.stack.spur/Makefile
branches/Cog/build.win32x86/newspeak.stack.spur/nsvm.rc
branches/Cog/build.win32x86/newspeak.stack.v3/Makefile
branches/Cog/build.win32x86/squeak.cog.spur/Croquet.rc
branches/Cog/build.win32x86/squeak.cog.spur/Makefile
branches/Cog/build.win32x86/squeak.cog.spur/Squeak.rc
branches/Cog/build.win32x86/squeak.cog.v3/Croquet.rc
branches/Cog/build.win32x86/squeak.cog.v3/Makefile
branches/Cog/build.win32x86/squeak.stack.spur/Croquet.rc
branches/Cog/build.win32x86/squeak.stack.spur/Makefile
branches/Cog/build.win32x86/squeak.stack.spur/Squeak.rc
branches/Cog/build.win32x86/squeak.stack.v3/Croquet.rc
branches/Cog/build.win32x86/squeak.stack.v3/Makefile
branches/Cog/build.win32x86/squeak.stack.v3/Squeak.rc
branches/Cog/image/buildspurtrunkimage.sh
branches/Cog/image/envvars.sh
branches/Cog/image/getGoodCogVM.sh
branches/Cog/image/getGoodSpurVM.sh
branches/Cog/image/getsqueak45.sh
branches/Cog/image/makegetvmscripts.sh
branches/Cog/platforms/unix/config/configure
branches/Cog/platforms/unix/config/configure.ac
branches/Cog/scripts/mkcogvmarchives
branches/Cog/scripts/mksistaarchives
branches/Cog/scripts/mkspurvmarchives
branches/Cog/scripts/uploadvms
branches/Cog/sistasrc/vm/cogit.c
branches/Cog/sistasrc/vm/cogit.h
branches/Cog/sistasrc/vm/cointerp.c
branches/Cog/sistasrc/vm/cointerp.h
branches/Cog/sistasrc/vm/gcc3x-cointerp.c
branches/Cog/sistasrc/vm/interp.h
branches/Cog/spursistasrc/vm/cogit.c
branches/Cog/spursistasrc/vm/cogit.h
branches/Cog/spursistasrc/vm/cointerp.c
branches/Cog/spursistasrc/vm/cointerp.h
branches/Cog/spursistasrc/vm/gcc3x-cointerp.c
branches/Cog/spursistasrc/vm/interp.h
branches/Cog/spursrc/vm/cogit.c
branches/Cog/spursrc/vm/cogit.h
branches/Cog/spursrc/vm/cointerp.c
branches/Cog/spursrc/vm/cointerp.h
branches/Cog/spursrc/vm/gcc3x-cointerp.c
branches/Cog/spursrc/vm/interp.h
branches/Cog/spurstacksrc/vm/gcc3x-interp.c
branches/Cog/spurstacksrc/vm/interp.c
branches/Cog/src/vm/cogit.c
branches/Cog/src/vm/cogit.h
branches/Cog/src/vm/cointerp.c
branches/Cog/src/vm/cointerp.h
branches/Cog/src/vm/cointerpmt.c
branches/Cog/src/vm/cointerpmt.h
branches/Cog/src/vm/gcc3x-cointerp.c
branches/Cog/src/vm/gcc3x-cointerpmt.c
branches/Cog/stacksrc/vm/gcc3x-interp.c
branches/Cog/stacksrc/vm/interp.c
Added Paths:
-----------
branches/Cog/image/makegetnsvmscripts.sh
Property Changed:
----------------
branches/Cog/platforms/Cross/vm/sqSCCSVersion.h
Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.cog.spur/build/mvm 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.linux32x86/newspeak.cog.spur/build/mvm 2014-08-14 19:43:38 UTC (rev 3063)
@@ -21,6 +21,7 @@
*) rm config.h; test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure \
+ --with-vmversion=5.0 \
--with-src=nsspursrc --with-plugins=nscogsrc/plugins \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert/mvm 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert/mvm 2014-08-14 19:43:38 UTC (rev 3063)
@@ -17,6 +17,7 @@
*) rm config.h; test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure \
+ --with-vmversion=5.0 \
--with-src=nsspursrc --with-plugins=nscogsrc/plugins \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbeat/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbeat/mvm 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbeat/mvm 2014-08-14 19:43:38 UTC (rev 3063)
@@ -17,6 +17,7 @@
*) rm config.h; test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure \
+ --with-vmversion=5.0 \
--with-src=nsspursrc --with-plugins=nscogsrc/plugins \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug/mvm 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug/mvm 2014-08-14 19:43:38 UTC (rev 3063)
@@ -17,6 +17,7 @@
*) rm config.h; test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure \
+ --with-vmversion=5.0 \
--with-src=nsspursrc --with-plugins=nscogsrc/plugins \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat/mvm 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat/mvm 2014-08-14 19:43:38 UTC (rev 3063)
@@ -17,6 +17,7 @@
*) rm config.h; test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure \
+ --with-vmversion=5.0 \
--with-src=nsspursrc --with-plugins=nscogsrc/plugins \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/mvm 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/mvm 2014-08-14 19:43:38 UTC (rev 3063)
@@ -21,6 +21,7 @@
*) rm config.h; test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure \
+ --with-vmversion=5.0 \
--with-src=nsspursrc --with-plugins=nscogsrc/plugins \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
Modified: branches/Cog/build.linux32x86/newspeak.stack.spur/build/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.stack.spur/build/mvm 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.linux32x86/newspeak.stack.spur/build/mvm 2014-08-14 19:43:38 UTC (rev 3063)
@@ -21,6 +21,7 @@
*) rm config.h; test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure \
+ --with-vmversion=5.0 \
--with-src=nsspurstacksrc --with-plugins=nscogsrc/plugins --disable-cogit \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
Modified: branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/mvm 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/mvm 2014-08-14 19:43:38 UTC (rev 3063)
@@ -17,6 +17,7 @@
*) rm config.h; test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure \
+ --with-vmversion=5.0 \
--with-src=nsspurstacksrc --with-plugins=nscogsrc/plugins --disable-cogit \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
Modified: branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/mvm
===================================================================
--- branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/mvm 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/mvm 2014-08-14 19:43:38 UTC (rev 3063)
@@ -17,6 +17,7 @@
*) rm config.h; test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure \
+ --with-vmversion=5.0 \
--with-src=nsspurstacksrc --with-plugins=nscogsrc/plugins --disable-cogit \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
Modified: branches/Cog/build.linux32x86/squeak.cog.spur/build/mvm
===================================================================
--- branches/Cog/build.linux32x86/squeak.cog.spur/build/mvm 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.linux32x86/squeak.cog.spur/build/mvm 2014-08-14 19:43:38 UTC (rev 3063)
@@ -18,6 +18,7 @@
*) test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure --without-npsqueak \
+ --with-vmversion=5.0 \
--with-src=spursrc --with-plugins=src/plugins \
CC="gcc -m32" \
CXX="g++ -m32" \
Modified: branches/Cog/build.linux32x86/squeak.cog.spur/build.assert/mvm
===================================================================
--- branches/Cog/build.linux32x86/squeak.cog.spur/build.assert/mvm 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.linux32x86/squeak.cog.spur/build.assert/mvm 2014-08-14 19:43:38 UTC (rev 3063)
@@ -14,6 +14,7 @@
*) test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure --without-npsqueak \
+ --with-vmversion=5.0 \
--with-src=spursrc --with-plugins=src/plugins \
CC="gcc -m32" \
CXX="g++ -m32" \
Modified: branches/Cog/build.linux32x86/squeak.cog.spur/build.assert.itimerheartbeat/mvm
===================================================================
--- branches/Cog/build.linux32x86/squeak.cog.spur/build.assert.itimerheartbeat/mvm 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.linux32x86/squeak.cog.spur/build.assert.itimerheartbeat/mvm 2014-08-14 19:43:38 UTC (rev 3063)
@@ -14,6 +14,7 @@
*) test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure --without-npsqueak \
+ --with-vmversion=5.0 \
--with-src=spursrc --with-plugins=src/plugins \
CC="gcc -m32" \
CXX="g++ -m32" \
Modified: branches/Cog/build.linux32x86/squeak.cog.spur/build.debug/mvm
===================================================================
--- branches/Cog/build.linux32x86/squeak.cog.spur/build.debug/mvm 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.linux32x86/squeak.cog.spur/build.debug/mvm 2014-08-14 19:43:38 UTC (rev 3063)
@@ -14,6 +14,7 @@
*) test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure --without-npsqueak \
+ --with-vmversion=5.0 \
--with-src=spursrc --with-plugins=src/plugins \
CC="gcc -m32" \
CXX="g++ -m32" \
Modified: branches/Cog/build.linux32x86/squeak.cog.spur/build.debug.itimerheartbeat/mvm
===================================================================
--- branches/Cog/build.linux32x86/squeak.cog.spur/build.debug.itimerheartbeat/mvm 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.linux32x86/squeak.cog.spur/build.debug.itimerheartbeat/mvm 2014-08-14 19:43:38 UTC (rev 3063)
@@ -14,6 +14,7 @@
*) test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure --without-npsqueak \
+ --with-vmversion=5.0 \
--with-src=spursrc --with-plugins=src/plugins \
CC="gcc -m32" \
CXX="g++ -m32" \
Modified: branches/Cog/build.linux32x86/squeak.cog.spur/build.itimerheartbeat/mvm
===================================================================
--- branches/Cog/build.linux32x86/squeak.cog.spur/build.itimerheartbeat/mvm 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.linux32x86/squeak.cog.spur/build.itimerheartbeat/mvm 2014-08-14 19:43:38 UTC (rev 3063)
@@ -18,6 +18,7 @@
*) test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure --without-npsqueak \
+ --with-vmversion=5.0 \
--with-src=spursrc --with-plugins=src/plugins \
CC="gcc -m32" \
CXX="g++ -m32" \
Modified: branches/Cog/build.linux32x86/squeak.stack.spur/build/mvm
===================================================================
--- branches/Cog/build.linux32x86/squeak.stack.spur/build/mvm 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.linux32x86/squeak.stack.spur/build/mvm 2014-08-14 19:43:38 UTC (rev 3063)
@@ -17,6 +17,7 @@
*) rm config.h; test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure \
+ --with-vmversion=5.0 \
--with-src=spurstacksrc --with-plugins=src/plugins --disable-cogit \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
Modified: branches/Cog/build.linux32x86/squeak.stack.spur/build.assert/mvm
===================================================================
--- branches/Cog/build.linux32x86/squeak.stack.spur/build.assert/mvm 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.linux32x86/squeak.stack.spur/build.assert/mvm 2014-08-14 19:43:38 UTC (rev 3063)
@@ -14,6 +14,7 @@
*) rm config.h; test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure \
+ --with-vmversion=5.0 \
--with-src=spurstacksrc --with-plugins=src/plugins --disable-cogit \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
Modified: branches/Cog/build.linux32x86/squeak.stack.spur/build.debug/mvm
===================================================================
--- branches/Cog/build.linux32x86/squeak.stack.spur/build.debug/mvm 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.linux32x86/squeak.stack.spur/build.debug/mvm 2014-08-14 19:43:38 UTC (rev 3063)
@@ -14,6 +14,7 @@
*) rm config.h; test -f Makefile && make reallyclean
esac
test -f config.h || ../../../platforms/unix/config/configure \
+ --with-vmversion=5.0 \
--with-src=spurstacksrc --with-plugins=src/plugins --disable-cogit \
--without-vm-display-fbdev --without-npsqueak \
CC="gcc -m32" \
Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.plist
===================================================================
--- branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.plist 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.plist 2014-08-14 19:43:38 UTC (rev 3063)
@@ -122,11 +122,11 @@
<key>CFBundleExecutable</key>
<string>Newspeak Virtual Machine</string>
<key>CFBundleGetInfoString</key>
- <string>Newspeak Virtual Machine 4.0.0 http://newspeaklanguage.org</string><!--version-->
+ <string>Newspeak Cog Spur Virtual Machine 5.0.0 http://newspeaklanguage.org</string><!--version-->
<key>CFBundleShortVersionString</key>
- <string>Newspeak Virtual Machine 4.0.0</string><!--version-->
+ <string>Newspeak Cog Spur Virtual Machine 5.0.0</string><!--version-->
<key>CFBundleVersion</key>
- <string>4.0.0</string><!--version-->
+ <string>5.0.0</string><!--version-->
<key>CFBundleIconFile</key>
<string>Newspeak Virtual Machine.icns</string>
<key>CFBundleIdentifier</key>
Modified: branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.plist
===================================================================
--- branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.plist 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.plist 2014-08-14 19:43:38 UTC (rev 3063)
@@ -76,11 +76,11 @@
<key>CFBundleExecutable</key>
<string>Newspeak Virtual Machine</string>
<key>CFBundleGetInfoString</key>
- <string>Newspeak Virtual Machine 4.0.0 http://newspeaklanguage.org</string><!--version-->
+ <string>Newspeak Stack Spur Virtual Machine 5.0.0 http://newspeaklanguage.org</string><!--version-->
<key>CFBundleShortVersionString</key>
- <string>Newspeak Virtual Machine 4.0.0</string><!--version-->
+ <string>Newspeak Stack Spur Virtual Machine 5.0.0</string><!--version-->
<key>CFBundleVersion</key>
- <string>4.0.0</string><!--version-->
+ <string>5.0.0</string><!--version-->
<key>CFBundleIconFile</key>
<string>Newspeak Virtual Machine.icns</string>
<key>CFBundleIdentifier</key>
Modified: branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.plist
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.plist 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.plist 2014-08-14 19:43:38 UTC (rev 3063)
@@ -368,11 +368,11 @@
<key>CFBundleExecutable</key>
<string>Squeak</string>
<key>CFBundleGetInfoString</key>
- <string>Squeak Cog 4.0.0 http://www.mirandabanda.org</string><!--version-->
+ <string>Squeak Cog Spur 5.0.0 http://www.mirandabanda.org</string><!--version-->
<key>CFBundleShortVersionString</key>
- <string>Squeak Cog 4.0.0</string><!--version-->
+ <string>Squeak Cog Spur 5.0.0</string><!--version-->
<key>CFBundleVersion</key>
- <string>4.0.0</string><!--version-->
+ <string>5.0.0</string><!--version-->
<key>CFBundleIconFile</key>
<string>GreenCogSqueak.icns</string>
<key>CFBundleIdentifier</key>
Modified: branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.plist
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.plist 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.plist 2014-08-14 19:43:38 UTC (rev 3063)
@@ -368,11 +368,11 @@
<key>CFBundleExecutable</key>
<string>Squeak</string>
<key>CFBundleGetInfoString</key>
- <string>Squeak Cog 4.0.0 http://www.mirandabanda.org</string><!--version-->
+ <string>Squeak Spur Sista 6.0.0 http://www.mirandabanda.org</string><!--version-->
<key>CFBundleShortVersionString</key>
- <string>Squeak Cog 4.0.0</string><!--version-->
+ <string>Squeak Spur Sista 6.0.0</string><!--version-->
<key>CFBundleVersion</key>
- <string>4.0.0</string><!--version-->
+ <string>6.0.0</string><!--version-->
<key>CFBundleIconFile</key>
<string>GreenCogSqueak.icns</string>
<key>CFBundleIdentifier</key>
Modified: branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.plist
===================================================================
--- branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.plist 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.plist 2014-08-14 19:43:38 UTC (rev 3063)
@@ -368,11 +368,11 @@
<key>CFBundleExecutable</key>
<string>Squeak</string>
<key>CFBundleGetInfoString</key>
- <string>Squeak Cog 4.0.0 http://www.mirandabanda.org</string><!--version-->
+ <string>Squeak Sista 4.6.0 http://www.mirandabanda.org</string><!--version-->
<key>CFBundleShortVersionString</key>
- <string>Squeak Cog 4.0.0</string><!--version-->
+ <string>Squeak Sista 4.6.0</string><!--version-->
<key>CFBundleVersion</key>
- <string>4.0.0</string><!--version-->
+ <string>4.6.0</string><!--version-->
<key>CFBundleIconFile</key>
<string>GreenCogSqueak.icns</string>
<key>CFBundleIdentifier</key>
Modified: branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.plist
===================================================================
--- branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.plist 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.plist 2014-08-14 19:43:38 UTC (rev 3063)
@@ -368,11 +368,11 @@
<key>CFBundleExecutable</key>
<string>Squeak</string>
<key>CFBundleGetInfoString</key>
- <string>Squeak Cog Stack 4.0.0 http://www.mirandabanda.org</string><!--version-->
+ <string>Squeak Stack 5.0.0 http://www.mirandabanda.org</string><!--version-->
<key>CFBundleShortVersionString</key>
- <string>Squeak Cog Stack 4.0.0</string><!--version-->
+ <string>Squeak Stack 5.0.0</string><!--version-->
<key>CFBundleVersion</key>
- <string>4.0.0</string><!--version-->
+ <string>5.0.0</string><!--version-->
<key>CFBundleIconFile</key>
<string>GreenCogSqueak.icns</string>
<key>CFBundleIdentifier</key>
Modified: branches/Cog/build.win32x86/newspeak.cog.spur/Makefile
===================================================================
--- branches/Cog/build.win32x86/newspeak.cog.spur/Makefile 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.win32x86/newspeak.cog.spur/Makefile 2014-08-14 19:43:38 UTC (rev 3063)
@@ -127,7 +127,7 @@
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)
-TZ:=$(shell date +%Z)
+TZ:=$(shell date +%Z)
DEFS:= -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \
-DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \
$(WINDEFS) -DNO_ISNAN -DNO_SERVICE $(NDEBUG) -DLSB_FIRST -DX86 $(XDEFS)
@@ -169,7 +169,7 @@
#
RC:= windres
SVNREV:= $(shell sed -e "s/^static.*SvnRawRevisionString.*Rev: \([0-9][0-9]*\).*/\\1/p" -e d $(PLATDIR)/Cross/vm/sqSCCSVersion.h)
-RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32 -DFILEVERSIONVALUES=4,0,$(SVNREV),0 '-DFILEVERSIONSTRING=\"4.0.$(SVNREV)\\0\"'
+RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32 -DFILEVERSIONVALUES=4,0,$(SVNREV),0 '-DFILEVERSIONSTRING=\"5.0.$(SVNREV)\\0\"'
.SUFFIXES:
.SUFFIXES: .ccg .cc .c .o .s .i .rc .res .cg .hg .ccg .cpp
Modified: branches/Cog/build.win32x86/newspeak.cog.spur/nsvm.rc
===================================================================
--- branches/Cog/build.win32x86/newspeak.cog.spur/nsvm.rc 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.win32x86/newspeak.cog.spur/nsvm.rc 2014-08-14 19:43:38 UTC (rev 3063)
@@ -14,7 +14,7 @@
1 VERSIONINFO
FILEVERSION FILEVERSIONVALUES
- PRODUCTVERSION 4,0,0,0
+ PRODUCTVERSION 5,0,0,0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0xaL
FILEOS 0x10001L
@@ -29,7 +29,7 @@
VALUE "FileDescription", "Newsqueak Cog Spur Virtual Machine\0"
VALUE "FileVersion", FILEVERSIONSTRING
VALUE "ProductName", "Newsqueak Cog Spur\0"
- VALUE "ProductVersion", "4.0\0"
+ VALUE "ProductVersion", "5.0\0"
END
END
BLOCK "VarFileInfo"
Modified: branches/Cog/build.win32x86/newspeak.cog.v3/Makefile
===================================================================
--- branches/Cog/build.win32x86/newspeak.cog.v3/Makefile 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.win32x86/newspeak.cog.v3/Makefile 2014-08-14 19:43:38 UTC (rev 3063)
@@ -127,7 +127,7 @@
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)
-TZ:=$(shell date +%Z)
+TZ:=$(shell date +%Z)
DEFS:= -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \
-DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \
$(WINDEFS) -DNO_ISNAN -DNO_SERVICE $(NDEBUG) -DLSB_FIRST -DX86 $(XDEFS)
Modified: branches/Cog/build.win32x86/newspeak.stack.spur/Makefile
===================================================================
--- branches/Cog/build.win32x86/newspeak.stack.spur/Makefile 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.win32x86/newspeak.stack.spur/Makefile 2014-08-14 19:43:38 UTC (rev 3063)
@@ -128,7 +128,7 @@
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)
-TZ:=$(shell date +%Z)
+TZ:=$(shell date +%Z)
DEFS:= -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \
-DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \
$(WINDEFS) -DNO_ISNAN -DNO_SERVICE $(NDEBUG) -DLSB_FIRST -DX86 $(XDEFS)
@@ -170,7 +170,7 @@
#
RC:= windres
SVNREV:= $(shell sed -e "s/^static.*SvnRawRevisionString.*Rev: \([0-9][0-9]*\).*/\\1/p" -e d $(PLATDIR)/Cross/vm/sqSCCSVersion.h)
-RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32 -DFILEVERSIONVALUES=4,0,$(SVNREV),0 '-DFILEVERSIONSTRING=\"4.0.$(SVNREV)\\0\"'
+RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32 -DFILEVERSIONVALUES=4,0,$(SVNREV),0 '-DFILEVERSIONSTRING=\"5.0.$(SVNREV)\\0\"'
.SUFFIXES:
.SUFFIXES: .ccg .cc .c .o .s .i .rc .res .cg .hg .ccg .cpp
Modified: branches/Cog/build.win32x86/newspeak.stack.spur/nsvm.rc
===================================================================
--- branches/Cog/build.win32x86/newspeak.stack.spur/nsvm.rc 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.win32x86/newspeak.stack.spur/nsvm.rc 2014-08-14 19:43:38 UTC (rev 3063)
@@ -14,7 +14,7 @@
1 VERSIONINFO
FILEVERSION FILEVERSIONVALUES
- PRODUCTVERSION 4,0,0,0
+ PRODUCTVERSION 5,0,0,0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0xaL
FILEOS 0x10001L
@@ -29,7 +29,7 @@
VALUE "FileDescription", "Newsqueak Stack Spur Virtual Machine\0"
VALUE "FileVersion", FILEVERSIONSTRING
VALUE "ProductName", "Newsqueak Stack Spur\0"
- VALUE "ProductVersion", "4.0\0"
+ VALUE "ProductVersion", "5.0\0"
END
END
BLOCK "VarFileInfo"
Modified: branches/Cog/build.win32x86/newspeak.stack.v3/Makefile
===================================================================
--- branches/Cog/build.win32x86/newspeak.stack.v3/Makefile 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.win32x86/newspeak.stack.v3/Makefile 2014-08-14 19:43:38 UTC (rev 3063)
@@ -128,7 +128,7 @@
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)
-TZ:=$(shell date +%Z)
+TZ:=$(shell date +%Z)
DEFS:= -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \
-DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \
$(WINDEFS) -DNO_ISNAN -DNO_SERVICE $(NDEBUG) -DLSB_FIRST -DX86 $(XDEFS)
Modified: branches/Cog/build.win32x86/squeak.cog.spur/Croquet.rc
===================================================================
--- branches/Cog/build.win32x86/squeak.cog.spur/Croquet.rc 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.win32x86/squeak.cog.spur/Croquet.rc 2014-08-14 19:43:38 UTC (rev 3063)
@@ -2,4 +2,31 @@
1 ICON DISCARDABLE "Croquet.ico"
2 ICON DISCARDABLE "Croquet.ico"
3 ICON DISCARDABLE "Croquet.ico"
-#endif
\ No newline at end of file
+
+1 VERSIONINFO
+ FILEVERSION FILEVERSIONVALUES
+ PRODUCTVERSION 5,0,0,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilin
+ BEGIN
+ VALUE "CompanyName", "Squeak.org\0"
+ VALUE "FileDescription", "Croquet Cog Spur Virtual Machine\0"
+ VALUE "FileVersion", FILEVERSIONSTRING
+ VALUE "LegalCopyright", "Copyright \251 Squeak.org 1996-2014\0"
+ VALUE "ProductName", "Croquet Cog Spur\0"
+ VALUE "ProductVersion", "5.0\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1252
+ END
+END
+#endif
Modified: branches/Cog/build.win32x86/squeak.cog.spur/Makefile
===================================================================
--- branches/Cog/build.win32x86/squeak.cog.spur/Makefile 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.win32x86/squeak.cog.spur/Makefile 2014-08-14 19:43:38 UTC (rev 3063)
@@ -131,7 +131,7 @@
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)
-TZ:=$(shell date +%Z)
+TZ:=$(shell date +%Z)
DEFS:= $(COGDEFS) $(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_ISNAN \
-DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \
$(NDEBUG) -DLSB_FIRST -D'VM_NAME="$(VM_NAME)"' -DX86 $(XDEFS) $(CROQUET)
@@ -173,7 +173,7 @@
#
RC:= windres
SVNREV:= $(shell sed -e "s/^static.*SvnRawRevisionString.*Rev: \([0-9][0-9]*\).*/\\1/p" -e d $(PLATDIR)/Cross/vm/sqSCCSVersion.h)
-RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32 -DFILEVERSIONVALUES=4,0,$(SVNREV),0 '-DFILEVERSIONSTRING=\"4.0.$(SVNREV)\\0\"'
+RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32 -DFILEVERSIONVALUES=4,0,$(SVNREV),0 '-DFILEVERSIONSTRING=\"5.0.$(SVNREV)\\0\"'
.SUFFIXES:
.SUFFIXES: .ccg .cc .c .o .s .i .rc .res .cg .hg .ccg .cpp
Modified: branches/Cog/build.win32x86/squeak.cog.spur/Squeak.rc
===================================================================
--- branches/Cog/build.win32x86/squeak.cog.spur/Squeak.rc 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.win32x86/squeak.cog.spur/Squeak.rc 2014-08-14 19:43:38 UTC (rev 3063)
@@ -5,7 +5,7 @@
1 VERSIONINFO
FILEVERSION FILEVERSIONVALUES
- PRODUCTVERSION 4,0,0,0
+ PRODUCTVERSION 5,0,0,0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0xaL
FILEOS 0x10001L
@@ -20,8 +20,8 @@
VALUE "FileDescription", "Squeak Cog Spur Virtual Machine\0"
VALUE "FileVersion", FILEVERSIONSTRING
VALUE "LegalCopyright", "Copyright \251 Squeak.org 1996-2014\0"
- VALUE "ProductName", "Squeak Cog\0"
- VALUE "ProductVersion", "4.0\0"
+ VALUE "ProductName", "Squeak Cog Spur\0"
+ VALUE "ProductVersion", "5.0\0"
END
END
BLOCK "VarFileInfo"
Modified: branches/Cog/build.win32x86/squeak.cog.v3/Croquet.rc
===================================================================
--- branches/Cog/build.win32x86/squeak.cog.v3/Croquet.rc 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.win32x86/squeak.cog.v3/Croquet.rc 2014-08-14 19:43:38 UTC (rev 3063)
@@ -2,4 +2,31 @@
1 ICON DISCARDABLE "Croquet.ico"
2 ICON DISCARDABLE "Croquet.ico"
3 ICON DISCARDABLE "Croquet.ico"
-#endif
\ No newline at end of file
+
+1 VERSIONINFO
+ FILEVERSION FILEVERSIONVALUES
+ PRODUCTVERSION 4,0,0,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilin
+ BEGIN
+ VALUE "CompanyName", "Squeak.org\0"
+ VALUE "FileDescription", "Croquet Cog Virtual Machine\0"
+ VALUE "FileVersion", FILEVERSIONSTRING
+ VALUE "LegalCopyright", "Copyright \251 Squeak.org 1996-2014\0"
+ VALUE "ProductName", "Croquet Cog\0"
+ VALUE "ProductVersion", "4.0\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1252
+ END
+END
+#endif
Modified: branches/Cog/build.win32x86/squeak.cog.v3/Makefile
===================================================================
--- branches/Cog/build.win32x86/squeak.cog.v3/Makefile 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.win32x86/squeak.cog.v3/Makefile 2014-08-14 19:43:38 UTC (rev 3063)
@@ -151,7 +151,7 @@
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)
-TZ:=$(shell date +%Z)
+TZ:=$(shell date +%Z)
DEFS:= $(COGDEFS) $(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_ISNAN \
-DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \
$(NDEBUG) -DLSB_FIRST -D'VM_NAME="$(VM_NAME)"' -DX86 $(XDEFS) $(CROQUET)
Modified: branches/Cog/build.win32x86/squeak.stack.spur/Croquet.rc
===================================================================
--- branches/Cog/build.win32x86/squeak.stack.spur/Croquet.rc 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.win32x86/squeak.stack.spur/Croquet.rc 2014-08-14 19:43:38 UTC (rev 3063)
@@ -2,4 +2,31 @@
1 ICON DISCARDABLE "Croquet.ico"
2 ICON DISCARDABLE "Croquet.ico"
3 ICON DISCARDABLE "Croquet.ico"
-#endif
\ No newline at end of file
+
+1 VERSIONINFO
+ FILEVERSION FILEVERSIONVALUES
+ PRODUCTVERSION 5,0,0,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilin
+ BEGIN
+ VALUE "CompanyName", "Squeak.org\0"
+ VALUE "FileDescription", "Croquet Stack Spur Virtual Machine\0"
+ VALUE "FileVersion", FILEVERSIONSTRING
+ VALUE "LegalCopyright", "Copyright \251 Squeak.org 1996-2014\0"
+ VALUE "ProductName", "Croquet Stack Spur\0"
+ VALUE "ProductVersion", "5.0\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1252
+ END
+END
+#endif
Modified: branches/Cog/build.win32x86/squeak.stack.spur/Makefile
===================================================================
--- branches/Cog/build.win32x86/squeak.stack.spur/Makefile 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.win32x86/squeak.stack.spur/Makefile 2014-08-14 19:43:38 UTC (rev 3063)
@@ -132,7 +132,7 @@
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)
-TZ:=$(shell date +%Z)
+TZ:=$(shell date +%Z)
DEFS:= $(COGDEFS) $(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_ISNAN \
-DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \
$(NDEBUG) -DLSB_FIRST -D'VM_NAME="$(VM_NAME)"' -DX86 $(XDEFS) $(CROQUET)
@@ -174,7 +174,7 @@
#
RC:= windres
SVNREV:= $(shell sed -e "s/^static.*SvnRawRevisionString.*Rev: \([0-9][0-9]*\).*/\\1/p" -e d $(PLATDIR)/Cross/vm/sqSCCSVersion.h)
-RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32 -DFILEVERSIONVALUES=4,0,$(SVNREV),0 '-DFILEVERSIONSTRING=\"4.0.$(SVNREV)\\0\"'
+RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32 -DFILEVERSIONVALUES=4,0,$(SVNREV),0 '-DFILEVERSIONSTRING=\"5.0.$(SVNREV)\\0\"'
.SUFFIXES:
.SUFFIXES: .ccg .cc .c .o .s .i .rc .res .cg .hg .ccg .cpp
Modified: branches/Cog/build.win32x86/squeak.stack.spur/Squeak.rc
===================================================================
--- branches/Cog/build.win32x86/squeak.stack.spur/Squeak.rc 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.win32x86/squeak.stack.spur/Squeak.rc 2014-08-14 19:43:38 UTC (rev 3063)
@@ -5,7 +5,7 @@
1 VERSIONINFO
FILEVERSION FILEVERSIONVALUES
- PRODUCTVERSION 4,0,0,0
+ PRODUCTVERSION 5,0,0,0
FILEFLAGSMASK 0x3fL
FILEFLAGS 0xaL
FILEOS 0x10001L
@@ -20,8 +20,8 @@
VALUE "FileDescription", "Squeak Stack Spur Virtual Machine\0"
VALUE "FileVersion", FILEVERSIONSTRING
VALUE "LegalCopyright", "Copyright \251 Squeak.org 1996-2014\0"
- VALUE "ProductName", "Squeak Cog\0"
- VALUE "ProductVersion", "4.0\0"
+ VALUE "ProductName", "Squeak Stack Spur\0"
+ VALUE "ProductVersion", "5.0\0"
END
END
BLOCK "VarFileInfo"
Modified: branches/Cog/build.win32x86/squeak.stack.v3/Croquet.rc
===================================================================
--- branches/Cog/build.win32x86/squeak.stack.v3/Croquet.rc 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.win32x86/squeak.stack.v3/Croquet.rc 2014-08-14 19:43:38 UTC (rev 3063)
@@ -2,4 +2,31 @@
1 ICON DISCARDABLE "Croquet.ico"
2 ICON DISCARDABLE "Croquet.ico"
3 ICON DISCARDABLE "Croquet.ico"
-#endif
\ No newline at end of file
+
+1 VERSIONINFO
+ FILEVERSION FILEVERSIONVALUES
+ PRODUCTVERSION 4,0,0,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+ BLOCK "StringFileInfo"
+ BEGIN
+ BLOCK "040904E4" // Lang=US English, CharSet=Windows Multilin
+ BEGIN
+ VALUE "CompanyName", "Squeak.org\0"
+ VALUE "FileDescription", "Croquet Stack Virtual Machine\0"
+ VALUE "FileVersion", FILEVERSIONSTRING
+ VALUE "LegalCopyright", "Copyright \251 Squeak.org 1996-2014\0"
+ VALUE "ProductName", "Croquet Stack\0"
+ VALUE "ProductVersion", "4.0\0"
+ END
+ END
+ BLOCK "VarFileInfo"
+ BEGIN
+ VALUE "Translation", 0x409, 1252
+ END
+END
+#endif
Modified: branches/Cog/build.win32x86/squeak.stack.v3/Makefile
===================================================================
--- branches/Cog/build.win32x86/squeak.stack.v3/Makefile 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.win32x86/squeak.stack.v3/Makefile 2014-08-14 19:43:38 UTC (rev 3063)
@@ -132,7 +132,7 @@
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)
-TZ:=$(shell date +%Z)
+TZ:=$(shell date +%Z)
DEFS:= $(COGDEFS) $(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_ISNAN \
-DNO_SERVICE -DNO_STD_FILE_SUPPORT -D'TZ="$(TZ)"' \
$(NDEBUG) -DLSB_FIRST -D'VM_NAME="$(VM_NAME)"' -DX86 $(XDEFS) $(CROQUET)
Modified: branches/Cog/build.win32x86/squeak.stack.v3/Squeak.rc
===================================================================
--- branches/Cog/build.win32x86/squeak.stack.v3/Squeak.rc 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/build.win32x86/squeak.stack.v3/Squeak.rc 2014-08-14 19:43:38 UTC (rev 3063)
@@ -20,7 +20,7 @@
VALUE "FileDescription", "Squeak Stack Virtual Machine\0"
VALUE "FileVersion", FILEVERSIONSTRING
VALUE "LegalCopyright", "Copyright \251 Squeak.org 1996-2014\0"
- VALUE "ProductName", "Squeak Cog\0"
+ VALUE "ProductName", "Squeak Stack\0"
VALUE "ProductVersion", "4.0\0"
END
END
Modified: branches/Cog/image/buildspurtrunkimage.sh
===================================================================
--- branches/Cog/image/buildspurtrunkimage.sh 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/image/buildspurtrunkimage.sh 2014-08-14 19:43:38 UTC (rev 3063)
@@ -3,12 +3,15 @@
./getsqueak45.sh
. ./getGoodCogVM.sh
-cp -p $SQUEAK45.image trunk46forspur.image
-cp -p $SQUEAK45.changes trunk46forspur.changes
+if [ "$1" -ne -skiptrunkbuild ]; then
+ cp -p $SQUEAK45.image trunk46forspur.image
+ cp -p $SQUEAK45.changes trunk46forspur.changes
+ echo $VM trunk46forspur.image BuildSqueakTrunkImage.st
+ $VM trunk46forspur.image BuildSqueakTrunkImage.st
+fi
+
rm -f temp-spur-repository/* temp-v3-repository/*
-echo $VM trunk46forspur.image BuildSqueakTrunkImage.st
-$VM trunk46forspur.image BuildSqueakTrunkImage.st
echo $VM trunk46forspur.image WriteSpurPackagesToTempDir.st
$VM trunk46forspur.image WriteSpurPackagesToTempDir.st
Modified: branches/Cog/image/envvars.sh
===================================================================
--- branches/Cog/image/envvars.sh 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/image/envvars.sh 2014-08-14 19:43:38 UTC (rev 3063)
@@ -22,23 +22,33 @@
test "$OS" = Darwin && function quietmd5 () { /sbin/md5 -q "$1" 2>/dev/null; }
test "$OS" = Darwin || function quietmd5 () { /usr/bin/md5sum "$1" | sed 's/ .*$//' 2>/dev/null; }
+test "$OS" = Darwin && function geturl () { FILE=`basename "$1"`; curl -C - "`echo $1 | sed 's/ /%20/g'`" -o "$FILE"; }
+test "$OS" = Darwin || function geturl () { wget -c "$1"; }
+
+if unzip --help >/dev/null; then
+ true
+else
+ echo 'could not find unzip. you can find instructions on how to install it on google.' 1>&2;
+ exit 1
+fi
+
function get_vm_from_tar() # VM VMHASH VMARC VMARCHASH
{ VM="$1"
VMDIR=`echo $VM | sed 's/\/.*//'`
VMHASH="$2"
- if [ ! -d $VMDIR -o "`quietmd5 "$VM"`" != $VMHASH ]; then
+ if [ ! -d "$VMDIR" -o "`quietmd5 "$VM"`" != $VMHASH ]; then
VMARC="$3"
ARCHASH="$4"
if [ ! -f "$VMARC" -o "`quietmd5 "$VMARC"`" != $ARCHASH ]; then
- wget -c "$URL/$VMARC"
+ geturl "$URL/$VMARC"
if [ ! -f "$VMARC" -o "`quietmd5 "$VMARC"`" != $ARCHASH ]; then
echo failed to get $VMARC \; file corrupted\? 1>&2
exit 2
fi
fi
- rm -rf $VMDIR
+ rm -rf "$VMDIR"
tar xzf "$VMARC"
- if [ ! -d $VMDIR -o "`quietmd5 "$VM"`" != $VMHASH ]; then
+ if [ ! -d "$VMDIR" -o "`quietmd5 "$VM"`" != $VMHASH ]; then
echo failed to correctly extract $VMDIR from $VMARC 1>&2
exit 3
fi
@@ -53,13 +63,13 @@
ARCHASH="$4"
if [ ! -d "$VMDIR" -o "`quietmd5 "$VM"`" != $VMHASH ]; then
if [ ! -f "$VMARC" -o "`quietmd5 "$VMARC"`" != $ARCHASH ]; then
- wget -c "$URL/$VMARC"
+ geturl "$URL/$VMARC"
if [ ! -f "$VMARC" -o "`quietmd5 "$VMARC"`" != $ARCHASH ]; then
echo failed to get $VMARC \; file corrupted\? 1>&2
exit 2
fi
fi
- rm -rf $VMDIR
+ rm -rf "$VMDIR"
unzip -q "$VMARC"
if [ ! -d "$VMDIR" -o "`quietmd5 "$VM"`" != $VMHASH ]; then
echo failed to correctly extract "`dirname $VM`" from $VMARC 1>&2
Modified: branches/Cog/image/getGoodCogVM.sh
===================================================================
--- branches/Cog/image/getGoodCogVM.sh 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/image/getGoodCogVM.sh 2014-08-14 19:43:38 UTC (rev 3063)
@@ -8,13 +8,6 @@
. ./envvars.sh
-if wget --help >/dev/null ; then
- true
-else
- echo 'could not find wget. you can find instructions on how to install it on google.' 1>&2
- exit 1
-fi
-
case "$OS" in
Darwin) get_vm_from_tar \
Cog.app/Contents/MacOS/Squeak b9d79576423fe79f9f77383f676d37d6 \
Modified: branches/Cog/image/getGoodSpurVM.sh
===================================================================
--- branches/Cog/image/getGoodSpurVM.sh 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/image/getGoodSpurVM.sh 2014-08-14 19:43:38 UTC (rev 3063)
@@ -8,13 +8,6 @@
. ./envvars.sh
-if wget --help >/dev/null ; then
- true
-else
- echo 'could not find wget. you can find instructions on how to install it on google.' 1>&2
- exit 1
-fi
-
case "$OS" in
Darwin) get_vm_from_tar \
CogSpur.app/Contents/MacOS/Squeak d71657f3596108f1ee26ddde98d2a6e1 \
Modified: branches/Cog/image/getsqueak45.sh
===================================================================
--- branches/Cog/image/getsqueak45.sh 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/image/getsqueak45.sh 2014-08-14 19:43:38 UTC (rev 3063)
@@ -8,13 +8,7 @@
ZIP=Squeak-4.5-All-in-One.zip
if [ "`quietmd5 $ZIP`" != $ZIPHASH ]
then
- if wget --help >/dev/null; then
- true
- else
- echo 'could not find wget. you can find instructions on how to install it on google.' 1>&2
- exit 1
- fi
- wget -c http://ftp.squeak.org/4.5/$ZIP
+ geturl http://ftp.squeak.org/4.5/$ZIP
fi
if unzip --help >/dev/null; then
true
Added: branches/Cog/image/makegetnsvmscripts.sh
===================================================================
--- branches/Cog/image/makegetnsvmscripts.sh (rev 0)
+++ branches/Cog/image/makegetnsvmscripts.sh 2014-08-14 19:43:38 UTC (rev 3063)
@@ -0,0 +1,149 @@
+#!/bin/sh
+# Create the getGoodCogNsvm.sh & getGoodSpurNsvm.sh scripts.
+GetCogScript=getGoodCogNsvm.sh
+GetSpurScript=getGoodSpurNsvm.sh
+
+cd `dirname $0`
+
+REV=
+TAG=
+while getopts 'r:t:?' opt "$@"; do
+ case "$opt" in
+ r) REV="$OPTARG";;
+ t) TAG="$OPTARG";;
+ h|\?|*) echo usage: $0 [-r SVNREV] [-t YR.WK.SVNREV]
+ exit 0;;
+ esac
+done
+shift `expr $OPTIND - 1`
+
+test -n "$REV" || REV=`grep 'SvnRawRevisionString.*Rev:' ../platforms/Cross/vm/sqSCCSVersion.h \
+ | sed 's/^.*Rev: \([0-9][0-9]*\) $";/\1/'`
+test -n "$TAG" || TAG=`date +%g.%U.`$REV
+
+echo REV=$REV TAG=$TAG
+
+. ./envvars.sh
+
+ABORT=
+for a in "Newspeak Virtual Machine.app-$TAG.tgz" "Newspeak Virtual Machine-$TAG..dmg" nsvmlinuxht-$TAG.tgz nsvmlinux-$TAG.tgz nsvmwin-$TAG.zip\
+ "Newspeak Spur Virtual Machine.app-$TAG.tgz" "Newspeak Spur Virtual Machine-$TAG.dmg"nsvmspurlinuxht-$TAG.tgz nsvmspurwin-$TAG.zip
+do
+ test -f "../products/$a" || echo $a does not exist
+ ABORT=true
+done
+test -n "$ABORT" || exit 1
+
+cat >$GetCogScript <<END
+#!/bin/sh
+# Sets the VM env var to the r$REV Newspeak VM for the current platform.
+# will download and install the VM in this directory if necessary.
+
+TAG=$TAG
+REV=$REV
+URL=http://www.mirandabanda.org/files/Cog/VM/VM.r\$REV/
+
+. ./envvars.sh
+
+case "\$OS" in
+Darwin) get_vm_from_tar \\
+END
+
+echo -n ' "Newspeak Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine" ' >>$GetCogScript
+echo -n `quietmd5 "../products/Newspeak Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine"` >>$GetCogScript
+echo ' \' >> $GetCogScript
+echo -n ' "Newspeak Virtual Machine.app-$TAG.tgz" ' >>$GetCogScript
+quietmd5 "../products/Newspeak Virtual Machine.app-$TAG.tgz" >>$GetCogScript
+
+cat >>$GetCogScript <<END
+ VM="Newspeak Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine";;
+Linux)
+ if expr \$OSREL \\> 2.6.12; then
+ get_vm_from_tar \\
+END
+
+echo -n ' nsvmlinuxht/lib/nsvm/4.0-$REV/nsvm ' >>$GetCogScript
+echo -n `quietmd5 ../products/nsvmlinuxht/lib/nsvm/4.0-$REV/nsvm` >>$GetCogScript
+echo ' \' >>$GetCogScript
+echo -n ' nsvmlinuxht-$TAG.tgz ' >>$GetCogScript
+quietmd5 ../products/nsvmlinuxht-$TAG.tgz >>$GetCogScript
+
+cat >>$GetCogScript <<END
+ else
+ get_vm_from_tar \\
+END
+
+echo -n ' nsvmlinux/lib/nsvm/4.0-$REV/nsvm ' >>$GetCogScript
+echo -n `quietmd5 ../products/nsvmlinux/lib/nsvm/4.0-$REV/nsvm` >>$GetCogScript
+echo ' \' >>$GetCogScript
+echo -n ' nsvmlinux-$TAG.tgz ' >>$GetCogScript
+quietmd5 ../products/nsvmlinux-$TAG.tgz >>$GetCogScript
+cat >>$GetCogScript <<END
+ fi;;
+CYGWIN*) get_vm_from_zip \\
+END
+
+echo -n ' nsvmwin/nsvmConsole.exe ' >>$GetCogScript
+echo -n `quietmd5 ../products/nsvmwin/nsvmConsole.exe` >>$GetCogScript
+echo ' \' >>$GetCogScript
+echo -n ' nsvmwin-$TAG.zip ' >>$GetCogScript
+quietmd5 ../products/nsvmwin-$TAG.zip >>$GetCogScript
+
+cat >>$GetCogScript <<END
+ VM=nsvmwin/nsvmConsole.exe;;
+*) echo "don't know how to run nsvm on your system. bailing out." 1>&2; exit 2
+esac
+END
+
+chmod a+x $GetCogScript
+
+cat >$GetSpurScript <<END
+#!/bin/sh
+# Sets the VM env var to the r$REV Newspeak Spur VM for the current platform.
+# will download and install the VM in this directory if necessary.
+
+TAG=$TAG
+REV=$REV
+URL=http://www.mirandabanda.org/files/Cog/VM/VM.r\$REV/
+
+. ./envvars.sh
+
+case "\$OS" in
+Darwin) get_vm_from_tar \\
+END
+
+echo -n ' "Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine" ' >>$GetSpurScript
+echo -n `quietmd5 ../products/"Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine"` >>$GetSpurScript
+echo ' \' >>$GetSpurScript
+echo -n ' "Newspeak Spur Virtual Machine.app-$TAG.tgz" ' >>$GetSpurScript
+quietmd5 "../products/Newspeak Spur Virtual Machine.app-$TAG.tgz" >>$GetSpurScript
+
+cat >>$GetSpurScript <<END
+ VM="Newspeak Spur Virtual Machine.app/Contents/MacOS/Newspeak Virtual Machine";;
+Linux) get_vm_from_tar \\
+END
+
+echo -n ' nsvmspurlinuxht/lib/nsvm/4.0-$REV/nsvm ' >>$GetSpurScript
+echo -n `quietmd5 ../products/nsvmspurlinuxht/lib/nsvm/4.0-$REV/nsvm` >>$GetSpurScript
+echo ' \' >>$GetSpurScript
+echo -n ' nsvmspurlinuxht-$TAG.tgz ' >>$GetSpurScript
+quietmd5 ../products/nsvmspurlinuxht-$TAG.tgz >>$GetSpurScript
+
+cat >>$GetSpurScript <<END
+ VM=nsvmspurlinuxht/nsvm;;
+CYGWIN*) get_vm_from_zip \\
+END
+
+echo -n ' nsvmspurwin/nsvmConsole.exe ' >>$GetSpurScript
+echo -n `quietmd5 ../products/nsvmspurwin/nsvmConsole.exe` >>$GetSpurScript
+echo ' \' >>$GetSpurScript
+echo -n ' nsvmspurwin-$TAG.zip ' >>$GetSpurScript
+quietmd5 ../products/nsvmspurwin-$TAG.zip >>$GetSpurScript
+
+cat >>$GetSpurScript <<END
+ VM=nsvmspurwin/nsvmConsole.exe;;
+*) echo "don't know how to run nsvm on your system. bailing out." 1>&2; exit 2
+esac
+END
+
+chmod a+x $GetSpurScript
Property changes on: branches/Cog/image/makegetnsvmscripts.sh
___________________________________________________________________
Added: svn:executable
+ *
Modified: branches/Cog/image/makegetvmscripts.sh
===================================================================
--- branches/Cog/image/makegetvmscripts.sh 2014-08-07 17:23:08 UTC (rev 3062)
+++ branches/Cog/image/makegetvmscripts.sh 2014-08-14 19:43:38 UTC (rev 3063)
@@ -1,16 +1,26 @@
#!/bin/sh
# Create the getGoodCogVM.sh & getGoodSpurVM.sh scripts.
+GetCogScript=getGoodCogVM.sh
+GetSpurScript=getGoodSpurVM.sh
cd `dirname $0`
-REV=`grep 'SvnRawRevisionString.*Rev:' ../platforms/Cross/vm/sqSCCSVersion.h \
- | sed 's/^.*Rev: \([0-9][0-9]*\) $";/\1/'`
-if [ "$1" = "-r" -a -n "$2" ]; then
- REV="$2"
- shift;shift
-fi
+REV=
+TAG=
+while getopts 'r:t:?' opt "$@"; do
+ case "$opt" in
+ r) REV="$OPTARG";;
+ t) TAG="$OPTARG";;
+ h|\?|*) echo usage: $0 [-r SVNREV] [-t YR.WK.SVNREV]
+ exit 0;;
+ esac
+done
+shift `expr $OPTIND - 1`
-TAG=`date +%g.%U.`$REV
+test -n "$REV" || REV=`grep 'SvnRawRevisionString.*Rev:' ../platforms/Cross/vm/sqSCCSVersion.h \
+ | sed 's/^.*Rev: \([0-9][0-9]*\) $";/\1/'`
+test -n "$TAG" || TAG=`date +%g.%U.`$REV
+
echo REV=$REV TAG=$TAG
. ./envvars.sh
@@ -24,7 +34,7 @@
done
test -n "$ABORT" || exit 1
-cat >getGoodCogVM.sh <<END
+cat >$GetCogScript <<END
#!/bin/sh
# Sets the VM env var to the r$REV Cog VM for the current platform.
# will download and install the VM in this directory if necessary.
@@ -35,66 +45,59 @@
. ./envvars.sh
-if wget --help >/dev/null ; then
- true
-else
- echo 'could not find wget. you can find instructions on how to install it on google.' 1>&2
- exit 1
-fi
-
case "\$OS" in
Darwin) get_vm_from_tar \\
END
-echo -n ' Cog.app/Contents/MacOS/Squeak ' >>getGoodCogVM.sh
-echo -n `quietmd5 ../products/Cog.app/Contents/MacOS/Squeak` >>getGoodCogVM.sh
-echo ' \' >>getGoodCogVM.sh
-echo -n ' Cog.app-$TAG.tgz ' >>getGoodCogVM.sh
-quietmd5 ../products/Cog.app-$TAG.tgz >>getGoodCogVM.sh
+echo -n ' Cog.app/Contents/MacOS/Squeak ' >>$GetCogScript
+echo -n `quietmd5 ../products/Cog.app/Contents/MacOS/Squeak` >>$GetCogScript
+echo ' \' >>$GetCogScript
+echo -n ' Cog.app-$TAG.tgz ' >>$GetCogScript
+quietmd5 ../products/Cog.app-$TAG.tgz >>$GetCogScript
-cat >>getGoodCogVM.sh <<END
+cat >>$GetCogScript <<END
VM=Cog.app/Contents/MacOS/Squeak;;
Linux)
if expr \$OSREL \\> 2.6.12; then
get_vm_from_tar \\
END
-echo -n ' coglinuxht/lib/squeak/4.0-$REV/squeak ' >>getGoodCogVM.sh
-echo -n `quietmd5 ../products/coglinuxht/lib/squeak/4.0-$REV/squeak` >>getGoodCogVM.sh
-echo ' \' >>getGoodCogVM.sh
-echo -n ' coglinuxht-$TAG.tgz ' >>getGoodCogVM.sh
-quietmd5 ../products/coglinuxht-$TAG.tgz >>getGoodCogVM.sh
+echo -n ' coglinuxht/lib/squeak/4.0-$REV/squeak ' >>$GetCogScript
+echo -n `quietmd5 ../products/coglinuxht/lib/squeak/4.0-$REV/squeak` >>$GetCogScript
+echo ' \' >>$GetCogScript
+echo -n ' coglinuxht-$TAG.tgz ' >>$GetCogScript
+quietmd5 ../products/coglinuxht-$TAG.tgz >>$GetCogScript
-cat >>getGoodCogVM.sh <<END
+cat >>$GetCogScript <<END
else
get_vm_from_tar \\
END
-echo -n ' coglinux/lib/squeak/4.0-$REV/squeak ' >>getGoodCogVM.sh
-echo -n `quietmd5 ../products/coglinux/lib/squeak/4.0-$REV/squeak` >>getGoodCogVM.sh
-echo ' \' >>getGoodCogVM.sh
-echo -n ' coglinux-$TAG.tgz ' >>getGoodCogVM.sh
-quietmd5 ../products/coglinux-$TAG.tgz >>getGoodCogVM.sh
-cat >>getGoodCogVM.sh <<END
+echo -n ' coglinux/lib/squeak/4.0-$REV/squeak ' >>$GetCogScript
+echo -n `quietmd5 ../products/coglinux/lib/squeak/4.0-$REV/squeak` >>$GetCogScript
+echo ' \' >>$GetCogScript
+echo -n ' coglinux-$TAG.tgz ' >>$GetCogScript
+quietmd5 ../products/coglinux-$TAG.tgz >>$GetCogScript
+cat >>$GetCogScript <<END
fi;;
CYGWIN*) get_vm_from_zip \\
END
-echo -n ' cogwin/SqueakConsole.exe ' >>getGoodCogVM.sh
-echo -n `quietmd5 ../products/cogwin/SqueakConsole.exe` >>getGoodCogVM.sh
-echo ' \' >>getGoodCogVM.sh
-echo -n ' cogwin-$TAG.zip ' >>getGoodCogVM.sh
-quietmd5 ../products/cogwin-$TAG.zip >>getGoodCogVM.sh
+echo -n ' cogwin/SqueakConsole.exe ' >>$GetCogScript
+echo -n `quietmd5 ../products/cogwin/SqueakConsole.exe` >>$GetCogScript
+echo ' \' >>$GetCogScript
+echo -n ' cogwin-$TAG.zip ' >>$GetCogScript
+quietmd5 ../products/cogwin-$TAG.zip >>$GetCogScript
-cat >>getGoodCogVM.sh <<END
+cat >>$GetCogScript <<END
VM=cogwin/SqueakConsole.exe;;
*) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2
esac
END
-chmod a+x getGoodCogVM.sh
+chmod a+x $GetCogScript
-cat >getGoodSpurVM.sh <<END
+cat >$GetSpurScript <<END
#!/bin/sh
# Sets the VM env var to the r$REV Cog Spur VM for the current platform.
# will download and install the VM in this directory if necessary.
@@ -105,49 +108,42 @@
. ./envvars.sh
-if wget --help >/dev/null ; then
- true
-else
@@ Diff output truncated at 50000 characters. @@
More information about the Vm-dev
mailing list