Vm-dev June 2014

vm-dev@lists.squeakfoundation.org

37 participants
268 discussions

VM Maker: CMakeVMMakerSqueak-tty.63.mcz
by commits＠source.squeak.org 17 Jun '14

17 Jun '14

Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.63.mcz ==================== Summary ==================== Name: CMakeVMMakerSqueak-tty.63 Author: tty Time: 17 June 2014, 3:24:06.517 pm UUID: 8195eb69-2253-479c-b758-0424ce90d22a Ancestors: CMakeVMMakerSqueak-tty.62 Weird problem in initialize that was preventing the package from loading. All the instance variables where "old" version. Maybe it was me, but it is strange. Will test autoload next =============== Diff against CMakeVMMakerSqueak-tty.62 =============== Item was changed: ----- Method: Linux32x86Config>>initialize (in category 'initialize-release') ----- initialize super initialize. "this should be in my superclass, but I do not have permission to modify it. tty" + generateBuild:=generateBuildAssert:=generateBuildAssertITimerHeartbeat:=generateBuildDebug:=generateBuildDebugITimerHeartbeat :=generateBuildDebugMultiThreaded:=generateBuildIHeartbeatTimer:=generateBuildMultiThreaded:=generateBuildMultiThreadedAssert:= generateBuildMultiThreadedDebug:=false + ! - generateForAssert:= generateForAssertHeartbeatTimer:= generateForDebug :=generateForDebugWithHeartbeatTimer:= generateForDebugMultiThreadedFFI:= generateForReleaseHeartbeatTimer:= generateForReleaseMultiThreadedFFI:=false! Item was changed: CogFamilyUnixConfig subclass: #Linux32x86SqueakCogV3Configz uses: TCPlatformConfigForSqueak + instanceVariableNames: 'buildType generateBuild generateBuildAssert generateBuildAssertITimerHeartbeat generateBuildDebug generateBuildDebugITimerHeartbeat generateBuildDebugMultiThreaded generateBuildIHeartbeatTimer generateBuildMultiThreaded generateBuildMultiThreadedAssert generateBuildMultiThreadedDebug' - instanceVariableNames: 'buildType generateForAssert generateForDebug generateForDebugWithHeartbeatTimer generateForDebugMultiThreadedFFI generateForReleaseHeartbeatTimer generateForReleaseMultiThreadedFFI generateForAssertHeartbeatTimer' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMakerSqueak-IslandOfMisfitToys'! !Linux32x86SqueakCogV3Configz commentStamp: 'tty 6/7/2014 10:35' prior: 0! Base and concrete configuration for building a CogVM on Unix platform(s). Usage: Linux32x86SqueakCogV3Config generateWithSources or Linux32x86SqueakCogV3Config generate "if VMMaker sources already there" Or: find my Builder in CMakeVMMakerSqueak-Builder category and use that to query me or invoke me ! Linux32x86SqueakCogV3Configz class uses: TCPlatformConfigForSqueak classTrait instanceVariableNames: ''! Item was changed: ----- Method: Linux32x86SqueakCogV3Configz>>initialize (in category 'initialize-release') ----- initialize super initialize. "this should be in my superclass, but I do not have permission to modify it. tty" + generateBuild:=generateBuildAssert:=generateBuildAssertITimerHeartbeat:=generateBuildDebug:=generateBuildDebugITimerHeartbeat :=generateBuildDebugMultiThreaded:=generateBuildIHeartbeatTimer:=generateBuildMultiThreaded:=generateBuildMultiThreadedAssert:= generateBuildMultiThreadedDebug:=false + ! - generateForAssert:= generateForAssertHeartbeatTimer:= generateForDebug :=generateForDebugWithHeartbeatTimer:= generateForDebugMultiThreadedFFI:= generateForReleaseHeartbeatTimer:= generateForReleaseMultiThreadedFFI:=false! Item was changed: StackUnixConfig subclass: #Linux32x86SqueakStackV3Configz uses: TCPlatformConfigForSqueak + instanceVariableNames: 'buildType generateBuild generateBuildAssert generateBuildAssertITimerHeartbeat generateBuildDebug generateBuildDebugITimerHeartbeat generateBuildDebugMultiThreaded generateBuildIHeartbeatTimer generateBuildMultiThreaded generateBuildMultiThreadedAssert generateBuildMultiThreadedDebug' - instanceVariableNames: 'buildType generateForAssert generateForDebug generateForDebugWithHeartbeatTimer generateForDebugMultiThreadedFFI generateForReleaseHeartbeatTimer generateForReleaseMultiThreadedFFI generateForAssertHeartbeatTimer' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMakerSqueak-IslandOfMisfitToys'! !Linux32x86SqueakStackV3Configz commentStamp: 'tty 6/7/2014 10:33' prior: 0! A Linux32x86SqueakStackV3Config configures a VM according to my name's form: [Operating System] [WordSize] [Processor Language][VM MemoryManager][BuildType]Conf Usage: Linux32x86SqueakStackV3Config generate Or: Linux32x86SqueakStackV3Config generateWithSources Or: find my Builder in CMakeVMMakerSqueak-Builder category and use that to query me or invoke me ! Linux32x86SqueakStackV3Configz class uses: TCPlatformConfigForSqueak classTrait instanceVariableNames: ''! Item was changed: ----- Method: Linux32x86SqueakStackV3Configz>>initialize (in category 'initialize-release') ----- initialize super initialize. "this should be in my superclass, but I do not have permission to modify it. tty" + generateBuild:=generateBuildAssert:=generateBuildAssertITimerHeartbeat:=generateBuildDebug:=generateBuildDebugITimerHeartbeat :=generateBuildDebugMultiThreaded:=generateBuildIHeartbeatTimer:=generateBuildMultiThreaded:=generateBuildMultiThreadedAssert:= generateBuildMultiThreadedDebug:=false + ! - generateForAssert:= generateForAssertHeartbeatTimer:= generateForDebug :=generateForDebugWithHeartbeatTimer:= generateForDebugMultiThreadedFFI:= generateForReleaseHeartbeatTimer:= generateForReleaseMultiThreadedFFI:=false! Item was changed: ----- Method: Linux64Config>>initialize (in category 'initialize-release') ----- initialize super initialize. "this should be in my superclass, but I do not have permission to modify it. tty" + generateBuild:=generateBuildAssert:=generateBuildAssertITimerHeartbeat:=generateBuildDebug:=generateBuildDebugITimerHeartbeat :=generateBuildDebugMultiThreaded:=generateBuildIHeartbeatTimer:=generateBuildMultiThreaded:=generateBuildMultiThreadedAssert:= generateBuildMultiThreadedDebug:=false + ! - generateForAssert:= generateForAssertHeartbeatTimer:= generateForDebug :=generateForDebugWithHeartbeatTimer:= generateForDebugMultiThreadedFFI:= generateForReleaseHeartbeatTimer:= generateForReleaseMultiThreadedFFI:=false! Item was changed: ----- Method: Linux64x86w32BitConfig>>initialize (in category 'initialize-release') ----- initialize super initialize. "this should be in my superclass, but I do not have permission to modify it. tty" + generateBuild:=generateBuildAssert:=generateBuildAssertITimerHeartbeat:=generateBuildDebug:=generateBuildDebugITimerHeartbeat :=generateBuildDebugMultiThreaded:=generateBuildIHeartbeatTimer:=generateBuildMultiThreaded:=generateBuildMultiThreadedAssert:= generateBuildMultiThreadedDebug:=false + ! - generateForAssert:= generateForAssertHeartbeatTimer:= generateForDebug :=generateForDebugWithHeartbeatTimer:= generateForDebugMultiThreadedFFI:= generateForReleaseHeartbeatTimer:= generateForReleaseMultiThreadedFFI:=false! Item was changed: ----- Method: SqueakAndroidStackEvtConfig>>initialize (in category 'initialize-release') ----- initialize super initialize. "this should be in my superclass, but I do not have permission to modify it. tty" + generateBuild:=generateBuildAssert:=generateBuildAssertITimerHeartbeat:=generateBuildDebug:=generateBuildDebugITimerHeartbeat :=generateBuildDebugMultiThreaded:=generateBuildIHeartbeatTimer:=generateBuildMultiThreaded:=generateBuildMultiThreadedAssert:= generateBuildMultiThreadedDebug:=false + ! - generateForAssert:= generateForAssertHeartbeatTimer:= generateForDebug :=generateForDebugWithHeartbeatTimer:= generateForDebugMultiThreadedFFI:= generateForReleaseHeartbeatTimer:= generateForReleaseMultiThreadedFFI:=false! Item was added: + ----- Method: SqueakBSDConfig>>initialize (in category 'initialize-release') ----- + initialize + super initialize. + "this should be in my superclass, but I do not have permission to modify it. tty" + generateBuild:=generateBuildAssert:=generateBuildAssertITimerHeartbeat:=generateBuildDebug:=generateBuildDebugITimerHeartbeat :=generateBuildDebugMultiThreaded:=generateBuildIHeartbeatTimer:=generateBuildMultiThreaded:=generateBuildMultiThreadedAssert:= generateBuildMultiThreadedDebug:=false + ! Item was changed: ----- Method: SqueakIA32BochsConfig>>initialize (in category 'initialize-release') ----- initialize super initialize. "this should be in my superclass, but I do not have permission to modify it. tty" + generateBuild:=generateBuildAssert:=generateBuildAssertITimerHeartbeat:=generateBuildDebug:=generateBuildDebugITimerHeartbeat :=generateBuildDebugMultiThreaded:=generateBuildIHeartbeatTimer:=generateBuildMultiThreaded:=generateBuildMultiThreadedAssert:= generateBuildMultiThreadedDebug:=false + ! - generateForAssert:= generateForAssertHeartbeatTimer:= generateForDebug :=generateForDebugWithHeartbeatTimer:= generateForDebugMultiThreadedFFI:= generateForReleaseHeartbeatTimer:= generateForReleaseMultiThreadedFFI:=false! Item was changed: ----- Method: SqueakMacOSConfig>>initialize (in category 'initialize-release') ----- initialize super initialize. "this should be in my superclass, but I do not have permission to modify it. tty" + generateBuild:=generateBuildAssert:=generateBuildAssertITimerHeartbeat:=generateBuildDebug:=generateBuildDebugITimerHeartbeat :=generateBuildDebugMultiThreaded:=generateBuildIHeartbeatTimer:=generateBuildMultiThreaded:=generateBuildMultiThreadedAssert:= generateBuildMultiThreadedDebug:=false + ! - generateForAssert:= generateForAssertHeartbeatTimer:= generateForDebug :=generateForDebugWithHeartbeatTimer:= generateForDebugMultiThreadedFFI:= generateForReleaseHeartbeatTimer:= generateForReleaseMultiThreadedFFI:=false! Item was changed: ----- Method: SqueakSunOS32x86Config>>initialize (in category 'initialize-release') ----- initialize super initialize. "this should be in my superclass, but I do not have permission to modify it. tty" + generateBuild:=generateBuildAssert:=generateBuildAssertITimerHeartbeat:=generateBuildDebug:=generateBuildDebugITimerHeartbeat :=generateBuildDebugMultiThreaded:=generateBuildIHeartbeatTimer:=generateBuildMultiThreaded:=generateBuildMultiThreadedAssert:= generateBuildMultiThreadedDebug:=false + ! - generateForAssert:= generateForAssertHeartbeatTimer:= generateForDebug :=generateForDebugWithHeartbeatTimer:= generateForDebugMultiThreadedFFI:= generateForReleaseHeartbeatTimer:= generateForReleaseMultiThreadedFFI:=false! Item was changed: ----- Method: SqueakWin32x86Config>>initialize (in category 'initialize-release') ----- initialize super initialize. "this should be in my superclass, but I do not have permission to modify it. tty" + generateBuild:=generateBuildAssert:=generateBuildAssertITimerHeartbeat:=generateBuildDebug:=generateBuildDebugITimerHeartbeat :=generateBuildDebugMultiThreaded:=generateBuildIHeartbeatTimer:=generateBuildMultiThreaded:=generateBuildMultiThreadedAssert:= generateBuildMultiThreadedDebug:=false + ! - generateForAssert:= generateForAssertHeartbeatTimer:= generateForDebug :=generateForDebugWithHeartbeatTimer:= generateForDebugMultiThreadedFFI:= generateForReleaseHeartbeatTimer:= generateForReleaseMultiThreadedFFI:=false!

1 0

VM Maker: CogTools-eem.70.mcz
by commits＠source.squeak.org 17 Jun '14

17 Jun '14

Eliot Miranda uploaded a new version of CogTools to project VM Maker: http://source.squeak.org/VMMaker/CogTools-eem.70.mcz ==================== Summary ==================== Name: CogTools-eem.70 Author: eem Time: 17 June 2014, 10:59:51.468 am UUID: 558f0b66-463f-4b27-a542-718fd8485e78 Ancestors: CogTools-eem.69 Get new and old space sizes right in VMProfiler report. =============== Diff against CogTools-eem.69 =============== Item was changed: ----- Method: VMProfiler class>>reportGCStats:upTime:on: (in category 'reports') ----- reportGCStats: gcStatsArray upTime: elapsedMilliseconds on: str | oldSpaceEnd youngSpaceEnd memoryEnd fullGCs fullGCTime incrGCs incrGCTime tenureCount rootOverflows | gcStatsArray ifNil: [^self]. + oldSpaceEnd := gcStatsArray at: 2. "a.k.a. oldSpace size on Spur" - oldSpaceEnd := gcStatsArray at: 1. "a.k.a. oldSpace size on Spur" fullGCs := gcStatsArray at: 7. fullGCTime := gcStatsArray at: 8. incrGCs := gcStatsArray at: 9. incrGCTime := gcStatsArray at: 10. tenureCount := gcStatsArray at: 11. rootOverflows := gcStatsArray at: 22. str cr. str nextPutAll: '**Memory**'; cr. str nextPutAll: ' old '; nextPutAll: oldSpaceEnd asStringWithCommasSigned; nextPutAll: ' bytes'; cr. self amOnSpur ifTrue: [(gcStatsArray at: 54) ifNotNil: [:freeSpace| str nextPutAll: ' free '; nextPutAll: freeSpace asStringWithCommasSigned; nextPutAll: ' bytes'; cr]] ifFalse: + [youngSpaceEnd := gcStatsArray at: 1. - [youngSpaceEnd := gcStatsArray at: 2. memoryEnd := gcStatsArray at: 3. str nextPutAll: ' young '; nextPutAll: (youngSpaceEnd - oldSpaceEnd) asStringWithCommasSigned; nextPutAll: ' bytes'; cr. str nextPutAll: ' used '; nextPutAll: youngSpaceEnd asStringWithCommasSigned; nextPutAll: ' bytes'; cr. str nextPutAll: ' free '; nextPutAll: (memoryEnd - youngSpaceEnd) asStringWithCommasSigned; nextPutAll: ' bytes'; cr]. str cr. str nextPutAll: '**GCs**'; cr. str nextPutAll: ' full '; print: fullGCs; nextPutAll: ' totalling '; nextPutAll: fullGCTime asStringWithCommas; nextPutAll: 'ms ('; print: fullGCTime / elapsedMilliseconds * 100 maxDecimalPlaces: 3; nextPutAll: '% elapsed time)'. fullGCs = 0 ifFalse: [str nextPutAll: ', avg '; print: fullGCTime / fullGCs maxDecimalPlaces: 3; nextPutAll: 'ms']. str cr. str nextPutAll: (self amOnSpur ifTrue: [' scavenges '] ifFalse: [' incr ']); print: incrGCs; nextPutAll: ' totalling '; nextPutAll: incrGCTime asStringWithCommas; nextPutAll: 'ms ('; print: incrGCTime / elapsedMilliseconds * 100 maxDecimalPlaces: 3; nextPutAll: '% elapsed time)'. incrGCs = 0 ifFalse: [str nextPutAll:', avg '; print: incrGCTime / incrGCs maxDecimalPlaces: 3; nextPutAll: 'ms']. str cr. str nextPutAll: ' tenures '; nextPutAll: tenureCount asStringWithCommas. tenureCount = 0 ifFalse: [str nextPutAll: ' (avg '; print: (incrGCs / tenureCount) asInteger; nextPutAll: ' GCs/tenure)']. str cr. str nextPutAll: ' root table '; nextPutAll: rootOverflows asStringWithCommas; nextPutAll:' overflows'. str cr. (gcStatsArray size >= 63 and: [(gcStatsArray at: 63) isInteger]) ifTrue: [| numCompactions compactionMsecs | str cr; nextPutAll: '**Compiled Code Compactions**'; cr. numCompactions := gcStatsArray at: 62. compactionMsecs := gcStatsArray at: 63. str tab; print: numCompactions; nextPutAll: ' totalling '; nextPutAll: compactionMsecs asStringWithCommas; nextPutAll: 'ms ('; print: compactionMsecs / elapsedMilliseconds * 100 maxDecimalPlaces: 3; nextPutAll: '% elapsed time)'. numCompactions = 0 ifFalse: [str nextPutAll: ', avg '; print: compactionMsecs / numCompactions maxDecimalPlaces: 3; nextPutAll: 'ms']. str cr]. gcStatsArray size >= 61 ifTrue: [str cr; nextPutAll: '**Events**'; cr. (56 to: 61) with: #('Process switches' 'ioProcessEvents calls' 'Interrupt checks' 'Event checks' 'Stack overflows' 'Stack page divorces') do: [:index :eventName| | value n | value := gcStatsArray at: index. n := 22 - eventName size // 4 + 1. str nextPutAll: eventName; tab: n; print: value; nextPutAll: ' ('; print: (value * 1000 / elapsedMilliseconds) rounded; nextPutAll: ' per second)'; cr]]!

1 0

VM Maker: CogTools-eem.69.mcz
by commits＠source.squeak.org 17 Jun '14

17 Jun '14

