[Vm-dev] [commit][2896]
Update to name the script by the squeak version and no longer define hex8.
commits at squeakvm.org
commits at squeakvm.org
Fri Apr 18 19:29:03 UTC 2014
Revision: 2896
Author: eliot
Date: 2014-04-18 12:29:01 -0700 (Fri, 18 Apr 2014)
Log Message:
-----------
Update to name the script by the squeak version and no longer define hex8.
Added Paths:
-----------
branches/Cog/image/BuildSqueak45Image.st
branches/Cog/image/buildsqueak45image.sh
Removed Paths:
-------------
branches/Cog/image/BuildImage.st
branches/Cog/image/Integer-hex8.st
branches/Cog/image/buildimage.sh
Deleted: branches/Cog/image/BuildImage.st
===================================================================
--- branches/Cog/image/BuildImage.st 2014-04-17 22:54:20 UTC (rev 2895)
+++ branches/Cog/image/BuildImage.st 2014-04-18 19:29:01 UTC (rev 2896)
@@ -1,49 +0,0 @@
-| loadables load |
-loadables := #( ('http://source.squeak.org/FFI' 1 ('FFI-Pools' 'FFI-Kernel'))
- ('http://source.squeak.org/VMMaker' 5 ('Balloon-Engine-Pools' 'VMMaker.oscog' 'Cog' 'CogTools'))
- ('http://ss3.gemstone.com/ss/MethodMassage' 3 ('MethodMassage' 'MethodMassageCompatibility'))
- ('http://www.squeaksource.com/AioPlugin' 6 ('VMConstruction-Plugins-AioPlugin'))
- ('http://www.squeaksource.com/Alien' 0 ('Alien'))
- "('http://www.squeaksource.com/FreeTypePlus' 7 ('FreeType')) can't load this. it is toxic to Squeak 4.5"
- ('http://www.squeaksource.com/FreetypePlugin' 8 ('Freetype-Plugin'))
- ('http://www.squeaksource.com/OSProcess' 4 ('OSProcess'))
- ('http://www.squeaksource.com/OSProcessPlugin' 9 ('VMConstruction-Plugins-OSProcessPlugin.oscog'))
- ('http://www.squeaksource.com/Speech' 2 ('SharedPool-Speech' ))).
-
-load := (loadables collect:
- [:tuple|
- [:path :order :packages| | repository |
- repository := MCHttpRepository
- location: path
- user: 'squeak'
- password: 'squeak'.
- MCRepositoryGroup default addRepository: repository.
- {repository. order. packages}] valueWithArguments: tuple])
- sort: [:a :b| a second <= b second].
-
-#( 'FT2Constants.st'
- 'Object-performwithwithwithwithwith.st'
- 'Integer-hex8.st' ) do:
- [:fileName| (FileDirectory default fileNamed: fileName) fileIn].
-
-load do:
- [:tuple|
- [:repository :order :packages|
- packages do:
- [:package| | latestVersion |
- latestVersion := (repository versionNamesForPackageNamed: package) first.
- [| version |
- version := repository versionNamed: latestVersion.
- version load.
- version workingCopy repositoryGroup addRepository: repository]
- on: Warning
- do: [:ex|
- (ex messageText beginsWith: 'This package depends on the following classes') ifFalse:
- [ex pass].
- ex resume]]
- ] valueWithArguments: tuple].
-
-#( 'Workspace' 'Slang Test Workspace' 'VM Simulation Workspace' ) do:
- [:textFileName|
- (StringHolder new contents: (FileDirectory default fileNamed: textFileName, '.text') contentsOfEntireFile)
- openLabel: textFileName]
Copied: branches/Cog/image/BuildSqueak45Image.st (from rev 2895, branches/Cog/image/BuildImage.st)
===================================================================
--- branches/Cog/image/BuildSqueak45Image.st (rev 0)
+++ branches/Cog/image/BuildSqueak45Image.st 2014-04-18 19:29:01 UTC (rev 2896)
@@ -0,0 +1,48 @@
+| manifest load |
+manifest := #( ('http://source.squeak.org/FFI' 1 ('FFI-Pools' 'FFI-Kernel'))
+ ('http://source.squeak.org/VMMaker' 5 ('Balloon-Engine-Pools' 'VMMaker.oscog' 'Cog' 'CogTools'))
+ ('http://ss3.gemstone.com/ss/MethodMassage' 3 ('MethodMassage' 'MethodMassageCompatibility'))
+ ('http://www.squeaksource.com/AioPlugin' 6 ('VMConstruction-Plugins-AioPlugin'))
+ ('http://www.squeaksource.com/Alien' 0 ('Alien'))
+ "('http://www.squeaksource.com/FreeTypePlus' 7 ('FreeType')) can't load this. it is toxic to Squeak 4.5"
+ ('http://www.squeaksource.com/FreetypePlugin' 8 ('Freetype-Plugin'))
+ ('http://www.squeaksource.com/OSProcess' 4 ('OSProcess'))
+ ('http://www.squeaksource.com/OSProcessPlugin' 9 ('VMConstruction-Plugins-OSProcessPlugin.oscog'))
+ ('http://www.squeaksource.com/Speech' 2 ('SharedPool-Speech' ))).
+
+load := (manifest collect:
+ [:tuple|
+ [:path :order :packages| | repository |
+ repository := MCHttpRepository
+ location: path
+ user: 'squeak'
+ password: 'squeak'.
+ MCRepositoryGroup default addRepository: repository.
+ {repository. order. packages}] valueWithArguments: tuple])
+ sort: [:a :b| a second <= b second].
+
+#( 'FT2Constants.st'
+ 'Object-performwithwithwithwithwith.st' ) do:
+ [:fileName| (FileDirectory default fileNamed: fileName) fileIn].
+
+load do:
+ [:tuple|
+ [:repository :order :packages|
+ packages do:
+ [:package| | latestVersion |
+ latestVersion := (repository versionNamesForPackageNamed: package) first.
+ [| version |
+ version := repository versionNamed: latestVersion.
+ version load.
+ version workingCopy repositoryGroup addRepository: repository]
+ on: Warning
+ do: [:ex|
+ (ex messageText beginsWith: 'This package depends on the following classes') ifFalse:
+ [ex pass].
+ ex resume]]]
+ valueWithArguments: tuple].
+
+#( 'Workspace' 'Slang Test Workspace' 'VM Simulation Workspace' ) do:
+ [:textFileName|
+ (StringHolder new contents: (FileDirectory default fileNamed: textFileName, '.text') contentsOfEntireFile)
+ openLabel: textFileName]
Deleted: branches/Cog/image/Integer-hex8.st
===================================================================
--- branches/Cog/image/Integer-hex8.st 2014-04-17 22:54:20 UTC (rev 2895)
+++ branches/Cog/image/Integer-hex8.st 2014-04-18 19:29:01 UTC (rev 2896)
@@ -1,14 +0,0 @@
-'From Squeak4.1 of 17 April 2010 [latest update: #9957] on 22 January 2014 at 5:02:45 pm'!
-
-!Integer methodsFor: 'printing' stamp: 'eem 5/21/2010 11:09'!
-hex8
- "Print the receiver in base 16 with prefixed base, using at least 8 digits.
- DO NOT CHANGE THIS!! The Cog VMMaker depends on this.
- Consider using storeStringBase: 16 length: 11 padded: true instead."
- "16r3333 hex8"
- | hex |
- hex := self hex. "16rNNN"
- ^hex size < 11
- ifTrue: [hex copyReplaceFrom: 4 to: 3
- with: ('00000000' copyFrom: 1 to: 11-hex size)]
- ifFalse: [hex]! !
Deleted: branches/Cog/image/buildimage.sh
===================================================================
--- branches/Cog/image/buildimage.sh 2014-04-17 22:54:20 UTC (rev 2895)
+++ branches/Cog/image/buildimage.sh 2014-04-18 19:29:01 UTC (rev 2896)
@@ -1,34 +0,0 @@
-#!/bin/bash
-SQUEAK45APP=Squeak-4.5-All-in-One.app
-SQUEAK45RESOURCES=$SQUEAK45APP/Contents/Resources
-SQUEAK45=$SQUEAK45RESOURCES/Squeak4.5-13680
-
-if [ "`md5 -q \"$SQUEAK45\".image`" != 1d0d4320224b741da1f56c6871963702 ]; then
- ZIP=Squeak-4.5-All-in-One.zip
- if [ "`md5 -q $ZIP`" != b90e0303ab61e928a5d997b22d18b468 ]
- then
- wget --help >/dev/null || (echo 'could not find wget. you can find instructions on how to install it on google.' 1>&2; exit 1)
- wget -c http://ftp.squeak.org/4.5/$ZIP
- fi
- unzip --help >/dev/null || (echo 'could not find unzip. you can find instructions on how to install it on google.' 1>&2; exit 1)
- unzip $ZIP
-fi
-test -f SqueakV41.sources || ln $SQUEAK45RESOURCES/SqueakV41.sources .
-cp -p $SQUEAK45.image CogVMMaker.image
-cp -p $SQUEAK45.changes CogVMMaker.changes
-
-OS=`uname -s`
-CPU=`uname -m`
-
-case $OS in
-Darwin) VM="$SQUEAK45APP/Contents/MacOS/Squeak";;
-CYGWIN*) VM="$SQUEAK45APP/SqueakConsole.exe";;
-Linux) if [ "$CPU" = x86_64 ]; then
- CPU=i686
- echo Running 32-bit Squeak on a 64-bit System. Hope the 32-bit runtime libraries are installed ...
- fi
- VM="$APP/Contents/$OS-$CPU/bin/squeak";;
-*) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2
-esac
-
-exec "$VM" CogVMMaker.image BuildImage.st
Copied: branches/Cog/image/buildsqueak45image.sh (from rev 2895, branches/Cog/image/buildimage.sh)
===================================================================
--- branches/Cog/image/buildsqueak45image.sh (rev 0)
+++ branches/Cog/image/buildsqueak45image.sh 2014-04-18 19:29:01 UTC (rev 2896)
@@ -0,0 +1,34 @@
+#!/bin/bash
+SQUEAK45APP=Squeak-4.5-All-in-One.app
+SQUEAK45RESOURCES=$SQUEAK45APP/Contents/Resources
+SQUEAK45=$SQUEAK45RESOURCES/Squeak4.5-13680
+
+if [ "`md5 -q \"$SQUEAK45\".image`" != 1d0d4320224b741da1f56c6871963702 ]; then
+ ZIP=Squeak-4.5-All-in-One.zip
+ if [ "`md5 -q $ZIP`" != b90e0303ab61e928a5d997b22d18b468 ]
+ then
+ wget --help >/dev/null || (echo 'could not find wget. you can find instructions on how to install it on google.' 1>&2; exit 1)
+ wget -c http://ftp.squeak.org/4.5/$ZIP
+ fi
+ unzip --help >/dev/null || (echo 'could not find unzip. you can find instructions on how to install it on google.' 1>&2; exit 1)
+ unzip $ZIP
+fi
+test -f SqueakV41.sources || ln $SQUEAK45RESOURCES/SqueakV41.sources .
+cp -p $SQUEAK45.image CogVMMaker.image
+cp -p $SQUEAK45.changes CogVMMaker.changes
+
+OS=`uname -s`
+CPU=`uname -m`
+
+case $OS in
+Darwin) VM="$SQUEAK45APP/Contents/MacOS/Squeak";;
+CYGWIN*) VM="$SQUEAK45APP/SqueakConsole.exe";;
+Linux) if [ "$CPU" = x86_64 ]; then
+ CPU=i686
+ echo Running 32-bit Squeak on a 64-bit System. Hope the 32-bit runtime libraries are installed ...
+ fi
+ VM="$APP/Contents/$OS-$CPU/bin/squeak";;
+*) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2
+esac
+
+exec "$VM" CogVMMaker.image BuildSqueak45Image.st
More information about the Vm-dev
mailing list