Skip to content

Commit

Permalink
Issue #47: add project entries for RB and FileTree ... add Zodiac as …
Browse files Browse the repository at this point in the history
…a base project used by stone (only loaded in GemStone 3.3 and beyond)
  • Loading branch information
dalehenrich committed Dec 17, 2015
1 parent 51e52d3 commit 6bccca3
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 1 deletion.
9 changes: 8 additions & 1 deletion sys/default/client/server-bootstrap-scripts/loadMetacello.ws
Expand Up @@ -4,7 +4,7 @@
Transcript cr; show: '---Step 2 of tODE bootstrap process: execute loadMetacello.ws'.

GsUpgrader batchErrorHandlingDo: [
| metacelloRepo filetreeRepo greaseRepo pharoCompatRepo glass1Repo rbRepo stonRepo zincRepo |
| metacelloRepo filetreeRepo greaseRepo pharoCompatRepo glass1Repo rbRepo stonRepo zincRepo zodiacRepo |
metacelloRepo := GsFile _expandEnvVariable: 'GS_SHARED_REPO_METACELLO' isClient: false.
filetreeRepo := GsFile _expandEnvVariable: 'GS_SHARED_REPO_GEMSTONE_FILETREE' isClient: false.
greaseRepo := GsFile _expandEnvVariable: 'GS_SHARED_REPO_GREASE' isClient: false.
Expand All @@ -13,6 +13,7 @@ GsUpgrader batchErrorHandlingDo: [
rbRepo := GsFile _expandEnvVariable: 'GS_SHARED_REPO_RB' isClient: false.
stonRepo := GsFile _expandEnvVariable: 'GS_SHARED_REPO_STON' isClient: false.
zincRepo := GsFile _expandEnvVariable: 'GS_SHARED_REPO_ZINC' isClient: false.
zodiacRepo := GsFile _expandEnvVariable: 'GS_SHARED_REPO_ZODIAC' isClient: false.
Transcript
cr;
show: 'Locking Metacello: ', metacelloRepo printString;
Expand All @@ -28,6 +29,8 @@ GsUpgrader batchErrorHandlingDo: [
show: 'Locking RB: ', rbRepo printString;
cr;
show: 'Locking ZincHTTPComponents: ', zincRepo printString;
cr;
show: 'Locking Zodiac: ', zodiacRepo printString;
yourself.
Metacello new
baseline: 'Metacello';
Expand All @@ -53,6 +56,10 @@ GsUpgrader batchErrorHandlingDo: [
baseline: 'ZincHTTPComponents';
repository: zincRepo;
lock.
Metacello new
baseline: 'Zodiac';
repository: zodiacRepo;
lock.
Metacello new
baseline: 'Ston';
repository: stonRepo;
Expand Down
3 changes: 3 additions & 0 deletions sys/default/gsdevkit_bin/defSharedGitDevKit.env
Expand Up @@ -13,6 +13,7 @@ export GS_SHARED_GITHUB_COMMIT_PHARO_COMPAT="master"
export GS_SHARED_GITHUB_COMMIT_GLASS1="master"
export GS_SHARED_GITHUB_COMMIT_RB="dev"
export GS_SHARED_GITHUB_COMMIT_ZINC="2.4.3.?"
export GS_SHARED_GITHUB_COMMIT_ZODIAC="gs_master"

# by default, check out the "master" branch for the repository (which might not be master)
export GS_SHARED_GIT_CHECKOUT_METACELLO="master"
Expand All @@ -35,4 +36,6 @@ export GS_SHARED_GIT_CHECKOUT_RB="dev"
export GS_SHARED_GIT_REMOTE_RB="origin"
export GS_SHARED_GIT_CHECKOUT_ZINC="gs_master"
export GS_SHARED_GIT_REMOTE_ZINC="origin"
export GS_SHARED_GIT_CHECKOUT_ZODIAC="gs_master"
export GS_SHARED_GIT_REMOTE_ZODIAC="origin"

5 changes: 5 additions & 0 deletions sys/default/gsdevkit_bin/defSharedRepoDevKit.env
Expand Up @@ -65,3 +65,8 @@ else
export GS_SHARED_REPO_ZINC="github://GsDevKit/zinc:${GS_SHARED_GITHUB_COMMIT_ZINC}/repository"
fi

if [ -d "${GS_SHARED_REPO}/zodiac" ] ; then
export GS_SHARED_REPO_ZODIAC="filetree://${GS_SHARED_REPO}/zodiac/repository"
else
export GS_SHARED_REPO_ZODIAC="github://GsDevKit/zodiac:${GS_SHARED_GITHUB_COMMIT_ZODIAC}/repository"
fi
12 changes: 12 additions & 0 deletions sys/default/server/projects/FileTree.ston
@@ -0,0 +1,12 @@
TDObjectGatewayLeafNode{#name:'FileTree',#contents:'| repoSpec gitCheckout |
gitCheckout := GsFile _expandEnvVariable: \'GS_SHARED_GIT_CHECKOUT_FILETREE\' isClient: false.
repoSpec := GsFile _expandEnvVariable: \'GS_SHARED_REPO_FILETREE\' isClient: false.
^ TDProjectSpecEntryDefinition new
baseline: \'FileTree\'
repository: repoSpec
loads: #( \'default\' );
gitCheckout: gitCheckout;
status: #(#\'inactive\');
locked: true;
yourself.
'}
12 changes: 12 additions & 0 deletions sys/default/server/projects/RB.ston
@@ -0,0 +1,12 @@
TDObjectGatewayLeafNode{#name:'RB',#contents:'| repoSpec gitCheckout |
gitCheckout := GsFile _expandEnvVariable: \'GS_SHARED_GIT_CHECKOUT_RB\' isClient: false.
repoSpec := GsFile _expandEnvVariable: \'GS_SHARED_REPO_RB\' isClient: false.
^ TDProjectSpecEntryDefinition new
baseline: \'RB\'
repository: repoSpec
loads: #( \'AST-Core\' );
gitCheckout: gitCheckout;
status: #(#\'inactive\');
locked: true;
yourself.
'}
11 changes: 11 additions & 0 deletions sys/default/server/projects/Zodiac.ston
@@ -0,0 +1,11 @@
TDObjectGatewayLeafNode{#name:'Zodiac',#contents:'| repoSpec gitCheckout |
gitCheckout := GsFile _expandEnvVariable: \'GS_SHARED_GIT_CHECKOUT_ZODIAC\' isClient: false.
repoSpec := GsFile _expandEnvVariable: \'GS_SHARED_REPO_ZODIAC\' isClient: false.
^ TDProjectSpecEntryDefinition new
baseline: \'Zodiac\'
repository: repoSpec
loads: #(\'Core\' \'Tests\' \'Extras\');
gitCheckout: gitCheckout;
status: #(#\'inactive\');
locked: true;
yourself'}

0 comments on commit 6bccca3

Please sign in to comment.