[Vm-dev] [commit][3449] More cleanup to fix buildspurtrunk64image.sh

commits at squeakvm.org commits at squeakvm.org
Fri Sep 25 19:30:13 UTC 2015


Revision: 3449
Author:   eliot
Date:     2015-09-25 12:30:09 -0700 (Fri, 25 Sep 2015)
Log Message:
-----------
More cleanup to fix buildspurtrunk64image.sh

Modified Paths:
--------------
    branches/Cog/image/buildspurtrunk64image.sh
    branches/Cog/image/buildspurtrunkreaderimage.sh

Added Paths:
-----------
    branches/Cog/image/old/FileDirectory-on-methods.st
    branches/Cog/image/old/uploadspurimage.sh
    branches/Cog/image/updatevmmakerimage.sh

Removed Paths:
-------------
    branches/Cog/image/FileDirectory-on-methods.st
    branches/Cog/image/uploadspurimage.sh

Deleted: branches/Cog/image/FileDirectory-on-methods.st
===================================================================
--- branches/Cog/image/FileDirectory-on-methods.st	2015-09-25 18:56:44 UTC (rev 3448)
+++ branches/Cog/image/FileDirectory-on-methods.st	2015-09-25 19:30:09 UTC (rev 3449)
@@ -1,28 +0,0 @@
-'From Squeak4.5 of 18 April 2014 [latest update: #13719] on 21 April 2014 at 3:07:52 pm'!
-
-!FileDirectory class methodsFor: 'instance creation' stamp: 'eem 4/21/2014 14:53'!
-on: pathString
-	"Return a new file directory for the given path, of the appropriate FileDirectory subclass for the current OS platform."
-
-	| pathName |
-	DirectoryClass ifNil: [self setDefaultDirectoryClass].
-	"If path ends with a delimiter (: or /) then remove it"
-	pathName := pathString.
-	(pathName at: pathName size ifAbsent: nil) = self pathNameDelimiter ifTrue:
-		[pathName := pathName allButLast].
-	DirectoryClass parentDirectoryNickname ifNotNil:
-		[:parentName|
-		(pathName beginsWith: parentName) ifTrue:
-			[pathName = parentName ifTrue:
-				[^self default containingDirectory].
-			 (pathName at: parentName size + 1 ifAbsent: nil) = self pathNameDelimiter ifTrue:
-				[^self default containingDirectory on: (pathName allButFirst: parentName size + 1)]]].
-	^DirectoryClass new setPathName: pathName! !
-
-!FileDirectory methodsFor: 'path access' stamp: 'eem 4/21/2014 14:57'!
-on: path
-	"Return another instance"
-
-	^ self class on: ((path at: 1 ifAbsent: nil) = self pathNameDelimiter
-						ifTrue: [path]
-						ifFalse: [pathName asString, (String with: self pathNameDelimiter), path])! !
Modified: branches/Cog/image/buildspurtrunk64image.sh
===================================================================
--- branches/Cog/image/buildspurtrunk64image.sh	2015-09-25 18:56:44 UTC (rev 3448)
+++ branches/Cog/image/buildspurtrunk64image.sh	2015-09-25 19:30:09 UTC (rev 3449)
@@ -5,5 +5,7 @@
 
 . ./getGoodSpurVM.sh
 
+./updatevmmakerimage.sh
+
 echo $VM SpurVMMaker.image BuildSpurTrunk64Image.st
 $VM SpurVMMaker.image BuildSpurTrunk64Image.st

Modified: branches/Cog/image/buildspurtrunkreaderimage.sh
===================================================================
--- branches/Cog/image/buildspurtrunkreaderimage.sh	2015-09-25 18:56:44 UTC (rev 3448)
+++ branches/Cog/image/buildspurtrunkreaderimage.sh	2015-09-25 19:30:09 UTC (rev 3449)
@@ -3,9 +3,7 @@
 # really useful for VMMaker simulation testing.
 . ./envvars.sh
 
-if [ ! -f trunk50.image -o ! -f trunk50.changes ]; then
-	./updatespurimage.sh
-fi
+./updatespurimage.sh
 
 ./ensureSqueakV50sources.sh
 