Eliot Miranda uploaded a new version of CogTools to project VM Maker: http://source.squeak.org/VMMaker/CogTools-eem.69.mcz ==================== Summary ==================== Name: CogTools-eem.69 Author: eem Time: 17 June 2014, 10:30:28.054 am UUID: e345c4d7-b9af-4c49-977e-e949fd349418 Ancestors: CogTools-eem.68 Revamp reporting for Squeak 4.5 (float printing) and Spur. Fix bug for spyOn: report printing last canned benchmark instead of block that is profiled. =============== Diff against CogTools-eem.68 =============== Item was added: + ----- Method: VMProfiler class>>amOnSpur (in category 'reports') ----- + amOnSpur + ^(Smalltalk vmParameterAt: 41) anyMask: 16! Item was changed: ----- Method: VMProfiler class>>report: (in category 'spying') ----- report: aStream + "Compatibility with MessageTally and AndreasSystemProfiler instance side spyOn: & report:" - "Compatibility with MessageTally and QSystemProfiler instance side spyOn: & report:" ^self openInstance report: aStream! Item was changed: ----- Method: VMProfiler class>>reportGCStats:upTime:on: (in category 'reports') ----- reportGCStats: gcStatsArray upTime: elapsedMilliseconds on: str | oldSpaceEnd youngSpaceEnd memoryEnd fullGCs fullGCTime incrGCs incrGCTime tenureCount rootOverflows | gcStatsArray ifNil: [^self]. + oldSpaceEnd := gcStatsArray at: 1. "a.k.a. oldSpace size on Spur" - oldSpaceEnd := gcStatsArray at: 1. - youngSpaceEnd := gcStatsArray at: 2. - memoryEnd := gcStatsArray at: 3. fullGCs := gcStatsArray at: 7. fullGCTime := gcStatsArray at: 8. incrGCs := gcStatsArray at: 9. incrGCTime := gcStatsArray at: 10. + tenureCount := gcStatsArray at: 11. - tenureCount := gcStatsArray at: 11. rootOverflows := gcStatsArray at: 22. + str cr. - str cr. str nextPutAll: '**Memory**'; cr. str nextPutAll: ' old '; nextPutAll: oldSpaceEnd asStringWithCommasSigned; nextPutAll: ' bytes'; cr. + self amOnSpur + ifTrue: + [(gcStatsArray at: 54) ifNotNil: + [:freeSpace| + str nextPutAll: ' free '; + nextPutAll: freeSpace asStringWithCommasSigned; nextPutAll: ' bytes'; cr]] + ifFalse: + [youngSpaceEnd := gcStatsArray at: 2. + memoryEnd := gcStatsArray at: 3. + str nextPutAll: ' young '; + nextPutAll: (youngSpaceEnd - oldSpaceEnd) asStringWithCommasSigned; nextPutAll: ' bytes'; cr. + str nextPutAll: ' used '; + nextPutAll: youngSpaceEnd asStringWithCommasSigned; nextPutAll: ' bytes'; cr. + str nextPutAll: ' free '; + nextPutAll: (memoryEnd - youngSpaceEnd) asStringWithCommasSigned; nextPutAll: ' bytes'; cr]. - str nextPutAll: ' young '; - nextPutAll: (youngSpaceEnd - oldSpaceEnd) asStringWithCommasSigned; nextPutAll: ' bytes'; cr. - str nextPutAll: ' used '; - nextPutAll: youngSpaceEnd asStringWithCommasSigned; nextPutAll: ' bytes'; cr. - str nextPutAll: ' free '; - nextPutAll: (memoryEnd - youngSpaceEnd) asStringWithCommasSigned; nextPutAll: ' bytes'; cr. + str cr. - str cr. str nextPutAll: '**GCs**'; cr. str nextPutAll: ' full '; print: fullGCs; nextPutAll: ' totalling '; nextPutAll: fullGCTime asStringWithCommas; nextPutAll: 'ms ('; + print: fullGCTime / elapsedMilliseconds * 100 maxDecimalPlaces: 3; - print: ((fullGCTime / elapsedMilliseconds * 100) rounded); nextPutAll: '% elapsed time)'. fullGCs = 0 ifFalse: + [str nextPutAll: ', avg '; print: fullGCTime / fullGCs maxDecimalPlaces: 3; nextPutAll: 'ms']. - [str nextPutAll: ', avg '; print: (fullGCTime / fullGCs roundTo: 0.1); nextPutAll: 'ms']. str cr. + str nextPutAll: (self amOnSpur ifTrue: [' scavenges '] ifFalse: [' incr ']); - str nextPutAll: ' incr '; print: incrGCs; nextPutAll: ' totalling '; nextPutAll: incrGCTime asStringWithCommas; nextPutAll: 'ms ('; + print: incrGCTime / elapsedMilliseconds * 100 maxDecimalPlaces: 3; - print: ((incrGCTime / elapsedMilliseconds * 100) roundTo: 0.1); nextPutAll: '% elapsed time)'. incrGCs = 0 ifFalse: + [str nextPutAll:', avg '; print: incrGCTime / incrGCs maxDecimalPlaces: 3; nextPutAll: 'ms']. - [str nextPutAll:', avg '; print: (incrGCTime / incrGCs roundTo: 0.01); nextPutAll: 'ms']. str cr. str nextPutAll: ' tenures '; nextPutAll: tenureCount asStringWithCommas. tenureCount = 0 ifFalse: [str nextPutAll: ' (avg '; print: (incrGCs / tenureCount) asInteger; nextPutAll: ' GCs/tenure)']. str cr. str nextPutAll: ' root table '; nextPutAll: rootOverflows asStringWithCommas; nextPutAll:' overflows'. str cr. (gcStatsArray size >= 63 and: [(gcStatsArray at: 63) isInteger]) ifTrue: [| numCompactions compactionMsecs | str cr; nextPutAll: '**Compiled Code Compactions**'; cr. numCompactions := gcStatsArray at: 62. compactionMsecs := gcStatsArray at: 63. str tab; print: numCompactions; nextPutAll: ' totalling '; nextPutAll: compactionMsecs asStringWithCommas; nextPutAll: 'ms ('; + print: compactionMsecs / elapsedMilliseconds * 100 maxDecimalPlaces: 3; - print: ((compactionMsecs / elapsedMilliseconds * 100) rounded); nextPutAll: '% elapsed time)'. numCompactions = 0 ifFalse: + [str nextPutAll: ', avg '; print: compactionMsecs / numCompactions maxDecimalPlaces: 3; nextPutAll: 'ms']. - [str nextPutAll: ', avg '; print: (compactionMsecs / numCompactions roundTo: 0.1); nextPutAll: 'ms']. str cr]. gcStatsArray size >= 61 ifTrue: [str cr; nextPutAll: '**Events**'; cr. (56 to: 61) with: #('Process switches' 'ioProcessEvents calls' 'Interrupt checks' 'Event checks' 'Stack overflows' 'Stack page divorces') + do: [:index :eventName| | value n | - do: [:index :eventName| | value | value := gcStatsArray at: index. + n := 22 - eventName size // 4 + 1. + str nextPutAll: eventName; tab: n; print: value; nextPutAll: ' ('; - str nextPutAll: eventName; tab; print: value; nextPutAll: ' ('; print: (value * 1000 / elapsedMilliseconds) rounded; nextPutAll: ' per second)'; cr]]! Item was changed: ----- Method: VMProfiler class>>spyOn: (in category 'spying') ----- spyOn: aBlock + "Compatibility with MessageTally and AndreasSystemProfiler instance side spyOn: & report:" - "Compatibility with MessageTally and QSystemProfiler instance side spyOn: & report:" ^Cursor execute showWhile: [self openInstance spyOn: aBlock]! Item was changed: ----- Method: VMProfiler>>report: (in category 'reports') ----- report: s + self totalsDo: + [:vmTotals :cogTotals :nonVMTotals + :samplesInVM :samplesInCog :samplesInNonVMModules :samplesInNonVM | + self putReportPreambleOn: s. + s print: samplesInVM + samplesInCog; nextPutAll: ' samples in the VM'; tab; nextPut: $(; + print: total; nextPutAll: ' samples in the entire program) '. + self printPercentage: samplesInVM + samplesInCog total: total on: s. + s nextPutAll: ' of total'; cr; cr. + cogTotals isEmpty ifFalse: + [s print: samplesInCog; nextPutAll: ' samples in generated vm code '. + self printPercentage: samplesInCog total: samplesInVM + samplesInCog on: s. + s nextPutAll: ' of entire vm ('. + self printPercentage: samplesInCog total: total on: s. + s nextPutAll: ' of total)'; cr. + s print: samplesInVM; nextPutAll: ' samples in vanilla vm code '. + self printPercentage: samplesInVM total: samplesInVM + samplesInCog on: s. + s nextPutAll: ' of entire vm ('. + self printPercentage: samplesInVM total: total on: s. + s nextPutAll: ' of total)'; cr; cr. + self printSymbolTotals: cogTotals labelled: 'generated vm code' on: s sumTotal: samplesInCog]. + vmTotals isEmpty ifFalse: + [self printSymbolTotals: vmTotals labelled: 'vanilla vm code' on: s sumTotal: samplesInVM]. + (samplesInNonVM * 100 >= total + and: [nonVMTotals notEmpty]) ifTrue: + [s print: samplesInNonVM; nextPutAll: ' samples in the rest '. + self printPercentage: samplesInNonVM total: total on: s. + s nextPutAll: ' of total'; cr; cr. + self printSymbolTotals: nonVMTotals labelled: 'rest' on: s sumTotal: samplesInNonVM]. + self class reportGCStats: elapsedStats upTime: elapsedTime on: s]! - | vmTotals cogTotals nonVMTotals - samplesInVM samplesInCog samplesInNonVMModules samplesInNonVM | - vmTotals := Dictionary new. - cogTotals := Dictionary new. - nonVMTotals := Dictionary new. - samplesInVM := samplesInCog := samplesInNonVMModules := 0. - Cursor execute showWhile: - [(symbolManager symbolsInModule: symbolManager vmModule) do: - [:sym| | samples | - (#(publicFunction privateFunction) includes: sym type) ifTrue: - [samples := 0. - sym address to: sym limit - 1 do: - [:a| samples := samples + (highResSamples at: a)]. - samples > 0 ifTrue: - [vmTotals at: sym put: samples. - samplesInVM := samplesInVM + samples]]]. - (symbolManager symbolsInModule: symbolManager cogModule) do: - [:sym| | samples | - (#(publicFunction privateFunction) includes: sym type) ifTrue: - [samples := 0. - sym address to: sym limit - 1 do: - [:a| samples := samples + (highResSamples at: a)]. - samples > 0 ifTrue: - [cogTotals at: sym put: samples. - samplesInCog := samplesInCog + samples]]]. - ((symbolManager modules - copyWithout: symbolManager vmModule) - copyWithout: symbolManager cogModule) do: - [:module| - (symbolManager symbolsInModule: module) do: - [:sym| | samples | - ((#(publicFunction privateFunction) includes: sym type) - and: [(sym address // lowResolution to: sym limit // lowResolution) anySatisfy: - [:pc| (lowResSamples at: pc + 1) > 0]]) ifTrue: - [samples := 0. - sym address to: sym limit - 1 do: - [:a| samples := samples + (highResSamples at: a)]. - samples > 0 ifTrue: - [nonVMTotals at: sym put: samples. - samplesInNonVMModules := samplesInNonVMModules + samples]]]]]. - samplesInNonVM := total - samplesInVM - samplesInCog. - nonVMTotals - at: 'Samples Not In Any Function' - put: samplesInNonVM - samplesInNonVMModules. - self putReportPreambleOn: s. - s print: samplesInVM + samplesInCog; nextPutAll: ' samples in the VM'; tab; nextPut: $(; - print: total; nextPutAll: ' samples in the entire program) '. - self printPercentage: samplesInVM + samplesInCog total: total on: s. - s nextPutAll: ' of total'; cr; cr. - cogTotals isEmpty ifFalse: - [s print: samplesInCog; nextPutAll: ' samples in generated vm code '. - self printPercentage: samplesInCog total: samplesInVM + samplesInCog on: s. - s nextPutAll: ' of entire vm ('. - self printPercentage: samplesInCog total: total on: s. - s nextPutAll: ' of total)'; cr. - s print: samplesInVM; nextPutAll: ' samples in vanilla vm code '. - self printPercentage: samplesInVM total: samplesInVM + samplesInCog on: s. - s nextPutAll: ' of entire vm ('. - self printPercentage: samplesInVM total: total on: s. - s nextPutAll: ' of total)'; cr; cr. - self printSymbolTotals: cogTotals labelled: 'generated vm code' on: s sumTotal: samplesInCog]. - vmTotals isEmpty ifFalse: - [self printSymbolTotals: vmTotals labelled: 'vanilla vm code' on: s sumTotal: samplesInVM]. - (samplesInNonVM * 100 >= total - and: [nonVMTotals notEmpty]) ifTrue: - [s print: samplesInNonVM; nextPutAll: ' samples in the rest '. - self printPercentage: samplesInNonVM total: total on: s. - s nextPutAll: ' of total'; cr; cr. - self printSymbolTotals: nonVMTotals labelled: 'rest' on: s sumTotal: samplesInNonVM]. - self class reportGCStats: elapsedStats upTime: elapsedTime on: s! Item was changed: ----- Method: VMProfiler>>spyOn: (in category 'spying') ----- spyOn: aBlock | blockToProfile r | blockToProfile := forkProfile ifTrue: [| sem fr | sem := Semaphore new. [[fr := aBlock value. sem signal] fork. sem wait. fr]] ifFalse: [aBlock]. + self selectBenchmark: aBlock sourceString. self startProfiling. r := blockToProfile ensure: [self stopProfiling]. WorldState addDeferredUIMessage: [self plotGraph]. ^r! Item was added: + ----- Method: VMProfiler>>totalsDo: (in category 'reports') ----- + totalsDo: septuaryBlock + "Evaluate aBlock with + a Dictionary of symbol -> total for the functions in the VM (excluding generated code) + a Dictionary of symbol -> total for the generated code in the VM + a Dictionary of symbol -> total for the functions in other code + total number of samples in functions in the VM (excluding generated code) + total number of samples in generated code in the VM + total number of samples in generated code in the VM + total number of samples in functions in other code + total number of samples not in VM or VM-generated code (incudes code not in any function)" + | vmTotals cogTotals nonVMTotals + samplesInVM samplesInCog samplesInNonVMModules samplesInNonVM | + vmTotals := Dictionary new. + cogTotals := Dictionary new. + nonVMTotals := Dictionary new. + samplesInVM := samplesInCog := samplesInNonVMModules := 0. + (symbolManager symbolsInModule: symbolManager vmModule) do: + [:sym| | samples | + (#(publicFunction privateFunction) includes: sym type) ifTrue: + [samples := 0. + sym address to: sym limit - 1 do: + [:a| samples := samples + (highResSamples at: a)]. + samples > 0 ifTrue: + [vmTotals at: sym put: samples. + samplesInVM := samplesInVM + samples]]]. + (symbolManager symbolsInModule: symbolManager cogModule) do: + [:sym| | samples | + (#(publicFunction privateFunction) includes: sym type) ifTrue: + [samples := 0. + sym address to: sym limit - 1 do: + [:a| samples := samples + (highResSamples at: a)]. + samples > 0 ifTrue: + [cogTotals at: sym put: samples. + samplesInCog := samplesInCog + samples]]]. + ((symbolManager modules + copyWithout: symbolManager vmModule) + copyWithout: symbolManager cogModule) do: + [:module| + (symbolManager symbolsInModule: module) do: + [:sym| | samples | + ((#(publicFunction privateFunction) includes: sym type) + and: [(sym address // lowResolution to: sym limit // lowResolution) anySatisfy: + [:pc| (lowResSamples at: pc + 1) > 0]]) ifTrue: + [samples := 0. + sym address to: sym limit - 1 do: + [:a| samples := samples + (highResSamples at: a)]. + samples > 0 ifTrue: + [nonVMTotals at: sym put: samples. + samplesInNonVMModules := samplesInNonVMModules + samples]]]]. + samplesInNonVM := total - samplesInVM - samplesInCog. + nonVMTotals + at: 'Samples Not In Any Function' + put: samplesInNonVM - samplesInNonVMModules. + septuaryBlock valueWithArguments: + {vmTotals. + cogTotals. + nonVMTotals. + samplesInVM. + samplesInCog. + samplesInNonVMModules. + samplesInNonVM}!

1 0

Re: [Pharo-dev] Spur Squeak Trunk Image Available
by Eliot Miranda 17 Jun '14

17 Jun '14

Hi Philippe, On Tue, Jun 17, 2014 at 1:03 AM, Philippe Marschall < philippe.marschall(a)netcetera.ch> wrote: > On 13.06.14 01:41, Eliot Miranda wrote: > >> >> >> >> >> Hi All, >> >> it gives me great pleasure to let you know that a spur-format trunk >> Squeak image is finally available at >> http://www.mirandabanda.org/files/Cog/SpurImages/. Spur VMs are >> available at http://www.mirandabanda.org/files/Cog/VM/VM.r2987/. >> >> … >> > > I'm seeing a Seaside request handling benchmark going from 10k req/s to > 11k req/s. > Don't be too quick to dismiss this as being IO-bound (being IO-bound is > actually quite hard on Squeak/Pharo). During the benchmark Squeak fully > saturates one core. It is hard to tell what the limiting factor for this > benchmark actually is. But removing one or two String allocations from the > request handling loop usually yields about 100 to 200 additional req/s. > That's good news at least. One thing you can try is the VMProfiler. It's an interactive Morphic application so it will try and open and may crash Load the VMProfiler and use it via VMProfiler openInstance spyOn: [...]; report: aStream. e.g. VMProfiler openInstance spyOn: [1 tinyBenchmarks]; report: (Transcript cr; yourself). Transcript flush. produces: /Users/eliot/Cog/oscogvm/build.macos32x86/squeak.cog.spur/Fast.app/Contents/MacOS/Squeak 6/17/2014 eden size: 2,603,344 stack pages: 160 code size: 1,048,576 1 tinyBenchmarks gc prior. clear prior. 6.298 seconds; sampling frequency 1473 hz 9231 samples in the VM (9275 samples in the entire program) 99.53% of total 8798 samples in generated vm code 95.31% of entire vm (94.86% of total) 433 samples in vanilla vm code 4.69% of entire vm ( 4.67% of total) % of generated vm code (% of total) (samples) (cumulative) 61.29% (58.13%) Integer>>benchFib (5392) (61.29%) 13.47% (12.78%) Integer>>benchmark (1185) (74.76%) 11.48% (10.89%) Object>>at:put: (1010) (86.24%) 9.60% ( 9.11%) SmallInteger>>+ (845) (95.84%) 3.99% ( 3.78%) Object>>at: (351) (99.83%) 0.07% ( 0.06%) ceBaseFram...Trampoline(6) (99.90%) 0.03% ( 0.03%) ceMethodAbort0Args (3) (99.93%) 0.03% ( 0.03%) Sequenceabl...om:to:put: (3) (99.97%) 0.02% ( 0.02%) Magnitude>>min: (2) (99.99%) 0.01% ( 0.01%) ceEnterCog...ceiverReg (1) (100.0%) % of vanilla vm code (% of total) (samples) (cumulative) 32.33% ( 1.51%) primitiveStringReplace (140) (32.33%) 24.25% ( 1.13%) copyAndForward (105) (56.58%) 13.63% ( 0.64%) marryFrameSP (59) (70.21%) 10.85% ( 0.51%) instantiateClassindexableSize (47) (81.06%) 3.46% ( 0.16%) ceBaseFrameReturn (15) (84.53%) 2.08% ( 0.10%) scavengeLoop (9) (86.61%) 1.62% ( 0.08%) checkForEvent...ontextSwitch (7) (88.22%) 1.39% ( 0.06%) externalEnsureIsBaseFrame (6) (89.61%) 1.39% ( 0.06%) voidVMStateForSn...nalPrimitivesIf(6) (90.99%) 1.15% ( 0.05%) mapInterpreterOops (5) (92.15%) 1.15% ( 0.05%) returnToExecuti...tContextSwitch(5) (93.30%) 1.15% ( 0.05%) scavengeReferentsOf (5) (94.46%) 0.92% ( 0.04%) handleStackOverflow (4) (95.38%) 0.92% ( 0.04%) signed64BitIntegerFor (4) (96.30%) 0.46% ( 0.02%) primitiveShortAt (2) (96.77%) 0.46% ( 0.02%) ceNonLocalReturn (2) (97.23%) 0.23% ( 0.01%) gMoveCwR (1) (97.46%) 0.23% ( 0.01%) genInnerPrimit...CharacterinReg (1) (97.69%) 0.23% ( 0.01%) genPrimitiveMultiply (1) (97.92%) 0.23% ( 0.01%) primitiveInflateDecompressBlock(1) (98.15%) 0.23% ( 0.01%) primitiveNewWithArg (1) (98.38%) 0.23% ( 0.01%) primitiveTestAnd...fCriticalSection(1) (98.61%) 0.23% ( 0.01%) processWeaklings (1) (98.85%) 0.23% ( 0.01%) scavengingGCTenuringIf (1) (99.08%) 0.23% ( 0.01%) updateMaybeObjRefAt (1) (99.31%) 0.23% ( 0.01%) wakeHighestPriority (1) (99.54%) 0.23% ( 0.01%) ceCannotResume (1) (99.77%) 0.23% ( 0.01%) ioPositionOfWindowSetxy (1) (100.0%) **Memory** old +574,744 bytes **GCs** full 0 totalling 0ms (0% elapsed time) scavenges 330 totalling 93ms (1.477% elapsed time), avg 0.282ms tenures 0 root table 0 overflows **Compiled Code Compactions** 0 totalling 0ms (0% elapsed time) **Events** Process switches 66 (10 per second) ioProcessEvents calls 314 (50 per second) Interrupt checks 3462 (550 per second) Event checks 3585 (569 per second) Stack overflows 421897 (66989 per second) Stack page divorces 0 (0 per second) While this profile is flat, it does show where the VM is spending its time, and since the VM is not something with deep call chains, this view is the most useful I have. The VMProfiler is part of the CogTools package at http://source.squeak.org/VMMaker. P.S. Extending the size of the DefaultTabsArray will result in a less cramped report. HTH Eliot

1 0

Cog 3000, libcrypto, and Altitude
by Chris Cunnington 17 Jun '14

17 Jun '14

