From 83fa9bd1367ccfac232639fed5d43be466f71d8a Mon Sep 17 00:00:00 2001 From: Jenkins Build Server Date: Mon, 11 May 2015 14:42:08 +0200 Subject: [PATCH] 50043 ConfigurationOfRubric http://files.pharo.org/image/50/50043.zip --- .../symbolic versions/development_.st | 4 ++- .../instance/symbolic versions/stable_.st | 5 +++- .../instance/versions/version123_.st | 17 +++++++++++ .../instance/versions/version124_.st | 14 +++++++++ .../symbolic versions/development_.st | 1 + .../instance/symbolic versions/stable_.st | 3 +- .../instance/versions/version313_.st | 30 +++++++++++++++++++ .../instance/symbolic versions/stable_.st | 2 ++ .../class/accessing/shutDown_.st | 8 +++-- .../instance/accessing/stepModel_.st | 2 +- .../initialization/initializeListeners.st | 2 +- .../RPackage/instance/spotterActDefault.st | 2 +- .../{script651.st => script50043.st} | 6 ++-- .../instance/pharo - updates/update50042.st | 15 ---------- .../instance/pharo - updates/update50043.st | 20 +++++++++++++ .../public/commentForCurrentUpdate.st | 15 ++++------ .../instance/code generation/emitStore_.st | 2 +- .../instance/code generation/emitStore_.st | 2 +- .../instance/code generation/emitStore_.st | 2 +- 19 files changed, 113 insertions(+), 39 deletions(-) create mode 100644 ConfigurationOfGTSpotter.package/ConfigurationOfGTSpotter.class/instance/versions/version123_.st create mode 100644 ConfigurationOfGTSpotter.package/ConfigurationOfGTSpotter.class/instance/versions/version124_.st create mode 100644 ConfigurationOfGlamourCore.package/ConfigurationOfGlamourCore.class/instance/versions/version313_.st rename ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/{script651.st => script50043.st} (99%) delete mode 100644 ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50042.st create mode 100644 ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50043.st diff --git a/ConfigurationOfGTSpotter.package/ConfigurationOfGTSpotter.class/instance/symbolic versions/development_.st b/ConfigurationOfGTSpotter.package/ConfigurationOfGTSpotter.class/instance/symbolic versions/development_.st index 887b8e0490..c1328d17fb 100644 --- a/ConfigurationOfGTSpotter.package/ConfigurationOfGTSpotter.class/instance/symbolic versions/development_.st +++ b/ConfigurationOfGTSpotter.package/ConfigurationOfGTSpotter.class/instance/symbolic versions/development_.st @@ -2,4 +2,6 @@ development: spec spec for: #'common' version: '1.2-baseline'. - spec for: #'pharo3.x' version: '1.0.4' + + spec for: #'pharo3.x' version: '1.0.4'. + spec for: #'pharo4.x' version: '1.2-baseline'. diff --git a/ConfigurationOfGTSpotter.package/ConfigurationOfGTSpotter.class/instance/symbolic versions/stable_.st b/ConfigurationOfGTSpotter.package/ConfigurationOfGTSpotter.class/instance/symbolic versions/stable_.st index 10f5640c3c..044e6f643c 100644 --- a/ConfigurationOfGTSpotter.package/ConfigurationOfGTSpotter.class/instance/symbolic versions/stable_.st +++ b/ConfigurationOfGTSpotter.package/ConfigurationOfGTSpotter.class/instance/symbolic versions/stable_.st @@ -1,5 +1,8 @@ stable: spec - spec for: #'pharo4.x' version: '1.2.2'. + spec for: #'common' version: '1.2.4'. + spec for: #'pharo3.x' version: '1.0.4'. + + spec for: #'pharo4.x' version: '1.2.4'. diff --git a/ConfigurationOfGTSpotter.package/ConfigurationOfGTSpotter.class/instance/versions/version123_.st b/ConfigurationOfGTSpotter.package/ConfigurationOfGTSpotter.class/instance/versions/version123_.st new file mode 100644 index 0000000000..54825296a8 --- /dev/null +++ b/ConfigurationOfGTSpotter.package/ConfigurationOfGTSpotter.class/instance/versions/version123_.st @@ -0,0 +1,17 @@ +version123: spec + + + spec for: #'common' do: [ + spec blessing: #'stable'. + spec description: 'Replace Announcer>>#on:send:to:''s senders with Announcer>>#when:send:to: in the following methods + +GTSpotterCategoryTitleBrick>>#stepModel: +GTSpotterMorph>>#initializeListeners'. + spec author: 'BernardoContreras'. + spec timestamp: '5/2/2015 18:48'. + spec project: 'GlamourCore' with: '3.1.2'. + spec + package: 'GT-Spotter' with: 'GT-Spotter-BernardoContreras.308'; + package: 'GT-Spotter-EventRecorder' with: 'GT-Spotter-EventRecorder-JurajKubelka.89'; + package: 'GT-SpotterExtensions-Core' with: 'GT-SpotterExtensions-Core-TudorGirba.142'; + package: 'GT-Tests-Spotter' with: 'GT-Tests-Spotter-TudorGirba.8'. ]. diff --git a/ConfigurationOfGTSpotter.package/ConfigurationOfGTSpotter.class/instance/versions/version124_.st b/ConfigurationOfGTSpotter.package/ConfigurationOfGTSpotter.class/instance/versions/version124_.st new file mode 100644 index 0000000000..5e59513887 --- /dev/null +++ b/ConfigurationOfGTSpotter.package/ConfigurationOfGTSpotter.class/instance/versions/version124_.st @@ -0,0 +1,14 @@ +version124: spec + + + spec for: #'common' do: [ + spec blessing: #'stable'. + spec description: 'merged with Pharo + fixed RPackage>>spotterActDefault'. + spec author: 'AndreiChis'. + spec timestamp: '5/7/2015 15:29'. + spec project: 'GlamourCore' with: '3.1.3'. + spec + package: 'GT-Spotter' with: 'GT-Spotter-BernardoContreras.308'; + package: 'GT-Spotter-EventRecorder' with: 'GT-Spotter-EventRecorder-JurajKubelka.89'; + package: 'GT-SpotterExtensions-Core' with: 'GT-SpotterExtensions-Core-AndreiChis.146'; + package: 'GT-Tests-Spotter' with: 'GT-Tests-Spotter-TudorGirba.8'. ]. diff --git a/ConfigurationOfGlamourCore.package/ConfigurationOfGlamourCore.class/instance/symbolic versions/development_.st b/ConfigurationOfGlamourCore.package/ConfigurationOfGlamourCore.class/instance/symbolic versions/development_.st index c0047c931f..6c6e7fc64e 100644 --- a/ConfigurationOfGlamourCore.package/ConfigurationOfGlamourCore.class/instance/symbolic versions/development_.st +++ b/ConfigurationOfGlamourCore.package/ConfigurationOfGlamourCore.class/instance/symbolic versions/development_.st @@ -2,3 +2,4 @@ development: spec spec for: #'common' version: '3.2-baseline'. + spec for: #'pharo4.x' version: '3.2-baseline'. diff --git a/ConfigurationOfGlamourCore.package/ConfigurationOfGlamourCore.class/instance/symbolic versions/stable_.st b/ConfigurationOfGlamourCore.package/ConfigurationOfGlamourCore.class/instance/symbolic versions/stable_.st index df0c8a2662..453533b914 100644 --- a/ConfigurationOfGlamourCore.package/ConfigurationOfGlamourCore.class/instance/symbolic versions/stable_.st +++ b/ConfigurationOfGlamourCore.package/ConfigurationOfGlamourCore.class/instance/symbolic versions/stable_.st @@ -1,5 +1,6 @@ stable: spec - spec for: #'common' version: '3.1.2'. + spec for: #'common' version: '3.1.3'. + spec for: #'pharo4.x' version: '3.1.3'. spec for: #'pharo3.x' version: '3.0.7'. diff --git a/ConfigurationOfGlamourCore.package/ConfigurationOfGlamourCore.class/instance/versions/version313_.st b/ConfigurationOfGlamourCore.package/ConfigurationOfGlamourCore.class/instance/versions/version313_.st new file mode 100644 index 0000000000..e398329735 --- /dev/null +++ b/ConfigurationOfGlamourCore.package/ConfigurationOfGlamourCore.class/instance/versions/version313_.st @@ -0,0 +1,30 @@ +version313: spec + + + spec for: #'common' do: [ + spec blessing: #'stable'. + spec description: 'version 3.1.3'. + spec author: 'AndreiChis'. + spec timestamp: '05/05/2015'. + spec + package: 'Glamour-Announcements' with: 'Glamour-Announcements-AndreiChis.8'; + package: 'Glamour-Browsers' with: 'Glamour-Browsers-TorstenBergmann.109'; + package: 'Glamour-Core' with: 'Glamour-Core-StefanReichhart.299'; + package: 'Glamour-Examples' with: 'Glamour-Examples-TorstenBergmann.291'; + package: 'Glamour-Helpers' with: 'Glamour-Helpers-AndreiChis.39'; + package: 'Glamour-Morphic-Brick' with: 'Glamour-Morphic-Brick-StefanReichhart.398'; + package: 'Glamour-Morphic-Brick-Tests' with: 'Glamour-Morphic-Brick-Tests-AliakseiSyrel.13'; + package: 'Glamour-Morphic-Pager' with: 'Glamour-Morphic-Pager-AndreiChis.103'; + package: 'Glamour-Morphic-Renderer' with:'Glamour-Morphic-Renderer-AndreiChis.321'; + package: 'Glamour-Morphic-Theme' with: 'Glamour-Morphic-Theme-StefanReichhart.212'; + package: 'Glamour-Morphic-Widgets' with: 'Glamour-Morphic-Widgets-AndreiChis.177'; + package: 'Glamour-Presentations' with: 'Glamour-Presentations-AndreiChis.177'; + package: 'Glamour-Rubric-Presentations' with: 'Glamour-Rubric-Presentations-AndreiChis.41'; + package: 'Glamour-Tests-Core' with: 'Glamour-Tests-Core-AliakseiSyrel.104'; + package: 'Glamour-Tests-Morphic' with: 'Glamour-Tests-Morphic-AndreiChis.124'; + package: 'Glamour-Tests-Resources' with: 'Glamour-Tests-Resources-AndreiChis.3'; + package: 'Glamour-Tests-Rubric' with: 'Glamour-Tests-Rubric-AndreiChis.14'. + + spec + project: 'Rubric' with: '1.2.14' ]. + diff --git a/ConfigurationOfRubric.package/ConfigurationOfRubric.class/instance/symbolic versions/stable_.st b/ConfigurationOfRubric.package/ConfigurationOfRubric.class/instance/symbolic versions/stable_.st index a9a83211cb..37eacf069a 100644 --- a/ConfigurationOfRubric.package/ConfigurationOfRubric.class/instance/symbolic versions/stable_.st +++ b/ConfigurationOfRubric.package/ConfigurationOfRubric.class/instance/symbolic versions/stable_.st @@ -2,5 +2,7 @@ stable: spec spec for: #'common' version: '1.2.14'. + + spec for: #'pharo4.x' version: '1.2.14'. spec for: #'pharo3.x' version: '1.2.8'. diff --git a/FreeType.package/FreeTypeCache.class/class/accessing/shutDown_.st b/FreeType.package/FreeTypeCache.class/class/accessing/shutDown_.st index 16848d2d83..f86b3a07ec 100644 --- a/FreeType.package/FreeTypeCache.class/class/accessing/shutDown_.st +++ b/FreeType.package/FreeTypeCache.class/class/accessing/shutDown_.st @@ -1,4 +1,6 @@ shutDown: quitting - - (current notNil and: [self clearCacheOnShutdown]) - ifTrue:[self current removeAll] \ No newline at end of file + quitting ifFalse: [ ^ self ]. + (current notNil and: [ self clearCacheOnShutdown ]) + ifTrue:[ + self current removeAll. + current := nil ] \ No newline at end of file diff --git a/GT-Spotter.package/GTSpotterCategoryTitleBrick.class/instance/accessing/stepModel_.st b/GT-Spotter.package/GTSpotterCategoryTitleBrick.class/instance/accessing/stepModel_.st index 21e5fd63b5..4798f30277 100644 --- a/GT-Spotter.package/GTSpotterCategoryTitleBrick.class/instance/accessing/stepModel_.st +++ b/GT-Spotter.package/GTSpotterCategoryTitleBrick.class/instance/accessing/stepModel_.st @@ -1,6 +1,6 @@ stepModel: anObject stepModel := anObject. - self stepModel announcer weak on: GTSpotterSelectedCandidateChanged send: #onCandidateSelected to: self. + self stepModel announcer weak when: GTSpotterSelectedCandidateChanged send: #onCandidateSelected to: self. self stepModel spotter announcer weak subscribe: GTSpotterRevealHints send: #onRevealHints to: self. self stepModel spotter announcer weak subscribe: GTSpotterHideHints send: #onHideHints to: self. \ No newline at end of file diff --git a/GT-Spotter.package/GTSpotterMorph.class/instance/initialization/initializeListeners.st b/GT-Spotter.package/GTSpotterMorph.class/instance/initialization/initializeListeners.st index a858b2bc84..ec155a3132 100644 --- a/GT-Spotter.package/GTSpotterMorph.class/instance/initialization/initializeListeners.st +++ b/GT-Spotter.package/GTSpotterMorph.class/instance/initialization/initializeListeners.st @@ -2,7 +2,7 @@ initializeListeners self activeHand addEventListener: self. - Morph announcer weak on: MorphLostFocus send: #onLostFocus: to: self. + Morph announcer weak when: MorphLostFocus send: #onLostFocus: to: self. self bindKeyCombination: Character escape toAction: [ self spotterModel exitDueTo: #keyPressedEscape ]. self bindKeyCombination: $w command toAction: [ self spotterModel exitDueTo: #keyPressedW ]. diff --git a/GT-SpotterExtensions-Core.package/extension/RPackage/instance/spotterActDefault.st b/GT-SpotterExtensions-Core.package/extension/RPackage/instance/spotterActDefault.st index b5cc62f2a4..5e3cedb3a3 100644 --- a/GT-SpotterExtensions-Core.package/extension/RPackage/instance/spotterActDefault.st +++ b/GT-SpotterExtensions-Core.package/extension/RPackage/instance/spotterActDefault.st @@ -1,2 +1,2 @@ spotterActDefault - ^ Nautilus openOnPackage: self \ No newline at end of file + ^ Smalltalk tools browser openOnPackage: self \ No newline at end of file diff --git a/ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/script651.st b/ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/script50043.st similarity index 99% rename from ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/script651.st rename to ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/script50043.st index 7db6f4f148..51b79136ad 100644 --- a/ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/script651.st +++ b/ScriptLoader50.package/ScriptLoader.class/instance/pharo - scripts/script50043.st @@ -1,4 +1,4 @@ -script651 +script50043 ^ 'AST-Core-TheIntegrator.286.mcz AST-Tests-Core-TheIntegrator.68.mcz @@ -59,7 +59,7 @@ Files-TheIntegrator.373.mcz FontChooser-TheIntegrator.7.mcz FontInfrastructure-TheIntegrator.8.mcz FontInfrastructure-Tests-TheIntegrator.2.mcz -FreeType-TheIntegrator.699.mcz +FreeType-TheIntegrator.702.mcz FreeTypeTests-SvenVanCaekenberghe.5.mcz Fuel-TheIntegrator.805.mcz FuelCommandLineHandler-TheIntegrator.27.mcz @@ -251,7 +251,7 @@ ShoreLine-Report-Settings-TommasoDalSasso.2.mcz ShoreLine-Report-UI-TommasoDalSasso.12.mcz Shout-TheIntegrator.247.mcz ShoutTests-TheIntegrator.27.mcz -Slot-TheIntegrator.611.mcz +Slot-TheIntegrator.614.mcz Slot-Tests-TheIntegrator.39.mcz SmartSuggestions-TheIntegrator.155.mcz SmartSuggestions-Tests-TheIntegrator.2.mcz diff --git a/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50042.st b/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50042.st deleted file mode 100644 index 7412f08997..0000000000 --- a/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50042.st +++ /dev/null @@ -1,15 +0,0 @@ -update50042 - "self new update50042" - self withUpdateLog: '15510 Missed some part of the original 15199 - https://pharo.fogbugz.com/f/cases/15510 - -15518 association is misspelled in OrderedDictionary>>printElementsOn: - https://pharo.fogbugz.com/f/cases/15518 - -15509 SelectionMorph>>extent: broken - https://pharo.fogbugz.com/f/cases/15509 - -15474 Some Color method comments refere to Color>>showColors: - https://pharo.fogbugz.com/f/cases/15474'. - self loadTogether: self script651 merge: false. - self flushCaches. diff --git a/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50043.st b/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50043.st new file mode 100644 index 0000000000..31f5ec1d5d --- /dev/null +++ b/ScriptLoader50.package/ScriptLoader.class/instance/pharo - updates/update50043.st @@ -0,0 +1,20 @@ +update50043 + "self new update50043" + +{ { 'ConfigurationOfRubric'. 'Pharo'. 'Rubric' }. + { 'ConfigurationOfGlamourCore'. 'Moose'. 'Glamour' }. +} do: [ :spec | + Gofer new + smalltalkhubUser: spec second project: spec third; + package: spec first; + load ]. + self withUpdateLog: '15520 use pushLiteralVariable: instead of pushLiteral: for reflective slot access + https://pharo.fogbugz.com/f/cases/15520 + +15521 FreeType should not clean cache each time you save image + https://pharo.fogbugz.com/f/cases/15521 + +15470 Replace Announcer>>#on:send:to:s senders in GTSpotter + https://pharo.fogbugz.com/f/cases/15470'. + self loadTogether: self script50043 merge: false. + self loadConfiguration: 'GTSpotter' version: '1.2.4'.self flushCaches. diff --git a/ScriptLoader50.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st b/ScriptLoader50.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st index f5c4876c8a..df0b25771c 100644 --- a/ScriptLoader50.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st +++ b/ScriptLoader50.package/ScriptLoader.class/instance/public/commentForCurrentUpdate.st @@ -1,12 +1,9 @@ commentForCurrentUpdate - ^ '15510 Missed some part of the original 15199 - https://pharo.fogbugz.com/f/cases/15510 + ^ '15520 use pushLiteralVariable: instead of pushLiteral: for reflective slot access + https://pharo.fogbugz.com/f/cases/15520 -15518 association is misspelled in OrderedDictionary>>printElementsOn: - https://pharo.fogbugz.com/f/cases/15518 +15521 FreeType should not clean cache each time you save image + https://pharo.fogbugz.com/f/cases/15521 -15509 SelectionMorph>>extent: broken - https://pharo.fogbugz.com/f/cases/15509 - -15474 Some Color method comments refere to Color>>showColors: - https://pharo.fogbugz.com/f/cases/15474' \ No newline at end of file +15470 Replace Announcer>>#on:send:to:s senders in GTSpotter + https://pharo.fogbugz.com/f/cases/15470' \ No newline at end of file diff --git a/Slot.package/LiteralVariable.class/instance/code generation/emitStore_.st b/Slot.package/LiteralVariable.class/instance/code generation/emitStore_.st index 2a27ef6122..517b1bc582 100644 --- a/Slot.package/LiteralVariable.class/instance/code generation/emitStore_.st +++ b/Slot.package/LiteralVariable.class/instance/code generation/emitStore_.st @@ -5,6 +5,6 @@ emitStore: aMethodBuilder addTemp: tempName; storeTemp: tempName; popTop; - pushLiteral: self; + pushLiteralVariable: #global -> self; pushTemp: tempName; send: #write: \ No newline at end of file diff --git a/Slot.package/RelationSlot.class/instance/code generation/emitStore_.st b/Slot.package/RelationSlot.class/instance/code generation/emitStore_.st index 7dcd9890cc..f75403f208 100644 --- a/Slot.package/RelationSlot.class/instance/code generation/emitStore_.st +++ b/Slot.package/RelationSlot.class/instance/code generation/emitStore_.st @@ -6,6 +6,6 @@ emitStore: aMethodBuilder storeTemp: tempName; popTop; pushReceiver; - pushLiteral: self; + pushLiteralVariable: #slot -> self; pushTemp: tempName; send: #writeSlot:value: \ No newline at end of file diff --git a/Slot.package/Slot.class/instance/code generation/emitStore_.st b/Slot.package/Slot.class/instance/code generation/emitStore_.st index 7dcd9890cc..f75403f208 100644 --- a/Slot.package/Slot.class/instance/code generation/emitStore_.st +++ b/Slot.package/Slot.class/instance/code generation/emitStore_.st @@ -6,6 +6,6 @@ emitStore: aMethodBuilder storeTemp: tempName; popTop; pushReceiver; - pushLiteral: self; + pushLiteralVariable: #slot -> self; pushTemp: tempName; send: #writeSlot:value: \ No newline at end of file