Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v0.2.0 - demarcation point between gsDevKitHome and GsDevKit_home #222

Merged
merged 52 commits into from
Oct 13, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
3e7ca99
moving towards installing only tODE on client - command line tools sh…
dalehenrich Sep 22, 2015
7ae065d
add support for GsDevKit_home ... new location for tode/sys/default|l…
dalehenrich Sep 22, 2015
0092855
add support for GsDevKit_home ... new location for tode/sys/default|l…
dalehenrich Sep 22, 2015
216a995
add support for GsDevKit_home ... new location for tode/sys/default|l…
dalehenrich Sep 22, 2015
14ef63a
fix up usave of GS_DHARED_TODE
dalehenrich Sep 22, 2015
5ce9bf1
correct path the GemTalk Systems logo
dalehenrich Sep 22, 2015
6785f69
make jigsaw-medium the default window layout
dalehenrich Sep 22, 2015
d25df29
add Common-Core group for use by TodeClient (minimal tODE install) ..…
dalehenrich Sep 24, 2015
f585f6d
move postLoadDoIt to 'Tode-Client-Common' - cross fingers
dalehenrich Sep 24, 2015
235dc13
partition post load doits, into a doit that defines the tode and clie…
dalehenrich Sep 24, 2015
5b9cdaf
add `batch edit` menu item to method lists ... specify a regex and re…
dalehenrich Sep 26, 2015
f17faa8
set Consolas as the default mono font on windows
dalehenrich Sep 26, 2015
93bb7ab
add TDSessionDescription class>>convertPathFromEnvironmentForOS: for …
dalehenrich Sep 28, 2015
2c8fd49
turns out TDSessionDescription class>>convertPathFromEnvironmentForOS…
dalehenrich Sep 28, 2015
af3ae13
TDSessionDescription>>osUserId now answers the value of User env var …
dalehenrich Sep 29, 2015
73ae39c
add netldiPort and netldiPortRange fields to TDSessionDescription
dalehenrich Sep 29, 2015
eef2f50
TDAbstractDevTool>>performOnServer:logging: moved to tode-gemstone-co…
dalehenrich Sep 29, 2015
38aa4fd
adjust the gemNRS for TDSessionDescription when netLDIPort is present…
dalehenrich Sep 29, 2015
73675a4
add TDMetacelloToolProjectLoadSpec to eliminate the need for TDMetace…
dalehenrich Sep 29, 2015
12b7316
fix typos and other infant mortality for TDMetacelloToolProjectLoadSpec
dalehenrich Sep 29, 2015
02e7744
look to get the tests passing again
dalehenrich Sep 29, 2015
5527e79
no need for tag matching for ston and tode ... v0.9.4 it is
dalehenrich Sep 30, 2015
ef7a108
skip todeClient initialization if GS_HOME is not defined in environment
dalehenrich Sep 30, 2015
2682e4a
in order to allow a tode client to login to an old stone, it is neces…
dalehenrich Oct 1, 2015
3db65d7
add --all option to `project list` command ... the default `project l…
dalehenrich Oct 2, 2015
3fbc3f8
move the edit methods to a client-side package
dalehenrich Oct 2, 2015
412514b
changes to support new location of the session descriptions: GS_SHARE…
dalehenrich Oct 2, 2015
af43158
exclude snapshotDirectory for TDSessionDescription to support Tode v0…
dalehenrich Oct 2, 2015
a160d6e
Issue #213: ignore REAME* and .* files in session descriptions directory
dalehenrich Oct 2, 2015
69497e5
need trailing / for TDShell class>>gsDevKitSessionDescriptionPath
dalehenrich Oct 2, 2015
e03978a
fix bug in `project load`
dalehenrich Oct 5, 2015
21e1f19
fix another bug in `project load`
dalehenrich Oct 5, 2015
b8c6196
undefined symbol elimination
dalehenrich Oct 5, 2015
d0a62ee
fix `test image`
dalehenrich Oct 6, 2015
f0db28c
clean up more undefined globals and TDAbstractDevTool>>performOnServe…
dalehenrich Oct 6, 2015
821fdee
fiddle with TDSessionDescript template editting
dalehenrich Oct 6, 2015
7955397
more progress against sent but not implemented
dalehenrich Oct 6, 2015
116dc8a
when exporting TDSessionDescription to disk, include netLDIPort and n…
dalehenrich Oct 6, 2015
4b7fb7c
tweak the `git mergetool` for recent changes to performOnServer...(re…
dalehenrich Oct 7, 2015
b52fe3d
TDGemToolTool>>gemtoolbuRestore was doing a backup not a restore .. b…
dalehenrich Oct 8, 2015
caf6615
bump cientAPIVersion to 1.2.0 ... added new instance variables to TDS…
dalehenrich Oct 9, 2015
c6eac8b
when client-side debugMode is enabled, give developer the option of o…
dalehenrich Oct 9, 2015
4a6c135
update todeServerAPIVersion as this version supports the additional i…
dalehenrich Oct 9, 2015
892a9c7
fix mistake in TDTopezServer class>>todeServerAPIVersionString
dalehenrich Oct 9, 2015
add8c21
twas a bit to aggressive in the `git mergetool` change in 4b7fb7c
dalehenrich Oct 9, 2015
39d9eab
fix typo in BaselineOfTode>>pharo30InstallFullTodeClient
dalehenrich Oct 10, 2015
8eb6eba
adjust location of todeClientRoot with new _sys_local module
dalehenrich Oct 10, 2015
1ca8bd5
another typo in BaselineOfTode>>pharo30InstallFullTodeClient
dalehenrich Oct 10, 2015
f051b68
todeClientRoot and todeRoot are now the same now that I've returned t…
dalehenrich Oct 10, 2015
57ca16b
adjust TDShell class>>gsDevKitSessionDescriptionPath for new (old) sy…
dalehenrich Oct 10, 2015
db01f81
use GS_SYS_SESSIONS env var for session description home
dalehenrich Oct 11, 2015
1e5b554
fine tune the filter for `project list`
dalehenrich Oct 11, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ baseline: spec
do: [
spec
baseline: 'Ston'
with: [ spec repository: 'github://GsDevKit/ston:v0.9.?/repository' ];
with: [ spec repository: 'github://GsDevKit/ston:v0.9.4/repository' ];
yourself.
spec
package: 'Topez-Common-Core' with: [ spec requires: #('Ston') ];
Expand Down Expand Up @@ -54,9 +54,15 @@ baseline: spec
postLoadDoIt: #'initializeTools';
requires: #('Topez-Server-Core') ];
package: 'Tode-Client-Common'
with: [ spec requires: #('Topez-Common-Core' 'Topez-Pharo-Common') ];
with: [
spec
postLoadDoIt: #'pharo30InstallTodeClient';
requires: #('Topez-Common-Core' 'Topez-Pharo-Common') ];
package: 'Topez-Client-GemStone'
with: [ spec requires: #('GemTools-ClientGCI' 'Tode-Client-Common') ];
with: [
spec
postLoadDoIt: #'pharo30InstallFullTodeClient';
requires: #('GemTools-ClientGCI' 'Tode-Client-Common') ];
package: 'Tode-Client-Pharo'
with: [ spec requires: #('Tode-Client-Common') ];
package: 'Tode-Client-ServerBlocks'
Expand All @@ -72,6 +78,7 @@ baseline: spec
group: 'GemStone Tests' with: #('Topez-ClientTravis-Tests');
group: 'GemStone Dev'
with: #('GemStone' 'Common Tests' 'GemStone Tests');
group: 'Common-Core' with: #('Topez-Common-Core');
group: 'Pharo Dev' with: #('Pharo' 'Common Tests');
yourself ].
spec
Expand All @@ -96,13 +103,7 @@ baseline: spec
spec
package: 'Tode-Client-Roassal2'
with: [ spec requires: #('Tode-Client-ServerBlocks') ];
package: 'TPZ-Talk'
with: [
spec
requires: #('Ston' 'Roassal2');
repository:
'http://smalltalkhub.com/mc/PierreChanson/TPZ-Talk/main' ];
group: 'Visualize' with: #('TPZ-Talk' 'Tode-Client-Roassal2');
group: 'Visualize' with: #('Tode-Client-Roassal2' 'GemStone');
yourself ].
spec
for: #'gemstone'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
baseline
initialization
initializeTools
Smalltalk at: #'TDStandardTool' ifPresent: [ :cls | cls initializeTools ]
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
initialization
pharo30InstallFullTodeClient
| monoFontName windowProperties bounds |
Smalltalk at: #'TODE_CLIENT_INSTALLED' ifPresent: [ ^ self ].
Smalltalk os environment
at: 'GS_HOME'
ifAbsent: [
"Cannot initialize correctly if $GS_HOME is not defined correctly"
^ self ].
self pharo30InstallTodeClient.
(Smalltalk at: #'World') perform: #'closeAllWindowsDiscardingChanges'. "close all windows"
(Smalltalk at: #'PolymorphSystemSettings')
perform: #'desktopLogoFileName:'
with:
(((Smalltalk at: #'FileSystem') perform: #'workingDirectory')
/ 'GemTalkSystemsLogo.png') pathString.
(Smalltalk at: #'TaskbarMorph') perform: #'showTaskbar:' with: false.
(Smalltalk at: #'NECPreferences') perform: #'enabled:' with: false.
Smalltalk at: #'TODE_CLIENT_INSTALLED' put: true.
(Smalltalk at: #'TDShell') perform: #'resetWorldMenu'.
(Smalltalk at: #'FreeTypeFontProvider') current perform: #'updateFromSystem'.
monoFontName := 'Courier New'. "Windows"
(Smalltalk os perform: #'isUnix')
ifTrue: [ monoFontName := 'DejaVu Sans Mono' ]
ifFalse: [
(Smalltalk os perform: #'isMacOSX')
ifTrue: [ monoFontName := 'Monaco' ]
ifFalse: [
"Windows"
monoFontName := 'Consolas' ] ].
(Smalltalk at: #'StandardFonts')
defaultFont:
((Smalltalk at: #'LogicalFont')
perform: #'familyName:pointSize:'
with: monoFontName
with: 8).
(Smalltalk at: #'StandardFonts')
perform: #'setAllStandardFontsTo:'
with: ((Smalltalk at: #'StandardFonts') perform: #'defaultFont').
windowProperties := (Smalltalk at: #'TDAbstractWindowProperties')
import: 'jigsaw-medium'.
windowProperties installOn: (Smalltalk at: #'TDTopezGemStoneClient').
bounds := (windowProperties perform: #'caculateWindowBounds') at: #'transcript'.
(Smalltalk at: #'TDShell') perform: #'resizeTranscript:' with: bounds
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
initialization
pharo30InstallTodeClient
"setup paths"

Deprecation
perform: #'showWarning:' with: false;
perform: #'raiseWarning:' with: false.
(Smalltalk os environment
at: 'GS_HOME'
ifAbsent: [
"Cannot initialize correctly if $GS_HOME is not defined correctly"
^ self ])
ifNotNil: [ :gs_home | (Smalltalk at: #'TDShell') perform: #'devKitRoot:' with: gs_home ].
(Smalltalk os environment at: 'GS_HOME' ifAbsent: [ ])
ifNotNil: [ :todeRoot |
"support for GsDevKit_home"
(Smalltalk at: #'TDShell')
perform: #'todeRoot:'
with: todeRoot ]
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,7 @@
"class" : {
},
"instance" : {
"baseline:" : "dkh 06/26/2015 14:21",
"initializeTools" : "dkh 06/06/2013 11:59" } }
"baseline:" : "dkh 09/29/2015 17:22",
"initializeTools" : "dkh 06/06/2013 11:59",
"pharo30InstallFullTodeClient" : "dkh 10/10/2015 16:30",
"pharo30InstallTodeClient" : "dkh 10/10/2015 16:36" } }
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SystemOrganization addCategory: #'BaselineOfTode'!
SystemOrganization addCategory: #BaselineOfTode!
46 changes: 1 addition & 45 deletions repository/BaselineOfTode.package/monticello.meta/version

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
template
*Tode-Client-Common
editTemplate
| stream |
stream := WriteStream on: String new.
Expand All @@ -7,5 +7,5 @@ editTemplate
cr;
nextPutAll: '('.
self editTemplateOn: stream.
stream nextPutAll: ') exportTo: TDShell todeSysLocalSessionDescriptionPath.'.
stream nextPutAll: ') exportTo: TDShell gsDevKitSessionDescriptionPath.'.
^ stream contents
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
template
*Tode-Client-Common
editTemplateOn: stream
stream
nextPutAll: self class name asString;
Expand Down Expand Up @@ -39,6 +39,18 @@ editTemplateOn: stream
tab;
nextPutAll: 'netLDI: ' , self netLDI printString;
nextPut: $;.
stream
cr;
tab;
nextPutAll: 'netLDIPort: ' , self netLDIPort printString;
nextPut: $;.
netLDIPortRange notNil
ifTrue: [
stream
cr;
tab;
nextPutAll: 'netLDIPortRange: ' , self netLDIPortRange printString;
nextPut: $; ].
(gemTask notNil and: [ gemTask isEmpty not ])
ifTrue: [
stream
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"class" : {
},
"instance" : {
"editTemplate" : "dkh 10/2/2015 10:12",
"editTemplateOn:" : "dlh 10/5/2015 20:58" } }
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{
"name" : "TDSessionDescription" }
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
instance creation
forSessionNamed: aSessionName
| sessionDescription |
sessionDescription := TDSessionDescription importFrom: self todeSysLocalSessionDescriptionPath , aSessionName.
sessionDescription := TDSessionDescription importFrom: self gsDevKitSessionDescriptionPath , aSessionName.
^ self new
sessionDescription: sessionDescription;
batchMode: true;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
home
gsDevKitSessionDescriptionPath
^ (Smalltalk os environment
at: 'GS_SYS_SESSIONS'
ifAbsent: [
| clientDescriptionsPath "allow new client to connect to an old gsDevKitHome structure" |
clientDescriptionsPath := 'client/descriptions/'.
self useTodeSys
ifTrue: [ ^ self todeClientSysLocalPath , clientDescriptionsPath ].
^ self todeRoot , '/' , clientDescriptionsPath ]) , '/'
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
as yet unclassified
home
lookupPharoScript: scriptFilename
{(self todeSysLocalPharoPath).
(self todeSysDefaultPharoPath)}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
instance creation
open: aSessionName
^ self openFrom: self todeSysLocalSessionDescriptionPath, aSessionName
^ self openFrom: self gsDevKitSessionDescriptionPath, aSessionName
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
as yet unclassified
home-private
pharoPath
^ 'pharo/'
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
testing
testLogin: aSessionName
| sessionDescription |
sessionDescription := TDSessionDescription importFrom: self todeSysLocalSessionDescriptionPath , aSessionName.
sessionDescription := TDSessionDescription importFrom: self gsDevKitSessionDescriptionPath , aSessionName.
^ self testLoginForSessionDescription: sessionDescription
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
testing
testWindowLayout: aSessionName
| sessionDescription shell|
sessionDescription := TDSessionDescription importFrom: self todeSysLocalSessionDescriptionPath , aSessionName.
sessionDescription := TDSessionDescription importFrom: self gsDevKitSessionDescriptionPath , aSessionName.
shell := self new.
shell openOnSessionDescription: sessionDescription.
shell evaluate: 'bin/halt'.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
home-private
todeClientRoot: aString
TodeClientRoot := aString.
self resetWorldMenu
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
client
todeClientRoot
TodeClientRoot ifNil: [ ^ self todeRoot ].
^ TodeClientRoot
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
client
todeClientSysDefaultPath
^self todeClientSysPath , '/default/'
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
client
todeClientSysLocalPath
^self todeClientSysPath , '/local/'
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
client
todeClientSysPath
^self todeClientRoot , '/sys/'
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ system menu
todeMenuCommandOn: aBuilder
<todeWorldMenu>
| sessionDescriptionDir |
sessionDescriptionDir := self todeSysLocalSessionDescriptionPath asFileReference.
sessionDescriptionDir := self gsDevKitSessionDescriptionPath asFileReference.
sessionDescriptionDir exists
ifTrue: [
(aBuilder item: #'Open Shell')
Expand All @@ -16,7 +16,7 @@ todeMenuCommandOn: aBuilder
target: self;
icon: Smalltalk ui icons configIcon;
enabled: currentShell isNil.
(aBuilder item: #'Workspace')
(aBuilder item: #Workspace)
parent: #'Open Tool';
order: 2.0;
target: self;
Expand All @@ -35,5 +35,7 @@ todeMenuCommandOn: aBuilder
target: self.
(sessionDescriptionDir files sorted: [ :a :b | a basename <= b basename ])
do: [ :file |
file basename = 'README.md'
| base |
base := file basename.
((base beginsWith: 'README') or: [ base beginsWith: '.' ])
ifFalse: [ self importSessionDescriptionFrom: file for: aBuilder ] ] ]

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
home
todeSysDefaultClientScriptsPath
^self todeSysDefaultPath , self clientScriptsPath
^self todeClientSysDefaultPath , self clientScriptsPath

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
as yet unclassified
home
todeSysDefaultPharoPath
^self todeSysDefaultPath , self pharoPath
^self todeClientSysDefaultPath , self pharoPath
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
home
todeSysDefaultServerScriptsPath
^self todeSysDefaultPath , self serverScriptsPath
^ self todeClientSysDefaultPath , self serverScriptsPath
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
home
todeSysDefaultWindowLayoutPath
^self todeSysDefaultPath , self windowLayoutPath
^self todeClientSysDefaultPath , self windowLayoutPath
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
home
todeSysLocalClientScriptsPath
^self todeSysLocalPath , self clientScriptsPath
^self todeClientSysLocalPath , self clientScriptsPath

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
as yet unclassified
home
todeSysLocalPharoPath
^self todeSysLocalPath , self pharoPath
^self todeClientSysLocalPath , self pharoPath
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
home
todeSysLocalServerScriptsPath
^self todeSysLocalPath , self serverScriptsPath
^ self todeClientSysLocalPath , self serverScriptsPath

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
home
todeSysLocalWindowLayoutPath
^self todeSysLocalPath , self windowLayoutPath
^self todeClientSysLocalPath , self windowLayoutPath
Loading