I downloaded 3000 versions of coglinux, coglinuxht, cogmtlinuxht to my Ubuntu laptop. [1] I wanted to see if I could use the Altitude web framework without creating a symlink to the libcrypto library [2]. I think the 3000 series looks for libcrypto.so.1.0.0, which I think I have installed. [3]. The coglinux image starts, but I get the standard Module Not Found error. [5]. This is what the symlink solves. The other two VMs, coglinuxht and cogmtlinuxht, don't start. [4] Cheers, Chris [1] Ubuntu 12.04 LTS Intel Core i7-3687u CPU @ 2.10 GHzx4 [2] chris@ooplu:~/Desktop/Cog/lib/squeak/4.0-2761$ file libcrypto.so libcrypto.so: symbolic link to `/usr/lib/i386-linux-gnu/libcrypto.so.0.9.8' [3] chris@ooplu:~/Desktop/Cog/lib/squeak/4.0-2761$ locate libcrypto /home/chris/.local/share/Trash/files/libcrypto.so.0.9.8 /home/chris/.local/share/Trash/info/libcrypto.so.0.9.8.trashinfo /lib/i386-linux-gnu/libcrypto.so.0.9.8 /lib/i386-linux-gnu/libcrypto.so.1.0.0 /lib/x86_64-linux-gnu/libcrypto.so.1.0.0 /usr/lib/i386-linux-gnu/libcrypto.so.0.9.8 /usr/lib/x86_64-linux-gnu/libcrypto.a /usr/lib/x86_64-linux-gnu/libcrypto.so /usr/lib/x86_64-linux-gnu/pkgconfig/libcrypto.pc [4] chris@ooplu:~/Desktop/coglinux$ ./squeak '/home/chris/Desktop/ squeak.org/Squeak4.4-12327.image' & [1] 5932 chris@ooplu:~/Desktop/coglinux$ cd ../coglinuxht [1]+ Done ./squeak '/home/chris/Desktop/ squeak.org/Squeak4.4-12327.image' (wd: ~/Desktop/coglinux) (wd now: ~/Desktop/coglinuxht) chris@ooplu:~/Desktop/coglinuxht$ ./squeak '/home/chris/Desktop/ squeak.org/Squeak4.4-12327.image' & [1] 5949 chris@ooplu:~/Desktop/coglinuxht$ pthread_setschedparam failed; consider using ITIMER_HEARTBEAT: Operation not permitted ^C [1]+ Exit 1 ./squeak '/home/chris/Desktop/ squeak.org/Squeak4.4-12327.image' chris@ooplu:~/Desktop/coglinuxht$ cd ../cogmtlinuxht chris@ooplu:~/Desktop/cogmtlinuxht$ ./squeak '/home/chris/Desktop/ squeak.org/Squeak4.4-12327.image' & [1] 5962 chris@ooplu:~/Desktop/cogmtlinuxht$ warning, processHasThreadId flag is unset; cannot function as a threaded VM if so. pthread_setschedparam failed; consider using ITIMER_HEARTBEAT: Operation not permitted ^C [1]+ Exit 1 ./squeak '/home/chris/Desktop/ squeak.org/Squeak4.4-12327.image' [5] Error: External module not found 15 June 2014 12:15:47.612 pm VM: unix - Smalltalk Image: Squeak4.4 [latest update: #12327] SecurityManager state: Restricted: false FileAccess: true SocketAccess: true Working Dir /home/chris/Desktop/squeak.org Trusted Dir /home/chris/Desktop/squeak.org/secure Untrusted Dir /home/chris/Desktop/squeak.org/My Squeak XTLibCryptoHash(Object)>>error: Receiver: a XTLibCryptoHash Arguments and temporary variables: aString: 'External module not found' Receiver's instance variables: library: nil context: a XTEVPMDCTX algorithm: nil XTLibCryptoHash(Object)>>externalCallFailed Receiver: a XTLibCryptoHash Arguments and temporary variables: errCode: 15 Receiver's instance variables: library: nil context: a XTEVPMDCTX algorithm: nil XTLibCryptoHash>>EVP_MD_CTX_init: Receiver: a XTLibCryptoHash Arguments and temporary variables: <<error during printing> Receiver's instance variables: library: nil context: a XTEVPMDCTX algorithm: nil

2 1

VM Maker: CMakeVMMakerSqueak-tty.62.mcz
by commits＠source.squeak.org 17 Jun '14

17 Jun '14

Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.62.mcz ==================== Summary ==================== Name: CMakeVMMakerSqueak-tty.62 Author: tty Time: 16 June 2014, 9:26:06.024 pm UUID: 240b4326-5dda-4748-8230-23a9a4df4710 Ancestors: CMakeVMMakerSqueak-tty.61 Removed per buildType stubs for extraVMSettings and postBuildActions. These are compat layer overrides and not pure additions to the system. I want to live with a few iterations before implementing. left a note to myself to reconsider: extraVMSettingsBuild: aMaker postBuildActionsBuild: aMaker extraPluginSettings: aMaker tests ran build compiled fine buildDebug generated and started to build! Tomorrow starts the boilerplate grunt work of cranking out real configurations. =============== Diff against CMakeVMMakerSqueak-tty.61 =============== Item was removed: - ----- Method: TCPlatformConfigForSqueak>>extraVMSettingsBuild (in category 'cmake config build type ') ----- - extraVMSettingsBuild - self required! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>extraVMSettingsBuildAssert (in category 'cmake config build type ') ----- - extraVMSettingsBuildAssert - self required! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>extraVMSettingsBuildAssertITimerHeartbeat (in category 'cmake config build type ') ----- - extraVMSettingsBuildAssertITimerHeartbeat - self required! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>extraVMSettingsBuildDebug (in category 'cmake config build type ') ----- - extraVMSettingsBuildDebug - self required! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>extraVMSettingsBuildDebugITimerHeartbeat (in category 'cmake config build type ') ----- - extraVMSettingsBuildDebugITimerHeartbeat - self required! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>extraVMSettingsBuildITimerHeartbeat (in category 'cmake config build type ') ----- - extraVMSettingsBuildITimerHeartbeat - self required! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>extraVMSettingsBuildMultiThreaded (in category 'cmake config build type ') ----- - extraVMSettingsBuildMultiThreaded - self required! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>extraVMSettingsBuildMultiThreadedAssert (in category 'cmake config build type ') ----- - extraVMSettingsBuildMultiThreadedAssert - self required! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>extraVMSettingsBuildMultiThreadedDebug (in category 'cmake config build type ') ----- - extraVMSettingsBuildMultiThreadedDebug - self required! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>extraVMSettingsBuildNone (in category 'cmake config build type ') ----- - extraVMSettingsBuildNone - self required! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>postBuildActionsBuild: (in category 'cmake config build type ') ----- - postBuildActionsBuild: aMaker - "convenience method for this buildType. default is self postBuildActions" - ^self postBuildActions:aMaker - ! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>postBuildActionsBuildAssert: (in category 'cmake config build type ') ----- - postBuildActionsBuildAssert: aMaker - "convenience method for this buildType. default is self postBuildActions" - ^self postBuildActions:aMaker - ! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>postBuildActionsBuildAssertITimerHeartbeat: (in category 'cmake config build type ') ----- - postBuildActionsBuildAssertITimerHeartbeat: aMaker - "convenience method for this buildType. default is self postBuildActions" - ^self postBuildActions:aMaker - ! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>postBuildActionsBuildDebug: (in category 'cmake config build type ') ----- - postBuildActionsBuildDebug: aMaker - "convenience method for this buildType. default is self postBuildActions: aMaker" - ^self postBuildActions:aMaker - ! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>postBuildActionsBuildDebugITimerHeartbeat: (in category 'cmake config build type ') ----- - postBuildActionsBuildDebugITimerHeartbeat: aMaker - "convenience method for this buildType. default is self postBuildActions: aMaker" - ^self postBuildActions:aMaker - ! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>postBuildActionsBuildITimerHeartbeat: (in category 'cmake config build type ') ----- - postBuildActionsBuildITimerHeartbeat: aMaker - "convenience method for this buildType. default is self postBuildActions: aMaker" - ^self postBuildActions:aMaker - ! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>postBuildActionsBuildMultiThreaded: (in category 'cmake config build type ') ----- - postBuildActionsBuildMultiThreaded: aMaker - "convenience method for this buildType. default is self postBuildActions: aMaker" - ^self postBuildActions:aMaker - ! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>postBuildActionsBuildMultiThreadedAssert: (in category 'cmake config build type ') ----- - postBuildActionsBuildMultiThreadedAssert: aMaker - "convenience method for this buildType. default is self postBuildActions: aMaker" - ^self postBuildActions:aMaker - ! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>postBuildActionsBuildMultiThreadedDebug: (in category 'cmake config build type ') ----- - postBuildActionsBuildMultiThreadedDebug: aMaker - "convenience method for this buildType. default is self postBuildActions: aMaker" - ^self postBuildActions:aMaker - ! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>postBuildActionsBuildNone: (in category 'cmake config build type ') ----- - postBuildActionsBuildNone: aMaker - "convenience method for this buildType. default is self postBuildActions: aMaker" - ^self postBuildActions:aMaker - !

1 0

VM Maker: CMakeVMMakerSqueak-tty.61.mcz
by commits＠source.squeak.org 17 Jun '14

17 Jun '14

Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.61.mcz ==================== Summary ==================== Name: CMakeVMMakerSqueak-tty.61 Author: tty Time: 16 June 2014, 9:03:03.664 pm UUID: 5e4fd6d7-f360-4eb2-98de-e7c712cc843d Ancestors: CMakeVMMakerSqueak-tty.60 setupDirectoriesBuild: aMaker is a compatibility method override. Decided against configuring for different buildTypes for now. Will revisit later if necessary =============== Diff against CMakeVMMakerSqueak-tty.60 =============== Item was changed: + ----- Method: Linux64Config>>setupDirectories: (in category 'cmake config build type ') ----- + setupDirectories: aMaker + "SystemNavigation default browseMethodsWhoseNamesContain: 'setupDirectories:' + + we subclass this in our concrete builder and route it to + + ^self setupDirectories: aMaker buildType: (self buildType asSymbol) - ----- Method: Linux64Config>>setupDirectories: (in category 'squeak compatibility') ----- - setupDirectories: gen - | dirsInclude | + " + self required - " write the directories in separate include file" - dirsInclude := gen captureOutputDuring: [ - gen - set: #topDir toString: (self topDir fullName); - set: #buildDir toString: (self buildDir ifNil: ['${topDir}/build'] ifNotNil: [self buildDir fullName] ); - set: #thirdpartyDir toString: '${buildDir}/thirdParty'; - set: #platformsDir toString: self platformsDir; - set: #srcDir toString: self srcDir pathName; - set: #srcPluginsDir toString: (pluginsDir ifNil: [ '${srcDir}/plugins' ]); - set: #srcVMDir toString: '${srcDir}/vm'; - set: #platformName toString: self platformName; - set: #targetPlatform to: '${platformsDir}/${platformName}'; - set: #crossDir toString: '${platformsDir}/Cross'; - set: #platformVMDir toString: '${targetPlatform}/vm'; - set: #outputDir toString: self outputDir fullName. - ]. - - self write: dirsInclude toFile: 'directories.cmake'. - gen include: 'directories.cmake'. ! Item was changed: ----- Method: Linux64x86w32BitConfig>>configureBuild (in category 'cmake') ----- configureBuild "configure this Configuration for a buildType #build" self - " setGlobalOptionsBuild: aMaker" - " setGlobalOptionsAfterDetermineSystemBuild: aMaker" - " setupDirectoriesBuild: aMaker;" preferredIncludesBuild; standardIncludesBuild; compilerFlagsBuild; - " extraVMSettingsBuild: aMaker" internalPluginsBuild; externalPluginsBuild; thirdpartyLibsBuild. + ! - " postBuildActionsBuild: aMaker" - " configHBuild"! Item was changed: ----- Method: Linux64x86w32BitConfig>>setupDirectories: (in category 'squeak compatibility') ----- + setupDirectories: aMaker - setupDirectories: gen | dirsInclude | " write the directories in separate include file" + dirsInclude := aMaker captureOutputDuring: [ + aMaker - dirsInclude := gen captureOutputDuring: [ - gen set: #topDir toString: (self topDir fullName); set: #buildDir toString: (self buildDir ifNil: ['${topDir}/build'] ifNotNil: [self buildDir fullName] ); set: #thirdpartyDir toString: '${buildDir}/thirdParty'; set: #platformsDir toString: self platformsDir; set: #srcDir toString: self srcDir pathName; set: #srcPluginsDir toString: (pluginsDir ifNil: [ '${srcDir}/plugins' ]); set: #srcVMDir toString: '${srcDir}/vm'; set: #platformName toString: self platformName; set: #targetPlatform to: '${platformsDir}/${platformName}'; set: #crossDir toString: '${platformsDir}/Cross'; set: #platformVMDir toString: '${targetPlatform}/vm'; set: #outputDir toString: self outputDir fullName. ]. self write: dirsInclude toFile: 'directories.cmake'. + aMaker include: 'directories.cmake'. - gen include: 'directories.cmake'. ! Item was changed: ----- Method: Linux64x86w32BitSqueakCogV3SlackwareNoGLConfig>>setupDirectories: (in category 'squeak compatibility') ----- setupDirectories: gen super setupDirectories: gen. gen set: #externalModulesDir toString: self externalModulesDir.! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>configureBuild (in category 'cmake configuration') ----- + configureBuild + "configure this Configuration for a buildType #build" + self + preferredIncludesBuild; + standardIncludesBuild; + compilerFlagsBuild; + internalPluginsBuild; + externalPluginsBuild; + thirdpartyLibsBuild + + + + + + ! Item was added: + ----- Method: SqueakBSDConfig>>configureBuild (in category 'cmake configuration') ----- + configureBuild + "configure this Configuration for a buildType #build" + self + preferredIncludesBuild; + standardIncludesBuild; + compilerFlagsBuild; + internalPluginsBuild; + externalPluginsBuild; + thirdpartyLibsBuild + + + + + + ! Item was added: + ----- Method: SqueakIA32BochsConfig>>configureBuild (in category 'cmake configuration') ----- + configureBuild + "configure this Configuration for a buildType #build" + self + preferredIncludesBuild; + standardIncludesBuild; + compilerFlagsBuild; + internalPluginsBuild; + externalPluginsBuild; + thirdpartyLibsBuild + + + + + ! Item was added: + ----- Method: SqueakMacOSConfig>>configureBuild (in category 'cmake configuration') ----- + configureBuild + "configure this Configuration for a buildType #build" + self + preferredIncludesBuild; + standardIncludesBuild; + compilerFlagsBuild; + internalPluginsBuild; + externalPluginsBuild; + thirdpartyLibsBuild + + + + + + ! Item was added: + ----- Method: SqueakSunOS32x86Config>>configureBuild (in category 'cmake configuration') ----- + configureBuild + "configure this Configuration for a buildType #build" + self + preferredIncludesBuild; + standardIncludesBuild; + compilerFlagsBuild; + internalPluginsBuild; + externalPluginsBuild; + thirdpartyLibsBuild + + + + + ! Item was added: + ----- Method: SqueakWin32x86Config>>configureBuild (in category 'cmake configuration') ----- + configureBuild + "configure this Configuration for a buildType #build" + self + preferredIncludesBuild; + standardIncludesBuild; + compilerFlagsBuild; + internalPluginsBuild; + externalPluginsBuild; + thirdpartyLibsBuild + + + + + + ! Item was changed: ----- Method: TCPlatformConfigForSqueak>>configureBuild (in category 'cmake configuration') ----- configureBuild "configure this Configuration for a buildType #build" self - " setGlobalOptionsBuild: aMaker" - " setGlobalOptionsAfterDetermineSystemBuild: aMaker" - " setupDirectoriesBuild: aMaker;" preferredIncludesBuild; standardIncludesBuild; compilerFlagsBuild; - " extraVMSettingsBuild: aMaker" internalPluginsBuild; externalPluginsBuild; thirdpartyLibsBuild - " postBuildActionsBuild:" - " configHBuild." ! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>setupDirectoriesBuild: (in category 'cmake config build type ') ----- - setupDirectoriesBuild: aMaker - "convencience method to customize for this build. default is self setupDirectories: aMaker" - self setupDirectories: aMaker - ! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>setupDirectoriesBuildAssert: (in category 'cmake config build type ') ----- - setupDirectoriesBuildAssert: aMaker - "convencience method to customize for this build. default is self setupDirectories: aMaker" - self setupDirectories: aMaker - - ! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>setupDirectoriesBuildAssertITimerHeartbeat: (in category 'cmake config build type ') ----- - setupDirectoriesBuildAssertITimerHeartbeat: aMaker - "convencience method to customize for this build. default is self setupDirectories: aMaker" - self setupDirectories: aMaker - - - - ! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>setupDirectoriesBuildDebug: (in category 'cmake config build type ') ----- - setupDirectoriesBuildDebug: aMaker - "convencience method to customize for this build. default is self setupDirectories: aMaker" - self setupDirectories: aMaker - - - - ! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>setupDirectoriesBuildDebugITimerHeartbeat: (in category 'cmake config build type ') ----- - setupDirectoriesBuildDebugITimerHeartbeat: aMaker - "convencience method to customize for this build. default is self setupDirectories: aMaker" - self setupDirectories: aMaker - - ! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>setupDirectoriesBuildITimerHeartbeat: (in category 'cmake config build type ') ----- - setupDirectoriesBuildITimerHeartbeat: aMaker - "convencience method to customize for this build. default is self setupDirectories: aMaker" - self setupDirectories: aMaker! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>setupDirectoriesBuildMultiThreaded: (in category 'cmake config build type ') ----- - setupDirectoriesBuildMultiThreaded: aMaker - "convencience method to customize for this build. default is self setupDirectories: aMaker" - self setupDirectories: aMaker! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>setupDirectoriesBuildMultiThreadedAssert: (in category 'cmake config build type ') ----- - setupDirectoriesBuildMultiThreadedAssert: aMaker - "convencience method to customize for this build. default is self setupDirectories: aMaker" - self setupDirectories: aMaker! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>setupDirectoriesBuildMultiThreadedDebug: (in category 'cmake config build type ') ----- - setupDirectoriesBuildMultiThreadedDebug: aMaker - "convencience method to customize for this build. default is self setupDirectories: aMaker" - self setupDirectories: aMaker! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>setupDirectoriesBuildNone: (in category 'cmake config build type ') ----- - setupDirectoriesBuildNone: aMaker - "WE SHOULD NEVER GET HERE" - self halt. - !

1 0

VM Maker: CMakeVMMakerSqueak-tty.60.mcz
by commits＠source.squeak.org 17 Jun '14

17 Jun '14

Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.60.mcz ==================== Summary ==================== Name: CMakeVMMakerSqueak-tty.60 Author: tty Time: 16 June 2014, 8:24:16.748 pm UUID: b17ada22-1810-4cf0-a4fb-e6405f96b880 Ancestors: CMakeVMMakerSqueak-tty.59 setGlobalOptionsAfterDetermineSystemBuild: intercepted as customization option for build type and routes to setGlobalOptionsAfterDetermineSystem:buildType: where configurations have option of customizing this. default routes to super class original method. Removed an extraneous key #buildDebugMultiThreaded in SqueakCMakeVMMakerAbstractBuilder buildTypeAndDirectoryInfo since #buildMultiThreadedDebug is naming convention in directory structure Edited all methods that accessed it. Tests run, build completes. Next up setupDirectoriesBuild: aMaker =============== Diff against CMakeVMMakerSqueak-tty.59 =============== Item was changed: ----- Method: Linux32x86Config>>compilerFlags (in category 'compiler flags') ----- compilerFlags |d commonFlags flags| d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d at: #build put: [self compilerFlagsBuild]; at: #buildAssert put: [self compilerFlagsAssert]; at: #buildAssertITimerHeartbeat put: [self compilerFlagsAssertITimerHeartbeat]; at:#buildDebug put: [self compilerFlagsDebug]; "located in CMakeVMMaker CPlatformConfig" at: #buildDebugITimerHeartbeat put: [self compilerFlagsDebugITimerHeartbeat ]; - at: #buildDebugMultiThreaded put: [self compilerFlagsDebugMultiThreaded]; at: #buildITimerHeartbeat put: [self compilerFlagsIHeartbeatTimer]; at: #buildMultiThreaded put: [self compilerFlagsMultiThreaded ]; at: #buildMultiThreadedAssert put: [self compilerFlagsMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self compilerFlagsMultiThreadedDebug ]; at: #buildNone put:[self compilerFlagsNoBuildType]. flags:= String streamContents: [ :stream | (((d at: buildType) value) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter:' ']. commonFlags:=String streamContents: [ :stream | ((self commonCompilerFlags) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter: ' ' ]. ^ commonFlags, ' ' ,flags.! Item was changed: ----- Method: Linux32x86Config>>configureForBuildType: (in category 'cmake') ----- configureForBuildType: aSymbol | d | "provide a concrete builder with the buildType and configureBuildX method to invoke" d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. self configureNoBuildType. "reset all internal flags" d at: #build put: [self buildType:#build. self configureBuild]; at: #buildAssert put: [self buildType: #buildAssert. self configureBuildAssert]; at: #buildAssertITimerHeartbeat put: [ self buildType: #buildAssertITimerHeartbeat. self configureBuildAssertITimerHeartbeat]; at:#buildDebug put: [self buildType: #buildDebug. self configureBuildDebug]; at: #buildDebugITimerHeartbeat put: [self buildType: #buildDebugITimerHeartbeat. self configureBuildDebugITimerHeartbeat]; - at: #buildDebugMultiThreaded - put: [self buildType: #buildDebugMultiThreaded. self configureBuildDebugMultiThreaded]; - at: #buildITimerHeartbeat put: [self buildType:#buildITimerHeartbeat. self configureBuildIHeartbeatTimer]; at: #buildMultiThreaded put: [self buildType:#buildMultiThreaded . self configureBuildMultiThreaded]; at: #buildMultiThreadedAssert put: [self buildType: #buildMultiThreadedAssert. self configureBuildMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self buildType: #buildMultiThreadedDebug. self configureBuildMultiThreadedDebug]. ^(d at: aSymbol).! Item was added: + ----- Method: Linux32x86Config>>generateConfigH: (in category 'headers generation') ----- + generateConfigH: aBuildType + "self write: self configH toFile: 'config.h'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self configHBuild]; + at: #buildAssert put: [self configHBuildAssert]; + at: #buildAssertITimerHeartbeat put: [self configHBuildAssertITimerHeartbeat]; + at:#buildDebug put: [self configHBuildDebug]; "located in CMakeVMMaker CPlatformConfig" + at: #buildDebugITimerHeartbeat put: [self configHBuildDebugITimerHeartbeat ]; + at: #buildITimerHeartbeat put: [self configHBuildITimerHeartbeat]; + at: #buildMultiThreaded put: [self configHBuildMultiThreaded ]; + at: #buildMultiThreadedAssert put: [self configHBuildMultiThreadedAssert]; + at: #buildMultiThreadedDebug put: [self configHBuildMultiThreadedDebug ]; + at: #buildNone put:[self configHNoBuildType]. + + + ^(d at: ( aBuildType)) value + + + + ! Item was added: + ----- Method: Linux32x86Config>>setGlobalOptionsAfterDetermineSystem:buildType: (in category 'utils') ----- + setGlobalOptionsAfterDetermineSystem: aMaker buildType: aBuildType + "invoke correct setGlobalOptions for this buildType to allow per-buildType customization'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self setGlobalOptionsAfterDetermineSystemBuild: aMaker]; + at: #buildAssert put: [self setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker]; + at: #buildAssertITimerHeartbeat put: [self setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker]; + at:#buildDebug put: [self setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker]; + at: #buildITimerHeartbeat put: [self setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker]; + at: #buildMultiThreaded put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker ]; + at: #buildMultiThreadedAssert put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker]; + at: #buildMultiThreadedDebug put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker ]; + at: #buildNone put:[self setGlobalOptionsBuildNone: aMaker]. + + ^(d at: ( aBuildType)) value + ! Item was changed: ----- Method: Linux32x86SqueakCogV3Configz>>compilerFlags (in category 'squeak compatibility') ----- compilerFlags |d commonFlags flags| d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d at: #build put: [self compilerFlagsBuild]; at: #buildAssert put: [self compilerFlagsAssert]; at: #buildAssertITimerHeartbeat put: [self compilerFlagsAssertITimerHeartbeat]; at:#buildDebug put: [self compilerFlagsDebug]; "located in CMakeVMMaker CPlatformConfig" at: #buildDebugITimerHeartbeat put: [self compilerFlagsDebugITimerHeartbeat ]; - at: #buildDebugMultiThreaded put: [self compilerFlagsDebugMultiThreaded]; at: #buildITimerHeartbeat put: [self compilerFlagsIHeartbeatTimer]; at: #buildMultiThreaded put: [self compilerFlagsMultiThreaded ]; at: #buildMultiThreadedAssert put: [self compilerFlagsMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self compilerFlagsMultiThreadedDebug ]; at: #buildNone put:[self compilerFlagsNoBuildType]. flags:= String streamContents: [ :stream | (((d at: buildType) value) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter:' ']. commonFlags:=String streamContents: [ :stream | ((self commonCompilerFlags) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter: ' ' ]. ^ commonFlags, ' ' ,flags.! Item was changed: ----- Method: Linux32x86SqueakCogV3Configz>>configureForBuildType: (in category 'cmake configuration') ----- configureForBuildType: aSymbol | d | "provide a concrete builder with the buildType and configureBuildX method to invoke" d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. self configureNoBuildType. "reset all internal flags" d at: #build put: [self buildType:#build. self configureBuild]; at: #buildAssert put: [self buildType: #buildAssert. self configureBuildAssert]; at: #buildAssertITimerHeartbeat put: [ self buildType: #buildAssertITimerHeartbeat. self configureBuildAssertITimerHeartbeat]; at:#buildDebug put: [self buildType: #buildDebug. self configureBuildDebug]; at: #buildDebugITimerHeartbeat put: [self buildType: #buildDebugITimerHeartbeat. self configureBuildDebugITimerHeartbeat]; - at: #buildDebugMultiThreaded - put: [self buildType: #buildDebugMultiThreaded. self configureBuildDebugMultiThreaded]; - at: #buildITimerHeartbeat put: [self buildType:#buildITimerHeartbeat. self configureBuildIHeartbeatTimer]; at: #buildMultiThreaded put: [self buildType:#buildMultiThreaded . self configureBuildMultiThreaded]; at: #buildMultiThreadedAssert put: [self buildType: #buildMultiThreadedAssert. self configureBuildMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self buildType: #buildMultiThreadedDebug. self configureBuildMultiThreadedDebug]. ^(d at: aSymbol).! Item was added: + ----- Method: Linux32x86SqueakCogV3Configz>>generateConfigH: (in category 'headers generation') ----- + generateConfigH: aBuildType + "self write: self configH toFile: 'config.h'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self configHBuild]; + at: #buildAssert put: [self configHBuildAssert]; + at: #buildAssertITimerHeartbeat put: [self configHBuildAssertITimerHeartbeat]; + at:#buildDebug put: [self configHBuildDebug]; "located in CMakeVMMaker CPlatformConfig" + at: #buildDebugITimerHeartbeat put: [self configHBuildDebugITimerHeartbeat ]; + at: #buildITimerHeartbeat put: [self configHBuildITimerHeartbeat]; + at: #buildMultiThreaded put: [self configHBuildMultiThreaded ]; + at: #buildMultiThreadedAssert put: [self configHBuildMultiThreadedAssert]; + at: #buildMultiThreadedDebug put: [self configHBuildMultiThreadedDebug ]; + at: #buildNone put:[self configHNoBuildType]. + + + ^(d at: ( aBuildType)) value + + + + ! Item was added: + ----- Method: Linux32x86SqueakCogV3Configz>>setGlobalOptionsAfterDetermineSystem:buildType: (in category 'utils') ----- + setGlobalOptionsAfterDetermineSystem: aMaker buildType: aBuildType + "invoke correct setGlobalOptions for this buildType to allow per-buildType customization'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self setGlobalOptionsAfterDetermineSystemBuild: aMaker]; + at: #buildAssert put: [self setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker]; + at: #buildAssertITimerHeartbeat put: [self setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker]; + at:#buildDebug put: [self setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker]; + at: #buildITimerHeartbeat put: [self setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker]; + at: #buildMultiThreaded put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker ]; + at: #buildMultiThreadedAssert put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker]; + at: #buildMultiThreadedDebug put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker ]; + at: #buildNone put:[self setGlobalOptionsBuildNone: aMaker]. + + ^(d at: ( aBuildType)) value + ! Item was changed: ----- Method: Linux32x86SqueakCogV3DebugConfigz>>compilerFlags (in category 'squeak compatibility') ----- compilerFlags |d commonFlags flags| d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d at: #build put: [self compilerFlagsBuild]; at: #buildAssert put: [self compilerFlagsAssert]; at: #buildAssertITimerHeartbeat put: [self compilerFlagsAssertITimerHeartbeat]; at:#buildDebug put: [self compilerFlagsDebug]; "located in CMakeVMMaker CPlatformConfig" at: #buildDebugITimerHeartbeat put: [self compilerFlagsDebugITimerHeartbeat ]; - at: #buildDebugMultiThreaded put: [self compilerFlagsDebugMultiThreaded]; at: #buildITimerHeartbeat put: [self compilerFlagsIHeartbeatTimer]; at: #buildMultiThreaded put: [self compilerFlagsMultiThreaded ]; at: #buildMultiThreadedAssert put: [self compilerFlagsMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self compilerFlagsMultiThreadedDebug ]; at: #buildNone put:[self compilerFlagsNoBuildType]. flags:= String streamContents: [ :stream | (((d at: buildType) value) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter:' ']. commonFlags:=String streamContents: [ :stream | ((self commonCompilerFlags) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter: ' ' ]. ^ commonFlags, ' ' ,flags.! Item was changed: ----- Method: Linux32x86SqueakStackSpurConfigz>>compilerFlags (in category 'compiler flags') ----- compilerFlags |d commonFlags flags| d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d at: #build put: [self compilerFlagsBuild]; at: #buildAssert put: [self compilerFlagsAssert]; at: #buildAssertITimerHeartbeat put: [self compilerFlagsAssertITimerHeartbeat]; at:#buildDebug put: [self compilerFlagsDebug]; "located in CMakeVMMaker CPlatformConfig" at: #buildDebugITimerHeartbeat put: [self compilerFlagsDebugITimerHeartbeat ]; - at: #buildDebugMultiThreaded put: [self compilerFlagsDebugMultiThreaded]; at: #buildITimerHeartbeat put: [self compilerFlagsIHeartbeatTimer]; at: #buildMultiThreaded put: [self compilerFlagsMultiThreaded ]; at: #buildMultiThreadedAssert put: [self compilerFlagsMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self compilerFlagsMultiThreadedDebug ]; at: #buildNone put:[self compilerFlagsNoBuildType]. flags:= String streamContents: [ :stream | (((d at: buildType) value) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter:' ']. commonFlags:=String streamContents: [ :stream | ((self commonCompilerFlags) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter: ' ' ]. ^ commonFlags, ' ' ,flags.! Item was changed: ----- Method: Linux32x86SqueakStackSpurConfigz>>configureForBuildType: (in category 'cmake configuration') ----- configureForBuildType: aSymbol | d | "provide a concrete builder with the buildType and configureBuildX method to invoke" d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. self configureNoBuildType. "reset all internal flags" d at: #build put: [self buildType:#build. self configureBuild]; at: #buildAssert put: [self buildType: #buildAssert. self configureBuildAssert]; at: #buildAssertITimerHeartbeat put: [ self buildType: #buildAssertITimerHeartbeat. self configureBuildAssertITimerHeartbeat]; at:#buildDebug put: [self buildType: #buildDebug. self configureBuildDebug]; at: #buildDebugITimerHeartbeat put: [self buildType: #buildDebugITimerHeartbeat. self configureBuildDebugITimerHeartbeat]; - at: #buildDebugMultiThreaded - put: [self buildType: #buildDebugMultiThreaded. self configureBuildDebugMultiThreaded]; - at: #buildITimerHeartbeat put: [self buildType:#buildITimerHeartbeat. self configureBuildIHeartbeatTimer]; at: #buildMultiThreaded put: [self buildType:#buildMultiThreaded . self configureBuildMultiThreaded]; at: #buildMultiThreadedAssert put: [self buildType: #buildMultiThreadedAssert. self configureBuildMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self buildType: #buildMultiThreadedDebug. self configureBuildMultiThreadedDebug]. ^(d at: aSymbol).! Item was added: + ----- Method: Linux32x86SqueakStackSpurConfigz>>generateConfigH: (in category 'headers generation') ----- + generateConfigH: aBuildType + "self write: self configH toFile: 'config.h'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self configHBuild]; + at: #buildAssert put: [self configHBuildAssert]; + at: #buildAssertITimerHeartbeat put: [self configHBuildAssertITimerHeartbeat]; + at:#buildDebug put: [self configHBuildDebug]; "located in CMakeVMMaker CPlatformConfig" + at: #buildDebugITimerHeartbeat put: [self configHBuildDebugITimerHeartbeat ]; + at: #buildITimerHeartbeat put: [self configHBuildITimerHeartbeat]; + at: #buildMultiThreaded put: [self configHBuildMultiThreaded ]; + at: #buildMultiThreadedAssert put: [self configHBuildMultiThreadedAssert]; + at: #buildMultiThreadedDebug put: [self configHBuildMultiThreadedDebug ]; + at: #buildNone put:[self configHNoBuildType]. + + + ^(d at: ( aBuildType)) value + + + + ! Item was added: + ----- Method: Linux32x86SqueakStackSpurConfigz>>setGlobalOptionsAfterDetermineSystem:buildType: (in category 'utils') ----- + setGlobalOptionsAfterDetermineSystem: aMaker buildType: aBuildType + "invoke correct setGlobalOptions for this buildType to allow per-buildType customization'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self setGlobalOptionsAfterDetermineSystemBuild: aMaker]; + at: #buildAssert put: [self setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker]; + at: #buildAssertITimerHeartbeat put: [self setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker]; + at:#buildDebug put: [self setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker]; + at: #buildITimerHeartbeat put: [self setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker]; + at: #buildMultiThreaded put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker ]; + at: #buildMultiThreadedAssert put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker]; + at: #buildMultiThreadedDebug put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker ]; + at: #buildNone put:[self setGlobalOptionsBuildNone: aMaker]. + + ^(d at: ( aBuildType)) value + ! Item was changed: ----- Method: Linux32x86SqueakStackV3Configz>>compilerFlags (in category 'squeak compatibility') ----- compilerFlags |d commonFlags flags| d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d at: #build put: [self compilerFlagsBuild]; at: #buildAssert put: [self compilerFlagsAssert]; at: #buildAssertITimerHeartbeat put: [self compilerFlagsAssertITimerHeartbeat]; at:#buildDebug put: [self compilerFlagsDebug]; "located in CMakeVMMaker CPlatformConfig" at: #buildDebugITimerHeartbeat put: [self compilerFlagsDebugITimerHeartbeat ]; - at: #buildDebugMultiThreaded put: [self compilerFlagsDebugMultiThreaded]; at: #buildITimerHeartbeat put: [self compilerFlagsIHeartbeatTimer]; at: #buildMultiThreaded put: [self compilerFlagsMultiThreaded ]; at: #buildMultiThreadedAssert put: [self compilerFlagsMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self compilerFlagsMultiThreadedDebug ]; at: #buildNone put:[self compilerFlagsNoBuildType]. flags:= String streamContents: [ :stream | (((d at: buildType) value) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter:' ']. commonFlags:=String streamContents: [ :stream | ((self commonCompilerFlags) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter: ' ' ]. ^ commonFlags, ' ' ,flags.! Item was changed: ----- Method: Linux32x86SqueakStackV3Configz>>configureForBuildType: (in category 'cmake configuration') ----- configureForBuildType: aSymbol | d | "provide a concrete builder with the buildType and configureBuildX method to invoke" d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. self configureNoBuildType. "reset all internal flags" d at: #build put: [self buildType:#build. self configureBuild]; at: #buildAssert put: [self buildType: #buildAssert. self configureBuildAssert]; at: #buildAssertITimerHeartbeat put: [ self buildType: #buildAssertITimerHeartbeat. self configureBuildAssertITimerHeartbeat]; at:#buildDebug put: [self buildType: #buildDebug. self configureBuildDebug]; at: #buildDebugITimerHeartbeat put: [self buildType: #buildDebugITimerHeartbeat. self configureBuildDebugITimerHeartbeat]; - at: #buildDebugMultiThreaded - put: [self buildType: #buildDebugMultiThreaded. self configureBuildDebugMultiThreaded]; - at: #buildITimerHeartbeat put: [self buildType:#buildITimerHeartbeat. self configureBuildIHeartbeatTimer]; at: #buildMultiThreaded put: [self buildType:#buildMultiThreaded . self configureBuildMultiThreaded]; at: #buildMultiThreadedAssert put: [self buildType: #buildMultiThreadedAssert. self configureBuildMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self buildType: #buildMultiThreadedDebug. self configureBuildMultiThreadedDebug]. ^(d at: aSymbol).! Item was added: + ----- Method: Linux32x86SqueakStackV3Configz>>generateConfigH: (in category 'headers generation') ----- + generateConfigH: aBuildType + "self write: self configH toFile: 'config.h'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self configHBuild]; + at: #buildAssert put: [self configHBuildAssert]; + at: #buildAssertITimerHeartbeat put: [self configHBuildAssertITimerHeartbeat]; + at:#buildDebug put: [self configHBuildDebug]; "located in CMakeVMMaker CPlatformConfig" + at: #buildDebugITimerHeartbeat put: [self configHBuildDebugITimerHeartbeat ]; + at: #buildITimerHeartbeat put: [self configHBuildITimerHeartbeat]; + at: #buildMultiThreaded put: [self configHBuildMultiThreaded ]; + at: #buildMultiThreadedAssert put: [self configHBuildMultiThreadedAssert]; + at: #buildMultiThreadedDebug put: [self configHBuildMultiThreadedDebug ]; + at: #buildNone put:[self configHNoBuildType]. + + + ^(d at: ( aBuildType)) value + + + + ! Item was added: + ----- Method: Linux32x86SqueakStackV3Configz>>setGlobalOptionsAfterDetermineSystem:buildType: (in category 'utils') ----- + setGlobalOptionsAfterDetermineSystem: aMaker buildType: aBuildType + "invoke correct setGlobalOptions for this buildType to allow per-buildType customization'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self setGlobalOptionsAfterDetermineSystemBuild: aMaker]; + at: #buildAssert put: [self setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker]; + at: #buildAssertITimerHeartbeat put: [self setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker]; + at:#buildDebug put: [self setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker]; + at: #buildITimerHeartbeat put: [self setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker]; + at: #buildMultiThreaded put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker ]; + at: #buildMultiThreadedAssert put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker]; + at: #buildMultiThreadedDebug put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker ]; + at: #buildNone put:[self setGlobalOptionsBuildNone: aMaker]. + + ^(d at: ( aBuildType)) value + ! Item was changed: ----- Method: Linux64Config>>compilerFlags (in category 'squeak compatibility') ----- compilerFlags |d commonFlags flags| d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d at: #build put: [self compilerFlagsBuild]; at: #buildAssert put: [self compilerFlagsAssert]; at: #buildAssertITimerHeartbeat put: [self compilerFlagsAssertITimerHeartbeat]; at:#buildDebug put: [self compilerFlagsDebug]; "located in CMakeVMMaker CPlatformConfig" at: #buildDebugITimerHeartbeat put: [self compilerFlagsDebugITimerHeartbeat ]; - at: #buildDebugMultiThreaded put: [self compilerFlagsDebugMultiThreaded]; at: #buildITimerHeartbeat put: [self compilerFlagsIHeartbeatTimer]; at: #buildMultiThreaded put: [self compilerFlagsMultiThreaded ]; at: #buildMultiThreadedAssert put: [self compilerFlagsMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self compilerFlagsMultiThreadedDebug ]; at: #buildNone put:[self compilerFlagsNoBuildType]. flags:= String streamContents: [ :stream | (((d at: buildType) value) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter:' ']. commonFlags:=String streamContents: [ :stream | ((self commonCompilerFlags) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter: ' ' ]. ^ commonFlags, ' ' ,flags.! Item was changed: ----- Method: Linux64Config>>configureForBuildType: (in category 'cmake configuration') ----- configureForBuildType: aSymbol | d | "provide a concrete builder with the buildType and configureBuildX method to invoke" d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. self configureNoBuildType. "reset all internal flags" d at: #build put: [self buildType:#build. self configureBuild]; at: #buildAssert put: [self buildType: #buildAssert. self configureBuildAssert]; at: #buildAssertITimerHeartbeat put: [ self buildType: #buildAssertITimerHeartbeat. self configureBuildAssertITimerHeartbeat]; at:#buildDebug put: [self buildType: #buildDebug. self configureBuildDebug]; at: #buildDebugITimerHeartbeat put: [self buildType: #buildDebugITimerHeartbeat. self configureBuildDebugITimerHeartbeat]; - at: #buildDebugMultiThreaded - put: [self buildType: #buildDebugMultiThreaded. self configureBuildDebugMultiThreaded]; - at: #buildITimerHeartbeat put: [self buildType:#buildITimerHeartbeat. self configureBuildIHeartbeatTimer]; at: #buildMultiThreaded put: [self buildType:#buildMultiThreaded . self configureBuildMultiThreaded]; at: #buildMultiThreadedAssert put: [self buildType: #buildMultiThreadedAssert. self configureBuildMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self buildType: #buildMultiThreadedDebug. self configureBuildMultiThreadedDebug]. ^(d at: aSymbol).! Item was added: + ----- Method: Linux64Config>>generateConfigH: (in category 'headers generation') ----- + generateConfigH: aBuildType + "self write: self configH toFile: 'config.h'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self configHBuild]; + at: #buildAssert put: [self configHBuildAssert]; + at: #buildAssertITimerHeartbeat put: [self configHBuildAssertITimerHeartbeat]; + at:#buildDebug put: [self configHBuildDebug]; "located in CMakeVMMaker CPlatformConfig" + at: #buildDebugITimerHeartbeat put: [self configHBuildDebugITimerHeartbeat ]; + at: #buildITimerHeartbeat put: [self configHBuildITimerHeartbeat]; + at: #buildMultiThreaded put: [self configHBuildMultiThreaded ]; + at: #buildMultiThreadedAssert put: [self configHBuildMultiThreadedAssert]; + at: #buildMultiThreadedDebug put: [self configHBuildMultiThreadedDebug ]; + at: #buildNone put:[self configHNoBuildType]. + + + ^(d at: ( aBuildType)) value + + + + ! Item was added: + ----- Method: Linux64Config>>setGlobalOptionsAfterDetermineSystem:buildType: (in category 'utils') ----- + setGlobalOptionsAfterDetermineSystem: aMaker buildType: aBuildType + "invoke correct setGlobalOptions for this buildType to allow per-buildType customization'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self setGlobalOptionsAfterDetermineSystemBuild: aMaker]; + at: #buildAssert put: [self setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker]; + at: #buildAssertITimerHeartbeat put: [self setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker]; + at:#buildDebug put: [self setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker]; + at: #buildITimerHeartbeat put: [self setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker]; + at: #buildMultiThreaded put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker ]; + at: #buildMultiThreadedAssert put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker]; + at: #buildMultiThreadedDebug put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker ]; + at: #buildNone put:[self setGlobalOptionsBuildNone: aMaker]. + + ^(d at: ( aBuildType)) value + ! Item was changed: ----- Method: Linux64x86w32BitConfig>>compilerFlags (in category 'compiler flags') ----- compilerFlags |d commonFlags flags| d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d at: #build put: [self compilerFlagsBuild]; at: #buildAssert put: [self compilerFlagsAssert]; at: #buildAssertITimerHeartbeat put: [self compilerFlagsAssertITimerHeartbeat]; at:#buildDebug put: [self compilerFlagsDebug]; "located in CMakeVMMaker CPlatformConfig" at: #buildDebugITimerHeartbeat put: [self compilerFlagsDebugITimerHeartbeat ]; - at: #buildDebugMultiThreaded put: [self compilerFlagsDebugMultiThreaded]; at: #buildITimerHeartbeat put: [self compilerFlagsIHeartbeatTimer]; at: #buildMultiThreaded put: [self compilerFlagsMultiThreaded ]; at: #buildMultiThreadedAssert put: [self compilerFlagsMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self compilerFlagsMultiThreadedDebug ]; at: #buildNone put:[self compilerFlagsNoBuildType]. flags:= String streamContents: [ :stream | (((d at: buildType) value) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter:' ']. commonFlags:=String streamContents: [ :stream | ((self commonCompilerFlags) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter: ' ' ]. ^ commonFlags, ' ' ,flags.! Item was changed: ----- Method: Linux64x86w32BitConfig>>configureForBuildType: (in category 'cmake') ----- configureForBuildType: aSymbol | d | "provide a concrete builder with the buildType and configureBuildX method to invoke" d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. self configureNoBuildType. "reset all internal flags" d at: #build put: [self buildType:#build. self configureBuild]; at: #buildAssert put: [self buildType: #buildAssert. self configureBuildAssert]; at: #buildAssertITimerHeartbeat put: [ self buildType: #buildAssertITimerHeartbeat. self configureBuildAssertITimerHeartbeat]; at:#buildDebug put: [self buildType: #buildDebug. self configureBuildDebug]; at: #buildDebugITimerHeartbeat put: [self buildType: #buildDebugITimerHeartbeat. self configureBuildDebugITimerHeartbeat]; - at: #buildDebugMultiThreaded - put: [self buildType: #buildDebugMultiThreaded. self configureBuildDebugMultiThreaded]; - at: #buildITimerHeartbeat put: [self buildType:#buildITimerHeartbeat. self configureBuildIHeartbeatTimer]; at: #buildMultiThreaded put: [self buildType:#buildMultiThreaded . self configureBuildMultiThreaded]; at: #buildMultiThreadedAssert put: [self buildType: #buildMultiThreadedAssert. self configureBuildMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self buildType: #buildMultiThreadedDebug. self configureBuildMultiThreadedDebug]. ^(d at: aSymbol).! Item was added: + ----- Method: Linux64x86w32BitConfig>>generateConfigH: (in category 'headers generation') ----- + generateConfigH: aBuildType + "self write: self configH toFile: 'config.h'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self configHBuild]; + at: #buildAssert put: [self configHBuildAssert]; + at: #buildAssertITimerHeartbeat put: [self configHBuildAssertITimerHeartbeat]; + at:#buildDebug put: [self configHBuildDebug]; "located in CMakeVMMaker CPlatformConfig" + at: #buildDebugITimerHeartbeat put: [self configHBuildDebugITimerHeartbeat ]; + at: #buildITimerHeartbeat put: [self configHBuildITimerHeartbeat]; + at: #buildMultiThreaded put: [self configHBuildMultiThreaded ]; + at: #buildMultiThreadedAssert put: [self configHBuildMultiThreadedAssert]; + at: #buildMultiThreadedDebug put: [self configHBuildMultiThreadedDebug ]; + at: #buildNone put:[self configHNoBuildType]. + + + ^(d at: ( aBuildType)) value + + + + ! Item was changed: ----- Method: Linux64x86w32BitConfig>>setGlobalOptions:buildType: (in category 'utils') ----- setGlobalOptions: aMaker buildType: aBuildType "invoke correct setGlobalOptions for this buildType to allow per-buildType customization'" |d | d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d at: #build put: [self setGlobalOptionsBuild: aMaker]; at: #buildAssert put: [self setGlobalOptionsBuildAssert: aMaker]; at: #buildAssertITimerHeartbeat put: [self setGlobalOptionsBuildAssertITimerHeartbeat: aMaker]; at:#buildDebug put: [self setGlobalOptionsBuildDebug: aMaker]; "located in CMakeVMMaker CPlatformConfig" at: #buildDebugITimerHeartbeat put: [self setGlobalOptionsBuildDebugITimerHeartbeat: aMaker ]; - at: #buildDebugMultiThreaded put: [self setGlobalOptionsBuildDebugMultiThreaded: aMaker]; at: #buildITimerHeartbeat put: [self setGlobalOptionsBuildITimerHeartbeat: aMaker]; at: #buildMultiThreaded put: [self setGlobalOptionsBuildMultiThreaded: aMaker ]; at: #buildMultiThreadedAssert put: [self setGlobalOptionsBuildMultiThreadedAssert: aMaker]; at: #buildMultiThreadedDebug put: [self setGlobalOptionsBuildMultiThreadedDebug: aMaker ]; at: #buildNone put:[self setGlobalOptionsBuildNone: aMaker]. ^((d at: ( aBuildType)) value) ! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsAfterDetermineSystem:buildType: (in category 'utils') ----- + setGlobalOptionsAfterDetermineSystem: aMaker buildType: aBuildType + "invoke correct setGlobalOptions for this buildType to allow per-buildType customization'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self setGlobalOptionsAfterDetermineSystemBuild: aMaker]; + at: #buildAssert put: [self setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker]; + at: #buildAssertITimerHeartbeat put: [self setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker]; + at:#buildDebug put: [self setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker]; + at: #buildITimerHeartbeat put: [self setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker]; + at: #buildMultiThreaded put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker ]; + at: #buildMultiThreadedAssert put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker]; + at: #buildMultiThreadedDebug put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker ]; + at: #buildNone put:[self setGlobalOptionsBuildNone: aMaker]. + + ^(d at: ( aBuildType)) value + ! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'cmake config build type ') ----- + setGlobalOptionsAfterDetermineSystemBuild: aMaker + self required! Item was changed: ----- Method: SqueakAndroidStackEvtConfig>>configureForBuildType: (in category 'cmake configuration') ----- configureForBuildType: aSymbol | d | "provide a concrete builder with the buildType and configureBuildX method to invoke" d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. self configureNoBuildType. "reset all internal flags" d at: #build put: [self buildType:#build. self configureBuild]; at: #buildAssert put: [self buildType: #buildAssert. self configureBuildAssert]; at: #buildAssertITimerHeartbeat put: [ self buildType: #buildAssertITimerHeartbeat. self configureBuildAssertITimerHeartbeat]; at:#buildDebug put: [self buildType: #buildDebug. self configureBuildDebug]; at: #buildDebugITimerHeartbeat put: [self buildType: #buildDebugITimerHeartbeat. self configureBuildDebugITimerHeartbeat]; - at: #buildDebugMultiThreaded - put: [self buildType: #buildDebugMultiThreaded. self configureBuildDebugMultiThreaded]; - at: #buildITimerHeartbeat put: [self buildType:#buildITimerHeartbeat. self configureBuildIHeartbeatTimer]; at: #buildMultiThreaded put: [self buildType:#buildMultiThreaded . self configureBuildMultiThreaded]; at: #buildMultiThreadedAssert put: [self buildType: #buildMultiThreadedAssert. self configureBuildMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self buildType: #buildMultiThreadedDebug. self configureBuildMultiThreadedDebug]. ^(d at: aSymbol).! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>generateConfigH: (in category 'headers generation') ----- + generateConfigH: aBuildType + "self write: self configH toFile: 'config.h'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self configHBuild]; + at: #buildAssert put: [self configHBuildAssert]; + at: #buildAssertITimerHeartbeat put: [self configHBuildAssertITimerHeartbeat]; + at:#buildDebug put: [self configHBuildDebug]; "located in CMakeVMMaker CPlatformConfig" + at: #buildDebugITimerHeartbeat put: [self configHBuildDebugITimerHeartbeat ]; + at: #buildITimerHeartbeat put: [self configHBuildITimerHeartbeat]; + at: #buildMultiThreaded put: [self configHBuildMultiThreaded ]; + at: #buildMultiThreadedAssert put: [self configHBuildMultiThreadedAssert]; + at: #buildMultiThreadedDebug put: [self configHBuildMultiThreadedDebug ]; + at: #buildNone put:[self configHNoBuildType]. + + + ^(d at: ( aBuildType)) value + + + + ! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsAfterDetermineSystem:buildType: (in category 'utils') ----- + setGlobalOptionsAfterDetermineSystem: aMaker buildType: aBuildType + "invoke correct setGlobalOptions for this buildType to allow per-buildType customization'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self setGlobalOptionsAfterDetermineSystemBuild: aMaker]; + at: #buildAssert put: [self setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker]; + at: #buildAssertITimerHeartbeat put: [self setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker]; + at:#buildDebug put: [self setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker]; + at: #buildITimerHeartbeat put: [self setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker]; + at: #buildMultiThreaded put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker ]; + at: #buildMultiThreadedAssert put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker]; + at: #buildMultiThreadedDebug put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker ]; + at: #buildNone put:[self setGlobalOptionsBuildNone: aMaker]. + + ^(d at: ( aBuildType)) value + ! Item was changed: ----- Method: SqueakBSDConfig>>compilerFlags (in category 'squeak compatibility') ----- compilerFlags |d commonFlags flags| d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d at: #build put: [self compilerFlagsBuild]; at: #buildAssert put: [self compilerFlagsAssert]; at: #buildAssertITimerHeartbeat put: [self compilerFlagsAssertITimerHeartbeat]; at:#buildDebug put: [self compilerFlagsDebug]; "located in CMakeVMMaker CPlatformConfig" at: #buildDebugITimerHeartbeat put: [self compilerFlagsDebugITimerHeartbeat ]; - at: #buildDebugMultiThreaded put: [self compilerFlagsDebugMultiThreaded]; at: #buildITimerHeartbeat put: [self compilerFlagsIHeartbeatTimer]; at: #buildMultiThreaded put: [self compilerFlagsMultiThreaded ]; at: #buildMultiThreadedAssert put: [self compilerFlagsMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self compilerFlagsMultiThreadedDebug ]; at: #buildNone put:[self compilerFlagsNoBuildType]. flags:= String streamContents: [ :stream | (((d at: buildType) value) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter:' ']. commonFlags:=String streamContents: [ :stream | ((self commonCompilerFlags) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter: ' ' ]. ^ commonFlags, ' ' ,flags.! Item was changed: ----- Method: SqueakBSDConfig>>configureForBuildType: (in category 'cmake configuration') ----- configureForBuildType: aSymbol | d | "provide a concrete builder with the buildType and configureBuildX method to invoke" d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. self configureNoBuildType. "reset all internal flags" d at: #build put: [self buildType:#build. self configureBuild]; at: #buildAssert put: [self buildType: #buildAssert. self configureBuildAssert]; at: #buildAssertITimerHeartbeat put: [ self buildType: #buildAssertITimerHeartbeat. self configureBuildAssertITimerHeartbeat]; at:#buildDebug put: [self buildType: #buildDebug. self configureBuildDebug]; at: #buildDebugITimerHeartbeat put: [self buildType: #buildDebugITimerHeartbeat. self configureBuildDebugITimerHeartbeat]; - at: #buildDebugMultiThreaded - put: [self buildType: #buildDebugMultiThreaded. self configureBuildDebugMultiThreaded]; - at: #buildITimerHeartbeat put: [self buildType:#buildITimerHeartbeat. self configureBuildIHeartbeatTimer]; at: #buildMultiThreaded put: [self buildType:#buildMultiThreaded . self configureBuildMultiThreaded]; at: #buildMultiThreadedAssert put: [self buildType: #buildMultiThreadedAssert. self configureBuildMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self buildType: #buildMultiThreadedDebug. self configureBuildMultiThreadedDebug]. ^(d at: aSymbol).! Item was added: + ----- Method: SqueakBSDConfig>>generateConfigH: (in category 'headers generation') ----- + generateConfigH: aBuildType + "self write: self configH toFile: 'config.h'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self configHBuild]; + at: #buildAssert put: [self configHBuildAssert]; + at: #buildAssertITimerHeartbeat put: [self configHBuildAssertITimerHeartbeat]; + at:#buildDebug put: [self configHBuildDebug]; "located in CMakeVMMaker CPlatformConfig" + at: #buildDebugITimerHeartbeat put: [self configHBuildDebugITimerHeartbeat ]; + at: #buildITimerHeartbeat put: [self configHBuildITimerHeartbeat]; + at: #buildMultiThreaded put: [self configHBuildMultiThreaded ]; + at: #buildMultiThreadedAssert put: [self configHBuildMultiThreadedAssert]; + at: #buildMultiThreadedDebug put: [self configHBuildMultiThreadedDebug ]; + at: #buildNone put:[self configHNoBuildType]. + + + ^(d at: ( aBuildType)) value + + + + ! Item was added: + ----- Method: SqueakBSDConfig>>setGlobalOptionsAfterDetermineSystem:buildType: (in category 'utils') ----- + setGlobalOptionsAfterDetermineSystem: aMaker buildType: aBuildType + "invoke correct setGlobalOptions for this buildType to allow per-buildType customization'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self setGlobalOptionsAfterDetermineSystemBuild: aMaker]; + at: #buildAssert put: [self setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker]; + at: #buildAssertITimerHeartbeat put: [self setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker]; + at:#buildDebug put: [self setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker]; + at: #buildITimerHeartbeat put: [self setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker]; + at: #buildMultiThreaded put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker ]; + at: #buildMultiThreadedAssert put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker]; + at: #buildMultiThreadedDebug put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker ]; + at: #buildNone put:[self setGlobalOptionsBuildNone: aMaker]. + + ^(d at: ( aBuildType)) value + ! Item was changed: ----- Method: SqueakCMakeVMMakerAbstractBuilder>>initializeBuildTypeAndDirectoryInfo (in category 'initialization') ----- initializeBuildTypeAndDirectoryInfo "A dictionary of build types and the name of the directory they are stored in" buildTypeAndDirectoryInfo := Dictionary new. buildTypeAndDirectoryInfo at: #build put: 'build'; at: #buildAssert put:'build.assert'; at: #buildAssertITimerHeartbeat put: 'build.assert.itimerheartbeat'; at: #buildDebug put: 'build.debug'; at: #buildDebugITimerHeartbeat put: 'build.debug.itimerheartbeat'; - at: #buildDebugMultiThreaded put: 'build.debug.multithreaded'; at: #buildITimerHeartbeat put: 'build.itimerheartbeat'; at: #buildMultiThreaded put: 'build.multithreaded'; at: #buildMultiThreadedAssert put: 'build.multithreaded.assert'; at: #buildMultiThreadedDebug put: 'build.multithreaded.debug'; at: #buildNone put: 'build.should.not.happen'. ! Item was changed: ----- Method: SqueakIA32BochsConfig>>compilerFlags (in category 'compiler flags') ----- compilerFlags |d commonFlags flags| d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d at: #build put: [self compilerFlagsBuild]; at: #buildAssert put: [self compilerFlagsAssert]; at: #buildAssertITimerHeartbeat put: [self compilerFlagsAssertITimerHeartbeat]; at:#buildDebug put: [self compilerFlagsDebug]; "located in CMakeVMMaker CPlatformConfig" at: #buildDebugITimerHeartbeat put: [self compilerFlagsDebugITimerHeartbeat ]; - at: #buildDebugMultiThreaded put: [self compilerFlagsDebugMultiThreaded]; at: #buildITimerHeartbeat put: [self compilerFlagsIHeartbeatTimer]; at: #buildMultiThreaded put: [self compilerFlagsMultiThreaded ]; at: #buildMultiThreadedAssert put: [self compilerFlagsMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self compilerFlagsMultiThreadedDebug ]; at: #buildNone put:[self compilerFlagsNoBuildType]. flags:= String streamContents: [ :stream | (((d at: buildType) value) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter:' ']. commonFlags:=String streamContents: [ :stream | ((self commonCompilerFlags) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter: ' ' ]. ^ commonFlags, ' ' ,flags.! Item was changed: ----- Method: SqueakIA32BochsConfig>>configureForBuildType: (in category 'cmake configuration') ----- configureForBuildType: aSymbol | d | "provide a concrete builder with the buildType and configureBuildX method to invoke" d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. self configureNoBuildType. "reset all internal flags" d at: #build put: [self buildType:#build. self configureBuild]; at: #buildAssert put: [self buildType: #buildAssert. self configureBuildAssert]; at: #buildAssertITimerHeartbeat put: [ self buildType: #buildAssertITimerHeartbeat. self configureBuildAssertITimerHeartbeat]; at:#buildDebug put: [self buildType: #buildDebug. self configureBuildDebug]; at: #buildDebugITimerHeartbeat put: [self buildType: #buildDebugITimerHeartbeat. self configureBuildDebugITimerHeartbeat]; - at: #buildDebugMultiThreaded - put: [self buildType: #buildDebugMultiThreaded. self configureBuildDebugMultiThreaded]; - at: #buildITimerHeartbeat put: [self buildType:#buildITimerHeartbeat. self configureBuildIHeartbeatTimer]; at: #buildMultiThreaded put: [self buildType:#buildMultiThreaded . self configureBuildMultiThreaded]; at: #buildMultiThreadedAssert put: [self buildType: #buildMultiThreadedAssert. self configureBuildMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self buildType: #buildMultiThreadedDebug. self configureBuildMultiThreadedDebug]. ^(d at: aSymbol).! Item was added: + ----- Method: SqueakIA32BochsConfig>>generateConfigH: (in category 'headers generation') ----- + generateConfigH: aBuildType + "self write: self configH toFile: 'config.h'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self configHBuild]; + at: #buildAssert put: [self configHBuildAssert]; + at: #buildAssertITimerHeartbeat put: [self configHBuildAssertITimerHeartbeat]; + at:#buildDebug put: [self configHBuildDebug]; "located in CMakeVMMaker CPlatformConfig" + at: #buildDebugITimerHeartbeat put: [self configHBuildDebugITimerHeartbeat ]; + at: #buildITimerHeartbeat put: [self configHBuildITimerHeartbeat]; + at: #buildMultiThreaded put: [self configHBuildMultiThreaded ]; + at: #buildMultiThreadedAssert put: [self configHBuildMultiThreadedAssert]; + at: #buildMultiThreadedDebug put: [self configHBuildMultiThreadedDebug ]; + at: #buildNone put:[self configHNoBuildType]. + ^(d at: ( aBuildType)) value + + + + ! Item was added: + ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsAfterDetermineSystem:buildType: (in category 'utils') ----- + setGlobalOptionsAfterDetermineSystem: aMaker buildType: aBuildType + "invoke correct setGlobalOptions for this buildType to allow per-buildType customization'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self setGlobalOptionsAfterDetermineSystemBuild: aMaker]; + at: #buildAssert put: [self setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker]; + at: #buildAssertITimerHeartbeat put: [self setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker]; + at:#buildDebug put: [self setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker]; + at: #buildITimerHeartbeat put: [self setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker]; + at: #buildMultiThreaded put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker ]; + at: #buildMultiThreadedAssert put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker]; + at: #buildMultiThreadedDebug put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker ]; + at: #buildNone put:[self setGlobalOptionsBuildNone: aMaker]. + + ^(d at: ( aBuildType)) value + ! Item was changed: ----- Method: SqueakMacOSCogV3DebugConfig>>compilerFlags (in category 'accessing') ----- compilerFlags |d commonFlags flags| d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d at: #build put: [self compilerFlagsBuild]; at: #buildAssert put: [self compilerFlagsAssert]; at: #buildAssertITimerHeartbeat put: [self compilerFlagsAssertITimerHeartbeat]; at:#buildDebug put: [self compilerFlagsDebug]; "located in CMakeVMMaker CPlatformConfig" at: #buildDebugITimerHeartbeat put: [self compilerFlagsDebugITimerHeartbeat ]; - at: #buildDebugMultiThreaded put: [self compilerFlagsDebugMultiThreaded]; at: #buildITimerHeartbeat put: [self compilerFlagsIHeartbeatTimer]; at: #buildMultiThreaded put: [self compilerFlagsMultiThreaded ]; at: #buildMultiThreadedAssert put: [self compilerFlagsMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self compilerFlagsMultiThreadedDebug ]; at: #buildNone put:[self compilerFlagsNoBuildType]. flags:= String streamContents: [ :stream | (((d at: buildType) value) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter:' ']. commonFlags:=String streamContents: [ :stream | ((self commonCompilerFlags) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter: ' ' ]. ^ commonFlags, ' ' ,flags.! Item was changed: ----- Method: SqueakMacOSConfig>>compilerFlags (in category 'compiler flags') ----- compilerFlags |d commonFlags flags| d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d at: #build put: [self compilerFlagsBuild]; at: #buildAssert put: [self compilerFlagsAssert]; at: #buildAssertITimerHeartbeat put: [self compilerFlagsAssertITimerHeartbeat]; at:#buildDebug put: [self compilerFlagsDebug]; "located in CMakeVMMaker CPlatformConfig" at: #buildDebugITimerHeartbeat put: [self compilerFlagsDebugITimerHeartbeat ]; - at: #buildDebugMultiThreaded put: [self compilerFlagsDebugMultiThreaded]; at: #buildITimerHeartbeat put: [self compilerFlagsIHeartbeatTimer]; at: #buildMultiThreaded put: [self compilerFlagsMultiThreaded ]; at: #buildMultiThreadedAssert put: [self compilerFlagsMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self compilerFlagsMultiThreadedDebug ]; at: #buildNone put:[self compilerFlagsNoBuildType]. flags:= String streamContents: [ :stream | (((d at: buildType) value) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter:' ']. commonFlags:=String streamContents: [ :stream | ((self commonCompilerFlags) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter: ' ' ]. ^ commonFlags, ' ' ,flags.! Item was changed: ----- Method: SqueakMacOSConfig>>configureForBuildType: (in category 'cmake configuration') ----- configureForBuildType: aSymbol | d | "provide a concrete builder with the buildType and configureBuildX method to invoke" d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. self configureNoBuildType. "reset all internal flags" d at: #build put: [self buildType:#build. self configureBuild]; at: #buildAssert put: [self buildType: #buildAssert. self configureBuildAssert]; at: #buildAssertITimerHeartbeat put: [ self buildType: #buildAssertITimerHeartbeat. self configureBuildAssertITimerHeartbeat]; at:#buildDebug put: [self buildType: #buildDebug. self configureBuildDebug]; at: #buildDebugITimerHeartbeat put: [self buildType: #buildDebugITimerHeartbeat. self configureBuildDebugITimerHeartbeat]; - at: #buildDebugMultiThreaded - put: [self buildType: #buildDebugMultiThreaded. self configureBuildDebugMultiThreaded]; - at: #buildITimerHeartbeat put: [self buildType:#buildITimerHeartbeat. self configureBuildIHeartbeatTimer]; at: #buildMultiThreaded put: [self buildType:#buildMultiThreaded . self configureBuildMultiThreaded]; at: #buildMultiThreadedAssert put: [self buildType: #buildMultiThreadedAssert. self configureBuildMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self buildType: #buildMultiThreadedDebug. self configureBuildMultiThreadedDebug]. ^(d at: aSymbol).! Item was added: + ----- Method: SqueakMacOSConfig>>generateConfigH: (in category 'headers generation') ----- + generateConfigH: aBuildType + "self write: self configH toFile: 'config.h'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self configHBuild]; + at: #buildAssert put: [self configHBuildAssert]; + at: #buildAssertITimerHeartbeat put: [self configHBuildAssertITimerHeartbeat]; + at:#buildDebug put: [self configHBuildDebug]; "located in CMakeVMMaker CPlatformConfig" + at: #buildDebugITimerHeartbeat put: [self configHBuildDebugITimerHeartbeat ]; + at: #buildITimerHeartbeat put: [self configHBuildITimerHeartbeat]; + at: #buildMultiThreaded put: [self configHBuildMultiThreaded ]; + at: #buildMultiThreadedAssert put: [self configHBuildMultiThreadedAssert]; + at: #buildMultiThreadedDebug put: [self configHBuildMultiThreadedDebug ]; + at: #buildNone put:[self configHNoBuildType]. + + + ^(d at: ( aBuildType)) value + + + + ! Item was added: + ----- Method: SqueakMacOSConfig>>setGlobalOptionsAfterDetermineSystem:buildType: (in category 'utils') ----- + setGlobalOptionsAfterDetermineSystem: aMaker buildType: aBuildType + "invoke correct setGlobalOptions for this buildType to allow per-buildType customization'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self setGlobalOptionsAfterDetermineSystemBuild: aMaker]; + at: #buildAssert put: [self setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker]; + at: #buildAssertITimerHeartbeat put: [self setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker]; + at:#buildDebug put: [self setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker]; + at: #buildITimerHeartbeat put: [self setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker]; + at: #buildMultiThreaded put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker ]; + at: #buildMultiThreadedAssert put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker]; + at: #buildMultiThreadedDebug put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker ]; + at: #buildNone put:[self setGlobalOptionsBuildNone: aMaker]. + + ^(d at: ( aBuildType)) value + ! Item was changed: ----- Method: SqueakMacOSStackV3DebugConfig>>compilerFlags (in category 'accessing') ----- compilerFlags |d commonFlags flags| d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d at: #build put: [self compilerFlagsBuild]; at: #buildAssert put: [self compilerFlagsAssert]; at: #buildAssertITimerHeartbeat put: [self compilerFlagsAssertITimerHeartbeat]; at:#buildDebug put: [self compilerFlagsDebug]; "located in CMakeVMMaker CPlatformConfig" at: #buildDebugITimerHeartbeat put: [self compilerFlagsDebugITimerHeartbeat ]; - at: #buildDebugMultiThreaded put: [self compilerFlagsDebugMultiThreaded]; at: #buildITimerHeartbeat put: [self compilerFlagsIHeartbeatTimer]; at: #buildMultiThreaded put: [self compilerFlagsMultiThreaded ]; at: #buildMultiThreadedAssert put: [self compilerFlagsMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self compilerFlagsMultiThreadedDebug ]; at: #buildNone put:[self compilerFlagsNoBuildType]. flags:= String streamContents: [ :stream | (((d at: buildType) value) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter:' ']. commonFlags:=String streamContents: [ :stream | ((self commonCompilerFlags) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter: ' ' ]. ^ commonFlags, ' ' ,flags.! Item was changed: ----- Method: SqueakMacOSV3Config>>compilerFlags (in category 'accessing') ----- compilerFlags |d commonFlags flags| d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d at: #build put: [self compilerFlagsBuild]; at: #buildAssert put: [self compilerFlagsAssert]; at: #buildAssertITimerHeartbeat put: [self compilerFlagsAssertITimerHeartbeat]; at:#buildDebug put: [self compilerFlagsDebug]; "located in CMakeVMMaker CPlatformConfig" at: #buildDebugITimerHeartbeat put: [self compilerFlagsDebugITimerHeartbeat ]; - at: #buildDebugMultiThreaded put: [self compilerFlagsDebugMultiThreaded]; at: #buildITimerHeartbeat put: [self compilerFlagsIHeartbeatTimer]; at: #buildMultiThreaded put: [self compilerFlagsMultiThreaded ]; at: #buildMultiThreadedAssert put: [self compilerFlagsMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self compilerFlagsMultiThreadedDebug ]; at: #buildNone put:[self compilerFlagsNoBuildType]. flags:= String streamContents: [ :stream | (((d at: buildType) value) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter:' ']. commonFlags:=String streamContents: [ :stream | ((self commonCompilerFlags) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter: ' ' ]. ^ commonFlags, ' ' ,flags.! Item was changed: ----- Method: SqueakMacOSX32x86Config>>compilerFlags (in category 'accessing') ----- compilerFlags |d commonFlags flags| d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d at: #build put: [self compilerFlagsBuild]; at: #buildAssert put: [self compilerFlagsAssert]; at: #buildAssertITimerHeartbeat put: [self compilerFlagsAssertITimerHeartbeat]; at:#buildDebug put: [self compilerFlagsDebug]; "located in CMakeVMMaker CPlatformConfig" at: #buildDebugITimerHeartbeat put: [self compilerFlagsDebugITimerHeartbeat ]; - at: #buildDebugMultiThreaded put: [self compilerFlagsDebugMultiThreaded]; at: #buildITimerHeartbeat put: [self compilerFlagsIHeartbeatTimer]; at: #buildMultiThreaded put: [self compilerFlagsMultiThreaded ]; at: #buildMultiThreadedAssert put: [self compilerFlagsMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self compilerFlagsMultiThreadedDebug ]; at: #buildNone put:[self compilerFlagsNoBuildType]. flags:= String streamContents: [ :stream | (((d at: buildType) value) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter:' ']. commonFlags:=String streamContents: [ :stream | ((self commonCompilerFlags) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter: ' ' ]. ^ commonFlags, ' ' ,flags.! Item was changed: ----- Method: SqueakMacOSXPowerPCConfig>>compilerFlags (in category 'accessing') ----- compilerFlags |d commonFlags flags| d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d at: #build put: [self compilerFlagsBuild]; at: #buildAssert put: [self compilerFlagsAssert]; at: #buildAssertITimerHeartbeat put: [self compilerFlagsAssertITimerHeartbeat]; at:#buildDebug put: [self compilerFlagsDebug]; "located in CMakeVMMaker CPlatformConfig" at: #buildDebugITimerHeartbeat put: [self compilerFlagsDebugITimerHeartbeat ]; - at: #buildDebugMultiThreaded put: [self compilerFlagsDebugMultiThreaded]; at: #buildITimerHeartbeat put: [self compilerFlagsIHeartbeatTimer]; at: #buildMultiThreaded put: [self compilerFlagsMultiThreaded ]; at: #buildMultiThreadedAssert put: [self compilerFlagsMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self compilerFlagsMultiThreadedDebug ]; at: #buildNone put:[self compilerFlagsNoBuildType]. flags:= String streamContents: [ :stream | (((d at: buildType) value) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter:' ']. commonFlags:=String streamContents: [ :stream | ((self commonCompilerFlags) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter: ' ' ]. ^ commonFlags, ' ' ,flags.! Item was changed: ----- Method: SqueakSunOS32x86Config>>compilerFlags (in category 'compiler flags') ----- compilerFlags |d commonFlags flags| d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d at: #build put: [self compilerFlagsBuild]; at: #buildAssert put: [self compilerFlagsAssert]; at: #buildAssertITimerHeartbeat put: [self compilerFlagsAssertITimerHeartbeat]; at:#buildDebug put: [self compilerFlagsDebug]; "located in CMakeVMMaker CPlatformConfig" at: #buildDebugITimerHeartbeat put: [self compilerFlagsDebugITimerHeartbeat ]; - at: #buildDebugMultiThreaded put: [self compilerFlagsDebugMultiThreaded]; at: #buildITimerHeartbeat put: [self compilerFlagsIHeartbeatTimer]; at: #buildMultiThreaded put: [self compilerFlagsMultiThreaded ]; at: #buildMultiThreadedAssert put: [self compilerFlagsMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self compilerFlagsMultiThreadedDebug ]; at: #buildNone put:[self compilerFlagsNoBuildType]. flags:= String streamContents: [ :stream | (((d at: buildType) value) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter:' ']. commonFlags:=String streamContents: [ :stream | ((self commonCompilerFlags) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter: ' ' ]. ^ commonFlags, ' ' ,flags.! Item was changed: ----- Method: SqueakSunOS32x86Config>>configureForBuildType: (in category 'cmake configuration') ----- configureForBuildType: aSymbol | d | "provide a concrete builder with the buildType and configureBuildX method to invoke" d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. self configureNoBuildType. "reset all internal flags" d at: #build put: [self buildType:#build. self configureBuild]; at: #buildAssert put: [self buildType: #buildAssert. self configureBuildAssert]; at: #buildAssertITimerHeartbeat put: [ self buildType: #buildAssertITimerHeartbeat. self configureBuildAssertITimerHeartbeat]; at:#buildDebug put: [self buildType: #buildDebug. self configureBuildDebug]; at: #buildDebugITimerHeartbeat put: [self buildType: #buildDebugITimerHeartbeat. self configureBuildDebugITimerHeartbeat]; - at: #buildDebugMultiThreaded - put: [self buildType: #buildDebugMultiThreaded. self configureBuildDebugMultiThreaded]; - at: #buildITimerHeartbeat put: [self buildType:#buildITimerHeartbeat. self configureBuildIHeartbeatTimer]; at: #buildMultiThreaded put: [self buildType:#buildMultiThreaded . self configureBuildMultiThreaded]; at: #buildMultiThreadedAssert put: [self buildType: #buildMultiThreadedAssert. self configureBuildMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self buildType: #buildMultiThreadedDebug. self configureBuildMultiThreadedDebug]. ^(d at: aSymbol).! Item was added: + ----- Method: SqueakSunOS32x86Config>>generateConfigH: (in category 'headers generation') ----- + generateConfigH: aBuildType + "self write: self configH toFile: 'config.h'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self configHBuild]; + at: #buildAssert put: [self configHBuildAssert]; + at: #buildAssertITimerHeartbeat put: [self configHBuildAssertITimerHeartbeat]; + at:#buildDebug put: [self configHBuildDebug]; "located in CMakeVMMaker CPlatformConfig" + at: #buildDebugITimerHeartbeat put: [self configHBuildDebugITimerHeartbeat ]; + at: #buildITimerHeartbeat put: [self configHBuildITimerHeartbeat]; + at: #buildMultiThreaded put: [self configHBuildMultiThreaded ]; + at: #buildMultiThreadedAssert put: [self configHBuildMultiThreadedAssert]; + at: #buildMultiThreadedDebug put: [self configHBuildMultiThreadedDebug ]; + at: #buildNone put:[self configHNoBuildType]. + + + ^(d at: ( aBuildType)) value + + + + ! Item was added: + ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsAfterDetermineSystem:buildType: (in category 'utils') ----- + setGlobalOptionsAfterDetermineSystem: aMaker buildType: aBuildType + "invoke correct setGlobalOptions for this buildType to allow per-buildType customization'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self setGlobalOptionsAfterDetermineSystemBuild: aMaker]; + at: #buildAssert put: [self setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker]; + at: #buildAssertITimerHeartbeat put: [self setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker]; + at:#buildDebug put: [self setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker]; + at: #buildITimerHeartbeat put: [self setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker]; + at: #buildMultiThreaded put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker ]; + at: #buildMultiThreadedAssert put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker]; + at: #buildMultiThreadedDebug put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker ]; + at: #buildNone put:[self setGlobalOptionsBuildNone: aMaker]. + + ^(d at: ( aBuildType)) value + ! Item was changed: ----- Method: SqueakWin32x86Config>>compilerFlags (in category 'directories') ----- compilerFlags |d commonFlags flags| d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d at: #build put: [self compilerFlagsBuild]; at: #buildAssert put: [self compilerFlagsAssert]; at: #buildAssertITimerHeartbeat put: [self compilerFlagsAssertITimerHeartbeat]; at:#buildDebug put: [self compilerFlagsDebug]; "located in CMakeVMMaker CPlatformConfig" at: #buildDebugITimerHeartbeat put: [self compilerFlagsDebugITimerHeartbeat ]; - at: #buildDebugMultiThreaded put: [self compilerFlagsDebugMultiThreaded]; at: #buildITimerHeartbeat put: [self compilerFlagsIHeartbeatTimer]; at: #buildMultiThreaded put: [self compilerFlagsMultiThreaded ]; at: #buildMultiThreadedAssert put: [self compilerFlagsMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self compilerFlagsMultiThreadedDebug ]; at: #buildNone put:[self compilerFlagsNoBuildType]. flags:= String streamContents: [ :stream | (((d at: buildType) value) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter:' ']. commonFlags:=String streamContents: [ :stream | ((self commonCompilerFlags) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter: ' ' ]. ^ commonFlags, ' ' ,flags.! Item was changed: ----- Method: SqueakWin32x86Config>>configureForBuildType: (in category 'cmake configuration') ----- configureForBuildType: aSymbol | d | "provide a concrete builder with the buildType and configureBuildX method to invoke" d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. self configureNoBuildType. "reset all internal flags" d at: #build put: [self buildType:#build. self configureBuild]; at: #buildAssert put: [self buildType: #buildAssert. self configureBuildAssert]; at: #buildAssertITimerHeartbeat put: [ self buildType: #buildAssertITimerHeartbeat. self configureBuildAssertITimerHeartbeat]; at:#buildDebug put: [self buildType: #buildDebug. self configureBuildDebug]; at: #buildDebugITimerHeartbeat put: [self buildType: #buildDebugITimerHeartbeat. self configureBuildDebugITimerHeartbeat]; - at: #buildDebugMultiThreaded - put: [self buildType: #buildDebugMultiThreaded. self configureBuildDebugMultiThreaded]; - at: #buildITimerHeartbeat put: [self buildType:#buildITimerHeartbeat. self configureBuildIHeartbeatTimer]; at: #buildMultiThreaded put: [self buildType:#buildMultiThreaded . self configureBuildMultiThreaded]; at: #buildMultiThreadedAssert put: [self buildType: #buildMultiThreadedAssert. self configureBuildMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self buildType: #buildMultiThreadedDebug. self configureBuildMultiThreadedDebug]. ^(d at: aSymbol).! Item was added: + ----- Method: SqueakWin32x86Config>>generateConfigH: (in category 'headers generation') ----- + generateConfigH: aBuildType + "self write: self configH toFile: 'config.h'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self configHBuild]; + at: #buildAssert put: [self configHBuildAssert]; + at: #buildAssertITimerHeartbeat put: [self configHBuildAssertITimerHeartbeat]; + at:#buildDebug put: [self configHBuildDebug]; "located in CMakeVMMaker CPlatformConfig" + at: #buildDebugITimerHeartbeat put: [self configHBuildDebugITimerHeartbeat ]; + at: #buildITimerHeartbeat put: [self configHBuildITimerHeartbeat]; + at: #buildMultiThreaded put: [self configHBuildMultiThreaded ]; + at: #buildMultiThreadedAssert put: [self configHBuildMultiThreadedAssert]; + at: #buildMultiThreadedDebug put: [self configHBuildMultiThreadedDebug ]; + at: #buildNone put:[self configHNoBuildType]. + + + ^(d at: ( aBuildType)) value + + + + ! Item was added: + ----- Method: SqueakWin32x86Config>>setGlobalOptionsAfterDetermineSystem:buildType: (in category 'utils') ----- + setGlobalOptionsAfterDetermineSystem: aMaker buildType: aBuildType + "invoke correct setGlobalOptions for this buildType to allow per-buildType customization'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self setGlobalOptionsAfterDetermineSystemBuild: aMaker]; + at: #buildAssert put: [self setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker]; + at: #buildAssertITimerHeartbeat put: [self setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker]; + at:#buildDebug put: [self setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker]; + at: #buildITimerHeartbeat put: [self setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker]; + at: #buildMultiThreaded put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker ]; + at: #buildMultiThreadedAssert put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker]; + at: #buildMultiThreadedDebug put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker ]; + at: #buildNone put:[self setGlobalOptionsBuildNone: aMaker]. + + ^(d at: ( aBuildType)) value + ! Item was changed: ----- Method: TCPlatformConfigForSqueak>>configureForBuildType: (in category 'cmake configuration') ----- configureForBuildType: aSymbol | d | "provide a concrete builder with the buildType and configureBuildX method to invoke" d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. self configureNoBuildType. "reset all internal flags" d at: #build put: [self buildType:#build. self configureBuild]; at: #buildAssert put: [self buildType: #buildAssert. self configureBuildAssert]; at: #buildAssertITimerHeartbeat put: [ self buildType: #buildAssertITimerHeartbeat. self configureBuildAssertITimerHeartbeat]; at:#buildDebug put: [self buildType: #buildDebug. self configureBuildDebug]; at: #buildDebugITimerHeartbeat put: [self buildType: #buildDebugITimerHeartbeat. self configureBuildDebugITimerHeartbeat]; - at: #buildDebugMultiThreaded - put: [self buildType: #buildDebugMultiThreaded. self configureBuildDebugMultiThreaded]; - at: #buildITimerHeartbeat put: [self buildType:#buildITimerHeartbeat. self configureBuildIHeartbeatTimer]; at: #buildMultiThreaded put: [self buildType:#buildMultiThreaded . self configureBuildMultiThreaded]; at: #buildMultiThreadedAssert put: [self buildType: #buildMultiThreadedAssert. self configureBuildMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self buildType: #buildMultiThreadedDebug. self configureBuildMultiThreadedDebug]. ^(d at: aSymbol).! Item was changed: ----- Method: TCPlatformConfigForSqueak>>generateConfigH: (in category 'headers generation') ----- generateConfigH: aBuildType "self write: self configH toFile: 'config.h'" |d | d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d at: #build put: [self configHBuild]; at: #buildAssert put: [self configHBuildAssert]; at: #buildAssertITimerHeartbeat put: [self configHBuildAssertITimerHeartbeat]; at:#buildDebug put: [self configHBuildDebug]; "located in CMakeVMMaker CPlatformConfig" at: #buildDebugITimerHeartbeat put: [self configHBuildDebugITimerHeartbeat ]; - at: #buildDebugMultiThreaded put: [self configHBuildDebugMultiThreaded]; at: #buildITimerHeartbeat put: [self configHBuildITimerHeartbeat]; at: #buildMultiThreaded put: [self configHBuildMultiThreaded ]; at: #buildMultiThreadedAssert put: [self configHBuildMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self configHBuildMultiThreadedDebug ]; at: #buildNone put:[self configHNoBuildType]. ^(d at: ( aBuildType)) value ! Item was changed: ----- Method: TCPlatformConfigForSqueak>>setGlobalOptions:buildType: (in category 'utils') ----- setGlobalOptions: aMaker buildType: aBuildType "invoke correct setGlobalOptions for this buildType to allow per-buildType customization'" |d | d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d at: #build put: [self setGlobalOptionsBuild: aMaker]; at: #buildAssert put: [self setGlobalOptionsBuildAssert: aMaker]; at: #buildAssertITimerHeartbeat put: [self setGlobalOptionsBuildAssertITimerHeartbeat: aMaker]; at:#buildDebug put: [self setGlobalOptionsBuildDebug: aMaker]; "located in CMakeVMMaker CPlatformConfig" at: #buildDebugITimerHeartbeat put: [self setGlobalOptionsBuildDebugITimerHeartbeat: aMaker ]; - at: #buildDebugMultiThreaded put: [self setGlobalOptionsBuildDebugMultiThreaded: aMaker]; at: #buildITimerHeartbeat put: [self setGlobalOptionsBuildITimerHeartbeat: aMaker]; at: #buildMultiThreaded put: [self setGlobalOptionsBuildMultiThreaded: aMaker ]; at: #buildMultiThreadedAssert put: [self setGlobalOptionsBuildMultiThreadedAssert: aMaker]; at: #buildMultiThreadedDebug put: [self setGlobalOptionsBuildMultiThreadedDebug: aMaker ]; at: #buildNone put:[self setGlobalOptionsBuildNone: aMaker]. ^(d at: ( aBuildType)) value ! Item was added: + ----- Method: TCPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystem:buildType: (in category 'utils') ----- + setGlobalOptionsAfterDetermineSystem: aMaker buildType: aBuildType + "invoke correct setGlobalOptions for this buildType to allow per-buildType customization'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self setGlobalOptionsAfterDetermineSystemBuild: aMaker]; + at: #buildAssert put: [self setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker]; + at: #buildAssertITimerHeartbeat put: [self setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker]; + at:#buildDebug put: [self setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker]; + at: #buildITimerHeartbeat put: [self setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker]; + at: #buildMultiThreaded put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker ]; + at: #buildMultiThreadedAssert put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker]; + at: #buildMultiThreadedDebug put: [self setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker ]; + at: #buildNone put:[self setGlobalOptionsBuildNone: aMaker]. + + ^(d at: ( aBuildType)) value + ! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystemBuild (in category 'cmake config build type ') ----- - setGlobalOptionsAfterDetermineSystemBuild - self required! Item was added: + ----- Method: TCPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'cmake config build type ') ----- + setGlobalOptionsAfterDetermineSystemBuild: aMaker + "convenience method to customize setGlobalOptionsAfterDetermineSystemBuild: aMaker for this build type. + + Default is in CPlatformConfig>AfterDetermineSystemBuild aMaker setGlobalOptions: aMaker" + ^super setGlobalOptions: aMaker + ! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystemBuildAssert (in category 'cmake config build type ') ----- - setGlobalOptionsAfterDetermineSystemBuildAssert - self required - ! Item was added: + ----- Method: TCPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystemBuildAssert: (in category 'cmake config build type ') ----- + setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker + "convenience method to customize setGlobalOptionsAfterDetermineSystemBuild: aMaker for this build type. + + Default is in CPlatformConfig>AfterDetermineSystemBuild aMaker setGlobalOptions: aMaker" + ^super setGlobalOptions: aMaker + ! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat (in category 'cmake config build type ') ----- - setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat - self required - ! Item was added: + ----- Method: TCPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: (in category 'cmake config build type ') ----- + setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker + "convenience method to customize setGlobalOptionsAfterDetermineSystemBuild: aMaker for this build type. + + Default is in CPlatformConfig>AfterDetermineSystemBuild aMaker setGlobalOptions: aMaker" + ^super setGlobalOptions: aMaker + ! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystemBuildDebug (in category 'cmake config build type ') ----- - setGlobalOptionsAfterDetermineSystemBuildDebug - self required - ! Item was added: + ----- Method: TCPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystemBuildDebug: (in category 'cmake config build type ') ----- + setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker + "convenience method to customize setGlobalOptionsAfterDetermineSystemBuild: aMaker for this build type. + + Default is in CPlatformConfig>AfterDetermineSystemBuild aMaker setGlobalOptions: aMaker" + ^super setGlobalOptions: aMaker + ! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat (in category 'cmake config build type ') ----- - setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat - self required - ! Item was added: + ----- Method: TCPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: (in category 'cmake config build type ') ----- + setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: aMaker + "convenience method to customize setGlobalOptionsAfterDetermineSystemBuild: aMaker for this build type. + + Default is in CPlatformConfig>AfterDetermineSystemBuild aMaker setGlobalOptions: aMaker" + ^super setGlobalOptions: aMaker + + ! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat (in category 'cmake config build type ') ----- - setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat - self required! Item was added: + ----- Method: TCPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: (in category 'cmake config build type ') ----- + setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker + "convenience method to customize setGlobalOptionsAfterDetermineSystemBuild: aMaker for this build type. + + Default is in CPlatformConfig>AfterDetermineSystemBuild aMaker setGlobalOptions: aMaker" + ^super setGlobalOptions: aMaker + ! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystemBuildMultiThreaded (in category 'cmake config build type ') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreaded - self required - ! Item was added: + ----- Method: TCPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: (in category 'cmake config build type ') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker + "convenience method to customize setGlobalOptionsAfterDetermineSystemBuild: aMaker for this build type. + + Default is in CPlatformConfig>AfterDetermineSystemBuild aMaker setGlobalOptions: aMaker" + ^super setGlobalOptions: aMaker + + ! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert (in category 'cmake config build type ') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert - self required - ! Item was added: + ----- Method: TCPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: (in category 'cmake config build type ') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker + "convenience method to customize setGlobalOptionsAfterDetermineSystemBuild: aMaker for this build type. + + Default is in CPlatformConfig>AfterDetermineSystemBuild aMaker setGlobalOptions: aMaker" + ^super setGlobalOptions: aMaker + + ! Item was removed: - ----- Method: TCPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug (in category 'cmake config build type ') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug - self required - ! Item was added: + ----- Method: TCPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: (in category 'cmake config build type ') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker + "convenience method to customize setGlobalOptionsAfterDetermineSystemBuild: aMaker for this build type. + + Default is in CPlatformConfig>AfterDetermineSystemBuild aMaker setGlobalOptions: aMaker" + ^super setGlobalOptions: aMaker + + ! Item was changed: ----- Method: Win32x86SqueakCogV3DebugConfigz>>compilerFlags (in category 'directories') ----- compilerFlags |d commonFlags flags| d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d at: #build put: [self compilerFlagsBuild]; at: #buildAssert put: [self compilerFlagsAssert]; at: #buildAssertITimerHeartbeat put: [self compilerFlagsAssertITimerHeartbeat]; at:#buildDebug put: [self compilerFlagsDebug]; "located in CMakeVMMaker CPlatformConfig" at: #buildDebugITimerHeartbeat put: [self compilerFlagsDebugITimerHeartbeat ]; - at: #buildDebugMultiThreaded put: [self compilerFlagsDebugMultiThreaded]; at: #buildITimerHeartbeat put: [self compilerFlagsIHeartbeatTimer]; at: #buildMultiThreaded put: [self compilerFlagsMultiThreaded ]; at: #buildMultiThreadedAssert put: [self compilerFlagsMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self compilerFlagsMultiThreadedDebug ]; at: #buildNone put:[self compilerFlagsNoBuildType]. flags:= String streamContents: [ :stream | (((d at: buildType) value) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter:' ']. commonFlags:=String streamContents: [ :stream | ((self commonCompilerFlags) collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter: ' ' ]. ^ commonFlags, ' ' ,flags.!

1 0

VM Maker: CMakeVMMakerSqueak-tty.59.mcz
by commits＠source.squeak.org 17 Jun '14

17 Jun '14

Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.59.mcz ==================== Summary ==================== Name: CMakeVMMakerSqueak-tty.59 Author: tty Time: 16 June 2014, 7:42:06.412 pm UUID: d9697c5e-41f3-4fb3-8c34-dc0f134d3520 Ancestors: CMakeVMMakerSqueak-tty.58 reroute setGlobalOptions: aMaker to allow customization by Configurations by buildType. Fix bug in configureForBuildType: aSymbol that incorrectly set the buildType: value Generated build and it compiled. Tests all pass. =============== Diff against CMakeVMMakerSqueak-tty.58 =============== Item was changed: ----- Method: Linux32x86Config>>configureForBuildType: (in category 'cmake') ----- configureForBuildType: aSymbol + | d | - | d info | "provide a concrete builder with the buildType and configureBuildX method to invoke" - info := SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. self configureNoBuildType. "reset all internal flags" d at: #build + put: [self buildType:#build. self configureBuild]; - put: [self buildType:(info at:#build). self configureBuild]; at: #buildAssert + put: [self buildType: #buildAssert. self configureBuildAssert]; - put: [self buildType:(info at: #buildAssert). self configureBuildAssert]; at: #buildAssertITimerHeartbeat + put: [ self buildType: #buildAssertITimerHeartbeat. self configureBuildAssertITimerHeartbeat]; - put: [ self buildType:(info at: #buildAssertITimerHeartbeat ). self configureBuildAssertITimerHeartbeat]; at:#buildDebug + put: [self buildType: #buildDebug. self configureBuildDebug]; - put: [self buildType:(info at: #buildDebug ). self configureBuildDebug]; at: #buildDebugITimerHeartbeat + put: [self buildType: #buildDebugITimerHeartbeat. self configureBuildDebugITimerHeartbeat]; - put: [self buildType:(info at: #buildDebugITimerHeartbeat). self configureBuildDebugITimerHeartbeat]; at: #buildDebugMultiThreaded + put: [self buildType: #buildDebugMultiThreaded. self configureBuildDebugMultiThreaded]; - put: [self buildType:(info at: #buildDebugMultiThreaded ). self configureBuildDebugMultiThreaded]; at: #buildITimerHeartbeat + put: [self buildType:#buildITimerHeartbeat. self configureBuildIHeartbeatTimer]; - put: [self buildType:(info at:#buildITimerHeartbeat ). self configureBuildIHeartbeatTimer]; at: #buildMultiThreaded + put: [self buildType:#buildMultiThreaded . self configureBuildMultiThreaded]; - put: [self buildType:(info at:#buildMultiThreaded ). self configureBuildMultiThreaded]; at: #buildMultiThreadedAssert + put: [self buildType: #buildMultiThreadedAssert. self configureBuildMultiThreadedAssert]; - put: [self buildType:(info at: #buildMultiThreadedAssert). self configureBuildMultiThreadedAssert]; at: #buildMultiThreadedDebug + put: [self buildType: #buildMultiThreadedDebug. self configureBuildMultiThreadedDebug]. - put: [self buildType: (info at: #buildMultiThreadedDebug). self configureBuildMultiThreadedDebug]. ^(d at: aSymbol).! Item was added: + ----- Method: Linux32x86SqueakCogV3Configz>>configureForBuildType: (in category 'cmake configuration') ----- + configureForBuildType: aSymbol + | d | + "provide a concrete builder with the buildType and configureBuildX method to invoke" + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + self configureNoBuildType. "reset all internal flags" + d + at: #build + put: [self buildType:#build. self configureBuild]; + + at: #buildAssert + put: [self buildType: #buildAssert. self configureBuildAssert]; + + at: #buildAssertITimerHeartbeat + put: [ self buildType: #buildAssertITimerHeartbeat. self configureBuildAssertITimerHeartbeat]; + + at:#buildDebug + put: [self buildType: #buildDebug. self configureBuildDebug]; + + at: #buildDebugITimerHeartbeat + put: [self buildType: #buildDebugITimerHeartbeat. self configureBuildDebugITimerHeartbeat]; + + at: #buildDebugMultiThreaded + put: [self buildType: #buildDebugMultiThreaded. self configureBuildDebugMultiThreaded]; + + at: #buildITimerHeartbeat + put: [self buildType:#buildITimerHeartbeat. self configureBuildIHeartbeatTimer]; + + at: #buildMultiThreaded + put: [self buildType:#buildMultiThreaded . self configureBuildMultiThreaded]; + + at: #buildMultiThreadedAssert + put: [self buildType: #buildMultiThreadedAssert. self configureBuildMultiThreadedAssert]; + + at: #buildMultiThreadedDebug + put: [self buildType: #buildMultiThreadedDebug. self configureBuildMultiThreadedDebug]. + + ^(d at: aSymbol).! Item was added: + ----- Method: Linux32x86SqueakStackSpurConfigz>>configureForBuildType: (in category 'cmake configuration') ----- + configureForBuildType: aSymbol + | d | + "provide a concrete builder with the buildType and configureBuildX method to invoke" + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + self configureNoBuildType. "reset all internal flags" + d + at: #build + put: [self buildType:#build. self configureBuild]; + + at: #buildAssert + put: [self buildType: #buildAssert. self configureBuildAssert]; + + at: #buildAssertITimerHeartbeat + put: [ self buildType: #buildAssertITimerHeartbeat. self configureBuildAssertITimerHeartbeat]; + + at:#buildDebug + put: [self buildType: #buildDebug. self configureBuildDebug]; + + at: #buildDebugITimerHeartbeat + put: [self buildType: #buildDebugITimerHeartbeat. self configureBuildDebugITimerHeartbeat]; + + at: #buildDebugMultiThreaded + put: [self buildType: #buildDebugMultiThreaded. self configureBuildDebugMultiThreaded]; + + at: #buildITimerHeartbeat + put: [self buildType:#buildITimerHeartbeat. self configureBuildIHeartbeatTimer]; + + at: #buildMultiThreaded + put: [self buildType:#buildMultiThreaded . self configureBuildMultiThreaded]; + + at: #buildMultiThreadedAssert + put: [self buildType: #buildMultiThreadedAssert. self configureBuildMultiThreadedAssert]; + + at: #buildMultiThreadedDebug + put: [self buildType: #buildMultiThreadedDebug. self configureBuildMultiThreadedDebug]. + + ^(d at: aSymbol).! Item was added: + ----- Method: Linux32x86SqueakStackV3Configz>>configureForBuildType: (in category 'cmake configuration') ----- + configureForBuildType: aSymbol + | d | + "provide a concrete builder with the buildType and configureBuildX method to invoke" + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + self configureNoBuildType. "reset all internal flags" + d + at: #build + put: [self buildType:#build. self configureBuild]; + + at: #buildAssert + put: [self buildType: #buildAssert. self configureBuildAssert]; + + at: #buildAssertITimerHeartbeat + put: [ self buildType: #buildAssertITimerHeartbeat. self configureBuildAssertITimerHeartbeat]; + + at:#buildDebug + put: [self buildType: #buildDebug. self configureBuildDebug]; + + at: #buildDebugITimerHeartbeat + put: [self buildType: #buildDebugITimerHeartbeat. self configureBuildDebugITimerHeartbeat]; + + at: #buildDebugMultiThreaded + put: [self buildType: #buildDebugMultiThreaded. self configureBuildDebugMultiThreaded]; + + at: #buildITimerHeartbeat + put: [self buildType:#buildITimerHeartbeat. self configureBuildIHeartbeatTimer]; + + at: #buildMultiThreaded + put: [self buildType:#buildMultiThreaded . self configureBuildMultiThreaded]; + + at: #buildMultiThreadedAssert + put: [self buildType: #buildMultiThreadedAssert. self configureBuildMultiThreadedAssert]; + + at: #buildMultiThreadedDebug + put: [self buildType: #buildMultiThreadedDebug. self configureBuildMultiThreadedDebug]. + + ^(d at: aSymbol).! Item was added: + ----- Method: Linux64Config>>configureForBuildType: (in category 'cmake configuration') ----- + configureForBuildType: aSymbol + | d | + "provide a concrete builder with the buildType and configureBuildX method to invoke" + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + self configureNoBuildType. "reset all internal flags" + d + at: #build + put: [self buildType:#build. self configureBuild]; + + at: #buildAssert + put: [self buildType: #buildAssert. self configureBuildAssert]; + + at: #buildAssertITimerHeartbeat + put: [ self buildType: #buildAssertITimerHeartbeat. self configureBuildAssertITimerHeartbeat]; + + at:#buildDebug + put: [self buildType: #buildDebug. self configureBuildDebug]; + + at: #buildDebugITimerHeartbeat + put: [self buildType: #buildDebugITimerHeartbeat. self configureBuildDebugITimerHeartbeat]; + + at: #buildDebugMultiThreaded + put: [self buildType: #buildDebugMultiThreaded. self configureBuildDebugMultiThreaded]; + + at: #buildITimerHeartbeat + put: [self buildType:#buildITimerHeartbeat. self configureBuildIHeartbeatTimer]; + + at: #buildMultiThreaded + put: [self buildType:#buildMultiThreaded . self configureBuildMultiThreaded]; + + at: #buildMultiThreadedAssert + put: [self buildType: #buildMultiThreadedAssert. self configureBuildMultiThreadedAssert]; + + at: #buildMultiThreadedDebug + put: [self buildType: #buildMultiThreadedDebug. self configureBuildMultiThreadedDebug]. + + ^(d at: aSymbol).! Item was changed: ----- Method: Linux64x86w32BitConfig>>configureForBuildType: (in category 'cmake') ----- configureForBuildType: aSymbol + | d | - | d info | "provide a concrete builder with the buildType and configureBuildX method to invoke" - info := SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. self configureNoBuildType. "reset all internal flags" d at: #build + put: [self buildType:#build. self configureBuild]; - put: [self buildType:(info at:#build). self configureBuild]; at: #buildAssert + put: [self buildType: #buildAssert. self configureBuildAssert]; - put: [self buildType:(info at: #buildAssert). self configureBuildAssert]; at: #buildAssertITimerHeartbeat + put: [ self buildType: #buildAssertITimerHeartbeat. self configureBuildAssertITimerHeartbeat]; - put: [ self buildType:(info at: #buildAssertITimerHeartbeat ). self configureBuildAssertITimerHeartbeat]; at:#buildDebug + put: [self buildType: #buildDebug. self configureBuildDebug]; - put: [self buildType:(info at: #buildDebug ). self configureBuildDebug]; at: #buildDebugITimerHeartbeat + put: [self buildType: #buildDebugITimerHeartbeat. self configureBuildDebugITimerHeartbeat]; - put: [self buildType:(info at: #buildDebugITimerHeartbeat). self configureBuildDebugITimerHeartbeat]; at: #buildDebugMultiThreaded + put: [self buildType: #buildDebugMultiThreaded. self configureBuildDebugMultiThreaded]; - put: [self buildType:(info at: #buildDebugMultiThreaded ). self configureBuildDebugMultiThreaded]; at: #buildITimerHeartbeat + put: [self buildType:#buildITimerHeartbeat. self configureBuildIHeartbeatTimer]; - put: [self buildType:(info at:#buildITimerHeartbeat ). self configureBuildIHeartbeatTimer]; at: #buildMultiThreaded + put: [self buildType:#buildMultiThreaded . self configureBuildMultiThreaded]; - put: [self buildType:(info at:#buildMultiThreaded ). self configureBuildMultiThreaded]; at: #buildMultiThreadedAssert + put: [self buildType: #buildMultiThreadedAssert. self configureBuildMultiThreadedAssert]; - put: [self buildType:(info at: #buildMultiThreadedAssert). self configureBuildMultiThreadedAssert]; at: #buildMultiThreadedDebug + put: [self buildType: #buildMultiThreadedDebug. self configureBuildMultiThreadedDebug]. - put: [self buildType: (info at: #buildMultiThreadedDebug). self configureBuildMultiThreadedDebug]. ^(d at: aSymbol).! Item was changed: ----- Method: Linux64x86w32BitConfig>>setGlobalOptions: (in category 'utils') ----- + setGlobalOptions: aMaker + "SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions:' - setGlobalOptions: maker - - maker set: 'CMAKE_C_COMPILER' to: '/usr/bin/gcc'. - maker set: 'CMAKE_CXX_COMPILER' to: '/usr/bin/g++'. - " maker set: 'CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH}' to: ' /usr/lib/gcc/x86_64-slackware-linux/4.8.2/'. - set any CMake global options, before declaring a project in cmake file + we subclass this in our concrete builder and route it to " + + ^self setGlobalOptions: aMaker buildType: (buildType asSymbol) + ! - set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /opt/local/lib) - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions:' - "! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptions:buildType: (in category 'utils') ----- + setGlobalOptions: aMaker buildType: aBuildType + "invoke correct setGlobalOptions for this buildType to allow per-buildType customization'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self setGlobalOptionsBuild: aMaker]; + at: #buildAssert put: [self setGlobalOptionsBuildAssert: aMaker]; + at: #buildAssertITimerHeartbeat put: [self setGlobalOptionsBuildAssertITimerHeartbeat: aMaker]; + at:#buildDebug put: [self setGlobalOptionsBuildDebug: aMaker]; "located in CMakeVMMaker CPlatformConfig" + at: #buildDebugITimerHeartbeat put: [self setGlobalOptionsBuildDebugITimerHeartbeat: aMaker ]; + at: #buildDebugMultiThreaded put: [self setGlobalOptionsBuildDebugMultiThreaded: aMaker]; + at: #buildITimerHeartbeat put: [self setGlobalOptionsBuildITimerHeartbeat: aMaker]; + at: #buildMultiThreaded put: [self setGlobalOptionsBuildMultiThreaded: aMaker ]; + at: #buildMultiThreadedAssert put: [self setGlobalOptionsBuildMultiThreadedAssert: aMaker]; + at: #buildMultiThreadedDebug put: [self setGlobalOptionsBuildMultiThreadedDebug: aMaker ]; + at: #buildNone put:[self setGlobalOptionsBuildNone: aMaker]. + + ^((d at: ( aBuildType)) value) + ! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuild: (in category 'cmake config build type ') ----- + setGlobalOptionsBuild: aMaker + "convenience method to customize setGlobalOptions: aMaker for this build type. + Default is in CPlatformConfig>setGlobalOptions: aMaker setGlobalOptions: aMaker" + ^super setGlobalOptions: aMaker! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuildAssert: (in category 'cmake config build type ') ----- + setGlobalOptionsBuildAssert: aMaker + "convenience method to customize setGlobalOptions: aMaker for this build type. + Default is in CPlatformConfig>setGlobalOptions: aMaker setGlobalOptions: aMaker" + ^super setGlobalOptions: aMaker! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuildAssertITimerHeartbeat: (in category 'cmake config build type ') ----- + setGlobalOptionsBuildAssertITimerHeartbeat: aMaker + "convenience method to customize setGlobalOptions: aMaker for this build type. + Default is in CPlatformConfig>setGlobalOptions: aMaker setGlobalOptions: aMaker" + ^super setGlobalOptions: aMaker! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuildDebug: (in category 'cmake config build type ') ----- + setGlobalOptionsBuildDebug: aMaker + "convenience method to customize setGlobalOptions: aMaker for this build type. + Default is in CPlatformConfig>setGlobalOptions: aMaker setGlobalOptions: aMaker" + ^super setGlobalOptions: aMaker! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuildDebugITimerHeartbeat: (in category 'cmake config build type ') ----- + setGlobalOptionsBuildDebugITimerHeartbeat: aMaker + "convenience method to customize setGlobalOptions: aMaker for this build type. + Default is in CPlatformConfig>setGlobalOptions: aMaker setGlobalOptions: aMaker" + ^super setGlobalOptions: aMaker! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuildITimerHeartbeat: (in category 'cmake config build type ') ----- + setGlobalOptionsBuildITimerHeartbeat: aMaker + "convenience method to customize setGlobalOptions: aMaker for this build type. + Default is in CPlatformConfig>setGlobalOptions: aMaker setGlobalOptions: aMaker" + self break. + ^super setGlobalOptions: aMaker! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuildMultiThreaded: (in category 'cmake config build type ') ----- + setGlobalOptionsBuildMultiThreaded: aMaker + "convenience method to customize setGlobalOptions: aMaker for this build type. + Default is in CPlatformConfig>setGlobalOptions: aMaker setGlobalOptions: aMaker" + ^super setGlobalOptions: aMaker! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuildMultiThreadedAssert: (in category 'cmake config build type ') ----- + setGlobalOptionsBuildMultiThreadedAssert: aMaker + "convenience method to customize setGlobalOptions: aMaker for this build type. + Default is in CPlatformConfig>setGlobalOptions: aMaker setGlobalOptions: aMaker" + ^super setGlobalOptions: aMaker! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuildMultiThreadedDebug: (in category 'cmake config build type ') ----- + setGlobalOptionsBuildMultiThreadedDebug: aMaker + "convenience method to customize setGlobalOptions: aMaker for this build type. + Default is in CPlatformConfig>setGlobalOptions: aMaker setGlobalOptions: aMaker" + ^super setGlobalOptions: aMaker! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>configureForBuildType: (in category 'cmake configuration') ----- + configureForBuildType: aSymbol + | d | + "provide a concrete builder with the buildType and configureBuildX method to invoke" + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + self configureNoBuildType. "reset all internal flags" + d + at: #build + put: [self buildType:#build. self configureBuild]; + + at: #buildAssert + put: [self buildType: #buildAssert. self configureBuildAssert]; + + at: #buildAssertITimerHeartbeat + put: [ self buildType: #buildAssertITimerHeartbeat. self configureBuildAssertITimerHeartbeat]; + + at:#buildDebug + put: [self buildType: #buildDebug. self configureBuildDebug]; + + at: #buildDebugITimerHeartbeat + put: [self buildType: #buildDebugITimerHeartbeat. self configureBuildDebugITimerHeartbeat]; + + at: #buildDebugMultiThreaded + put: [self buildType: #buildDebugMultiThreaded. self configureBuildDebugMultiThreaded]; + + at: #buildITimerHeartbeat + put: [self buildType:#buildITimerHeartbeat. self configureBuildIHeartbeatTimer]; + + at: #buildMultiThreaded + put: [self buildType:#buildMultiThreaded . self configureBuildMultiThreaded]; + + at: #buildMultiThreadedAssert + put: [self buildType: #buildMultiThreadedAssert. self configureBuildMultiThreadedAssert]; + + at: #buildMultiThreadedDebug + put: [self buildType: #buildMultiThreadedDebug. self configureBuildMultiThreadedDebug]. + + ^(d at: aSymbol).! Item was added: + ----- Method: SqueakBSDConfig>>configureForBuildType: (in category 'cmake configuration') ----- + configureForBuildType: aSymbol + | d | + "provide a concrete builder with the buildType and configureBuildX method to invoke" + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + self configureNoBuildType. "reset all internal flags" + d + at: #build + put: [self buildType:#build. self configureBuild]; + + at: #buildAssert + put: [self buildType: #buildAssert. self configureBuildAssert]; + + at: #buildAssertITimerHeartbeat + put: [ self buildType: #buildAssertITimerHeartbeat. self configureBuildAssertITimerHeartbeat]; + + at:#buildDebug + put: [self buildType: #buildDebug. self configureBuildDebug]; + + at: #buildDebugITimerHeartbeat + put: [self buildType: #buildDebugITimerHeartbeat. self configureBuildDebugITimerHeartbeat]; + + at: #buildDebugMultiThreaded + put: [self buildType: #buildDebugMultiThreaded. self configureBuildDebugMultiThreaded]; + + at: #buildITimerHeartbeat + put: [self buildType:#buildITimerHeartbeat. self configureBuildIHeartbeatTimer]; + + at: #buildMultiThreaded + put: [self buildType:#buildMultiThreaded . self configureBuildMultiThreaded]; + + at: #buildMultiThreadedAssert + put: [self buildType: #buildMultiThreadedAssert. self configureBuildMultiThreadedAssert]; + + at: #buildMultiThreadedDebug + put: [self buildType: #buildMultiThreadedDebug. self configureBuildMultiThreadedDebug]. + + ^(d at: aSymbol).! Item was changed: ----- Method: SqueakCMakeVMMakerAbstractBuilder>>configureABuildFor:withBuildType: (in category 'building') ----- configureABuildFor: configSymbol withBuildType: typeSymbol | i | self flag:'tty'. "excludeFromBuild returning True does not exit gracefully" "Do some sanity checks, then set the internal state of a Configuration for a particular build type. " [ ((Smalltalk at: configSymbol) category) = (self configurationsCategory) "verify the class is handled by this concrete builder" ifTrue:[ config := (Smalltalk at: configSymbol) new. "verify this config can handle this build type." config excludeFromBuild "has a developer excluded this build manually?" ifTrue:[^self userErrorConfigMarkedAsExcludeFromBuild: configSymbol]. i:=config availableBuilds indexOf:typeSymbol ifAbsent:[^self userErrorInvalidBuildType: typeSymbol "this config does not support this build type" forConfiguration: configSymbol hasTypes: config availableBuilds]. - (config configureForBuildType: typeSymbol) value. "config configure yourself" ^self] ifFalse:[^self userErrorInvalidTarget: configSymbol] ] ifError:[^'error configureABuildFor: ''', configSymbol]. ^nil. ! Item was added: + ----- Method: SqueakIA32BochsConfig>>configureForBuildType: (in category 'cmake configuration') ----- + configureForBuildType: aSymbol + | d | + "provide a concrete builder with the buildType and configureBuildX method to invoke" + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + self configureNoBuildType. "reset all internal flags" + d + at: #build + put: [self buildType:#build. self configureBuild]; + + at: #buildAssert + put: [self buildType: #buildAssert. self configureBuildAssert]; + + at: #buildAssertITimerHeartbeat + put: [ self buildType: #buildAssertITimerHeartbeat. self configureBuildAssertITimerHeartbeat]; + + at:#buildDebug + put: [self buildType: #buildDebug. self configureBuildDebug]; + + at: #buildDebugITimerHeartbeat + put: [self buildType: #buildDebugITimerHeartbeat. self configureBuildDebugITimerHeartbeat]; + + at: #buildDebugMultiThreaded + put: [self buildType: #buildDebugMultiThreaded. self configureBuildDebugMultiThreaded]; + + at: #buildITimerHeartbeat + put: [self buildType:#buildITimerHeartbeat. self configureBuildIHeartbeatTimer]; + + at: #buildMultiThreaded + put: [self buildType:#buildMultiThreaded . self configureBuildMultiThreaded]; + + at: #buildMultiThreadedAssert + put: [self buildType: #buildMultiThreadedAssert. self configureBuildMultiThreadedAssert]; + + at: #buildMultiThreadedDebug + put: [self buildType: #buildMultiThreadedDebug. self configureBuildMultiThreadedDebug]. + + ^(d at: aSymbol).! Item was added: + ----- Method: SqueakMacOSConfig>>configureForBuildType: (in category 'cmake configuration') ----- + configureForBuildType: aSymbol + | d | + "provide a concrete builder with the buildType and configureBuildX method to invoke" + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + self configureNoBuildType. "reset all internal flags" + d + at: #build + put: [self buildType:#build. self configureBuild]; + + at: #buildAssert + put: [self buildType: #buildAssert. self configureBuildAssert]; + + at: #buildAssertITimerHeartbeat + put: [ self buildType: #buildAssertITimerHeartbeat. self configureBuildAssertITimerHeartbeat]; + + at:#buildDebug + put: [self buildType: #buildDebug. self configureBuildDebug]; + + at: #buildDebugITimerHeartbeat + put: [self buildType: #buildDebugITimerHeartbeat. self configureBuildDebugITimerHeartbeat]; + + at: #buildDebugMultiThreaded + put: [self buildType: #buildDebugMultiThreaded. self configureBuildDebugMultiThreaded]; + + at: #buildITimerHeartbeat + put: [self buildType:#buildITimerHeartbeat. self configureBuildIHeartbeatTimer]; + + at: #buildMultiThreaded + put: [self buildType:#buildMultiThreaded . self configureBuildMultiThreaded]; + + at: #buildMultiThreadedAssert + put: [self buildType: #buildMultiThreadedAssert. self configureBuildMultiThreadedAssert]; + + at: #buildMultiThreadedDebug + put: [self buildType: #buildMultiThreadedDebug. self configureBuildMultiThreadedDebug]. + + ^(d at: aSymbol).! Item was added: + ----- Method: SqueakSunOS32x86Config>>configureForBuildType: (in category 'cmake configuration') ----- + configureForBuildType: aSymbol + | d | + "provide a concrete builder with the buildType and configureBuildX method to invoke" + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + self configureNoBuildType. "reset all internal flags" + d + at: #build + put: [self buildType:#build. self configureBuild]; + + at: #buildAssert + put: [self buildType: #buildAssert. self configureBuildAssert]; + + at: #buildAssertITimerHeartbeat + put: [ self buildType: #buildAssertITimerHeartbeat. self configureBuildAssertITimerHeartbeat]; + + at:#buildDebug + put: [self buildType: #buildDebug. self configureBuildDebug]; + + at: #buildDebugITimerHeartbeat + put: [self buildType: #buildDebugITimerHeartbeat. self configureBuildDebugITimerHeartbeat]; + + at: #buildDebugMultiThreaded + put: [self buildType: #buildDebugMultiThreaded. self configureBuildDebugMultiThreaded]; + + at: #buildITimerHeartbeat + put: [self buildType:#buildITimerHeartbeat. self configureBuildIHeartbeatTimer]; + + at: #buildMultiThreaded + put: [self buildType:#buildMultiThreaded . self configureBuildMultiThreaded]; + + at: #buildMultiThreadedAssert + put: [self buildType: #buildMultiThreadedAssert. self configureBuildMultiThreadedAssert]; + + at: #buildMultiThreadedDebug + put: [self buildType: #buildMultiThreadedDebug. self configureBuildMultiThreadedDebug]. + + ^(d at: aSymbol).! Item was added: + ----- Method: SqueakWin32x86Config>>configureForBuildType: (in category 'cmake configuration') ----- + configureForBuildType: aSymbol + | d | + "provide a concrete builder with the buildType and configureBuildX method to invoke" + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + self configureNoBuildType. "reset all internal flags" + d + at: #build + put: [self buildType:#build. self configureBuild]; + + at: #buildAssert + put: [self buildType: #buildAssert. self configureBuildAssert]; + + at: #buildAssertITimerHeartbeat + put: [ self buildType: #buildAssertITimerHeartbeat. self configureBuildAssertITimerHeartbeat]; + + at:#buildDebug + put: [self buildType: #buildDebug. self configureBuildDebug]; + + at: #buildDebugITimerHeartbeat + put: [self buildType: #buildDebugITimerHeartbeat. self configureBuildDebugITimerHeartbeat]; + + at: #buildDebugMultiThreaded + put: [self buildType: #buildDebugMultiThreaded. self configureBuildDebugMultiThreaded]; + + at: #buildITimerHeartbeat + put: [self buildType:#buildITimerHeartbeat. self configureBuildIHeartbeatTimer]; + + at: #buildMultiThreaded + put: [self buildType:#buildMultiThreaded . self configureBuildMultiThreaded]; + + at: #buildMultiThreadedAssert + put: [self buildType: #buildMultiThreadedAssert. self configureBuildMultiThreadedAssert]; + + at: #buildMultiThreadedDebug + put: [self buildType: #buildMultiThreadedDebug. self configureBuildMultiThreadedDebug]. + + ^(d at: aSymbol).! Item was changed: ----- Method: TCPlatformConfigForSqueak>>configureForBuildType: (in category 'cmake configuration') ----- configureForBuildType: aSymbol + | d | - | d info | "provide a concrete builder with the buildType and configureBuildX method to invoke" - info := SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. self configureNoBuildType. "reset all internal flags" d at: #build + put: [self buildType:#build. self configureBuild]; - put: [self buildType:(info at:#build). self configureBuild]; at: #buildAssert + put: [self buildType: #buildAssert. self configureBuildAssert]; - put: [self buildType:(info at: #buildAssert). self configureBuildAssert]; at: #buildAssertITimerHeartbeat + put: [ self buildType: #buildAssertITimerHeartbeat. self configureBuildAssertITimerHeartbeat]; - put: [ self buildType:(info at: #buildAssertITimerHeartbeat ). self configureBuildAssertITimerHeartbeat]; at:#buildDebug + put: [self buildType: #buildDebug. self configureBuildDebug]; - put: [self buildType:(info at: #buildDebug ). self configureBuildDebug]; at: #buildDebugITimerHeartbeat + put: [self buildType: #buildDebugITimerHeartbeat. self configureBuildDebugITimerHeartbeat]; - put: [self buildType:(info at: #buildDebugITimerHeartbeat). self configureBuildDebugITimerHeartbeat]; at: #buildDebugMultiThreaded + put: [self buildType: #buildDebugMultiThreaded. self configureBuildDebugMultiThreaded]; - put: [self buildType:(info at: #buildDebugMultiThreaded ). self configureBuildDebugMultiThreaded]; at: #buildITimerHeartbeat + put: [self buildType:#buildITimerHeartbeat. self configureBuildIHeartbeatTimer]; - put: [self buildType:(info at:#buildITimerHeartbeat ). self configureBuildIHeartbeatTimer]; at: #buildMultiThreaded + put: [self buildType:#buildMultiThreaded . self configureBuildMultiThreaded]; - put: [self buildType:(info at:#buildMultiThreaded ). self configureBuildMultiThreaded]; at: #buildMultiThreadedAssert + put: [self buildType: #buildMultiThreadedAssert. self configureBuildMultiThreadedAssert]; - put: [self buildType:(info at: #buildMultiThreadedAssert). self configureBuildMultiThreadedAssert]; at: #buildMultiThreadedDebug + put: [self buildType: #buildMultiThreadedDebug. self configureBuildMultiThreadedDebug]. - put: [self buildType: (info at: #buildMultiThreadedDebug). self configureBuildMultiThreadedDebug]. ^(d at: aSymbol).! Item was changed: ----- Method: TCPlatformConfigForSqueak>>setGlobalOptions: (in category 'utils') ----- setGlobalOptions: maker + "SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions:' - self required - "set any CMake global options, before declaring a project in cmake file + we subclass this in our concrete builder and route it to - maker set: 'CMAKE_C_COMPILER' to: '/usr/bin/gcc'. - maker set: 'CMAKE_CXX_COMPILER' to: '/usr/bin/g++'. + ^self setGlobalOptions: aMaker buildType: (self buildType asSymbol) + + " + self required + + ! - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions:' - "! Item was added: + ----- Method: TCPlatformConfigForSqueak>>setGlobalOptions:buildType: (in category 'utils') ----- + setGlobalOptions: aMaker buildType: aBuildType + "invoke correct setGlobalOptions for this buildType to allow per-buildType customization'" + + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self setGlobalOptionsBuild: aMaker]; + at: #buildAssert put: [self setGlobalOptionsBuildAssert: aMaker]; + at: #buildAssertITimerHeartbeat put: [self setGlobalOptionsBuildAssertITimerHeartbeat: aMaker]; + at:#buildDebug put: [self setGlobalOptionsBuildDebug: aMaker]; "located in CMakeVMMaker CPlatformConfig" + at: #buildDebugITimerHeartbeat put: [self setGlobalOptionsBuildDebugITimerHeartbeat: aMaker ]; + at: #buildDebugMultiThreaded put: [self setGlobalOptionsBuildDebugMultiThreaded: aMaker]; + at: #buildITimerHeartbeat put: [self setGlobalOptionsBuildITimerHeartbeat: aMaker]; + at: #buildMultiThreaded put: [self setGlobalOptionsBuildMultiThreaded: aMaker ]; + at: #buildMultiThreadedAssert put: [self setGlobalOptionsBuildMultiThreadedAssert: aMaker]; + at: #buildMultiThreadedDebug put: [self setGlobalOptionsBuildMultiThreadedDebug: aMaker ]; + at: #buildNone put:[self setGlobalOptionsBuildNone: aMaker]. + + ^(d at: ( aBuildType)) value + ! Item was changed: ----- Method: TCPlatformConfigForSqueak>>setGlobalOptionsBuildNone: (in category 'cmake config build type ') ----- setGlobalOptionsBuildNone: aMaker + "SHOULD NOT HAPPEN" + self halt.! - self required.!

1 0

[commit][3000] Add libcrypto and libssl to Linux and Mac builds of the SqueakSSL plugin.
by commits＠squeakvm.org 17 Jun '14

17 Jun '14

Revision: 3000 Author: eliot Date: 2014-06-13 20:36:18 -0700 (Fri, 13 Jun 2014) Log Message: ----------- Add libcrypto and libssl to Linux and Mac builds of the SqueakSSL plugin. Modified Paths: -------------- branches/Cog/build.macos32x86/newspeak.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/newspeak.cog.v3/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/newspeak.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/newspeak.stack.v3/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.cog.v3/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.sista.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.sista.v3/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.stack.v3/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj Added Paths: ----------- branches/Cog/platforms/unix/plugins/SqueakSSL/Makefile.inc Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2014-06-14 02:52:51 UTC (rev 2999) +++ branches/Cog/build.macos32x86/newspeak.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2014-06-14 03:36:18 UTC (rev 3000) @@ -10,6 +10,8 @@ 73027B6B17012E5F0086D8E4 /* SqueakSSL.c in Sources */ = {isa = PBXBuildFile; fileRef = 73027B6A17012E5F0086D8E4 /* SqueakSSL.c */; }; 732D9F4317012B6E00E25893 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 732D9F4117012B6E00E25893 /* Security.framework */; }; 732D9F4417012B6E00E25893 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 732D9F4217012B6E00E25893 /* CoreFoundation.framework */; }; + 73CEDF26194BF52D005C12A4 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */; }; + 73CEDF28194BF53B005C12A4 /* libssl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CEDF27194BF53B005C12A4 /* libssl.dylib */; }; 73D8A6421701272700C66275 /* sqMacSSL.c in Sources */ = {isa = PBXBuildFile; fileRef = 73D8A6411701272700C66275 /* sqMacSSL.c */; }; /* End PBXBuildFile section */ @@ -19,6 +21,8 @@ 732D9F4117012B6E00E25893 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; }; 732D9F4217012B6E00E25893 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; }; 73811791170128D400CB30CE /* sq.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sq.h; path = ../../../platforms/Cross/vm/sq.h; sourceTree = SOURCE_ROOT; }; + 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = usr/lib/libcrypto.dylib; sourceTree = SDKROOT; }; + 73CEDF27194BF53B005C12A4 /* libssl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libssl.dylib; path = usr/lib/libssl.dylib; sourceTree = SDKROOT; }; 73D8A62E1701259800C66275 /* SqueakSSL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SqueakSSL.h; path = ../../../platforms/Cross/plugins/SqueakSSL/SqueakSSL.h; sourceTree = SOURCE_ROOT; }; 73D8A6411701272700C66275 /* sqMacSSL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqMacSSL.c; path = "../../../platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c"; sourceTree = SOURCE_ROOT; }; 8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; @@ -38,6 +42,8 @@ files = ( 732D9F4317012B6E00E25893 /* Security.framework in Frameworks */, 732D9F4417012B6E00E25893 /* CoreFoundation.framework in Frameworks */, + 73CEDF26194BF52D005C12A4 /* libcrypto.dylib in Frameworks */, + 73CEDF28194BF53B005C12A4 /* libssl.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -50,6 +56,8 @@ 08FB77ADFE841716C02AAC07 /* Source */, 089C167CFE841241C02AAC07 /* Resources */, 19C28FB4FE9D528D11CA2CBB /* Products */, + 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */, + 73CEDF27194BF53B005C12A4 /* libssl.dylib */, ); name = SqueakSSL; sourceTree = "<group>"; Modified: branches/Cog/build.macos32x86/newspeak.cog.v3/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.v3/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2014-06-14 02:52:51 UTC (rev 2999) +++ branches/Cog/build.macos32x86/newspeak.cog.v3/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2014-06-14 03:36:18 UTC (rev 3000) @@ -10,6 +10,8 @@ 73027B6B17012E5F0086D8E4 /* SqueakSSL.c in Sources */ = {isa = PBXBuildFile; fileRef = 73027B6A17012E5F0086D8E4 /* SqueakSSL.c */; }; 732D9F4317012B6E00E25893 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 732D9F4117012B6E00E25893 /* Security.framework */; }; 732D9F4417012B6E00E25893 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 732D9F4217012B6E00E25893 /* CoreFoundation.framework */; }; + 73CEDF26194BF52D005C12A4 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */; }; + 73CEDF28194BF53B005C12A4 /* libssl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CEDF27194BF53B005C12A4 /* libssl.dylib */; }; 73D8A6421701272700C66275 /* sqMacSSL.c in Sources */ = {isa = PBXBuildFile; fileRef = 73D8A6411701272700C66275 /* sqMacSSL.c */; }; /* End PBXBuildFile section */ @@ -19,6 +21,8 @@ 732D9F4117012B6E00E25893 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; }; 732D9F4217012B6E00E25893 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; }; 73811791170128D400CB30CE /* sq.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sq.h; path = ../../../platforms/Cross/vm/sq.h; sourceTree = SOURCE_ROOT; }; + 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = usr/lib/libcrypto.dylib; sourceTree = SDKROOT; }; + 73CEDF27194BF53B005C12A4 /* libssl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libssl.dylib; path = usr/lib/libssl.dylib; sourceTree = SDKROOT; }; 73D8A62E1701259800C66275 /* SqueakSSL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SqueakSSL.h; path = ../../../platforms/Cross/plugins/SqueakSSL/SqueakSSL.h; sourceTree = SOURCE_ROOT; }; 73D8A6411701272700C66275 /* sqMacSSL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqMacSSL.c; path = "../../../platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c"; sourceTree = SOURCE_ROOT; }; 8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; @@ -38,6 +42,8 @@ files = ( 732D9F4317012B6E00E25893 /* Security.framework in Frameworks */, 732D9F4417012B6E00E25893 /* CoreFoundation.framework in Frameworks */, + 73CEDF26194BF52D005C12A4 /* libcrypto.dylib in Frameworks */, + 73CEDF28194BF53B005C12A4 /* libssl.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -50,6 +56,8 @@ 08FB77ADFE841716C02AAC07 /* Source */, 089C167CFE841241C02AAC07 /* Resources */, 19C28FB4FE9D528D11CA2CBB /* Products */, + 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */, + 73CEDF27194BF53B005C12A4 /* libssl.dylib */, ); name = SqueakSSL; sourceTree = "<group>"; Modified: branches/Cog/build.macos32x86/newspeak.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/newspeak.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2014-06-14 02:52:51 UTC (rev 2999) +++ branches/Cog/build.macos32x86/newspeak.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2014-06-14 03:36:18 UTC (rev 3000) @@ -10,6 +10,8 @@ 73027B6B17012E5F0086D8E4 /* SqueakSSL.c in Sources */ = {isa = PBXBuildFile; fileRef = 73027B6A17012E5F0086D8E4 /* SqueakSSL.c */; }; 732D9F4317012B6E00E25893 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 732D9F4117012B6E00E25893 /* Security.framework */; }; 732D9F4417012B6E00E25893 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 732D9F4217012B6E00E25893 /* CoreFoundation.framework */; }; + 73CEDF26194BF52D005C12A4 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */; }; + 73CEDF28194BF53B005C12A4 /* libssl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CEDF27194BF53B005C12A4 /* libssl.dylib */; }; 73D8A6421701272700C66275 /* sqMacSSL.c in Sources */ = {isa = PBXBuildFile; fileRef = 73D8A6411701272700C66275 /* sqMacSSL.c */; }; /* End PBXBuildFile section */ @@ -19,6 +21,8 @@ 732D9F4117012B6E00E25893 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; }; 732D9F4217012B6E00E25893 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; }; 73811791170128D400CB30CE /* sq.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sq.h; path = ../../../platforms/Cross/vm/sq.h; sourceTree = SOURCE_ROOT; }; + 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = usr/lib/libcrypto.dylib; sourceTree = SDKROOT; }; + 73CEDF27194BF53B005C12A4 /* libssl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libssl.dylib; path = usr/lib/libssl.dylib; sourceTree = SDKROOT; }; 73D8A62E1701259800C66275 /* SqueakSSL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SqueakSSL.h; path = ../../../platforms/Cross/plugins/SqueakSSL/SqueakSSL.h; sourceTree = SOURCE_ROOT; }; 73D8A6411701272700C66275 /* sqMacSSL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqMacSSL.c; path = "../../../platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c"; sourceTree = SOURCE_ROOT; }; 8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; @@ -38,6 +42,8 @@ files = ( 732D9F4317012B6E00E25893 /* Security.framework in Frameworks */, 732D9F4417012B6E00E25893 /* CoreFoundation.framework in Frameworks */, + 73CEDF26194BF52D005C12A4 /* libcrypto.dylib in Frameworks */, + 73CEDF28194BF53B005C12A4 /* libssl.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -50,6 +56,8 @@ 08FB77ADFE841716C02AAC07 /* Source */, 089C167CFE841241C02AAC07 /* Resources */, 19C28FB4FE9D528D11CA2CBB /* Products */, + 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */, + 73CEDF27194BF53B005C12A4 /* libssl.dylib */, ); name = SqueakSSL; sourceTree = "<group>"; Modified: branches/Cog/build.macos32x86/newspeak.stack.v3/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/newspeak.stack.v3/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2014-06-14 02:52:51 UTC (rev 2999) +++ branches/Cog/build.macos32x86/newspeak.stack.v3/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2014-06-14 03:36:18 UTC (rev 3000) @@ -10,6 +10,8 @@ 73027B6B17012E5F0086D8E4 /* SqueakSSL.c in Sources */ = {isa = PBXBuildFile; fileRef = 73027B6A17012E5F0086D8E4 /* SqueakSSL.c */; }; 732D9F4317012B6E00E25893 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 732D9F4117012B6E00E25893 /* Security.framework */; }; 732D9F4417012B6E00E25893 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 732D9F4217012B6E00E25893 /* CoreFoundation.framework */; }; + 73CEDF26194BF52D005C12A4 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */; }; + 73CEDF28194BF53B005C12A4 /* libssl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CEDF27194BF53B005C12A4 /* libssl.dylib */; }; 73D8A6421701272700C66275 /* sqMacSSL.c in Sources */ = {isa = PBXBuildFile; fileRef = 73D8A6411701272700C66275 /* sqMacSSL.c */; }; /* End PBXBuildFile section */ @@ -19,6 +21,8 @@ 732D9F4117012B6E00E25893 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; }; 732D9F4217012B6E00E25893 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; }; 73811791170128D400CB30CE /* sq.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sq.h; path = ../../../platforms/Cross/vm/sq.h; sourceTree = SOURCE_ROOT; }; + 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = usr/lib/libcrypto.dylib; sourceTree = SDKROOT; }; + 73CEDF27194BF53B005C12A4 /* libssl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libssl.dylib; path = usr/lib/libssl.dylib; sourceTree = SDKROOT; }; 73D8A62E1701259800C66275 /* SqueakSSL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SqueakSSL.h; path = ../../../platforms/Cross/plugins/SqueakSSL/SqueakSSL.h; sourceTree = SOURCE_ROOT; }; 73D8A6411701272700C66275 /* sqMacSSL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqMacSSL.c; path = "../../../platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c"; sourceTree = SOURCE_ROOT; }; 8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; @@ -38,6 +42,8 @@ files = ( 732D9F4317012B6E00E25893 /* Security.framework in Frameworks */, 732D9F4417012B6E00E25893 /* CoreFoundation.framework in Frameworks */, + 73CEDF26194BF52D005C12A4 /* libcrypto.dylib in Frameworks */, + 73CEDF28194BF53B005C12A4 /* libssl.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -50,6 +56,8 @@ 08FB77ADFE841716C02AAC07 /* Source */, 089C167CFE841241C02AAC07 /* Resources */, 19C28FB4FE9D528D11CA2CBB /* Products */, + 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */, + 73CEDF27194BF53B005C12A4 /* libssl.dylib */, ); name = SqueakSSL; sourceTree = "<group>"; Modified: branches/Cog/build.macos32x86/squeak.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2014-06-14 02:52:51 UTC (rev 2999) +++ branches/Cog/build.macos32x86/squeak.cog.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2014-06-14 03:36:18 UTC (rev 3000) @@ -7,10 +7,11 @@ objects = { /* Begin PBXBuildFile section */ - DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spursrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; 73027B6B17012E5F0086D8E4 /* SqueakSSL.c in Sources */ = {isa = PBXBuildFile; fileRef = 73027B6A17012E5F0086D8E4 /* SqueakSSL.c */; }; 732D9F4317012B6E00E25893 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 732D9F4117012B6E00E25893 /* Security.framework */; }; 732D9F4417012B6E00E25893 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 732D9F4217012B6E00E25893 /* CoreFoundation.framework */; }; + 73CEDF26194BF52D005C12A4 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */; }; + 73CEDF28194BF53B005C12A4 /* libssl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CEDF27194BF53B005C12A4 /* libssl.dylib */; }; 73D8A6421701272700C66275 /* sqMacSSL.c in Sources */ = {isa = PBXBuildFile; fileRef = 73D8A6411701272700C66275 /* sqMacSSL.c */; }; /* End PBXBuildFile section */ @@ -20,10 +21,13 @@ 732D9F4117012B6E00E25893 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; }; 732D9F4217012B6E00E25893 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; }; 73811791170128D400CB30CE /* sq.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sq.h; path = ../../../platforms/Cross/vm/sq.h; sourceTree = SOURCE_ROOT; }; + 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = usr/lib/libcrypto.dylib; sourceTree = SDKROOT; }; + 73CEDF27194BF53B005C12A4 /* libssl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libssl.dylib; path = usr/lib/libssl.dylib; sourceTree = SDKROOT; }; 73D8A62E1701259800C66275 /* SqueakSSL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SqueakSSL.h; path = ../../../platforms/Cross/plugins/SqueakSSL/SqueakSSL.h; sourceTree = SOURCE_ROOT; }; 73D8A6411701272700C66275 /* sqMacSSL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqMacSSL.c; path = "../../../platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c"; sourceTree = SOURCE_ROOT; }; 8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; 8D01CCD20486CAD60068D4B7 /* SqueakSSL.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SqueakSSL.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; + DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spursrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; DA3A20F60AA63CDC0050B983 /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; }; DA3A20F70AA63CDC0050B983 /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; }; DA3A20F80AA63D000050B983 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; }; @@ -38,6 +42,8 @@ files = ( 732D9F4317012B6E00E25893 /* Security.framework in Frameworks */, 732D9F4417012B6E00E25893 /* CoreFoundation.framework in Frameworks */, + 73CEDF26194BF52D005C12A4 /* libcrypto.dylib in Frameworks */, + 73CEDF28194BF53B005C12A4 /* libssl.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -50,6 +56,8 @@ 08FB77ADFE841716C02AAC07 /* Source */, 089C167CFE841241C02AAC07 /* Resources */, 19C28FB4FE9D528D11CA2CBB /* Products */, + 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */, + 73CEDF27194BF53B005C12A4 /* libssl.dylib */, ); name = SqueakSSL; sourceTree = "<group>"; Modified: branches/Cog/build.macos32x86/squeak.cog.v3/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.v3/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2014-06-14 02:52:51 UTC (rev 2999) +++ branches/Cog/build.macos32x86/squeak.cog.v3/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2014-06-14 03:36:18 UTC (rev 3000) @@ -7,10 +7,11 @@ objects = { /* Begin PBXBuildFile section */ - DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../src/vm/interp.h; sourceTree = SOURCE_ROOT; }; 73027B6B17012E5F0086D8E4 /* SqueakSSL.c in Sources */ = {isa = PBXBuildFile; fileRef = 73027B6A17012E5F0086D8E4 /* SqueakSSL.c */; }; 732D9F4317012B6E00E25893 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 732D9F4117012B6E00E25893 /* Security.framework */; }; 732D9F4417012B6E00E25893 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 732D9F4217012B6E00E25893 /* CoreFoundation.framework */; }; + 73CEDF26194BF52D005C12A4 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */; }; + 73CEDF28194BF53B005C12A4 /* libssl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CEDF27194BF53B005C12A4 /* libssl.dylib */; }; 73D8A6421701272700C66275 /* sqMacSSL.c in Sources */ = {isa = PBXBuildFile; fileRef = 73D8A6411701272700C66275 /* sqMacSSL.c */; }; /* End PBXBuildFile section */ @@ -20,10 +21,13 @@ 732D9F4117012B6E00E25893 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; }; 732D9F4217012B6E00E25893 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; }; 73811791170128D400CB30CE /* sq.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sq.h; path = ../../../platforms/Cross/vm/sq.h; sourceTree = SOURCE_ROOT; }; + 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = usr/lib/libcrypto.dylib; sourceTree = SDKROOT; }; + 73CEDF27194BF53B005C12A4 /* libssl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libssl.dylib; path = usr/lib/libssl.dylib; sourceTree = SDKROOT; }; 73D8A62E1701259800C66275 /* SqueakSSL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SqueakSSL.h; path = ../../../platforms/Cross/plugins/SqueakSSL/SqueakSSL.h; sourceTree = SOURCE_ROOT; }; 73D8A6411701272700C66275 /* sqMacSSL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqMacSSL.c; path = "../../../platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c"; sourceTree = SOURCE_ROOT; }; 8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; 8D01CCD20486CAD60068D4B7 /* SqueakSSL.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SqueakSSL.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; + DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../src/vm/interp.h; sourceTree = SOURCE_ROOT; }; DA3A20F60AA63CDC0050B983 /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; }; DA3A20F70AA63CDC0050B983 /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; }; DA3A20F80AA63D000050B983 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; }; @@ -38,6 +42,8 @@ files = ( 732D9F4317012B6E00E25893 /* Security.framework in Frameworks */, 732D9F4417012B6E00E25893 /* CoreFoundation.framework in Frameworks */, + 73CEDF26194BF52D005C12A4 /* libcrypto.dylib in Frameworks */, + 73CEDF28194BF53B005C12A4 /* libssl.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -50,6 +56,8 @@ 08FB77ADFE841716C02AAC07 /* Source */, 089C167CFE841241C02AAC07 /* Resources */, 19C28FB4FE9D528D11CA2CBB /* Products */, + 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */, + 73CEDF27194BF53B005C12A4 /* libssl.dylib */, ); name = SqueakSSL; sourceTree = "<group>"; Modified: branches/Cog/build.macos32x86/squeak.sista.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2014-06-14 02:52:51 UTC (rev 2999) +++ branches/Cog/build.macos32x86/squeak.sista.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2014-06-14 03:36:18 UTC (rev 3000) @@ -7,10 +7,11 @@ objects = { /* Begin PBXBuildFile section */ - DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spursistasrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; 73027B6B17012E5F0086D8E4 /* SqueakSSL.c in Sources */ = {isa = PBXBuildFile; fileRef = 73027B6A17012E5F0086D8E4 /* SqueakSSL.c */; }; 732D9F4317012B6E00E25893 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 732D9F4117012B6E00E25893 /* Security.framework */; }; 732D9F4417012B6E00E25893 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 732D9F4217012B6E00E25893 /* CoreFoundation.framework */; }; + 73CEDF26194BF52D005C12A4 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */; }; + 73CEDF28194BF53B005C12A4 /* libssl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CEDF27194BF53B005C12A4 /* libssl.dylib */; }; 73D8A6421701272700C66275 /* sqMacSSL.c in Sources */ = {isa = PBXBuildFile; fileRef = 73D8A6411701272700C66275 /* sqMacSSL.c */; }; /* End PBXBuildFile section */ @@ -20,10 +21,13 @@ 732D9F4117012B6E00E25893 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; }; 732D9F4217012B6E00E25893 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; }; 73811791170128D400CB30CE /* sq.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sq.h; path = ../../../platforms/Cross/vm/sq.h; sourceTree = SOURCE_ROOT; }; + 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = usr/lib/libcrypto.dylib; sourceTree = SDKROOT; }; + 73CEDF27194BF53B005C12A4 /* libssl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libssl.dylib; path = usr/lib/libssl.dylib; sourceTree = SDKROOT; }; 73D8A62E1701259800C66275 /* SqueakSSL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SqueakSSL.h; path = ../../../platforms/Cross/plugins/SqueakSSL/SqueakSSL.h; sourceTree = SOURCE_ROOT; }; 73D8A6411701272700C66275 /* sqMacSSL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqMacSSL.c; path = "../../../platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c"; sourceTree = SOURCE_ROOT; }; 8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; 8D01CCD20486CAD60068D4B7 /* SqueakSSL.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SqueakSSL.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; + DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spursistasrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; DA3A20F60AA63CDC0050B983 /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; }; DA3A20F70AA63CDC0050B983 /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; }; DA3A20F80AA63D000050B983 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; }; @@ -38,6 +42,8 @@ files = ( 732D9F4317012B6E00E25893 /* Security.framework in Frameworks */, 732D9F4417012B6E00E25893 /* CoreFoundation.framework in Frameworks */, + 73CEDF26194BF52D005C12A4 /* libcrypto.dylib in Frameworks */, + 73CEDF28194BF53B005C12A4 /* libssl.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -50,6 +56,8 @@ 08FB77ADFE841716C02AAC07 /* Source */, 089C167CFE841241C02AAC07 /* Resources */, 19C28FB4FE9D528D11CA2CBB /* Products */, + 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */, + 73CEDF27194BF53B005C12A4 /* libssl.dylib */, ); name = SqueakSSL; sourceTree = "<group>"; Modified: branches/Cog/build.macos32x86/squeak.sista.v3/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.v3/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2014-06-14 02:52:51 UTC (rev 2999) +++ branches/Cog/build.macos32x86/squeak.sista.v3/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2014-06-14 03:36:18 UTC (rev 3000) @@ -7,10 +7,11 @@ objects = { /* Begin PBXBuildFile section */ - DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../sistasrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; 73027B6B17012E5F0086D8E4 /* SqueakSSL.c in Sources */ = {isa = PBXBuildFile; fileRef = 73027B6A17012E5F0086D8E4 /* SqueakSSL.c */; }; 732D9F4317012B6E00E25893 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 732D9F4117012B6E00E25893 /* Security.framework */; }; 732D9F4417012B6E00E25893 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 732D9F4217012B6E00E25893 /* CoreFoundation.framework */; }; + 73CEDF26194BF52D005C12A4 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */; }; + 73CEDF28194BF53B005C12A4 /* libssl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CEDF27194BF53B005C12A4 /* libssl.dylib */; }; 73D8A6421701272700C66275 /* sqMacSSL.c in Sources */ = {isa = PBXBuildFile; fileRef = 73D8A6411701272700C66275 /* sqMacSSL.c */; }; /* End PBXBuildFile section */ @@ -20,10 +21,13 @@ 732D9F4117012B6E00E25893 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; }; 732D9F4217012B6E00E25893 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; }; 73811791170128D400CB30CE /* sq.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sq.h; path = ../../../platforms/Cross/vm/sq.h; sourceTree = SOURCE_ROOT; }; + 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = usr/lib/libcrypto.dylib; sourceTree = SDKROOT; }; + 73CEDF27194BF53B005C12A4 /* libssl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libssl.dylib; path = usr/lib/libssl.dylib; sourceTree = SDKROOT; }; 73D8A62E1701259800C66275 /* SqueakSSL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SqueakSSL.h; path = ../../../platforms/Cross/plugins/SqueakSSL/SqueakSSL.h; sourceTree = SOURCE_ROOT; }; 73D8A6411701272700C66275 /* sqMacSSL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqMacSSL.c; path = "../../../platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c"; sourceTree = SOURCE_ROOT; }; 8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; 8D01CCD20486CAD60068D4B7 /* SqueakSSL.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SqueakSSL.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; + DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../sistasrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; DA3A20F60AA63CDC0050B983 /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; }; DA3A20F70AA63CDC0050B983 /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; }; DA3A20F80AA63D000050B983 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; }; @@ -38,6 +42,8 @@ files = ( 732D9F4317012B6E00E25893 /* Security.framework in Frameworks */, 732D9F4417012B6E00E25893 /* CoreFoundation.framework in Frameworks */, + 73CEDF26194BF52D005C12A4 /* libcrypto.dylib in Frameworks */, + 73CEDF28194BF53B005C12A4 /* libssl.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -50,6 +56,8 @@ 08FB77ADFE841716C02AAC07 /* Source */, 089C167CFE841241C02AAC07 /* Resources */, 19C28FB4FE9D528D11CA2CBB /* Products */, + 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */, + 73CEDF27194BF53B005C12A4 /* libssl.dylib */, ); name = SqueakSSL; sourceTree = "<group>"; Modified: branches/Cog/build.macos32x86/squeak.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2014-06-14 02:52:51 UTC (rev 2999) +++ branches/Cog/build.macos32x86/squeak.stack.spur/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2014-06-14 03:36:18 UTC (rev 3000) @@ -7,10 +7,11 @@ objects = { /* Begin PBXBuildFile section */ - DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spurstacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; 73027B6B17012E5F0086D8E4 /* SqueakSSL.c in Sources */ = {isa = PBXBuildFile; fileRef = 73027B6A17012E5F0086D8E4 /* SqueakSSL.c */; }; 732D9F4317012B6E00E25893 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 732D9F4117012B6E00E25893 /* Security.framework */; }; 732D9F4417012B6E00E25893 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 732D9F4217012B6E00E25893 /* CoreFoundation.framework */; }; + 73CEDF26194BF52D005C12A4 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */; }; + 73CEDF28194BF53B005C12A4 /* libssl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CEDF27194BF53B005C12A4 /* libssl.dylib */; }; 73D8A6421701272700C66275 /* sqMacSSL.c in Sources */ = {isa = PBXBuildFile; fileRef = 73D8A6411701272700C66275 /* sqMacSSL.c */; }; /* End PBXBuildFile section */ @@ -20,10 +21,13 @@ 732D9F4117012B6E00E25893 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; }; 732D9F4217012B6E00E25893 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; }; 73811791170128D400CB30CE /* sq.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sq.h; path = ../../../platforms/Cross/vm/sq.h; sourceTree = SOURCE_ROOT; }; + 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = usr/lib/libcrypto.dylib; sourceTree = SDKROOT; }; + 73CEDF27194BF53B005C12A4 /* libssl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libssl.dylib; path = usr/lib/libssl.dylib; sourceTree = SDKROOT; }; 73D8A62E1701259800C66275 /* SqueakSSL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SqueakSSL.h; path = ../../../platforms/Cross/plugins/SqueakSSL/SqueakSSL.h; sourceTree = SOURCE_ROOT; }; 73D8A6411701272700C66275 /* sqMacSSL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqMacSSL.c; path = "../../../platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c"; sourceTree = SOURCE_ROOT; }; 8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; 8D01CCD20486CAD60068D4B7 /* SqueakSSL.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SqueakSSL.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; + DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spurstacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; DA3A20F60AA63CDC0050B983 /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; }; DA3A20F70AA63CDC0050B983 /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; }; DA3A20F80AA63D000050B983 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; }; @@ -38,6 +42,8 @@ files = ( 732D9F4317012B6E00E25893 /* Security.framework in Frameworks */, 732D9F4417012B6E00E25893 /* CoreFoundation.framework in Frameworks */, + 73CEDF26194BF52D005C12A4 /* libcrypto.dylib in Frameworks */, + 73CEDF28194BF53B005C12A4 /* libssl.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -50,6 +56,8 @@ 08FB77ADFE841716C02AAC07 /* Source */, 089C167CFE841241C02AAC07 /* Resources */, 19C28FB4FE9D528D11CA2CBB /* Products */, + 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */, + 73CEDF27194BF53B005C12A4 /* libssl.dylib */, ); name = SqueakSSL; sourceTree = "<group>"; Modified: branches/Cog/build.macos32x86/squeak.stack.v3/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.v3/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2014-06-14 02:52:51 UTC (rev 2999) +++ branches/Cog/build.macos32x86/squeak.stack.v3/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj 2014-06-14 03:36:18 UTC (rev 3000) @@ -7,10 +7,11 @@ objects = { /* Begin PBXBuildFile section */ - DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../stacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; 73027B6B17012E5F0086D8E4 /* SqueakSSL.c in Sources */ = {isa = PBXBuildFile; fileRef = 73027B6A17012E5F0086D8E4 /* SqueakSSL.c */; }; 732D9F4317012B6E00E25893 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 732D9F4117012B6E00E25893 /* Security.framework */; }; 732D9F4417012B6E00E25893 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 732D9F4217012B6E00E25893 /* CoreFoundation.framework */; }; + 73CEDF26194BF52D005C12A4 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */; }; + 73CEDF28194BF53B005C12A4 /* libssl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73CEDF27194BF53B005C12A4 /* libssl.dylib */; }; 73D8A6421701272700C66275 /* sqMacSSL.c in Sources */ = {isa = PBXBuildFile; fileRef = 73D8A6411701272700C66275 /* sqMacSSL.c */; }; /* End PBXBuildFile section */ @@ -20,10 +21,13 @@ 732D9F4117012B6E00E25893 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; }; 732D9F4217012B6E00E25893 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; }; 73811791170128D400CB30CE /* sq.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sq.h; path = ../../../platforms/Cross/vm/sq.h; sourceTree = SOURCE_ROOT; }; + 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = usr/lib/libcrypto.dylib; sourceTree = SDKROOT; }; + 73CEDF27194BF53B005C12A4 /* libssl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libssl.dylib; path = usr/lib/libssl.dylib; sourceTree = SDKROOT; }; 73D8A62E1701259800C66275 /* SqueakSSL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SqueakSSL.h; path = ../../../platforms/Cross/plugins/SqueakSSL/SqueakSSL.h; sourceTree = SOURCE_ROOT; }; 73D8A6411701272700C66275 /* sqMacSSL.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sqMacSSL.c; path = "../../../platforms/Mac OS/plugins/SqueakSSL/sqMacSSL.c"; sourceTree = SOURCE_ROOT; }; 8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; 8D01CCD20486CAD60068D4B7 /* SqueakSSL.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = SqueakSSL.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; + DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../stacksrc/vm/interp.h; sourceTree = SOURCE_ROOT; }; DA3A20F60AA63CDC0050B983 /* sqMemoryAccess.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqMemoryAccess.h; path = ../../../platforms/Cross/vm/sqMemoryAccess.h; sourceTree = SOURCE_ROOT; }; DA3A20F70AA63CDC0050B983 /* sqVirtualMachine.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sqVirtualMachine.h; path = ../../../platforms/Cross/vm/sqVirtualMachine.h; sourceTree = SOURCE_ROOT; }; DA3A20F80AA63D000050B983 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = "../../../platforms/Mac OS/vm/config.h"; sourceTree = SOURCE_ROOT; }; @@ -38,6 +42,8 @@ files = ( 732D9F4317012B6E00E25893 /* Security.framework in Frameworks */, 732D9F4417012B6E00E25893 /* CoreFoundation.framework in Frameworks */, + 73CEDF26194BF52D005C12A4 /* libcrypto.dylib in Frameworks */, + 73CEDF28194BF53B005C12A4 /* libssl.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -50,6 +56,8 @@ 08FB77ADFE841716C02AAC07 /* Source */, 089C167CFE841241C02AAC07 /* Resources */, 19C28FB4FE9D528D11CA2CBB /* Products */, + 73CEDF25194BF52D005C12A4 /* libcrypto.dylib */, + 73CEDF27194BF53B005C12A4 /* libssl.dylib */, ); name = SqueakSSL; sourceTree = "<group>"; Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Jun 13 19:42:51 PDT 2014 + Fri Jun 13 20:35:33 PDT 2014 Added: branches/Cog/platforms/unix/plugins/SqueakSSL/Makefile.inc =================================================================== --- branches/Cog/platforms/unix/plugins/SqueakSSL/Makefile.inc (rev 0) +++ branches/Cog/platforms/unix/plugins/SqueakSSL/Makefile.inc 2014-06-14 03:36:18 UTC (rev 3000) @@ -0,0 +1 @@ +XLDFLAGS= -lcrypto -lssl

3 2

← Newer
1
...
5
6
7
8
9
10
11
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev June 2014