Skip to content

Commit

Permalink
Issue #261: solo topaz deploy script is already to create topaz solo …
Browse files Browse the repository at this point in the history
…extent ... start process of converting the st_launcher scripts to GsDefKit_home scripts [ci skip]
  • Loading branch information
dalehenrich committed Oct 17, 2019
1 parent 3d74514 commit e058909
Show file tree
Hide file tree
Showing 11 changed files with 44 additions and 15 deletions.
2 changes: 1 addition & 1 deletion alt_bin/examples/error.st
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Example script that signals an error.
"
Class {
#name : 'GsDevKitLauncher_Error',
#superclass : 'AbstractGsDevKitProgram',
#superclass : 'AbstractProgram',
#category : 'gsdevKit_launcher-Scripts'
}

Expand Down
2 changes: 1 addition & 1 deletion alt_bin/examples/hello.st
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Hello world GsDevKit script
"
Class {
#name : 'GsDevKitLauncher_Hello',
#superclass : 'AbstractGsDevKitProgram',
#superclass : 'AbstractProgram',
#category : 'gsdevKit_launcher-Scripts'
}

Expand Down
17 changes: 5 additions & 12 deletions alt_bin/gsdevkit_launcher
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ fi

#
# this is the smalltalk code executed by the vm aasociated with the \$imageName image
# it is fed to the vm launched by the \$scriptCmdLine
#
vmScriptFile=`mktemp -p /tmp tmp.XXXXXXXXXX.stash`
pwd=`pwd`
Expand All @@ -105,16 +104,12 @@ cat - > $vmScriptFile << EOF
ifTrue: [ ex pass ]
ifFalse: [
StashScript
ansiRedOn: StLauncherCommon stderr
during: [ StLauncherCommon stderr nextPutAll: ex description ].
StLauncherCommon stderr lf.
ansiRedOn: AbstractProgram stderr
during: [ AbstractProgram stderr nextPutAll: ex description ].
AbstractProgram stderr lf.
false ] ].
EOF

#
# code used to launch the vm associated with the default image, that generates the \$scriptCmdLine
#

if [ "$ST_LAUNCHER_DEFAULT_PLATFORM" = "gemstone" ] ; then
inputFile=`mktemp`
cat - > $inputFile << EOF
Expand Down Expand Up @@ -167,7 +162,8 @@ EOF
exit $status
fi
# >&2 echo "-- debug session ended, continuing execution"
scriptCmdLine=`cat $stdoutF`
chmod +x $stdoutF
$stdoutF
fi
elif [ "$ST_LAUNCHER_DEFAULT_PLATFORM" = "pharo" ] ; then
echo "PHARO not supported ... yet"
Expand All @@ -177,9 +173,6 @@ else
exit 1
fi

# >&2 echo "$scriptCmdLine"
$scriptCmdLine

# https://github.com/mkropat/sh-realpath/blob/master/realpath.sh
realpath() {
canonicalize_path "$(resolve_symlinks "$1")"
Expand Down
1 change: 0 additions & 1 deletion alt_bin/gsdevkit_topaz_launcher
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,6 @@ EOF
$GEMSTONE/bin/topaz -lq -I "$topaziniPath" $soloExtentArg -S $generateCommandLineFile > $scriptFile
chmod +x $scriptFile
$scriptFile
# $scriptCommandLine -- $scriptArgs
fi


Expand Down
5 changes: 5 additions & 0 deletions shared/gemstone/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*
!/logs/
!/snapshots/
!.gitignore
!.topazini
5 changes: 5 additions & 0 deletions shared/gemstone/.topazini
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
SET GEMSTONE admin_gs_350
set user SystemUser
set password swordfish
set solologin on

4 changes: 4 additions & 0 deletions shared/gemstone/logs/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
*
!.gitignore
!README.md

1 change: 1 addition & 0 deletions shared/gemstone/logs/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This is where the topaz solo extent will be located
4 changes: 4 additions & 0 deletions shared/gemstone/snapshots/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
*
!.gitignore
!README.md

1 change: 1 addition & 0 deletions shared/gemstone/snapshots/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This is where the topaz solo extent will be located
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
set -e
. defStone.env

rm -rf *.log *.out

newExtent -t -s snapshots/extent0.tode.dbf $GEMSTONE_NAME

$ROWAN_PROJECTS_HOME/GsDevKit_launcher/bootstrapping/gemstone/bin/bootstrap_install_tode.tpz $GEMSTONE_NAME -lq

# this script needs to be rewritten for gsdevkit_launcher
rm -f ./snapshots/extent0.gsdevkit_launcher.dbf
todeIt $GEMSTONE_NAME bu snapshot gsdevkit_launcher.dbf

# cp the solo extent to snapshots directory
chmod oug-w snapshots/extent0.gsdevkit_launcher.dbf
cp -f ./snapshots/extent0.gsdevkit_launcher.dbf $GS_HOME/shared/gemstone/snapshots/

0 comments on commit e058909

Please sign in to comment.