Skip to content

Commit

Permalink
Merge pull request #297 from dalehenrich/appEnv_dev
Browse files Browse the repository at this point in the history
New features and bugfixes
  • Loading branch information
dalehenrich committed Nov 16, 2017
2 parents 3258818 + d655488 commit 99cdd71
Show file tree
Hide file tree
Showing 1,371 changed files with 9,624 additions and 1,152 deletions.
23 changes: 23 additions & 0 deletions .client.smalltalk.ston
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
SmalltalkCISpec {
#loading : [
SCIMetacelloLoadSpec {
#baseline : 'Tode',
#load : [ 'GemStone', 'Rewrite' ],
#directory : 'repository',
#onWarningLog : true,
#platforms : [ #gemstone ]
},
SCIMetacelloLoadSpec {
#baseline : 'Tode',
#load : [ 'CI' ],
#directory : 'repository',
#onWarningLog : true,
#platforms : [ #pharo ]
}
],
#testing : {
#exclude : {
#categories : [ 'Tode-Server-*', 'Topez-Server-*', 'Tode-GemStone-Server-*' ]
}
}
}
7 changes: 5 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ smalltalk:
- GemStone-3.2.17
- GemStone-3.3.6

env:
- GSCI_CLIENTS="Pharo-3.0"

before_script:
# 'project new' command tests need this
- git config --global user.email "you@example.com"
Expand All @@ -22,10 +25,10 @@ before_script:
matrix:
include:
# Do only one build on osx
- smalltalk: GemStone-3.3.0
- smalltalk: GemStone-3.3.3
os: osx
- smalltalk_config: .minimal.smalltalk.ston
smalltalk: GemStone-3.3.0
smalltalk: GemStone-3.3.3
env: GSCI_CLIENTS="Pharo-5.0"
allow_failures:
- os: osx
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ baseline: spec
with: #('GemStone' 'Common Tests' 'GemStone Tests');
group: 'Common-Core' with: #('Topez-Common-Core');
group: 'Pharo Dev' with: #('Pharo' 'Common Tests');
group: 'CI' with: #('GemStone Tests');
yourself ].
spec
for: #'pharo1.4.x'
Expand All @@ -97,7 +98,7 @@ baseline: spec
package: 'Tode-Pharo14' with: [ spec requires: 'Topez-Pharo-Common' ];
yourself ].
spec
for: #'pharo5.x'
for: #(#'pharo5.x' #'pharo6.x')
do: [
spec
baseline: 'GemStoneGCI'
Expand Down Expand Up @@ -195,6 +196,7 @@ baseline: spec
group: 'GemStone Dev' with: #('GemStone' 'GemStone Tests');
group: 'Rewrite' with: #('Tode-BatchEdit-Tool');
group: 'CI' with: #('GemStone' 'GemStone Tests' 'Rewrite');
group: 'Remote Server' with: #();
yourself ].
spec
for: #'gs2.4.x'
Expand Down Expand Up @@ -240,9 +242,11 @@ baseline: spec
package: 'Topez-Server-31x-Tests'
with: [ spec requires: 'Topez-Server-Tests' ];
package: 'Tode-GemStone-Server-Core'
with: [ spec includes: #('Tode-GemStone-Core3x') ];
with: [ spec includes: #('Tode-GemStone-Core3x' 'Topez-GemStone-Server-3x-Core') ];
package: 'Tode-GemStone-Core3x'
with: [ spec requires: #('Tode-GemStone-Server-Core') ];
package: 'Topez-GemStone-Server-3x-Core'
with: [ spec requires: #('Topez-Server-Core' 'Tode-GemStone-Server-Core') ];
package: 'Tode-GemStone-Server-Tests'
with: [ spec includes: #('Tode-GemStone-Server3x-Tests') ];
package: 'Tode-GemStone-Server3x-Tests'
Expand Down Expand Up @@ -284,20 +288,52 @@ baseline: spec
with: [ spec requires: 'Topez-Server-Core' ];
yourself ].
spec
for: #(#'gs3.3.x' #'gs3.4.x')
for: #(#'gs3.3.x')
do: [
spec
package: 'Tode-GemStone-Remote-Server'
with: [ spec includes: 'Tode-GemStone-Remote330-Server' ];
package: 'Tode-GemStone-Remote330-Server'
with: [ spec requires: 'Tode-GemStone-Remote-Server' ];
yourself ].
spec
for: #(#'gs3.4.x' #'gs3.5.x' #'gs3.6.x')
do: [
spec
package: 'Tode-GemStone-Remote-Server'
with: [ spec includes: 'Tode-GemStone-Remote340-Server' ];
package: 'Tode-GemStone-Remote340-Server'
with: [ spec requires: 'Tode-GemStone-Remote-Server' ];
yourself ].
spec
for: #(#'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x')
do: [
spec
package: 'Tode-GemStone-Server-Core'
with: [ spec includes: 'Topez-GemStone-Server-33x-Core' ];
package: 'Topez-GemStone-Server-33x-Core'
with: [ spec requires: 'Tode-GemStone-Server-Core' ];
with: [ spec requires: #('Tode-GemStone-Server-Core' 'Topez-GemStone-Server-3x-Core') ];
package: 'Topez-Server-Core'
with: [ spec includes: 'Topez-Server-33x-Core' ];
package: 'Topez-Server-33x-Core'
with: [ spec requires: 'Topez-Server-Core' ];
package: 'Tode-Remote-Server';
package: 'Tode-GemStone-Remote-Server'
with: [ spec requires: #('Topez-Server-DebugTools' 'Topez-GemStone-Server-33x-Core') ];
yourself.
spec
group: 'GemStone'
with: #('Tode-Remote-Server' 'Tode-GemStone-Remote-Server');
group: 'Remote Server' with: #('Tode-Remote-Server');
yourself ].
spec
for: #(#'gs643.4.x' #'gs643.5.x' #'gs643.6.x')
do: [
spec
package: 'Tode-Remote-Server';
yourself ].
spec
for: #(#'gs3.1.x' #'gs3.2.x' #'gs3.3.x' #'gs3.4.x')
for: #(#'gs3.1.x' #'gs3.2.x' #'gs3.3.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x')
do: [
spec
package: 'Topez-Server-DebugTools'
Expand All @@ -307,7 +343,7 @@ baseline: spec
yourself ].
spec
for:
#(#'gs3.3.1.x' #'gs3.3.2.x' #'gs3.3.3.x' #'gs3.3.4.x' #'gs3.3.5.x' #'gs3.3.6.x' #'gs3.3.7.x' #'gs3.4.x')
#(#'gs3.3.1.x' #'gs3.3.2.x' #'gs3.3.3.x' #'gs3.3.4.x' #'gs3.3.5.x' #'gs3.3.6.x' #'gs3.3.7.x' #'gs3.4.x' #'gs3.5.x' #'gs3.6.x')
do: [
spec
package: 'Tode-GemStone-Core331x'
Expand All @@ -324,4 +360,4 @@ baseline: spec
yourself.
spec
package: 'Topez-Common-Core'
with: [ spec includes: 'Topez-MagLev-Core' ] ]
with: [ spec includes: 'Topez-MagLev-Core' ] ]
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@ initialization
pharo30InstallTodeClient
"setup paths"

Deprecation
perform: #'showWarning:' with: false;
perform: #'raiseWarning:' with: false.
Smalltalk
at: #'Deprecation'
ifPresent: [ :cls |
cls
perform: #'showWarning:' with: false;
perform: #'raiseWarning:' with: false ].
(Smalltalk os environment
at: 'GS_HOME'
ifAbsent: [
Expand All @@ -14,6 +17,4 @@ pharo30InstallTodeClient
(Smalltalk os environment at: 'GS_HOME' ifAbsent: [ ])
ifNotNil: [ :todeRoot |
"support for GsDevKit_home"
(Smalltalk at: #'TDShell')
perform: #'todeRoot:'
with: todeRoot ]
(Smalltalk at: #'TDShell') perform: #'todeRoot:' with: todeRoot ]
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"class" : {
},
"instance" : {
"baseline:" : "dkh 04/13/2017 13:03",
"baseline:" : "dkh 10/18/2017 10:47",
"initializeTools" : "dkh 06/06/2013 11:59",
"pharo30InstallFullTodeClient" : "dkh 05/16/2016 14:51",
"pharo30InstallTodeClient" : "dkh 10/10/2015 16:36" } }
"pharo30InstallTodeClient" : "dkh 10/18/2017 10:50" } }
2 changes: 1 addition & 1 deletion repository/BaselineOfTode.package/monticello.meta/version

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
API-non-blocking
apiGciNbStep: anOopType a: level a: through
" * level 0 means step-into semantics starting from top of stack
* 1 means step-over semantics starting from top of stack
* > 1 means step-over semantics from specified level on stack.
*
* level < 0 or (level > GciPerform(aProcess, stackDepth, NULL, 0))
* will generate an error
*
* through == TRUE and level == 1 gives step through semantics, stopping
* in blocks for which top of stack frame is home method
*
*"
<apicall: OopType64 'GciNbStep_' (OopType64 long long) >
^self externalCallFailed
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"apiGciNbPerformNoDebug:a:a:a:a:" : "dkh 9/29/2012 10:16",
"apiGciNbPerformNoDebug:a:a:a:a:a:" : "dkh 3/30/2013 10:54",
"apiGciNbStep:a:" : "dkh 9/29/2012 15:01",
"apiGciNbStep:a:a:" : "dkh 12/21/2016 14:12",
"apiGciNewByteObj:a:a:" : "dkh 4/14/2008 14:46",
"apiGciNewString:" : "JGF 4/13/2007 16:15",
"apiGciNewSymbol:" : "JGF 4/13/2007 16:15",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
as yet unclassified
isClassForVersion: aString
^ (aString beginsWith: '3.3') or: [ aString beginsWith: '3.4' ]
^ ((aString beginsWith: '3.3') or: [ aString beginsWith: '3.4' ]) or: [ aString beginsWith: '3.5' ]
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"class" : {
"isClassForVersion:" : "dkh 12/21/2015 16:13" },
"isClassForVersion:" : "dkh 10/25/2017 10:33" },
"instance" : {
} }

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
public gci calls
stepThroughWith: processObj level: level
"level = 0 step into
level = 1 step over from top of stack
level > 1 step over from level on stack"

| result |
self class gsCursor
showWhile: [
result := self library
critical: [ :lib |
lib apiGciSetSessionId: self getSessionNumber.
lib apiGciNbStep: (self asOopType: processObj) a: level a: 1 ].
result := self getNbResultAsOop.
^ self library localFor: result ]
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
"softBreak" : "dkh 1/5/2013 11:46",
"stepIntoWith:" : "dkh 9/29/2012 09:57",
"stepOverWith:" : "dkh 9/29/2012 09:57",
"stepThroughWith:level:" : "dkh 12/21/2016 14:13",
"stepWith:level:" : "dkh 1/10/2013 08:13",
"stoneHost" : "JGF 4/2/2007 15:35",
"stoneNRS:" : "JGF 1/31/2007 14:58",
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ replaceMatchWith: replacementString topez: topez
copyReplaceFrom: matchingRange _from
to: matchingRange _to
with: replacementString.
self theBehavior
self
compile: newSource withGemstoneLineEndings
classified: self methodCategory.
matchingRanges := nil.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
"matchIndex" : "dkh 08/14/2013 23:14",
"matchingRange" : "dkh 08/14/2013 23:15",
"matchingRanges" : "dkh 08/14/2013 23:13",
"replaceMatchWith:topez:" : "dkh 10/10/2013 05:04",
"replaceMatchWith:topez:" : "dkh 09/23/2016 09:57",
"selectNextMatch:" : "dkh 08/15/2013 00:18" } }
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ asBatchEditorDefinitionFor: aBatchEditor
messagePattern: self messagePattern
messagePatternIsRegex: self messagePatternIsRegex)
batchEditor: aBatchEditor;
appEnv: self appEnv;
yourself
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"class" : {
},
"instance" : {
"asBatchEditorDefinitionFor:" : "dkh 08/15/2013 07:25" } }
"asBatchEditorDefinitionFor:" : "dkh 10/31/2017 15:55" } }
Original file line number Diff line number Diff line change
@@ -1 +1 @@
(name 'Tode-BatchEdit-Tool-dkh.4' message 'Issue #121: better label on renamed class reference definition window ... ALT-o in protocol window with nothing selected was not pretty either' id 'ebf2ff43-3604-4aa7-8e1a-c90f896f31f3' date '10/22/2015' time '19:46:25' author 'dkh' ancestors ((name 'Tode-BatchEdit-Tool-dkh.3' message 'Issue #74: all class-related menu items implemented' id '36661d15-d1ae-4e9a-a943-f007b739ac57' date '07/08/2014' time '10:20:20' author 'dkh' ancestors ((name 'Tode-BatchEdit-Tool-dkh.2' message 'Issue #75: rip up all of the old keyboard block support' id '65331077-c922-44d5-bb55-e15ba56e4537' date '06/18/2014' time '17:08:42' author 'dkh' ancestors ((name 'Tode-BatchEdit-Tool-dkh.1' message '- split TDBatchEditTool and friends into separate package ... this is a useful tool, but it needs to be re-written a bit before it becomes part of standard tool set ...' id '14340a92-64e6-47e7-b3ee-ba4e7ff1b2fb' date '04/26/2014' time '08:26:35' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
(name 'Tode-BatchEdit-Tool-dkh.6' message 'support for browsing methods (and perhaps all method-based browsing) using the current applicationEnvironment ...' id '7ffcd1da-c104-467e-801a-6c4ebe9bc7e4' date '10/31/2017' time '16:32:45' author 'dkh' ancestors ((name 'Tode-BatchEdit-Tool-dkh.5' message 'make arrangements to be able to add/remove methods to/from classes defined in another users symbolList ... using remote sessions to do the compile and removal' id 'c63dcf1a-961d-4a0b-a9af-0d3e12950fab' date '09/23/2016' time '10:54:39' author 'dkh' ancestors ((name 'Tode-BatchEdit-Tool-dkh.4' message 'Issue #121: better label on renamed class reference definition window ... ALT-o in protocol window with nothing selected was not pretty either' id 'ebf2ff43-3604-4aa7-8e1a-c90f896f31f3' date '10/22/2015' time '19:46:25' author 'dkh' ancestors ((name 'Tode-BatchEdit-Tool-dkh.3' message 'Issue #74: all class-related menu items implemented' id '36661d15-d1ae-4e9a-a943-f007b739ac57' date '07/08/2014' time '10:20:20' author 'dkh' ancestors ((name 'Tode-BatchEdit-Tool-dkh.2' message 'Issue #75: rip up all of the old keyboard block support' id '65331077-c922-44d5-bb55-e15ba56e4537' date '06/18/2014' time '17:08:42' author 'dkh' ancestors ((name 'Tode-BatchEdit-Tool-dkh.1' message '- split TDBatchEditTool and friends into separate package ... this is a useful tool, but it needs to be re-written a bit before it becomes part of standard tool set ...' id '14340a92-64e6-47e7-b3ee-ba4e7ff1b2fb' date '04/26/2014' time '08:26:35' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"sessionDescription:debugMode:" : "dkh 7/25/2014 16:46",
"sessionDescription:evaluate:" : "dkh 7/25/2014 10:17",
"sessionDescription:evaluate:debugMode:" : "dkh 2/21/2015 10:35",
"startUp:" : "dkh 11/4/2015 18:23",
"startUp:" : "dkh 3/21/2015 20:02",
"testLogin:" : "dkh 10/2/2015 10:11",
"testLoginForSessionDescription:" : "dkh 4/12/2014 08:51",
"testWindowLayout:" : "dkh 10/2/2015 10:11",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
as yet unclassified
dbStepThrough: level forProcessOop: processOop
[ ^ self handleDebugExceptionsDuring: [ self session stepThroughWith: (self session asOopType: processOop) level: level ] ]
on: GsClientForwarderSendNotification
do: [ :ex |
| result |
result := ex performSendNoForwarder: [ ].
^ ex resume: (Array with: #resume with: result) ]
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"currentWindowId:" : "dkh 1/26/2013 09:58",
"dbContinue:" : "dkh 1/11/2014 14:27",
"dbStep:forProcessOop:" : "dkh 1/11/2014 15:43",
"dbStepThrough:forProcessOop:" : "dkh 12/21/2016 14:15",
"deleteWindowAt:" : "dkh 10/19/2013 11:19",
"editClientElement:" : "dkh 12/30/2015 12:30",
"editElement:aspect:label:inWindow:at:" : "dkh 8/17/2015 16:25",
Expand All @@ -43,7 +44,7 @@
"nextAvailableWindowId" : "dkh 11/26/2012 15:04",
"objectSerializer" : "dkh 6/25/2015 15:17",
"objectSerializer:" : "dkh 6/25/2015 15:18",
"openDebugger" : "dkh 4/30/2016 07:45",
"openDebugger" : "dkh 2/4/2013 14:36",
"openDebuggerMessage" : "dkh 3/29/2013 15:07",
"postCopy" : "dkh 3/29/2013 15:17",
"proxyBehaviorClass" : "dkh 5/28/2013 13:27",
Expand Down

Large diffs are not rendered by default.

Loading

0 comments on commit 99cdd71

Please sign in to comment.