Copied: branches/Cog/image/old/FileDirectory-on-methods.st (from rev 3447, branches/Cog/image/FileDirectory-on-methods.st)
===================================================================
--- branches/Cog/image/old/FileDirectory-on-methods.st	                        (rev 0)
+++ branches/Cog/image/old/FileDirectory-on-methods.st	2015-09-25 19:30:09 UTC (rev 3449)
@@ -0,0 +1,28 @@
+'From Squeak4.5 of 18 April 2014 [latest update: #13719] on 21 April 2014 at 3:07:52 pm'!
+
+!FileDirectory class methodsFor: 'instance creation' stamp: 'eem 4/21/2014 14:53'!
+on: pathString
+	"Return a new file directory for the given path, of the appropriate FileDirectory subclass for the current OS platform."
+
+	| pathName |
+	DirectoryClass ifNil: [self setDefaultDirectoryClass].
+	"If path ends with a delimiter (: or /) then remove it"
+	pathName := pathString.
+	(pathName at: pathName size ifAbsent: nil) = self pathNameDelimiter ifTrue:
+		[pathName := pathName allButLast].
+	DirectoryClass parentDirectoryNickname ifNotNil:
+		[:parentName|
+		(pathName beginsWith: parentName) ifTrue:
+			[pathName = parentName ifTrue:
+				[^self default containingDirectory].
+			 (pathName at: parentName size + 1 ifAbsent: nil) = self pathNameDelimiter ifTrue:
+				[^self default containingDirectory on: (pathName allButFirst: parentName size + 1)]]].
+	^DirectoryClass new setPathName: pathName! !
+
+!FileDirectory methodsFor: 'path access' stamp: 'eem 4/21/2014 14:57'!
+on: path
+	"Return another instance"
+
+	^ self class on: ((path at: 1 ifAbsent: nil) = self pathNameDelimiter
+						ifTrue: [path]
+						ifFalse: [pathName asString, (String with: self pathNameDelimiter), path])! !
Copied: branches/Cog/image/old/uploadspurimage.sh (from rev 3447, branches/Cog/image/uploadspurimage.sh)
===================================================================
--- branches/Cog/image/old/uploadspurimage.sh	                        (rev 0)
+++ branches/Cog/image/old/uploadspurimage.sh	2015-09-25 19:30:09 UTC (rev 3449)
@@ -0,0 +1,39 @@
+#!/bin/sh
+# Upload a trunk46-spur.image/.changes to mirandabanda.org
+RemoteUser=eliotmiranda at highland-park.dreamhost.com
+RemoteRoot=mirandabanda.org/files/Cog/SpurImages
+IFS="	
+"
+DATE=`date +%Y-%m-%d`
+BASENAME=trunk46-spur
+
+test "$1" = -here || cd `dirname $0`
+echo uploading $BASENAME from `pwd`
+cksum $BASENAME.[ci]* >$BASENAME.sum
+
+DIR=$RemoteRoot/$DATE
+echo ssh -x $RemoteUser mkdir $DIR
+ssh -x $RemoteUser mkdir $DIR
+echo scp -p $BASENAME.image $BASENAME.changes $BASENAME.sum "$@" $RemoteUser:$DIR
+scp -p $BASENAME.image $BASENAME.changes $BASENAME.sum "$@" $RemoteUser:$DIR
+echo ssh $RemoteUser chmod a-w $DIR/* \\\; ls -al $DIR
+ssh $RemoteUser chmod a-w $DIR/* \; ls -al $DIR
+echo ssh $RemoteUser rm -f \
+	$RemoteRoot/{$BASENAME.image,$BASENAME.changes,$BASENAME.sum} \
+	$RemoteRoot/{$BASENAME-64.image,$BASENAME-64.changes,$BASENAME-64.sum}
+ssh $RemoteUser rm -f \
+	$RemoteRoot/{$BASENAME.image,$BASENAME.changes,$BASENAME.sum} \
+	$RemoteRoot/{$BASENAME-64.image,$BASENAME-64.changes,$BASENAME-64.sum}
+echo ssh $RemoteUser cd $RemoteRoot \\\; ln -s $DATE/{$BASENAME.image,$BASENAME.changes} .
+ssh $RemoteUser cd $RemoteRoot \; ln -s $DATE/{$BASENAME.image,$BASENAME.changes,$BASENAME.sum} .
+
+if [ "$BASENAME-64.changes" -nt "$BASENAME.changes" \
+	-a \( "$BASENAME-64.image" -nt "$BASENAME.image" ]; then
+	echo uploading $BASENAME-64 from `pwd`
+	cksum $BASENAME-64.[ci]* >$BASENAME-64.sum
+	echo scp -p $BASENAME-64.image $BASENAME-64.changes $BASENAME-64.sum $RemoteUser:$DIR
+	scp -p $BASENAME-64.image $BASENAME-64.changes $BASENAME-64.sum $RemoteUser:$DIR
+	echo ssh $RemoteUser cd $RemoteRoot \\\; ln -s $DATE/{$BASENAME-64.image,$BASENAME-64.changes} .
+	ssh $RemoteUser cd $RemoteRoot \; ln -s $DATE/{$BASENAME-64.image,$BASENAME-64.changes,$BASENAME-64.sum} .
+fi
+ssh $RemoteUser ls -l $RemoteRoot $RemoteRoot/$DATE

Copied: branches/Cog/image/updatevmmakerimage.sh (from rev 3447, branches/Cog/image/updatespurimage.sh)
===================================================================
--- branches/Cog/image/updatevmmakerimage.sh	                        (rev 0)
+++ branches/Cog/image/updatevmmakerimage.sh	2015-09-25 19:30:09 UTC (rev 3449)
@@ -0,0 +1,13 @@
+#!/bin/sh
+# Update the latest Spur image.
+. ./envvars.sh
+
+if [ ! -f SpurVMMaker.image ]; then
+	echo no SpurVMMaker.image to update\; $0 bailing out
+	exit 0
+fi
+
+. ./getGoodSpurVM.sh
+
+echo $VM SpurVMMaker.image UpdateSqueakTrunkImage.st
+$VM SpurVMMaker.image UpdateSqueakTrunkImage.st

Deleted: branches/Cog/image/uploadspurimage.sh
===================================================================
--- branches/Cog/image/uploadspurimage.sh	2015-09-25 18:56:44 UTC (rev 3448)
+++ branches/Cog/image/uploadspurimage.sh	2015-09-25 19:30:09 UTC (rev 3449)
@@ -1,39 +0,0 @@
-#!/bin/sh
-# Upload a trunk46-spur.image/.changes to mirandabanda.org
-RemoteUser=eliotmiranda at highland-park.dreamhost.com
-RemoteRoot=mirandabanda.org/files/Cog/SpurImages
-IFS="	
-"
-DATE=`date +%Y-%m-%d`
-BASENAME=trunk46-spur
-
-test "$1" = -here || cd `dirname $0`
-echo uploading $BASENAME from `pwd`
-cksum $BASENAME.[ci]* >$BASENAME.sum
-
-DIR=$RemoteRoot/$DATE
-echo ssh -x $RemoteUser mkdir $DIR
-ssh -x $RemoteUser mkdir $DIR
-echo scp -p $BASENAME.image $BASENAME.changes $BASENAME.sum "$@" $RemoteUser:$DIR
-scp -p $BASENAME.image $BASENAME.changes $BASENAME.sum "$@" $RemoteUser:$DIR
-echo ssh $RemoteUser chmod a-w $DIR/* \\\; ls -al $DIR
-ssh $RemoteUser chmod a-w $DIR/* \; ls -al $DIR
-echo ssh $RemoteUser rm -f \
-	$RemoteRoot/{$BASENAME.image,$BASENAME.changes,$BASENAME.sum} \
-	$RemoteRoot/{$BASENAME-64.image,$BASENAME-64.changes,$BASENAME-64.sum}
-ssh $RemoteUser rm -f \
-	$RemoteRoot/{$BASENAME.image,$BASENAME.changes,$BASENAME.sum} \
-	$RemoteRoot/{$BASENAME-64.image,$BASENAME-64.changes,$BASENAME-64.sum}
-echo ssh $RemoteUser cd $RemoteRoot \\\; ln -s $DATE/{$BASENAME.image,$BASENAME.changes} .
-ssh $RemoteUser cd $RemoteRoot \; ln -s $DATE/{$BASENAME.image,$BASENAME.changes,$BASENAME.sum} .
-
-if [ "$BASENAME-64.changes" -nt "$BASENAME.changes" \
-	-a \( "$BASENAME-64.image" -nt "$BASENAME.image" ]; then
-	echo uploading $BASENAME-64 from `pwd`
-	cksum $BASENAME-64.[ci]* >$BASENAME-64.sum
-	echo scp -p $BASENAME-64.image $BASENAME-64.changes $BASENAME-64.sum $RemoteUser:$DIR
-	scp -p $BASENAME-64.image $BASENAME-64.changes $BASENAME-64.sum $RemoteUser:$DIR
-	echo ssh $RemoteUser cd $RemoteRoot \\\; ln -s $DATE/{$BASENAME-64.image,$BASENAME-64.changes} .
-	ssh $RemoteUser cd $RemoteRoot \; ln -s $DATE/{$BASENAME-64.image,$BASENAME-64.changes,$BASENAME-64.sum} .
-fi
-ssh $RemoteUser ls -l $RemoteRoot $RemoteRoot/$DATE



More information about the Vm-dev mailing list