Vm-dev June 2014

vm-dev@lists.squeakfoundation.org

37 participants
268 discussions

New Cog VMs available
by Eliot Miranda 26 Jun '14

26 Jun '14

... at http://www.mirandabanda.org/files/Cog/VM/VM.r3018/. The main difference here is fixes to memory segment allocation on Spur. Linux and Mac OS can now grow the heap to 2.9Gb or there abouts, and Win XP can grow to 1.8Gb. I'm interested in reports on other Windows versions that don't have XP's 2Gb user process address space limit. Here's my test script: | them | them := OrderedCollection new. [[them addLast: (ByteArray new: 16000000). Transcript cr; print: (Smalltalk vmParameterAt: 3) / (1024*1024.0) maxDecimalPlaces: 1; flush] repeat] on: OutOfMemory do: [:ex| 2 to: them size by: 2 do: [:i| them at: i put: nil. Smalltalk garbageCollect]]. Transcript cr; print: (Smalltalk vmParameterAt: 3) / (1024*1024.0) maxDecimalPlaces: 1; flush. them := nil. Smalltalk garbageCollect. Transcript cr; print: (Smalltalk vmParameterAt: 3) / (1024*1024.0) maxDecimalPlaces: 1; flush And the README is: CogVM binaries as per VMMaker.oscog-eem.779/r3018. Rewrite memory allocation on linux for Spur. Arrange that the heap can grow above 2Gb without any large initial alloc. Rewrite platforms/unix/vm/sqUnixSpurMemory.c to stand alone. Use it in place of sqMacMemory.c with Spur on Mac OS. Now Spur can grow the heap to 2.9Gb on both linux (CentOS 5.3) and Mac OS X (10.6.8). Rewrite Spur memory allocation on win32 similarly to unix. Can now allocate up to 1.8Gb on Windows XP (which has a 2Gb address space limit). Add a flag to indicate if the win32 exe is running as a console app and don't write to the in-window console if so. Fix some sign issues with free space tallying to allow Spur to shrink memory and answer via primitiveVMParameter heap sizes above 2Gb. Add longPrintInstancesOf:/longPrintInstancesWithClassIndex: for debugging. Suggest reading a suitable README when the linux VM fails to spawn the heartbeat thread. Add parameter 54 on Spur to answer totalFreeOldSpace. -- best, Eliot

5 6

evicted zombie process from run queue
by Hernán Morales Durand 26 Jun '14

26 Jun '14

Can someone explain what does it mean or why it happens? Is that a common scenario for you? I am measuring execution time for big matrices in CogVM 4.0.0. Image is unresponsive. Cheers, Hernán

1 0

VM Maker: VMMaker.oscog-tpr.780.mcz
by commits＠source.squeak.org 26 Jun '14

26 Jun '14

tim Rowledge uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-tpr.780.mcz ==================== Summary ==================== Name: VMMaker.oscog-tpr.780 Author: tpr Time: 25 June 2014, 6:54:22.34 pm UUID: 00c7d818-3c36-4cf6-97ad-8950ed03d7a6 Ancestors: VMMaker.oscog-eem.779 tiny changes to improve trace printing readability in ioLoadFunction* =============== Diff against VMMaker.oscog-eem.779 =============== Item was changed: ----- Method: CogVMSimulator>>ioLoadFunction:From: (in category 'plugin support') ----- ioLoadFunction: functionString From: pluginString "Load and return the requested function from a module" | firstTime plugin fnSymbol | firstTime := false. fnSymbol := functionString asSymbol. transcript cr; show: '(', byteCount printString, ') Looking for ', functionString, ' in ', (pluginString isEmpty ifTrue:['vm'] ifFalse:[pluginString]). functionString = breakSelector ifTrue: [self halt: breakSelector]. plugin := pluginList detect:[:any| any key = pluginString asString] ifNone: [firstTime := true. self loadNewPlugin: pluginString]. plugin ifNil: [firstTime ifTrue: [transcript cr; show: 'Failed ... primitive not in plugin']. ^0]. plugin := plugin value. mappedPluginEntries doWithIndex: [:pluginAndName :index| ((pluginAndName at: 1) == plugin and:[(pluginAndName at: 2) == fnSymbol]) ifTrue: [^index]]. (plugin respondsTo: fnSymbol) ifFalse: [firstTime ifTrue: [transcript cr; show: 'Failed ... primitive not in plugin']. ^0]. mappedPluginEntries addLast: (Array with: plugin with: fnSymbol with: [plugin perform: fnSymbol. self]). "Transcript show: ' ... okay'." + transcript cr. ^ mappedPluginEntries size! Item was changed: ----- Method: CogVMSimulator>>ioLoadFunction:From:AccessorDepthInto: (in category 'plugin support') ----- ioLoadFunction: functionString From: pluginString AccessorDepthInto: accessorDepthPtr "Load and return the requested function from a module. Assign the accessor depth through accessorDepthPtr. N.B. The actual code lives in platforms/Cross/vm/sqNamedPrims.h" | firstTime plugin fnSymbol | firstTime := false. fnSymbol := functionString asSymbol. transcript cr; show: '(', byteCount printString, ') Looking for ', functionString, ' in ', (pluginString isEmpty ifTrue:['vm'] ifFalse:[pluginString]). (breakSelector notNil and: [(self str: functionString n: breakSelector cmp: functionString size) = 0]) ifTrue: [self halt: functionString]. plugin := pluginList detect: [:any| any key = pluginString asString] ifNone: [firstTime := true. self loadNewPlugin: pluginString]. plugin ifNil: [firstTime ifTrue: [transcript cr; show: 'Failed ... primitive not in plugin']. ^0]. plugin := plugin value. mappedPluginEntries doWithIndex: [:pluginAndName :index| ((pluginAndName at: 1) == plugin and:[(pluginAndName at: 2) == fnSymbol]) ifTrue: [firstTime ifTrue: [transcript show: ' ... okay'; cr]. accessorDepthPtr at: 0 put: (pluginAndName at: 4). ^index]]. firstTime ifTrue: [transcript cr; show: 'Failed ... primitive not in plugin']. + transcript cr. ^0! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>getCheckAllocFiller (in category 'cog jit support') ----- getCheckAllocFiller ^coInterpreter getCheckAllocFiller ifNil: [false]!

1 0

VM Maker: Cog-tpr.159.mcz
by commits＠source.squeak.org 26 Jun '14

26 Jun '14

tim Rowledge uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-tpr.159.mcz ==================== Summary ==================== Name: Cog-tpr.159 Author: tpr Time: 25 June 2014, 6:48:23.182 pm UUID: 005cc753-401b-4701-88a0-29ecc549a0fa Ancestors: Cog-eem.158 keep extending the ARM cog system; improve disassembly decoration to aid debugging, handel more sim aborts =============== Diff against Cog-eem.158 =============== Item was changed: CogProcessorAlien variableByteSubclass: #GdbARMAlien instanceVariableNames: '' + classVariableNames: 'LongConstReg LongConstStep LongConstValue PostBuildStackDelta' - classVariableNames: 'PostBuildStackDelta' poolDictionaries: '' category: 'Cog-Processors'! !GdbARMAlien commentStamp: 'lw 8/23/2012 19:17' prior: 0! I am a wrapper around the ARMulator CPU instance and emulator routines and I give access to disassembling using libopcodes. My C-part must be compiled with -DMODET, because otherwise my offesets are wrong by one field.! Item was added: + ----- Method: GdbARMAlien>>callerSavedSmashRegisterAccessors (in category 'accessing-abstract') ----- + callerSavedSmashRegisterAccessors + ^#(r0: r1: r2: r3: )! Item was added: + ----- Method: GdbARMAlien>>decorateDisassembly:for: (in category 'disassembly') ----- + decorateDisassembly: anInstructionString for: aSymbolManager + | parts strm hexNum string | + + "break up the string" + parts:= anInstructionString subStrings: ' ,:'. + "part 1 is the address, part 2 is the instruction. Last part is sometimes a hex number" + + "is this a mov of a literal number?" + ((parts at: 2) includesSubString: 'mov') + ifTrue:[ + "clear the flags & running total" + LongConstReg := nil. + LongConstValue := 0. + LongConstStep := 0. + (parts at:4) first = $# + ifTrue:["looks a good candidate" + LongConstReg :=(parts at: 3). "the target register" + (parts last beginsWith: '0x') ifTrue:[ + LongConstValue :=(NumberParser on: (parts last allButFirst:2)) nextUnsignedIntegerBase: 16]. + LongConstStep := 1]. + "not a likely candidate, just return the string" + ^anInstructionString]. + + "is this a build of a literal number?" + (((parts at: 2) includesSubString: 'orr') and:[LongConstStep >0]) + ifTrue:["add to running total if the register matches" + LongConstReg = (parts at: 3) + ifTrue:[ + (parts at:5) first = $# + ifTrue:["looks a good candidate" + (parts last beginsWith: '0x') ifTrue:[ + LongConstValue := LongConstValue + ((NumberParser on: (parts last allButFirst:2)) nextUnsignedIntegerBase: 16) ]. + LongConstStep:= LongConstStep +1]. + LongConstStep = 4 + ifTrue:["we've completed a pattern of mov/orr/orr/orr, so print the value it built" + ^anInstructionString, ' (', LongConstReg , ' = ', LongConstValue hex8, ((aSymbolManager lookupAddress: LongConstValue) ifNil: [''] ifNotNil:[:val| ' = ', val]), ')']] + ifFalse:[ LongConstStep := 0. + LongConstReg := nil. + LongConstValue := 0]. + "either not a likely candidate orpartway through the pattern, so just return the string" + ^anInstructionString]. + + + strm :=anInstructionString readStream. + strm skip: 9. "the instruction address" + + strm upToAll: '0x'. "see if there is a hex number" + strm atEnd ifTrue:[^anInstructionString]. "if not, leave it be" + + "extract the number" + hexNum := (NumberParser on: strm) nextUnsignedIntegerBase: 16. + "is there an intersting address with this?" + (string := aSymbolManager lookupAddress: hexNum) ifNil: [^anInstructionString]. + ^ anInstructionString, ' = ', string! Item was removed: - ----- Method: GdbARMAlien>>decorateDisassembly:for:fromAddress: (in category 'disassembly') ----- - decorateDisassembly: anInstructionString for: aSymbolManager "<Cogit>" fromAddress: address - (anInstructionString endsWith: 'mov r0, r0') - ifTrue: [^super decorateDisassembly: 'nop' for: aSymbolManager]. - ^super decorateDisassembly: anInstructionString for: aSymbolManager! Item was changed: ----- Method: GdbARMAlien>>handleLongJmpFailureAt:in: (in category 'error handling') ----- handleLongJmpFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" "Convert an execution primitive failure for a long jump into a ProcessorSimulationTrap signal." | callAddress failedInstruction| "grab the instruction at issue" failedInstruction := memoryArray unsignedLongAt: pc + 1 bigEndian: false. "Hmm. Perhaps we ought to test for an actual BX here rather than assuming?" (self instructionIsBX: failedInstruction) ifFalse:[ self halt: 'failed call type test']. "The memoryArray starts indexing from 1, whereas the pc is based on 0-indexing, therefore all access-offsets are one greater than expected" "address, combined from prior four MOV/ORR instructions. See CogARMCompiler>concretizeLongCall" callAddress := (memoryArray byteAt: pc -3) + ((memoryArray byteAt: pc - 7) << 8) + ((memoryArray byteAt: pc - 11) << 16) + + ((memoryArray byteAt: pc - 15) << 24). - + ((memoryArray byteAt: pc - 15) << 248). ^(ProcessorSimulationTrap pc: pc nextpc: pc + 4 address: callAddress signedIntToLong type: #jump) signal! Item was changed: ----- Method: GdbARMAlien>>handleMoveMbrRFailureAt:in: (in category 'error handling') ----- + handleMoveMbrRFailureAt: pc in: memoryArray - handleMoveMbrRFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" "Convert an execution primitive failure for a byte register load into a ProcessorSimulationTrap signal." + "generated by MoveMbrR" + "might be ldrb destReg, [srcReg, #immediate] or ldrb destReg, [srcReg, RISCTempReg] " + + "first test for ldrb destReg, [srcReg, RISCTempReg] + -test for 0xE7DX as the most significant three nibbles" + ((memoryArray byteAt: pc + 4) = 16rE7 and: [(memoryArray byteAt: pc + 3) >> 4 = 13]) + ifTrue: [(ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: (memoryArray byteAt: pc - 3) + + ((memoryArray byteAt: pc - 7) + << 8) + ((memoryArray byteAt: pc - 11) + << 16) + ((memoryArray byteAt: pc - 15) + << 24) + type: #read + accessor: ("work out the dest register name"self registerStateSetters at: (memoryArray byteAt: pc + 2) >> 4 + 1)) signal + ] + ifFalse: [self reportPrimitiveFailure]! - "MoveMbrR" - | modrmByte | - self halt. - ^(((modrmByte := memoryArray byteAt: pc + 2) bitAnd: 16rC0) = 16r80) "ModRegRegDisp32" - ifTrue: - [(ProcessorSimulationTrap - pc: pc - nextpc: pc + 6 - address: ((self perform: (#(eax ecx edx ebx esp ebp esi edi) at: (modrmByte bitAnd: 7) + 1)) - + (memoryArray unsignedLongAt: pc + 3 bigEndian: false) - bitAnd: 16rFFFFFFFF) - type: #read - accessor: (#(al: cl: dl: bl: ah: ch: dh: bh:) at: ((modrmByte >> 3 bitAnd: 7) + 1))) - signal] - ifFalse: - [self reportPrimitiveFailure]! Item was changed: ----- Method: GdbARMAlien>>handleMoveRAwFailureAt:in: (in category 'error handling') ----- handleMoveRAwFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" "Convert an execution primitive failure for a register write into Memory at a predefined address into a ProcessorSimulationTrap signal." + "LEA RISCTempReg + str srcReg, [RISCTempReg]" + "first we check this is a str r?, [sl]" ^((memoryArray byteAt: pc + 4) = 16rE5 and: [(memoryArray byteAt: pc + 3) = (16r80 + CogARMCompiler ARMTempReg)]) ifTrue: [(ProcessorSimulationTrap pc: pc nextpc: pc + 4 address: (memoryArray byteAt: pc -3) + ((memoryArray byteAt: pc - 7) << 8) + ((memoryArray byteAt: pc - 11) << 16) + ((memoryArray byteAt: pc - 15) <<24) type: #write + accessor: ("work out the dest register name" self registerStateNames at: ((memoryArray byteAt: pc + 2) >> 4) + 1)) - accessor: (self registerStateNames at: ((memoryArray byteAt: pc + 2) >> 4) + 1)) signal] ifFalse: [self reportPrimitiveFailure]! Item was changed: ----- Method: GdbARMAlien>>handleMoveRMbrFailureAt:in: (in category 'error handling') ----- handleMoveRMbrFailureAt: pc "<Integer>" in: memoryArray "<Bitmap|ByteArray>" + "Convert an execution primitive failure for a byte register write into a ProcessorSimulationTrap signal." + "generated by MoveRMbr" + + "might be strb destReg, [srcReg, #immediate] or strb destReg, [srcReg, RISCTempReg] " + + "first test for ldrb destReg, [srcReg, RISCTempReg] + -test for 0xE7CX as the most significant three nibbles" + ((memoryArray byteAt: pc + 4) = 16rE7 and: [(memoryArray byteAt: pc + 3) >> 4 = 16rC]) + ifTrue: [(ProcessorSimulationTrap + pc: pc + nextpc: pc + 4 + address: (memoryArray byteAt: pc - 3) + + ((memoryArray byteAt: pc - 7) + << 8) + ((memoryArray byteAt: pc - 11) + << 16) + ((memoryArray byteAt: pc - 15) + << 24) + type: #write + accessor: ("work out the dest register name"self registerStateNames at: (memoryArray byteAt: pc + 2) >> 4 + 1)) signal + ] - "Convert an execution primitive failure for a byte register write into a ProcessorSimulationTrap signal." - "MoveRMbr" - | modrmByte | - self halt. - ^(((modrmByte := memoryArray byteAt: pc + 2) bitAnd: 16rC0) = 16r80) "ModRegRegDisp32" - ifTrue: - [(ProcessorSimulationTrap - pc: pc - nextpc: pc + 6 - address: ((self perform: (#(eax ecx edx ebx esp ebp esi edi) at: (modrmByte bitAnd: 7) + 1)) - + (memoryArray unsignedLongAt: pc + 3 bigEndian: false) - bitAnd: 16rFFFFFFFF) - type: #write - accessor: (#(al cl dl bl ah ch dh bh) at: ((modrmByte >> 3 bitAnd: 7) + 1))) - signal] ifFalse: [self reportPrimitiveFailure]! Item was added: + ----- Method: GdbARMAlien>>retpcIn: (in category 'accessing-abstract') ----- + retpcIn: aMemory + "the return address is on the stack, apparently" + ^aMemory unsignedLongAt: self fp + 5 bigEndian: false! Item was added: + ----- Method: GdbARMAlien>>simulateJumpCallOf:memory: (in category 'execution simulation') ----- + simulateJumpCallOf: address memory: aMemory + "Simulate a frame-building jump of address. Build a frame since + a) this is used for calls into the run-time which are unlikely to be leaf-calls" + "This method builds a stack frame as expected by the simulator, not as defined by ARM aapcs-abi. + In ARM aapcs, every method can define for itself, wether it wants to push lr (nextpc), and wether it + uses a frame pointer. The standard never mentions a fp. It merely defines r4-r11 to be callee-saved." + + self assert: self sp \\ 8 = 0. "This check ensures, that we conform with ARM abi. Before doing anything to the stack, we ensure 2-word alignment." + self pushWord: self fp in: aMemory. + self fp: self sp. + PostBuildStackDelta ~= 0 ifTrue: + [self sp: self sp - PostBuildStackDelta]. "In order to satisfy the CStackAlignment check by cogit, which is only valid on IA32 platforms." + self pc: address! Item was added: + ----- Method: GdbARMAlien>>smashCallerSavedRegistersWithValuesFrom:by: (in category 'accessing-abstract') ----- + smashCallerSavedRegistersWithValuesFrom: base by: step + self callerSavedSmashRegisterAccessors + withIndexDo: + [:accessor :index| + self perform: accessor with: index - 1 * step + base]!

1 0

[commit][3019] Neaten README.
by commits＠squeakvm.org 26 Jun '14

26 Jun '14

Revision: 3019 Author: eliot Date: 2014-06-25 15:55:09 -0700 (Wed, 25 Jun 2014) Log Message: ----------- Neaten README. Fix edit of nsvm scripts to still mention squeak vm-dev. Modified Paths: -------------- branches/Cog/build.linux32x86/editnewspeakinstall.sh branches/Cog/scripts/uploadvms Modified: branches/Cog/build.linux32x86/editnewspeakinstall.sh =================================================================== --- branches/Cog/build.linux32x86/editnewspeakinstall.sh 2014-06-25 21:06:58 UTC (rev 3018) +++ branches/Cog/build.linux32x86/editnewspeakinstall.sh 2014-06-25 22:55:09 UTC (rev 3019) @@ -10,7 +10,7 @@ fi if [ -f bin/squeak ]; then mv bin/squeak bin/nsvm - ex -u NONE "+g/squeak/s/squeak/nsvm/g" +w +q bin/nsvm + ex -u NONE "+g/squeak/s/squeak/nsvm/g" "+/nsvm vm-dev/s//squeak vm-dev/" +w +q bin/nsvm fi rm -rf man doc LIBDIR="`echo lib/squeak/[0-9.-]*`" Modified: branches/Cog/scripts/uploadvms =================================================================== --- branches/Cog/scripts/uploadvms 2014-06-25 21:06:58 UTC (rev 3018) +++ branches/Cog/scripts/uploadvms 2014-06-25 22:55:09 UTC (rev 3019) @@ -117,11 +117,13 @@ * soft rtprio 2 e.g. + sudo cat >/etc/security/limits.d/squeak.conf <<END * hard rtprio 2 * soft rtprio 2 END sudo cp /etc/security/limits.d/squeak.conf /etc/security/limits.d/nsvm.conf + Only new processes will have the new security settings. Users must log out and log back in for the limits to take effect. Services must stop and then restart for the changes to take effect.

1 0

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

26 Jun '14

Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.76.mcz ==================== Summary ==================== Name: CMakeVMMakerSqueak-tty.76 Author: tty Time: 25 June 2014, 6:42:12.944 pm UUID: de515816-7681-4313-bd22-7e8e520d4645 Ancestors: CMakeVMMakerSqueak-tty.75 Tests for VMGeneratorSqueak>>generate methods implemented. next up: make sure no stragglers not in test's reach. At that point, boilerplate code is in place and time to implement =============== Diff against CMakeVMMakerSqueak-tty.75 =============== Item was added: + ----- Method: CMakeVMGeneratorForSqueak>>config: (in category 'accessing') ----- + config: aCPlatformConfigForSqueak + config:=aCPlatformConfigForSqueak + "accessor method needed for testing"! Item was added: + ----- Method: CMakeVMGeneratorForSqueak>>moduleName (in category 'accessing') ----- + moduleName + ^config executableName! Item was added: + ----- Method: CMakeVMGeneratorForSqueak>>processThirdpartyLibraries (in category 'as yet unclassified') ----- + processThirdpartyLibraries + + config thirdpartyLibs do: [:each | + each generateFor: self ] + + ! Item was changed: ----- Method: CMakeVMMakerSqueakRedirectMethodsTest>>testCommonCompilerFlags (in category 'as yet unclassified') ----- testCommonCompilerFlags #(#SqueakMacintoshConfig #SqueakUnixConfig #SqueakWindowsConfig ) do:[:each | (Smalltalk at:each) allSubclassesDo:[:configuration | | o buildTypes| o:= configuration new. (o excludeFromBuild not) & (configuration isAbstractBaseClass not) ifTrue:[ buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone). buildTypes do:[:buildType | o configureForBuildType: buildType. self assert:(o commonCompilerFlags isArray)]]]]. ! Item was added: + ----- Method: CMakeVMMakerSqueakRedirectMethodsTest>>testExternalPlugins (in category 'as yet unclassified') ----- + testExternalPlugins + #(#SqueakMacintoshConfig #SqueakUnixConfig #SqueakWindowsConfig ) + do:[:each | + (Smalltalk at:each) + allSubclassesDo:[:configuration | | o buildTypes| + o:= configuration new. + (o excludeFromBuild not) & (configuration isAbstractBaseClass not) + ifTrue:[ + buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone). + buildTypes do:[:buildType | + o configureForBuildType: buildType. + self assert:(o externalPlugins isArray). + ]]]]. + + + + + + + + ! Item was added: + ----- Method: CMakeVMMakerSqueakRedirectMethodsTest>>testInternalPlugins (in category 'as yet unclassified') ----- + testInternalPlugins + #(#SqueakMacintoshConfig #SqueakUnixConfig #SqueakWindowsConfig ) + do:[:each | + (Smalltalk at:each) + allSubclassesDo:[:configuration | | o buildTypes| + o:= configuration new. + (o excludeFromBuild not) & (configuration isAbstractBaseClass not) + ifTrue:[ + buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone). + buildTypes do:[:buildType | + o configureForBuildType: buildType. + self assert:(o externalPlugins isArray). + ]]]]. + + + + + + + + ! Item was added: + ----- Method: CMakeVMMakerSqueakRedirectMethodsTest>>testThirdPartyLibs (in category 'as yet unclassified') ----- + testThirdPartyLibs + #(#SqueakMacintoshConfig #SqueakUnixConfig #SqueakWindowsConfig ) + do:[:each | + (Smalltalk at:each) + allSubclassesDo:[:configuration | | o buildTypes| + o:= configuration new. + (o excludeFromBuild not) & (configuration isAbstractBaseClass not) + ifTrue:[ + buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone). + buildTypes do:[:buildType | + o configureForBuildType: buildType. + self assert:(o thirdPartyLibs isKindOf: Collection). + ]]]]. + + + + + + + + ! Item was added: + ----- Method: CMakeVMMakerSqueakRedirectMethodsWithArgTest>>testSetExtraTargetProperties (in category 'as yet unclassified') ----- + testSetExtraTargetProperties + self flag:'tty'. "Is the self shouldnt sufficient?" + #(#SqueakMacintoshConfig #SqueakUnixConfig #SqueakWindowsConfig ) + do:[:each | + (Smalltalk at:each) + allSubclassesDo:[:configuration | | o buildTypes vmGenerator| + o:= configuration new. + (o excludeFromBuild not) & (configuration isAbstractBaseClass not) + ifTrue:[ + buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone). + buildTypes do:[:buildType | + o configureForBuildType: buildType. + vmGenerator:=CMakeVMGeneratorForSqueak new. + vmGenerator config: o. + vmGenerator output:(String new writeStream). + self shouldnt: [o setExtraTargetProperties: vmGenerator] raise: Error]]]]. + ! Item was changed: ----- Method: CMakeVMMakerSqueakRedirectMethodsWithArgTest>>testSetGlobalOptions (in category 'as yet unclassified') ----- testSetGlobalOptions self flag:'tty'. "Is the self shouldnt sufficient?" #(#SqueakMacintoshConfig #SqueakUnixConfig #SqueakWindowsConfig ) do:[:each | (Smalltalk at:each) allSubclassesDo:[:configuration | | o buildTypes vmGenerator| o:= configuration new. (o excludeFromBuild not) & (configuration isAbstractBaseClass not) ifTrue:[ buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone). buildTypes do:[:buildType | o configureForBuildType: buildType. vmGenerator:=CMakeVMGeneratorForSqueak new. vmGenerator output:(String new writeStream). self shouldnt: [o setGlobalOptions: vmGenerator] raise: Error]]]]. ! Item was added: + ----- Method: CMakeVMMakerSqueakRedirectMethodsWithArgTest>>testSetGlobalOptionsAfterDetermineSystem (in category 'as yet unclassified') ----- + testSetGlobalOptionsAfterDetermineSystem + self flag:'tty'. "Is the self shouldnt sufficient?" + #(#SqueakMacintoshConfig #SqueakUnixConfig #SqueakWindowsConfig ) + do:[:each | + (Smalltalk at:each) + allSubclassesDo:[:configuration | | o buildTypes vmGenerator| + o:= configuration new. + (o excludeFromBuild not) & (configuration isAbstractBaseClass not) + ifTrue:[ + buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone). + buildTypes do:[:buildType | + o configureForBuildType: buildType. + vmGenerator:=CMakeVMGeneratorForSqueak new. + vmGenerator output:(String new writeStream). + self shouldnt: [o setGlobalOptionsAfterDetermineSystem: vmGenerator] raise: Error]]]]. + ! Item was added: + ----- Method: CMakeVMMakerSqueakRedirectMethodsWithArgTest>>testSetPostBuildActions (in category 'as yet unclassified') ----- + testSetPostBuildActions + self flag:'tty'. "Is the self shouldnt sufficient?" + #(#SqueakMacintoshConfig #SqueakUnixConfig #SqueakWindowsConfig ) + do:[:each | + (Smalltalk at:each) + allSubclassesDo:[:configuration | | o buildTypes vmGenerator| + o:= configuration new. + (o excludeFromBuild not) & (configuration isAbstractBaseClass not) + ifTrue:[ + buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone). + buildTypes do:[:buildType | + o configureForBuildType: buildType. + vmGenerator:=CMakeVMGeneratorForSqueak new. + vmGenerator config: o. + vmGenerator output:(String new writeStream). + self shouldnt: [o postBuildActions: vmGenerator] raise: Error]]]]. + ! Item was added: + ----- Method: CMakeVMMakerSqueakUnixConfigTest>>testCC (in category 'as yet unclassified') ----- + testCC + #( #SqueakUnixConfig) + do:[:each | + (Smalltalk at:each) + allSubclassesDo:[:configuration | | o buildTypes| + o:= configuration new. + (o excludeFromBuild not) & (configuration isAbstractBaseClass not) + ifTrue:[ + buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone). + buildTypes do:[:buildType | + o configureForBuildType: buildType. + self assert:(o cC isArray)]]]]. + + + + + ! Item was added: + ----- Method: CMakeVMMakerSqueakUnixConfigTest>>testCXX (in category 'as yet unclassified') ----- + testCXX + #( #SqueakUnixConfig) + do:[:each | + (Smalltalk at:each) + allSubclassesDo:[:configuration | | o buildTypes| + o:= configuration new. + (o excludeFromBuild not) & (configuration isAbstractBaseClass not) + ifTrue:[ + buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone). + buildTypes do:[:buildType | + o configureForBuildType: buildType. + self assert:(o cXX isArray)]]]]. + + + + + ! Item was changed: ----- Method: CMakeVMMakerSqueakUnixConfigTest>>testConfigH (in category 'as yet unclassified') ----- testConfigH #( SqueakUnixConfig) do:[:each | (Smalltalk at:each) allSubclassesDo:[:configuration | | o | o:= configuration new. + (o excludeFromBuild not) & (configuration isAbstractBaseClass not) - (o excludeFromBuild not) |(configuration isAbstractBaseClass not) ifTrue:[ o:= configuration new. (o excludeFromBuild not) ifTrue:[self assert:(o configH isString)]]]] ! Item was changed: ----- Method: CMakeVMMakerSqueakUnixConfigTest>>testExecutableType (in category 'as yet unclassified') ----- testExecutableType #( SqueakUnixConfig) do:[:each | (Smalltalk at:each) allSubclassesDo:[:configuration | | o | o:= configuration new. + (o excludeFromBuild not) & (configuration isAbstractBaseClass not) - (o excludeFromBuild not) |(configuration isAbstractBaseClass not) ifTrue:[ o:= configuration new. self assert:(o executableType = '').]]] "hello code smell" ! Item was added: + ----- Method: CMakeVMMakerSqueakUnixConfigTest>>testLDFlags (in category 'as yet unclassified') ----- + testLDFlags + #( #SqueakUnixConfig) + do:[:each | + (Smalltalk at:each) + allSubclassesDo:[:configuration | | o buildTypes| + o:= configuration new. + (o excludeFromBuild not) & (configuration isAbstractBaseClass not) + ifTrue:[ + buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone). + buildTypes do:[:buildType | + o configureForBuildType: buildType. + self assert:(o lDFlags isArray)]]]]. + + + + + ! Item was added: + ----- Method: CMakeVMMakerSqueakUnixConfigTest>>testLibs (in category 'as yet unclassified') ----- + testLibs + #( #SqueakUnixConfig) + do:[:each | + (Smalltalk at:each) + allSubclassesDo:[:configuration | | o buildTypes| + o:= configuration new. + (o excludeFromBuild not) & (configuration isAbstractBaseClass not) + ifTrue:[ + buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone). + buildTypes do:[:buildType | + o configureForBuildType: buildType. + self assert:(o libs isArray)]]]]. + + + + + ! Item was changed: ----- Method: CPlatformConfigForSqueak>>thirdPartyLibs (in category 'cmake buildType redirects') ----- thirdPartyLibs "Route this message send to the message appropriate for my buildType " |d | d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d + at: #build put: [self thirdpartyLibsBuild]; + at: #buildAssert put: [self thirdpartyLibsBuildAssert]; + at: #buildAssertITimerHeartbeat put: [self thirdpartyLibsBuildAssertITimerHeartbeat]; + at:#buildDebug put: [self thirdpartyLibsBuildDebug]; + at: #buildDebugITimerHeartbeat put: [self thirdpartyLibsBuildDebugITimerHeartbeat ]; + at: #buildITimerHeartbeat put: [self thirdpartyLibsBuildITimerHeartbeat]; + at: #buildMultiThreaded put: [self thirdpartyLibsBuildMultiThreaded]; + at: #buildMultiThreadedAssert put: [self thirdpartyLibsBuildMultiThreadedAssert]; + at: #buildMultiThreadedDebug put: [self thirdpartyLibsBuildMultiThreadedDebug ]; + at: #buildNone put:[self thirdpartyLibsBuildNone]. - at: #build put: [self thirdPartyLibsBuild]; - at: #buildAssert put: [self thirdPartyLibsBuildAssert]; - at: #buildAssertITimerHeartbeat put: [self thirdPartyLibsBuildAssertITimerHeartbeat]; - at:#buildDebug put: [self thirdPartyLibsBuildDebug]; - at: #buildDebugITimerHeartbeat put: [self thirdPartyLibsBuildDebugITimerHeartbeat ]; - at: #buildITimerHeartbeat put: [self thirdPartyLibsBuildITimerHeartbeat]; - at: #buildMultiThreaded put: [self thirdPartyLibsBuildMultiThreaded]; - at: #buildMultiThreadedAssert put: [self thirdPartyLibsBuildMultiThreadedAssert]; - at: #buildMultiThreadedDebug put: [self thirdPartyLibsBuildMultiThreadedDebug ]; - at: #buildNone put:[self thirdPartyLibsNoBuildType]. ^(d at: buildType) value ! Item was removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>setExtraTargetProperties: (in category 'utils') ----- - setExtraTargetProperties: maker - - "maker setTargetProperties: 'LINK_FLAGS ""'." - - maker puts: 'set_source_files_properties( ${srcVMDir}/cogit.c PROPERTIES - COMPILE_FLAGS "-O1 -fno-omit-frame-pointer -momit-leaf-frame-pointer")'. - - - maker - cmd: 'set_source_files_properties' - params: ' ${targetPlatform}/vm/sqUnixHeartbeat.c PROPERTIES - COMPILE_FLAGS "-O1 -fno-omit-frame-pointer"'. - - maker linkDirectories: '${CMAKE_FIND_ROOT_PATH}/usr/lib/arm-linux-gnueabihf/'. - - maker addExternalLibraries: - #( - 'm' "math lib" - 'dl' "dynamic loader" - 'pthread' "posix threads" - ). - - maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. - self addVMDrivers: maker.! Item was added: + ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>setExtraTargetPropertiesBuild: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuild: aMaker + + "maker setTargetProperties: 'LINK_FLAGS ""'." + + aMaker puts: 'set_source_files_properties( ${srcVMDir}/cogit.c PROPERTIES + COMPILE_FLAGS "-O1 -fno-omit-frame-pointer -momit-leaf-frame-pointer")'. + + + aMaker + cmd: 'set_source_files_properties' + params: ' ${targetPlatform}/vm/sqUnixHeartbeat.c PROPERTIES + COMPILE_FLAGS "-O1 -fno-omit-frame-pointer"'. + + aMaker linkDirectories: '${CMAKE_FIND_ROOT_PATH}/usr/lib/arm-linux-gnueabihf/'. + + aMaker addExternalLibraries: + #( + 'm' "math lib" + 'dl' "dynamic loader" + 'pthread' "posix threads" + ). + + aMaker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. + self addVMDrivers: aMaker.! Item was added: + ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>setExtraTargetPropertiesBuildAssert: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildAssert: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>setExtraTargetPropertiesBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildAssertITimerHeartbeat: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>setExtraTargetPropertiesBuildDebug: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildDebug: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>setExtraTargetPropertiesBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildDebugITimerHeartbeat: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>setExtraTargetPropertiesBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildITimerHeartbeat: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>setExtraTargetPropertiesBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildMultiThreaded: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>setExtraTargetPropertiesBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildMultiThreadedAssert: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>setExtraTargetPropertiesBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildMultiThreadedDebug: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux32ARMv6StackV3RaspbianConfig>>setExtraTargetProperties: (in category 'utils') ----- - setExtraTargetProperties: maker - - "maker setTargetProperties: 'LINK_FLAGS ""'." - - maker puts: 'set_source_files_properties( ${srcVMDir}/cogit.c PROPERTIES - COMPILE_FLAGS "-O1 -fno-omit-frame-pointer -momit-leaf-frame-pointer")'. - - - maker - cmd: 'set_source_files_properties' - params: ' ${targetPlatform}/vm/sqUnixHeartbeat.c PROPERTIES - COMPILE_FLAGS "-O1 -fno-omit-frame-pointer"'. - - - maker addExternalLibraries: - #( - 'm' "math lib" - 'dl' "dynamic loader" - 'pthread' "posix threads" - ). - - maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. - self addVMDrivers: maker.! Item was added: + ----- Method: Linux32ARMv6StackV3RaspbianConfig>>setExtraTargetPropertiesBuild: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuild: aMaker + + "maker setTargetProperties: 'LINK_FLAGS ""'." + + aMaker puts: 'set_source_files_properties( ${srcVMDir}/cogit.c PROPERTIES + COMPILE_FLAGS "-O1 -fno-omit-frame-pointer -momit-leaf-frame-pointer")'. + + + aMaker + cmd: 'set_source_files_properties' + params: ' ${targetPlatform}/vm/sqUnixHeartbeat.c PROPERTIES + COMPILE_FLAGS "-O1 -fno-omit-frame-pointer"'. + + + aMaker addExternalLibraries: + #( + 'm' "math lib" + 'dl' "dynamic loader" + 'pthread' "posix threads" + ). + + aMaker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. + self addVMDrivers: aMaker.! Item was added: + ----- Method: Linux32ARMv6StackV3RaspbianConfig>>setExtraTargetPropertiesBuildAssert: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildAssert: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux32ARMv6StackV3RaspbianConfig>>setExtraTargetPropertiesBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildAssertITimerHeartbeat: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux32ARMv6StackV3RaspbianConfig>>setExtraTargetPropertiesBuildDebug: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildDebug: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux32ARMv6StackV3RaspbianConfig>>setExtraTargetPropertiesBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildDebugITimerHeartbeat: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux32ARMv6StackV3RaspbianConfig>>setExtraTargetPropertiesBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildITimerHeartbeat: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux32ARMv6StackV3RaspbianConfig>>setExtraTargetPropertiesBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildMultiThreaded: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux32ARMv6StackV3RaspbianConfig>>setExtraTargetPropertiesBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildMultiThreadedAssert: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux32ARMv6StackV3RaspbianConfig>>setExtraTargetPropertiesBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildMultiThreadedDebug: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was changed: ----- Method: Linux32x86Config>>externalPluginsBuildAssert (in category 'cmake buildType redirects') ----- externalPluginsBuildAssert + ^ self externalPluginsBuild! - ^ externalPlugins ifNil: [ externalPlugins := self defaultExternalPlugins ]! Item was changed: ----- Method: Linux32x86Config>>externalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- externalPluginsBuildAssertITimerHeartbeat + ^ self externalPluginsBuild! - ^ externalPlugins ifNil: [ externalPlugins := self defaultExternalPlugins ]! Item was changed: ----- Method: Linux32x86Config>>externalPluginsBuildDebug (in category 'cmake buildType redirects') ----- externalPluginsBuildDebug + ^ self externalPluginsBuild! - ^ externalPlugins ifNil: [ externalPlugins := self defaultExternalPlugins ]! Item was changed: ----- Method: Linux32x86Config>>externalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- externalPluginsBuildDebugITimerHeartbeat + ^ self externalPluginsBuild! - ^ externalPlugins ifNil: [ externalPlugins := self defaultExternalPlugins ]! Item was changed: ----- Method: Linux32x86Config>>externalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- externalPluginsBuildITimerHeartbeat + ^ self externalPluginsBuild! - ^ externalPlugins ifNil: [ externalPlugins := self defaultExternalPlugins ]! Item was changed: ----- Method: Linux32x86Config>>externalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- externalPluginsBuildMultiThreaded + ^ self externalPluginsBuild! - ^ externalPlugins ifNil: [ externalPlugins := self defaultExternalPlugins ]! Item was changed: ----- Method: Linux32x86Config>>externalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- externalPluginsBuildMultiThreadedAssert + ^ self externalPluginsBuild! - ^ externalPlugins ifNil: [ externalPlugins := self defaultExternalPlugins ]! Item was changed: ----- Method: Linux32x86Config>>externalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- externalPluginsBuildMultiThreadedDebug + ^ self externalPluginsBuild! - ^ externalPlugins ifNil: [ externalPlugins := self defaultExternalPlugins ]! Item was changed: ----- Method: Linux32x86Config>>internalPluginsBuildAssert (in category 'cmake buildType redirects') ----- internalPluginsBuildAssert " internalPlugins := self defaultInternalPlugins" ^self internalPluginsBuild! Item was added: + ----- Method: Linux32x86Config>>postBuildActionsBuild: (in category 'cmake buildType redirects') ----- + postBuildActionsBuild: gen + "SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActionsBuild:'"! Item was added: + ----- Method: Linux32x86Config>>postBuildActionsBuildAssert: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildAssert: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: Linux32x86Config>>postBuildActionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildAssertITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: Linux32x86Config>>postBuildActionsBuildDebug: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildDebug: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: Linux32x86Config>>postBuildActionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildDebugITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: Linux32x86Config>>postBuildActionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: Linux32x86Config>>postBuildActionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreaded: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: Linux32x86Config>>postBuildActionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreadedAssert: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: Linux32x86Config>>postBuildActionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreadedDebug: aMaker + ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>setExtraTargetProperties: (in category 'utils') ----- - setExtraTargetProperties: maker - self flag:'tty'. "I am nervous about this method up here in this class, but pharo has it in CogUnixConfig, so using as is for now" - - maker setTargetProperties: 'LINK_FLAGS "-m32"'. - - maker puts: 'set_source_files_properties( ${srcVMDir}/cogit.c PROPERTIES - COMPILE_FLAGS "-O1 -fno-omit-frame-pointer -momit-leaf-frame-pointer -mno-rtd -mno-accumulate-outgoing-args")'. - - - maker - cmd: 'set_source_files_properties' - params: ' ${targetPlatform}/vm/sqUnixHeartbeat.c PROPERTIES - COMPILE_FLAGS "-O1 -fno-omit-frame-pointer -mno-rtd -mno-accumulate-outgoing-args"'. - - maker addExternalLibraries: - #( - 'uuid' "" - 'ssl' "" - 'crypto' "" - ). - - super setExtraTargetProperties: maker. - ! Item was added: + ----- Method: Linux32x86Config>>setExtraTargetPropertiesBuild: (in category 'utils') ----- + setExtraTargetPropertiesBuild: aMaker + self flag:'tty'. "I am nervous about this method up here in this class, but pharo has it in CogUnixConfig, so using as is for now" + + aMaker setTargetProperties: 'LINK_FLAGS "-m32"'. + + aMaker puts: 'set_source_files_properties( ${srcVMDir}/cogit.c PROPERTIES + COMPILE_FLAGS "-O1 -fno-omit-frame-pointer -momit-leaf-frame-pointer -mno-rtd -mno-accumulate-outgoing-args")'. + + + aMaker + cmd: 'set_source_files_properties' + params: ' ${targetPlatform}/vm/sqUnixHeartbeat.c PROPERTIES + COMPILE_FLAGS "-O1 -fno-omit-frame-pointer -mno-rtd -mno-accumulate-outgoing-args"'. + + aMaker addExternalLibraries: + #( + 'uuid' "" + 'ssl' "" + 'crypto' "" + ). + + ! Item was added: + ----- Method: Linux32x86Config>>setExtraTargetPropertiesBuildAssert: (in category 'utils') ----- + setExtraTargetPropertiesBuildAssert: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux32x86Config>>setExtraTargetPropertiesBuildAssertITimerHeartbeat: (in category 'utils') ----- + setExtraTargetPropertiesBuildAssertITimerHeartbeat: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux32x86Config>>setExtraTargetPropertiesBuildDebug: (in category 'utils') ----- + setExtraTargetPropertiesBuildDebug: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux32x86Config>>setExtraTargetPropertiesBuildDebugITimerHeartbeat: (in category 'utils') ----- + setExtraTargetPropertiesBuildDebugITimerHeartbeat: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux32x86Config>>setExtraTargetPropertiesBuildITimerHeartbeat: (in category 'utils') ----- + setExtraTargetPropertiesBuildITimerHeartbeat: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux32x86Config>>setExtraTargetPropertiesBuildMultiThreaded: (in category 'utils') ----- + setExtraTargetPropertiesBuildMultiThreaded: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux32x86Config>>setExtraTargetPropertiesBuildMultiThreadedAssert: (in category 'utils') ----- + setExtraTargetPropertiesBuildMultiThreadedAssert: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux32x86Config>>setExtraTargetPropertiesBuildMultiThreadedDebug: (in category 'utils') ----- + setExtraTargetPropertiesBuildMultiThreadedDebug: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux32x86Config>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'utils') ----- + setGlobalOptionsAfterDetermineSystemBuild: aMaker + "do nothing (so far) on Unix. + + SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystemBuild:' + "! Item was added: + ----- Method: Linux32x86Config>>setGlobalOptionsAfterDetermineSystemBuildAssert: (in category 'utils') ----- + setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: Linux32x86Config>>setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: (in category 'utils') ----- + setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: Linux32x86Config>>setGlobalOptionsAfterDetermineSystemBuildDebug: (in category 'utils') ----- + setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: Linux32x86Config>>setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: (in category 'utils') ----- + setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: Linux32x86Config>>setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: (in category 'utils') ----- + setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: Linux32x86Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: (in category 'utils') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: Linux32x86Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: (in category 'utils') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: Linux32x86Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: (in category 'utils') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: Linux64Config>>externalPluginsBuild (in category 'as yet unclassified') ----- + externalPluginsBuild + ^ externalPlugins ifNil: [ externalPlugins := self defaultExternalPlugins ]! Item was added: + ----- Method: Linux64Config>>externalPluginsBuildAssert (in category 'as yet unclassified') ----- + externalPluginsBuildAssert + ^ self externalPluginsBuild! Item was added: + ----- Method: Linux64Config>>externalPluginsBuildAssertITimerHeartbeat (in category 'as yet unclassified') ----- + externalPluginsBuildAssertITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: Linux64Config>>externalPluginsBuildDebug (in category 'as yet unclassified') ----- + externalPluginsBuildDebug + ^ self externalPluginsBuild! Item was added: + ----- Method: Linux64Config>>externalPluginsBuildDebugITimerHeartbeat (in category 'as yet unclassified') ----- + externalPluginsBuildDebugITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: Linux64Config>>externalPluginsBuildITimerHeartbeat (in category 'as yet unclassified') ----- + externalPluginsBuildITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: Linux64Config>>externalPluginsBuildMultiThreaded (in category 'as yet unclassified') ----- + externalPluginsBuildMultiThreaded + ^ self externalPluginsBuild! Item was added: + ----- Method: Linux64Config>>externalPluginsBuildMultiThreadedAssert (in category 'as yet unclassified') ----- + externalPluginsBuildMultiThreadedAssert + ^ self externalPluginsBuild! Item was added: + ----- Method: Linux64Config>>externalPluginsBuildMultiThreadedDebug (in category 'as yet unclassified') ----- + externalPluginsBuildMultiThreadedDebug + ^ self externalPluginsBuild! Item was added: + ----- Method: Linux64Config>>internalPluginsBuild (in category 'as yet unclassified') ----- + internalPluginsBuild + ^ internalPlugins ifNil: [ internalPlugins := self defaultInternalPlugins ]! Item was added: + ----- Method: Linux64Config>>internalPluginsBuildAssert (in category 'as yet unclassified') ----- + internalPluginsBuildAssert + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: Linux64Config>>internalPluginsBuildAssertITimerHeartbeat (in category 'as yet unclassified') ----- + internalPluginsBuildAssertITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: Linux64Config>>internalPluginsBuildDebug (in category 'as yet unclassified') ----- + internalPluginsBuildDebug + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: Linux64Config>>internalPluginsBuildDebugITimerHeartbeat (in category 'as yet unclassified') ----- + internalPluginsBuildDebugITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: Linux64Config>>internalPluginsBuildITimerHeartbeat (in category 'as yet unclassified') ----- + internalPluginsBuildITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: Linux64Config>>internalPluginsBuildMultiThreaded (in category 'as yet unclassified') ----- + internalPluginsBuildMultiThreaded + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: Linux64Config>>internalPluginsBuildMultiThreadedAssert (in category 'as yet unclassified') ----- + internalPluginsBuildMultiThreadedAssert + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: Linux64Config>>internalPluginsBuildMultiThreadedDebug (in category 'as yet unclassified') ----- + internalPluginsBuildMultiThreadedDebug + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: Linux64Config>>postBuildActionsBuild: (in category 'cmake buildType redirects') ----- + postBuildActionsBuild: gen + "SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActionsBuild:'"! Item was added: + ----- Method: Linux64Config>>postBuildActionsBuildAssert: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildAssert: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: Linux64Config>>postBuildActionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildAssertITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: Linux64Config>>postBuildActionsBuildDebug: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildDebug: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: Linux64Config>>postBuildActionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildDebugITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: Linux64Config>>postBuildActionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: Linux64Config>>postBuildActionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreaded: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: Linux64Config>>postBuildActionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreadedAssert: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: Linux64Config>>postBuildActionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreadedDebug: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: Linux64Config>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'as yet unclassified') ----- + setGlobalOptionsAfterDetermineSystemBuild: aMaker + "do nothing is an option + + SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystemBuild:'" + ! Item was added: + ----- Method: Linux64Config>>setGlobalOptionsAfterDetermineSystemBuildAssert: (in category 'as yet unclassified') ----- + setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: Linux64Config>>setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: (in category 'as yet unclassified') ----- + setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: Linux64Config>>setGlobalOptionsAfterDetermineSystemBuildDebug: (in category 'as yet unclassified') ----- + setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: Linux64Config>>setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: (in category 'as yet unclassified') ----- + setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: Linux64Config>>setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: (in category 'as yet unclassified') ----- + setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: Linux64Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: (in category 'as yet unclassified') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: Linux64Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: (in category 'as yet unclassified') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: Linux64Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: (in category 'as yet unclassified') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: Linux64Config>>setGlobalOptionsBuild: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuild: aMaker + + aMaker set: 'CMAKE_C_COMPILER' to: '/usr/bin/gcc'. + aMaker set: 'CMAKE_CXX_COMPILER' to: '/usr/bin/g++'. + ! Item was added: + ----- Method: Linux64Config>>setGlobalOptionsBuildAssert: (in category 'as yet unclassified') ----- + setGlobalOptionsBuildAssert: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: Linux64Config>>setGlobalOptionsBuildAssertITimerHeartbeat: (in category 'as yet unclassified') ----- + setGlobalOptionsBuildAssertITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: Linux64Config>>setGlobalOptionsBuildDebug: (in category 'as yet unclassified') ----- + setGlobalOptionsBuildDebug: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: Linux64Config>>setGlobalOptionsBuildDebugITimerHeartbeat: (in category 'as yet unclassified') ----- + setGlobalOptionsBuildDebugITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: Linux64Config>>setGlobalOptionsBuildITimerHeartbeat: (in category 'as yet unclassified') ----- + setGlobalOptionsBuildITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: Linux64Config>>setGlobalOptionsBuildMultiThreaded: (in category 'as yet unclassified') ----- + setGlobalOptionsBuildMultiThreaded: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: Linux64Config>>setGlobalOptionsBuildMultiThreadedAssert: (in category 'as yet unclassified') ----- + setGlobalOptionsBuildMultiThreadedAssert: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: Linux64Config>>setGlobalOptionsBuildMultiThreadedDebug: (in category 'as yet unclassified') ----- + setGlobalOptionsBuildMultiThreadedDebug: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: Linux64x86w32BitConfig>>externalPluginsBuild (in category 'cmake buildType redirects') ----- + externalPluginsBuild + ^ externalPlugins ifNil: [ externalPlugins := self defaultExternalPlugins ]! Item was added: + ----- Method: Linux64x86w32BitConfig>>externalPluginsBuildAssert (in category 'cmake buildType redirects') ----- + externalPluginsBuildAssert + ^ self externalPluginsBuild! Item was added: + ----- Method: Linux64x86w32BitConfig>>externalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + externalPluginsBuildAssertITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: Linux64x86w32BitConfig>>externalPluginsBuildDebug (in category 'cmake buildType redirects') ----- + externalPluginsBuildDebug + ^ self externalPluginsBuild! Item was added: + ----- Method: Linux64x86w32BitConfig>>externalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + externalPluginsBuildDebugITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: Linux64x86w32BitConfig>>externalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + externalPluginsBuildITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: Linux64x86w32BitConfig>>externalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- + externalPluginsBuildMultiThreaded + ^ self externalPluginsBuild! Item was added: + ----- Method: Linux64x86w32BitConfig>>externalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + externalPluginsBuildMultiThreadedAssert + ^ self externalPluginsBuild! Item was added: + ----- Method: Linux64x86w32BitConfig>>externalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + externalPluginsBuildMultiThreadedDebug + ^ self externalPluginsBuild! Item was added: + ----- Method: Linux64x86w32BitConfig>>internalPluginsBuild (in category 'cmake buildType redirects') ----- + internalPluginsBuild + ^ internalPlugins ifNil: [ internalPlugins := self defaultInternalPlugins ]! Item was added: + ----- Method: Linux64x86w32BitConfig>>internalPluginsBuildAssert (in category 'cmake buildType redirects') ----- + internalPluginsBuildAssert + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: Linux64x86w32BitConfig>>internalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + internalPluginsBuildAssertITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: Linux64x86w32BitConfig>>internalPluginsBuildDebug (in category 'cmake buildType redirects') ----- + internalPluginsBuildDebug + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: Linux64x86w32BitConfig>>internalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + internalPluginsBuildDebugITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: Linux64x86w32BitConfig>>internalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + internalPluginsBuildITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: Linux64x86w32BitConfig>>internalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- + internalPluginsBuildMultiThreaded + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: Linux64x86w32BitConfig>>internalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + internalPluginsBuildMultiThreadedAssert + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: Linux64x86w32BitConfig>>internalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + internalPluginsBuildMultiThreadedDebug + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: Linux64x86w32BitConfig>>postBuildActionsBuild: (in category 'cmake buildType redirects') ----- + postBuildActionsBuild: gen + "SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActionsBuild:'"! Item was added: + ----- Method: Linux64x86w32BitConfig>>postBuildActionsBuildAssert: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildAssert: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: Linux64x86w32BitConfig>>postBuildActionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildAssertITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: Linux64x86w32BitConfig>>postBuildActionsBuildDebug: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildDebug: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: Linux64x86w32BitConfig>>postBuildActionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildDebugITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: Linux64x86w32BitConfig>>postBuildActionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: Linux64x86w32BitConfig>>postBuildActionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreaded: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: Linux64x86w32BitConfig>>postBuildActionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreadedDebug: aMaker + ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setExtraTargetProperties: (in category 'utils') ----- - setExtraTargetProperties: maker - self flag:'tty'. "I am nervous about this method up here in this class, but pharo has it in CogUnixConfig, so using as is for now" - - maker setTargetProperties: 'LINK_FLAGS "-m32"'. - - maker puts: 'set_source_files_properties( ${srcVMDir}/cogit.c PROPERTIES - COMPILE_FLAGS "-O1 -fno-omit-frame-pointer -momit-leaf-frame-pointer -mno-rtd -mno-accumulate-outgoing-args")'. - - - maker - cmd: 'set_source_files_properties' - params: ' ${targetPlatform}/vm/sqUnixHeartbeat.c PROPERTIES - COMPILE_FLAGS "-O1 -fno-omit-frame-pointer -mno-rtd -mno-accumulate-outgoing-args"'. - - maker addExternalLibraries: - #( - 'uuid' "" - 'ssl' "" - 'crypto' "" - ). - - super setExtraTargetProperties: maker. - ! Item was added: + ----- Method: Linux64x86w32BitConfig>>setExtraTargetPropertiesBuild: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuild: aMaker + self flag:'tty'. "I am nervous about this method up here in this class, but pharo has it in CogUnixConfig, so using as is for now" + + aMaker setTargetProperties: 'LINK_FLAGS "-m32"'. + + aMaker puts: 'set_source_files_properties( ${srcVMDir}/cogit.c PROPERTIES + COMPILE_FLAGS "-O1 -fno-omit-frame-pointer -momit-leaf-frame-pointer -mno-rtd -mno-accumulate-outgoing-args")'. + + + aMaker + cmd: 'set_source_files_properties' + params: ' ${targetPlatform}/vm/sqUnixHeartbeat.c PROPERTIES + COMPILE_FLAGS "-O1 -fno-omit-frame-pointer -mno-rtd -mno-accumulate-outgoing-args"'. + + aMaker addExternalLibraries: + #( + 'uuid' "" + 'ssl' "" + 'crypto' "" + ). + + ! Item was added: + ----- Method: Linux64x86w32BitConfig>>setExtraTargetPropertiesBuildAssert: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildAssert: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux64x86w32BitConfig>>setExtraTargetPropertiesBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildAssertITimerHeartbeat: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux64x86w32BitConfig>>setExtraTargetPropertiesBuildDebug: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildDebug: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux64x86w32BitConfig>>setExtraTargetPropertiesBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildDebugITimerHeartbeat: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux64x86w32BitConfig>>setExtraTargetPropertiesBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildITimerHeartbeat: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux64x86w32BitConfig>>setExtraTargetPropertiesBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildMultiThreaded: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux64x86w32BitConfig>>setExtraTargetPropertiesBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildMultiThreadedAssert: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: Linux64x86w32BitConfig>>setExtraTargetPropertiesBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildMultiThreadedDebug: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setGlobalOptions: (in category 'utils') ----- - 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 - - set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /opt/local/lib) - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions:' - "! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuild: aMaker + " + SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystemBuild:'" + ! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsAfterDetermineSystemBuildAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsAfterDetermineSystemBuildDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuild: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuild: aMaker + aMaker set: 'CMAKE_C_COMPILER' to: '/usr/bin/gcc'. + aMaker 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 + + set(CMAKE_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} /opt/local/lib) + SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions:' + "! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuildAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildAssert: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildAssertITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuildDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildDebug: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildDebugITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreaded: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreadedAssert: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreadedDebug: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was changed: SqueakUnixConfig subclass: #SqueakAndroidStackEvtConfig instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMakerSqueak-Android'! + !SqueakAndroidStackEvtConfig commentStamp: 'tty 6/25/2014 16:25' prior: 0! - !SqueakAndroidStackEvtConfig commentStamp: 'tty 5/21/2014 12:18' prior: 0! A class to configure the Event-driven Stack Cog for Android. This configuration does not lead to building an executable; rather it prepares the source tree to be plugged into the jni subdirectory of an Android project. Requires AndroidPlugin + Ported from pharo to squeak. + + tty: a lot of 'build' methods are included in this class in order to let the testing framework work consistently. They are not used.! - Ported from pharo to squeak. ! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>externalPluginsBuildAssert (in category 'as yet unclassified') ----- + externalPluginsBuildAssert + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>externalPluginsBuildAssertITimerHeartbeat (in category 'as yet unclassified') ----- + externalPluginsBuildAssertITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>externalPluginsBuildDebug (in category 'as yet unclassified') ----- + externalPluginsBuildDebug + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>externalPluginsBuildDebugITimerHeartbeat (in category 'as yet unclassified') ----- + externalPluginsBuildDebugITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>externalPluginsBuildITimerHeartbeat (in category 'as yet unclassified') ----- + externalPluginsBuildITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>externalPluginsBuildMultiThreaded (in category 'as yet unclassified') ----- + externalPluginsBuildMultiThreaded + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>externalPluginsBuildMultiThreadedAssert (in category 'as yet unclassified') ----- + externalPluginsBuildMultiThreadedAssert + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>externalPluginsBuildMultiThreadedDebug (in category 'as yet unclassified') ----- + externalPluginsBuildMultiThreadedDebug + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>internalPluginsBuild (in category 'as yet unclassified') ----- + internalPluginsBuild + ^ internalPlugins ifNil: [ internalPlugins := self defaultInternalPlugins ]! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>internalPluginsBuildAssert (in category 'as yet unclassified') ----- + internalPluginsBuildAssert + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>internalPluginsBuildAssertITimerHeartbeat (in category 'as yet unclassified') ----- + internalPluginsBuildAssertITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>internalPluginsBuildDebug (in category 'as yet unclassified') ----- + internalPluginsBuildDebug + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>internalPluginsBuildDebugITimerHeartbeat (in category 'as yet unclassified') ----- + internalPluginsBuildDebugITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>internalPluginsBuildITimerHeartbeat (in category 'as yet unclassified') ----- + internalPluginsBuildITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>internalPluginsBuildMultiThreaded (in category 'as yet unclassified') ----- + internalPluginsBuildMultiThreaded + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>internalPluginsBuildMultiThreadedAssert (in category 'as yet unclassified') ----- + internalPluginsBuildMultiThreadedAssert + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>internalPluginsBuildMultiThreadedDebug (in category 'as yet unclassified') ----- + internalPluginsBuildMultiThreadedDebug + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'as yet unclassified') ----- + setGlobalOptionsAfterDetermineSystemBuild: aMaker + "do nothing (so far) on Unix. + + SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystemBuild:' + "! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsAfterDetermineSystemBuildAssert: (in category 'as yet unclassified') ----- + setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: (in category 'as yet unclassified') ----- + setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsAfterDetermineSystemBuildDebug: (in category 'as yet unclassified') ----- + setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: (in category 'as yet unclassified') ----- + setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: (in category 'as yet unclassified') ----- + setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: (in category 'as yet unclassified') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: (in category 'as yet unclassified') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: (in category 'as yet unclassified') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsBuild: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuild: aMaker + "does nothing. included for framework consistency/testing + + SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsBuild' + " + ! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsBuildAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildAssert: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildAssertITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsBuildDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildDebug: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildDebugITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreaded: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreadedAssert: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreadedDebug: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakBSDConfig>>externalPluginsBuild (in category 'cmake buildType redirects') ----- + externalPluginsBuild + ^ externalPlugins ifNil: [ externalPlugins := self defaultExternalPlugins ]! Item was added: + ----- Method: SqueakBSDConfig>>externalPluginsBuildAssert (in category 'cmake buildType redirects') ----- + externalPluginsBuildAssert + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakBSDConfig>>externalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + externalPluginsBuildAssertITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakBSDConfig>>externalPluginsBuildDebug (in category 'cmake buildType redirects') ----- + externalPluginsBuildDebug + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakBSDConfig>>externalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + externalPluginsBuildDebugITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakBSDConfig>>externalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + externalPluginsBuildITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakBSDConfig>>externalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- + externalPluginsBuildMultiThreaded + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakBSDConfig>>externalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + externalPluginsBuildMultiThreadedAssert + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakBSDConfig>>externalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + externalPluginsBuildMultiThreadedDebug + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakBSDConfig>>internalPluginsBuild (in category 'cmake buildType redirects') ----- + internalPluginsBuild + ^ internalPlugins ifNil: [ internalPlugins := self defaultInternalPlugins ]! Item was added: + ----- Method: SqueakBSDConfig>>internalPluginsBuildAssert (in category 'cmake buildType redirects') ----- + internalPluginsBuildAssert + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakBSDConfig>>internalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + internalPluginsBuildAssertITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakBSDConfig>>internalPluginsBuildDebug (in category 'cmake buildType redirects') ----- + internalPluginsBuildDebug + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakBSDConfig>>internalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + internalPluginsBuildDebugITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakBSDConfig>>internalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + internalPluginsBuildITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakBSDConfig>>internalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- + internalPluginsBuildMultiThreaded + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakBSDConfig>>internalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + internalPluginsBuildMultiThreadedAssert + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakBSDConfig>>internalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + internalPluginsBuildMultiThreadedDebug + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakBSDConfig>>postBuildActionsBuild: (in category 'cmake buildType redirects') ----- + postBuildActionsBuild: gen + "SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActionsBuild:'"! Item was added: + ----- Method: SqueakBSDConfig>>postBuildActionsBuildAssert: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildAssert: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakBSDConfig>>postBuildActionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildAssertITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakBSDConfig>>postBuildActionsBuildDebug: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildDebug: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakBSDConfig>>postBuildActionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildDebugITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakBSDConfig>>postBuildActionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakBSDConfig>>postBuildActionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreaded: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakBSDConfig>>postBuildActionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreadedAssert: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakBSDConfig>>postBuildActionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreadedDebug: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakBSDConfig>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuild: aMaker + "do nothing (so far) on Unix. + + SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystemBuild:' + "! Item was added: + ----- Method: SqueakBSDConfig>>setGlobalOptionsAfterDetermineSystemBuildAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakBSDConfig>>setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakBSDConfig>>setGlobalOptionsAfterDetermineSystemBuildDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakBSDConfig>>setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakBSDConfig>>setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakBSDConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakBSDConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakBSDConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakBSDConfig>>setGlobalOptionsBuild: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuild: aMaker + self flag:'tty'. "assume this is correct for BSD. it may not be" + aMaker set: 'CMAKE_C_COMPILER' to: '/usr/bin/gcc'. + aMaker set: 'CMAKE_CXX_COMPILER' to: '/usr/bin/g++'. + ! Item was added: + ----- Method: SqueakBSDConfig>>setGlobalOptionsBuildAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildAssert: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakBSDConfig>>setGlobalOptionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildAssertITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakBSDConfig>>setGlobalOptionsBuildDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildDebug: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakBSDConfig>>setGlobalOptionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildDebugITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakBSDConfig>>setGlobalOptionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakBSDConfig>>setGlobalOptionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreaded: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakBSDConfig>>setGlobalOptionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreadedAssert: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakBSDConfig>>setGlobalOptionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreadedDebug: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was changed: + ----- Method: SqueakBSDConfig>>standardIncludesBuild (in category 'cmake buildType redirects') ----- - ----- Method: SqueakBSDConfig>>standardIncludesBuild (in category 'as yet unclassified') ----- standardIncludesBuild ^#()! Item was changed: + ----- Method: SqueakBSDConfig>>standardIncludesBuildAssert (in category 'cmake buildType redirects') ----- - ----- Method: SqueakBSDConfig>>standardIncludesBuildAssert (in category 'as yet unclassified') ----- standardIncludesBuildAssert ^ self standardIncludesBuild! Item was changed: + ----- Method: SqueakBSDConfig>>standardIncludesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - ----- Method: SqueakBSDConfig>>standardIncludesBuildAssertITimerHeartbeat (in category 'as yet unclassified') ----- standardIncludesBuildAssertITimerHeartbeat ^ self standardIncludesBuild! Item was changed: + ----- Method: SqueakBSDConfig>>standardIncludesBuildDebug (in category 'cmake buildType redirects') ----- - ----- Method: SqueakBSDConfig>>standardIncludesBuildDebug (in category 'as yet unclassified') ----- standardIncludesBuildDebug ^ self standardIncludesBuild! Item was changed: + ----- Method: SqueakBSDConfig>>standardIncludesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - ----- Method: SqueakBSDConfig>>standardIncludesBuildDebugITimerHeartbeat (in category 'as yet unclassified') ----- standardIncludesBuildDebugITimerHeartbeat ^ self standardIncludesBuild! Item was changed: + ----- Method: SqueakBSDConfig>>standardIncludesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - ----- Method: SqueakBSDConfig>>standardIncludesBuildITimerHeartbeat (in category 'as yet unclassified') ----- standardIncludesBuildITimerHeartbeat ^ self standardIncludesBuild! Item was changed: + ----- Method: SqueakBSDConfig>>standardIncludesBuildMultiThreaded (in category 'cmake buildType redirects') ----- - ----- Method: SqueakBSDConfig>>standardIncludesBuildMultiThreaded (in category 'as yet unclassified') ----- standardIncludesBuildMultiThreaded ^ self standardIncludesBuild! Item was changed: + ----- Method: SqueakBSDConfig>>standardIncludesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - ----- Method: SqueakBSDConfig>>standardIncludesBuildMultiThreadedAssert (in category 'as yet unclassified') ----- standardIncludesBuildMultiThreadedAssert ^ self standardIncludesBuild! Item was changed: + ----- Method: SqueakBSDConfig>>standardIncludesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - ----- Method: SqueakBSDConfig>>standardIncludesBuildMultiThreadedDebug (in category 'as yet unclassified') ----- standardIncludesBuildMultiThreadedDebug ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>setExtraTargetProperties: (in category 'settings') ----- - setExtraTargetProperties: maker - | plist | - - maker addFrameworks: self frameworks. - - " generated and add Info.plist file " - plist := self plistFile. - - (FileStream forceNewFileNamed: (maker buildDir / 'Info.plist') fullName) - nextPutAll: plist; - close. - - maker - addProperty: 'MACOSX_BUNDLE_INFO_PLIST' - value: '${buildDir}/Info.plist'. - - (FileStream forceNewFileNamed: (maker buildDir / self prefixHeaderFileName) fullName ) - nextPutAll: self precompiledHeaders; - close. - maker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/', self prefixHeaderFileName. - - maker - addXCodeProperty: 'PER_ARCH_CFLAGS_i386' value: '-DLSB_FIRST -mfpmath=sse -finline-functions -fno-gcse -mtune=prescott -march=pentium-m -falign-functions=16'. - - "maker - addXCodeProperty: 'GCC_VERSION' value: '4.3'." - - maker - cmd: 'set_target_properties' - params: self executableName, ' PROPERTIES COMPILE_FLAGS "-include \"', (self buildDir / self prefixHeaderFileName) fullName, '\""'. - - " maker set: 'CMAKE_C_COMPILER' to: '/usr/bin/gcc-4.2'. - maker set: 'CMAKE_CXX_COMPILER' to: '/usr/bin/g++-4.2'. - " - maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. - maker set: 'RUNTIME_OUTPUT_DIRECTORY' toString: self outputDir fullName.! Item was added: + ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>setExtraTargetPropertiesBuild: (in category 'settings') ----- + setExtraTargetPropertiesBuild: aMaker + | plist | + + aMaker addFrameworks: self frameworks. + + " generated and add Info.plist file " + plist := self plistFile. + + (FileStream forceNewFileNamed: (aMaker buildDir / 'Info.plist') fullName) + nextPutAll: plist; + close. + + aMaker + addProperty: 'MACOSX_BUNDLE_INFO_PLIST' + value: '${buildDir}/Info.plist'. + + (FileStream forceNewFileNamed: (aMaker buildDir / self prefixHeaderFileName) fullName ) + nextPutAll: self precompiledHeaders; + close. + aMaker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/', self prefixHeaderFileName. + + aMaker + addXCodeProperty: 'PER_ARCH_CFLAGS_i386' value: '-DLSB_FIRST -mfpmath=sse -finline-functions -fno-gcse -mtune=prescott -march=pentium-m -falign-functions=16'. + + "maker + addXCodeProperty: 'GCC_VERSION' value: '4.3'." + + aMaker + cmd: 'set_target_properties' + params: self executableName, ' PROPERTIES COMPILE_FLAGS "-include \"', (self buildDir / self prefixHeaderFileName) fullName, '\""'. + + " maker set: 'CMAKE_C_COMPILER' to: '/usr/bin/gcc-4.2'. + maker set: 'CMAKE_CXX_COMPILER' to: '/usr/bin/g++-4.2'. + " + aMaker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. + aMaker set: 'RUNTIME_OUTPUT_DIRECTORY' toString: self outputDir fullName.! Item was removed: - ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>setGlobalOptions: (in category 'settings') ----- - setGlobalOptions: maker - - "set any CMake global options, before declaring a project in cmake file" - - maker set: 'CMAKE_C_COMPILER' to: '/usr/bin/gcc'. - maker set: 'CMAKE_CXX_COMPILER' to: '/usr/bin/g++'.! Item was removed: - ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>setGlobalOptionsAfterDetermineSystem: (in category 'settings') ----- - setGlobalOptionsAfterDetermineSystem: maker - maker set: 'CMAKE_OSX_DEPLOYMENT_TARGET' to: '10.5'. - maker - set: 'CMAKE_OSX_SYSROOT' - to: '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX', self sdkVersion, '.sdk'! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>setExtraTargetProperties: (in category 'settings') ----- - setExtraTargetProperties: maker - | plist precompiledHeaders | - - " generated and add Info.plist file " - plist := self plistFile. - - (maker buildDir forceNewFileNamed: 'Info.plist') - nextPutAll: plist; - close. - - maker - addProperty: 'MACOSX_BUNDLE_INFO_PLIST' - value: '${buildDir}/Info.plist'. - - maker - cmd: 'set_source_files_properties' - params: '${resources} PROPERTIES MACOSX_PACKAGE_LOCATION Resources'. - - precompiledHeaders := (self executableName, '_Prefix.pch'). - (maker buildDir forceNewFileNamed: precompiledHeaders) - nextPutAll: self precompiledHeaders; - close. - - maker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/', precompiledHeaders. - - "maker - addXCodeProperty: 'GCC_ENABLE_SSE3_EXTENSIONS' value: 'YES'; - addXCodeProperty: 'GCC_ENABLE_SSE41_EXTENSIONS' value: 'YES'; - addXCodeProperty: 'GCC_ENABLE_SSE42_EXTENSIONS' value: 'YES'; - addXCodeProperty: 'GCC_GENERATE_DEBUGGING_SYMBOLS' value: 'NO'; - addXCodeProperty: 'GCC_INLINES_ARE_PRIVATE_EXTERN' value: 'YES'; - addXCodeProperty: 'GCC_UNROLL_LOOPS' value: 'YES'. " - - "Extras" - maker - addXCodeProperty: 'ICC_DEBUG' value: 'NO'; - addXCodeProperty: 'ICC_OPTLEVEL' value: 'speedHLO'; - addXCodeProperty: 'ICC_OPT_IPO_FOR_SINGLE_FILE_COMPILATION' value: 'YES'; - addXCodeProperty: 'ICC_OPT_PARALLEL' value: 'NO'; - addXCodeProperty: 'ICC_OPT_PREFETCH_INSERTION' value: 'YES'; - addXCodeProperty: 'ICC_OPT_PROVIDE_FRAME_PTR' value: 'NO'; - addXCodeProperty: 'ICC_OPT_USE_ARCH_IA32' value: 'SSE41'; - addXCodeProperty: 'PER_ARCH_CFLAGS_i386' value: '-finline-functions -mfpmath=sse -march=pentium-m -mtune=prescott -falign-functions=16 -fno-gcse -DLSB_FIRST'; - addXCodeProperty: 'PER_ARCH_CFLAGS_ppc' value: '-fast -mtune=7450 -mcpu=7450 -D_BSD_SOCKLEN_T_=int'! Item was added: + ----- Method: SqueakCocoaIOSConfig>>setExtraTargetPropertiesBuild: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuild: maker + | plist precompiledHeaders | + + " generated and add Info.plist file " + plist := self plistFile. + + (maker buildDir forceNewFileNamed: 'Info.plist') + nextPutAll: plist; + close. + + maker + addProperty: 'MACOSX_BUNDLE_INFO_PLIST' + value: '${buildDir}/Info.plist'. + + maker + cmd: 'set_source_files_properties' + params: '${resources} PROPERTIES MACOSX_PACKAGE_LOCATION Resources'. + + precompiledHeaders := (self executableName, '_Prefix.pch'). + (maker buildDir forceNewFileNamed: precompiledHeaders) + nextPutAll: self precompiledHeaders; + close. + + maker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/', precompiledHeaders. + + "maker + addXCodeProperty: 'GCC_ENABLE_SSE3_EXTENSIONS' value: 'YES'; + addXCodeProperty: 'GCC_ENABLE_SSE41_EXTENSIONS' value: 'YES'; + addXCodeProperty: 'GCC_ENABLE_SSE42_EXTENSIONS' value: 'YES'; + addXCodeProperty: 'GCC_GENERATE_DEBUGGING_SYMBOLS' value: 'NO'; + addXCodeProperty: 'GCC_INLINES_ARE_PRIVATE_EXTERN' value: 'YES'; + addXCodeProperty: 'GCC_UNROLL_LOOPS' value: 'YES'. " + + "Extras" + maker + addXCodeProperty: 'ICC_DEBUG' value: 'NO'; + addXCodeProperty: 'ICC_OPTLEVEL' value: 'speedHLO'; + addXCodeProperty: 'ICC_OPT_IPO_FOR_SINGLE_FILE_COMPILATION' value: 'YES'; + addXCodeProperty: 'ICC_OPT_PARALLEL' value: 'NO'; + addXCodeProperty: 'ICC_OPT_PREFETCH_INSERTION' value: 'YES'; + addXCodeProperty: 'ICC_OPT_PROVIDE_FRAME_PTR' value: 'NO'; + addXCodeProperty: 'ICC_OPT_USE_ARCH_IA32' value: 'SSE41'; + addXCodeProperty: 'PER_ARCH_CFLAGS_i386' value: '-finline-functions -mfpmath=sse -march=pentium-m -mtune=prescott -falign-functions=16 -fno-gcse -DLSB_FIRST'; + addXCodeProperty: 'PER_ARCH_CFLAGS_ppc' value: '-fast -mtune=7450 -mcpu=7450 -D_BSD_SOCKLEN_T_=int'! Item was added: + ----- Method: SqueakCocoaIOSConfig>>setExtraTargetPropertiesBuildAssert: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildAssert: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: SqueakCocoaIOSConfig>>setExtraTargetPropertiesBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildAssertITimerHeartbeat: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: SqueakCocoaIOSConfig>>setExtraTargetPropertiesBuildDebug: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildDebug: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: SqueakCocoaIOSConfig>>setExtraTargetPropertiesBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildDebugITimerHeartbeat: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: SqueakCocoaIOSConfig>>setExtraTargetPropertiesBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildITimerHeartbeat: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: SqueakCocoaIOSConfig>>setExtraTargetPropertiesBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildMultiThreaded: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: SqueakCocoaIOSConfig>>setExtraTargetPropertiesBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildMultiThreadedAssert: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: SqueakCocoaIOSConfig>>setExtraTargetPropertiesBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + setExtraTargetPropertiesBuildMultiThreadedDebug: aMaker + ^self setExtraTargetPropertiesBuild: aMaker! Item was added: + ----- Method: SqueakCocoaIOSConfig>>setGlobalOptionsAfterDetermineSystem: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystem: maker + maker set: 'CMAKE_OSX_DEPLOYMENT_TARGET' to: '10.5'. + maker + set: 'CMAKE_OSX_SYSROOT' + to: '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX', self sdkVersion, '.sdk'! Item was removed: - ----- Method: SqueakCocoaIOSSqueakStackV3Config>>commonCompilerFlags (in category 'settings') ----- - commonCompilerFlags - ^ super commonCompilerFlags! Item was removed: - ----- Method: SqueakCocoaIOSSqueakStackV3Config>>setGlobalOptions: (in category 'settings') ----- - setGlobalOptions: maker - super setGlobalOptions: maker. - maker set: 'CMAKE_C_COMPILER' to: 'clang'. - maker set: 'CMAKE_CXX_COMPILER' to: 'clang++'.! Item was removed: - ----- Method: SqueakCocoaIOSStackV3CLANGConfig>>setExtraTargetProperties: (in category 'settings') ----- - setExtraTargetProperties: maker - - - maker set: 'CMAKE_C_COMPILER' to: 'clang'. - - super setExtraTargetProperties: maker! Item was added: + ----- Method: SqueakCocoaIOSStackV3CLANGConfig>>setExtraTargetPropertiesBuild: (in category 'settings') ----- + setExtraTargetPropertiesBuild: aMaker + + + aMaker set: 'CMAKE_C_COMPILER' to: 'clang'. + + super setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: SqueakCocoaIOSStackV3CLANGConfig>>setGlobalOptions: (in category 'settings') ----- - setGlobalOptions: maker - maker set: 'CMAKE_C_COMPILER' to: '/usr/bin/clang'. - maker set: 'CMAKE_CXX_COMPILER' to: '/usr/bin/clang++'.! Item was added: + ----- Method: SqueakIA32BochsConfig>>externalPluginsBuild (in category 'cmake buildType redirects') ----- + externalPluginsBuild + ^ externalPlugins ifNil: [ externalPlugins := self defaultExternalPlugins ]! Item was added: + ----- Method: SqueakIA32BochsConfig>>externalPluginsBuildAssert (in category 'cmake buildType redirects') ----- + externalPluginsBuildAssert + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakIA32BochsConfig>>externalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + externalPluginsBuildAssertITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakIA32BochsConfig>>externalPluginsBuildDebug (in category 'cmake buildType redirects') ----- + externalPluginsBuildDebug + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakIA32BochsConfig>>externalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + externalPluginsBuildDebugITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakIA32BochsConfig>>externalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + externalPluginsBuildITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakIA32BochsConfig>>externalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- + externalPluginsBuildMultiThreaded + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakIA32BochsConfig>>externalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + externalPluginsBuildMultiThreadedAssert + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakIA32BochsConfig>>externalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + externalPluginsBuildMultiThreadedDebug + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakIA32BochsConfig>>internalPluginsBuild (in category 'cmake buildType redirects') ----- + internalPluginsBuild + ^ internalPlugins ifNil: [ internalPlugins := self defaultInternalPlugins ]! Item was added: + ----- Method: SqueakIA32BochsConfig>>internalPluginsBuildAssert (in category 'cmake buildType redirects') ----- + internalPluginsBuildAssert + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakIA32BochsConfig>>internalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + internalPluginsBuildAssertITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakIA32BochsConfig>>internalPluginsBuildDebug (in category 'cmake buildType redirects') ----- + internalPluginsBuildDebug + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakIA32BochsConfig>>internalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + internalPluginsBuildDebugITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakIA32BochsConfig>>internalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + internalPluginsBuildITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakIA32BochsConfig>>internalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- + internalPluginsBuildMultiThreaded + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakIA32BochsConfig>>internalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + internalPluginsBuildMultiThreadedAssert + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakIA32BochsConfig>>internalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + internalPluginsBuildMultiThreadedDebug + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakIA32BochsConfig>>postBuildActionsBuild: (in category 'cmake buildType redirects') ----- + postBuildActionsBuild: gen + "SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActionsBuild:'"! Item was added: + ----- Method: SqueakIA32BochsConfig>>postBuildActionsBuildAssert: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildAssert: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakIA32BochsConfig>>postBuildActionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildAssertITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakIA32BochsConfig>>postBuildActionsBuildDebug: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildDebug: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakIA32BochsConfig>>postBuildActionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildDebugITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakIA32BochsConfig>>postBuildActionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakIA32BochsConfig>>postBuildActionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreaded: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakIA32BochsConfig>>postBuildActionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreadedAssert: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakIA32BochsConfig>>postBuildActionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreadedDebug: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuild: aMaker + "do nothing (so far) on Unix. + + SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystemBuild:' + "! Item was added: + ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsAfterDetermineSystemBuildAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsAfterDetermineSystemBuildDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsBuild: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuild: aMaker + "does nothing. included for framework consistency/testing + + SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsBuild' + " + ! Item was added: + ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsBuildAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildAssert: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildAssertITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsBuildDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildDebug: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildDebugITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreaded: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreadedAssert: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreadedDebug: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was changed: ----- Method: SqueakIA32BochsConfig>>standardIncludesBuildAssert (in category 'cmake buildType redirects') ----- standardIncludesBuildAssert ^ self standardIncludesBuild! Item was changed: ----- Method: SqueakIA32BochsConfig>>standardIncludesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- standardIncludesBuildAssertITimerHeartbeat ^ self standardIncludesBuild! Item was changed: ----- Method: SqueakIA32BochsConfig>>standardIncludesBuildDebug (in category 'cmake buildType redirects') ----- standardIncludesBuildDebug ^ self standardIncludesBuild! Item was changed: ----- Method: SqueakIA32BochsConfig>>standardIncludesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- standardIncludesBuildDebugITimerHeartbeat ^ self standardIncludesBuild! Item was changed: ----- Method: SqueakIA32BochsConfig>>standardIncludesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- standardIncludesBuildITimerHeartbeat ^ self standardIncludesBuild! Item was changed: ----- Method: SqueakIA32BochsConfig>>standardIncludesBuildMultiThreaded (in category 'cmake buildType redirects') ----- standardIncludesBuildMultiThreaded ^ self standardIncludesBuild! Item was changed: ----- Method: SqueakIA32BochsConfig>>standardIncludesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- standardIncludesBuildMultiThreadedAssert ^ self standardIncludesBuild! Item was changed: ----- Method: SqueakIA32BochsConfig>>standardIncludesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- standardIncludesBuildMultiThreadedDebug ^ self standardIncludesBuild! Item was added: + ----- Method: SqueakIOSConfig>>externalPluginsBuild (in category 'cmake buildType redirects') ----- + externalPluginsBuild + ^ externalPlugins ifNil: [ externalPlugins := self defaultExternalPlugins ]! Item was added: + ----- Method: SqueakIOSConfig>>externalPluginsBuildAssert (in category 'cmake buildType redirects') ----- + externalPluginsBuildAssert + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakIOSConfig>>externalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + externalPluginsBuildAssertITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakIOSConfig>>externalPluginsBuildDebug (in category 'cmake buildType redirects') ----- + externalPluginsBuildDebug + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakIOSConfig>>externalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + externalPluginsBuildDebugITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakIOSConfig>>externalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + externalPluginsBuildITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakIOSConfig>>externalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- + externalPluginsBuildMultiThreaded + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakIOSConfig>>externalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + externalPluginsBuildMultiThreadedAssert + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakIOSConfig>>externalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + externalPluginsBuildMultiThreadedDebug + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakIOSConfig>>internalPluginsBuild (in category 'cmake buildType redirects') ----- + internalPluginsBuild + ^ internalPlugins ifNil: [ internalPlugins := self defaultInternalPlugins ]! Item was added: + ----- Method: SqueakIOSConfig>>internalPluginsBuildAssert (in category 'cmake buildType redirects') ----- + internalPluginsBuildAssert + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakIOSConfig>>internalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + internalPluginsBuildAssertITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakIOSConfig>>internalPluginsBuildDebug (in category 'cmake buildType redirects') ----- + internalPluginsBuildDebug + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakIOSConfig>>internalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + internalPluginsBuildDebugITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakIOSConfig>>internalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + internalPluginsBuildITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakIOSConfig>>internalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- + internalPluginsBuildMultiThreaded + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakIOSConfig>>internalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + internalPluginsBuildMultiThreadedAssert + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakIOSConfig>>internalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + internalPluginsBuildMultiThreadedDebug + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakIOSConfig>>postBuildActions: (in category 'utils') ----- - postBuildActions: gen - - " override to add custom rules after all targets is defined " - - self write: self fixLibsTemplate toFile: 'fix_libs.cmake'. - - - gen - set: #bundlePath toString: '${outputDir}/', self executableName, '.app'; - set: #pluginsRelPath toString: '@executable_path/Plugins'. - - gen - puts: ' - INSTALL(CODE " - set(externalModulesDir \"${externalModulesDir}\") - set(bundlePath \"${bundlePath}\") - set(pluginsRelPath \"${pluginsRelPath}\") - - include(fix_libs.cmake) - ")' - - " FILE(GLOB_RECURSE bLibs /${externalModulesDir}/*.*) - "! Item was added: + ----- Method: SqueakIOSConfig>>postBuildActionsBuild: (in category 'utils') ----- + postBuildActionsBuild: gen + + " override to add custom rules after all targets is defined " + + self write: self fixLibsTemplate toFile: 'fix_libs.cmake'. + + + gen + set: #bundlePath toString: '${outputDir}/', self executableName, '.app'; + set: #pluginsRelPath toString: '@executable_path/Plugins'. + + gen + puts: ' + INSTALL(CODE " + set(externalModulesDir \"${externalModulesDir}\") + set(bundlePath \"${bundlePath}\") + set(pluginsRelPath \"${pluginsRelPath}\") + + include(fix_libs.cmake) + ")' + + " FILE(GLOB_RECURSE bLibs /${externalModulesDir}/*.*) + "! Item was added: + ----- Method: SqueakIOSConfig>>postBuildActionsBuildAssert: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildAssert: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakIOSConfig>>postBuildActionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildAssertITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakIOSConfig>>postBuildActionsBuildDebug: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildDebug: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakIOSConfig>>postBuildActionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildDebugITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakIOSConfig>>postBuildActionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakIOSConfig>>postBuildActionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreaded: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakIOSConfig>>postBuildActionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreadedAssert: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakIOSConfig>>postBuildActionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreadedDebug: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakIOSConfig>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuild: aMaker + self flag: 'tty'. "I do not know if this is appropriate for MacOSX32x86. It is in IOS, so I figured what the heck. + + SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystemBuild:' + " + aMaker set: 'CMAKE_OSX_DEPLOYMENT_TARGET' to: '10.5'. + aMaker + set: 'CMAKE_OSX_SYSROOT' + to: '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX', self sdkVersion, '.sdk'! Item was added: + ----- Method: SqueakIOSConfig>>setGlobalOptionsAfterDetermineSystemBuildAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakIOSConfig>>setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakIOSConfig>>setGlobalOptionsAfterDetermineSystemBuildDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakIOSConfig>>setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakIOSConfig>>setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakIOSConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakIOSConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakIOSConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakIOSConfig>>setGlobalOptionsBuild: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuild: aMaker + "does nothing. included for framework consistency/testing + + SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsBuild' + " + ! Item was added: + ----- Method: SqueakIOSConfig>>setGlobalOptionsBuildAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildAssert: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakIOSConfig>>setGlobalOptionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildAssertITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakIOSConfig>>setGlobalOptionsBuildDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildDebug: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakIOSConfig>>setGlobalOptionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildDebugITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakIOSConfig>>setGlobalOptionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakIOSConfig>>setGlobalOptionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreaded: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakIOSConfig>>setGlobalOptionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreadedAssert: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakIOSConfig>>setGlobalOptionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreadedDebug: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>setExtraTargetProperties: (in category 'settings') ----- - setExtraTargetProperties: maker - "super setExtraTargetProperties: maker." - - | precompiledHeaders plist | - - precompiledHeaders := (self executableName, '_Prefix.pch'). - (FileStream forceNewFileNamed: (maker buildDir / precompiledHeaders) fullName) - nextPutAll: self precompiledHeaders; - close. - - maker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/', precompiledHeaders. - - self setCommonProperties: maker. - - " generated and add Info.plist file " - plist := self plistFile. - (FileStream forceNewFileNamed: (maker buildDir / 'Info.plist') fullName) - nextPutAll: plist; - close. - - maker addProperty: 'MACOSX_BUNDLE_INFO_PLIST' value: '${buildDir}/Info.plist'. - maker - cmd: 'set_target_properties' - params: self executableName, ' PROPERTIES COMPILE_FLAGS "-include \"', (self buildDir / self prefixHeaderFileName) fullName, '\""'. - - maker - set: 'CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY' - toString: self codeSignIdentity. - maker - set: 'CMAKE_XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY' - toString: self targetedDeviceFamilyAsString. - maker - set: 'CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET' - to: self deploymentTargetVersion. - maker - set: 'CMAKE_XCODE_ATTRIBUTE_CONFIGURATION_BUILD_DIR' - toString: '$(BUILD_DIR)/$(CONFIGURATION)'. - maker - set: 'CMAKE_XCODE_ATTRIBUTE_CONFIGURATION_TEMP_DIR' - toString: '$(BUILD_DIR)/$(CONFIGURATION)'. - - maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. - - maker puts: 'set_source_files_properties(${srcVMDir}/gcc3x-cointerp.c PROPERTIES COMPILE_FLAGS -O0)'. - - - ! Item was added: + ----- Method: SqueakIPhoneSqueakStackV3Config>>setExtraTargetPropertiesBuild: (in category 'settings') ----- + setExtraTargetPropertiesBuild: aMaker + "super setExtraTargetProperties: maker." + + | precompiledHeaders plist | + + precompiledHeaders := (self executableName, '_Prefix.pch'). + (FileStream forceNewFileNamed: (aMaker buildDir / precompiledHeaders) fullName) + nextPutAll: self precompiledHeaders; + close. + + aMaker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/', precompiledHeaders. + + self setCommonProperties: aMaker. + + " generated and add Info.plist file " + plist := self plistFile. + (FileStream forceNewFileNamed: (aMaker buildDir / 'Info.plist') fullName) + nextPutAll: plist; + close. + + aMaker addProperty: 'MACOSX_BUNDLE_INFO_PLIST' value: '${buildDir}/Info.plist'. + aMaker + cmd: 'set_target_properties' + params: self executableName, ' PROPERTIES COMPILE_FLAGS "-include \"', (self buildDir / self prefixHeaderFileName) fullName, '\""'. + + aMaker + set: 'CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY' + toString: self codeSignIdentity. + aMaker + set: 'CMAKE_XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY' + toString: self targetedDeviceFamilyAsString. + aMaker + set: 'CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET' + to: self deploymentTargetVersion. + aMaker + set: 'CMAKE_XCODE_ATTRIBUTE_CONFIGURATION_BUILD_DIR' + toString: '$(BUILD_DIR)/$(CONFIGURATION)'. + aMaker + set: 'CMAKE_XCODE_ATTRIBUTE_CONFIGURATION_TEMP_DIR' + toString: '$(BUILD_DIR)/$(CONFIGURATION)'. + + aMaker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. + + aMaker puts: 'set_source_files_properties(${srcVMDir}/gcc3x-cointerp.c PROPERTIES COMPILE_FLAGS -O0)'. + + + ! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>setGlobalOptions: (in category 'settings') ----- - setGlobalOptions: maker - "set any CMake global options, before declaring a project in cmake file" - - " maker - set: 'CMAKE_C_COMPILER' - to: ('/Applications/Xcode.app/Contents/Developer/Platforms/{target}.platform/Developer/usr/bin/gcc' - nameFormat: {'target' -> self targetDevice} asDictionary). - maker - set: 'CMAKE_CXX_COMPILER' - to: ('/Applications/Xcode.app/Contents/Developer/Platforms/{target}.platform/Developer/usr/bin/g++' - nameFormat: {'target' -> self targetDevice } asDictionary). - self architecture ifNotNil: [ - maker set: 'CMAKE_OSX_ARCHITECTURES' to: self architecture ]." - ! Item was changed: ----- Method: SqueakIPhoneSqueakStackV3Config>>setGlobalOptionsAfterDetermineSystem: (in category 'utils') ----- setGlobalOptionsAfterDetermineSystem: maker - self setGlobalOptions: maker. maker set: 'CMAKE_OSX_SYSROOT' to: ('/Applications/Xcode.app/Contents/Developer/Platforms/{1}.platform/Developer/SDKs/{1}{2}.sdk' format: { self targetDevice. self sdkVersion })! Item was added: + ----- Method: SqueakMacOSX32x86Config>>externalPluginsBuild (in category 'cmake buildType redirects') ----- + externalPluginsBuild + ^ externalPlugins ifNil: [ externalPlugins := self defaultExternalPlugins ]! Item was added: + ----- Method: SqueakMacOSX32x86Config>>externalPluginsBuildAssert (in category 'cmake buildType redirects') ----- + externalPluginsBuildAssert + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakMacOSX32x86Config>>externalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + externalPluginsBuildAssertITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakMacOSX32x86Config>>externalPluginsBuildDebug (in category 'cmake buildType redirects') ----- + externalPluginsBuildDebug + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakMacOSX32x86Config>>externalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + externalPluginsBuildDebugITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakMacOSX32x86Config>>externalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + externalPluginsBuildITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakMacOSX32x86Config>>externalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- + externalPluginsBuildMultiThreaded + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakMacOSX32x86Config>>externalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + externalPluginsBuildMultiThreadedAssert + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakMacOSX32x86Config>>externalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + externalPluginsBuildMultiThreadedDebug + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakMacOSX32x86Config>>internalPluginsBuild (in category 'cmake buildType redirects') ----- + internalPluginsBuild + ^ internalPlugins ifNil: [ internalPlugins := self defaultInternalPlugins ]! Item was added: + ----- Method: SqueakMacOSX32x86Config>>internalPluginsBuildAssert (in category 'cmake buildType redirects') ----- + internalPluginsBuildAssert + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakMacOSX32x86Config>>internalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + internalPluginsBuildAssertITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakMacOSX32x86Config>>internalPluginsBuildDebug (in category 'cmake buildType redirects') ----- + internalPluginsBuildDebug + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakMacOSX32x86Config>>internalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + internalPluginsBuildDebugITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakMacOSX32x86Config>>internalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + internalPluginsBuildITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakMacOSX32x86Config>>internalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- + internalPluginsBuildMultiThreaded + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakMacOSX32x86Config>>internalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + internalPluginsBuildMultiThreadedAssert + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakMacOSX32x86Config>>internalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + internalPluginsBuildMultiThreadedDebug + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>postBuildActions: (in category 'utils') ----- - postBuildActions: gen - - " override to add custom rules after all targets is defined " - - self write: self fixLibsTemplate toFile: 'fix_libs.cmake'. - - - gen - set: #bundlePath toString: '${outputDir}/', self executableName, '.app'; - set: #pluginsRelPath toString: '@executable_path/Plugins'. - - gen - puts: ' - INSTALL(CODE " - set(externalModulesDir \"${externalModulesDir}\") - set(bundlePath \"${bundlePath}\") - set(pluginsRelPath \"${pluginsRelPath}\") - - include(fix_libs.cmake) - ")' - - " FILE(GLOB_RECURSE bLibs /${externalModulesDir}/*.*) - "! Item was added: + ----- Method: SqueakMacOSX32x86Config>>postBuildActionsBuild: (in category 'cmake buildType redirects') ----- + postBuildActionsBuild: gen + "SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActionsBuild:'"! Item was added: + ----- Method: SqueakMacOSX32x86Config>>postBuildActionsBuildAssert: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildAssert: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakMacOSX32x86Config>>postBuildActionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildAssertITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakMacOSX32x86Config>>postBuildActionsBuildDebug: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildDebug: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakMacOSX32x86Config>>postBuildActionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildDebugITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakMacOSX32x86Config>>postBuildActionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakMacOSX32x86Config>>postBuildActionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreaded: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakMacOSX32x86Config>>postBuildActionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreadedAssert: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakMacOSX32x86Config>>postBuildActionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreadedDebug: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuild: aMaker + self flag: 'tty'. "I do not know if this is appropriate for MacOSX32x86. It is in IOS, so I figured what the heck. + + SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystemBuild:' + " + aMaker set: 'CMAKE_OSX_DEPLOYMENT_TARGET' to: '10.5'. + aMaker + set: 'CMAKE_OSX_SYSROOT' + to: '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX', self sdkVersion, '.sdk'! Item was added: + ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsAfterDetermineSystemBuildAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsAfterDetermineSystemBuildDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsBuild: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuild: aMaker + "does nothing. included for framework consistency/testing + + SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsBuild' + " + ! Item was added: + ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsBuildAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildAssert: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildAssertITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsBuildDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildDebug: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildDebugITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreaded: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreadedAssert: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreadedDebug: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>externalPluginsBuild (in category 'cmake buildType redirects') ----- + externalPluginsBuild + ^ externalPlugins ifNil: [ externalPlugins := self defaultExternalPlugins ]! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>externalPluginsBuildAssert (in category 'cmake buildType redirects') ----- + externalPluginsBuildAssert + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>externalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + externalPluginsBuildAssertITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>externalPluginsBuildDebug (in category 'cmake buildType redirects') ----- + externalPluginsBuildDebug + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>externalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + externalPluginsBuildDebugITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>externalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + externalPluginsBuildITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>externalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- + externalPluginsBuildMultiThreaded + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>externalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + externalPluginsBuildMultiThreadedAssert + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>externalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + externalPluginsBuildMultiThreadedDebug + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>internalPluginsBuild (in category 'cmake buildType redirects') ----- + internalPluginsBuild + ^ internalPlugins ifNil: [ internalPlugins := self defaultInternalPlugins ]! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>internalPluginsBuildAssert (in category 'cmake buildType redirects') ----- + internalPluginsBuildAssert + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>internalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + internalPluginsBuildAssertITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>internalPluginsBuildDebug (in category 'cmake buildType redirects') ----- + internalPluginsBuildDebug + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>internalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + internalPluginsBuildDebugITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>internalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + internalPluginsBuildITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>internalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- + internalPluginsBuildMultiThreaded + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>internalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + internalPluginsBuildMultiThreadedAssert + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>internalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + internalPluginsBuildMultiThreadedDebug + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>postBuildActions: (in category 'utils') ----- - postBuildActions: gen - - " override to add custom rules after all targets is defined " - - self write: self fixLibsTemplate toFile: 'fix_libs.cmake'. - - - gen - set: #bundlePath toString: '${outputDir}/', self executableName, '.app'; - set: #pluginsRelPath toString: '@executable_path/Plugins'. - - gen - puts: ' - INSTALL(CODE " - set(externalModulesDir \"${externalModulesDir}\") - set(bundlePath \"${bundlePath}\") - set(pluginsRelPath \"${pluginsRelPath}\") - - include(fix_libs.cmake) - ")' - - " FILE(GLOB_RECURSE bLibs /${externalModulesDir}/*.*) - "! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>postBuildActionsBuild: (in category 'cmake buildType redirects') ----- + postBuildActionsBuild: gen + "SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActionsBuild:'"! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>postBuildActionsBuildAssert: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildAssert: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>postBuildActionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildAssertITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>postBuildActionsBuildDebug: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildDebug: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>postBuildActionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildDebugITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>postBuildActionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>postBuildActionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreaded: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>postBuildActionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreadedAssert: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>postBuildActionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreadedDebug: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuild: aMaker + self flag: 'tty'. "I do not know if this is appropriate for MacOSX32x86. It is in IOS, so I figured what the heck. + + SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystemBuild:' + " + aMaker set: 'CMAKE_OSX_DEPLOYMENT_TARGET' to: '10.5'. + aMaker + set: 'CMAKE_OSX_SYSROOT' + to: '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX', self sdkVersion, '.sdk'! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsAfterDetermineSystemBuildAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsAfterDetermineSystemBuildDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsBuild: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuild: aMaker + "does nothing. included for framework consistency/testing + + SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsBuild' + " + ! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsBuildAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildAssert: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildAssertITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsBuildDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildDebug: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildDebugITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreaded: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreadedAssert: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreadedDebug: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was changed: ----- Method: SqueakMacintoshConfig>>configureForBuildType: (in category 'cmake configuration') ----- configureForBuildType: aSymbol "Set my internal state appropriate for my build type". + self flag:'tty'. self configureNoBuildType. "reset all internal flags" buildType:= aSymbol. "error checking was handled previously" self preferredIncludes; standardIncludes; + " + Cog/build.macos32x86/squeak.cog.v3/mvm makes no reference (that I can see) of these variables. + cC; + cXX; + lDFlags; + libs; + " - cC; " CC=''gcc -m32 -v''" - cXX; "CXX=''g++ -m32'" - lDFlags; " LDFLAGS=-Wl,-z,now" - libs; " LIBS=''-lpthread -luuid''" internalPlugins; externalPlugins. ! Item was added: + ----- Method: SqueakMacintoshConfig>>thirdpartyLibsBuild (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuild + ^ thirdpartyLibs ifNil: [ thirdpartyLibs := OrderedCollection new ].! Item was added: + ----- Method: SqueakMacintoshConfig>>thirdpartyLibsBuildAssert (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuildAssert + ^ self thirdpartyLibs ! Item was added: + ----- Method: SqueakMacintoshConfig>>thirdpartyLibsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuildAssertITimerHeartbeat + ^ self thirdpartyLibs ! Item was added: + ----- Method: SqueakMacintoshConfig>>thirdpartyLibsBuildDebug (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuildDebug + ^ self thirdpartyLibs ! Item was added: + ----- Method: SqueakMacintoshConfig>>thirdpartyLibsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuildDebugITimerHeartbeat + ^ self thirdpartyLibs ! Item was added: + ----- Method: SqueakMacintoshConfig>>thirdpartyLibsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuildITimerHeartbeat + ^ self thirdpartyLibs ! Item was added: + ----- Method: SqueakMacintoshConfig>>thirdpartyLibsBuildMultiThreaded (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuildMultiThreaded + ^ self thirdpartyLibs ! Item was added: + ----- Method: SqueakMacintoshConfig>>thirdpartyLibsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuildMultiThreadedAssert + ^ self thirdpartyLibs ! Item was added: + ----- Method: SqueakMacintoshConfig>>thirdpartyLibsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuildMultiThreadedDebug + ^ self thirdpartyLibs ! Item was added: + ----- Method: SqueakSunOS32x86Config>>externalPluginsBuild (in category 'cmake buildType redirects') ----- + externalPluginsBuild + ^ externalPlugins ifNil: [ externalPlugins := self defaultExternalPlugins ]! Item was added: + ----- Method: SqueakSunOS32x86Config>>externalPluginsBuildAssert (in category 'cmake buildType redirects') ----- + externalPluginsBuildAssert + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakSunOS32x86Config>>externalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + externalPluginsBuildAssertITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakSunOS32x86Config>>externalPluginsBuildDebug (in category 'cmake buildType redirects') ----- + externalPluginsBuildDebug + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakSunOS32x86Config>>externalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + externalPluginsBuildDebugITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakSunOS32x86Config>>externalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + externalPluginsBuildITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakSunOS32x86Config>>externalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- + externalPluginsBuildMultiThreaded + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakSunOS32x86Config>>externalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + externalPluginsBuildMultiThreadedAssert + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakSunOS32x86Config>>externalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + externalPluginsBuildMultiThreadedDebug + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakSunOS32x86Config>>internalPluginsBuild (in category 'cmake buildType redirects') ----- + internalPluginsBuild + ^ internalPlugins ifNil: [ internalPlugins := self defaultInternalPlugins ]! Item was added: + ----- Method: SqueakSunOS32x86Config>>internalPluginsBuildAssert (in category 'cmake buildType redirects') ----- + internalPluginsBuildAssert + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakSunOS32x86Config>>internalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + internalPluginsBuildAssertITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakSunOS32x86Config>>internalPluginsBuildDebug (in category 'cmake buildType redirects') ----- + internalPluginsBuildDebug + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakSunOS32x86Config>>internalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + internalPluginsBuildDebugITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakSunOS32x86Config>>internalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + internalPluginsBuildITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakSunOS32x86Config>>internalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- + internalPluginsBuildMultiThreaded + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakSunOS32x86Config>>internalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + internalPluginsBuildMultiThreadedAssert + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakSunOS32x86Config>>internalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + internalPluginsBuildMultiThreadedDebug + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakSunOS32x86Config>>postBuildActionsBuild: (in category 'cmake buildType redirects') ----- + postBuildActionsBuild: gen + "SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActionsBuild:'"! Item was added: + ----- Method: SqueakSunOS32x86Config>>postBuildActionsBuildAssert: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildAssert: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakSunOS32x86Config>>postBuildActionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildAssertITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakSunOS32x86Config>>postBuildActionsBuildDebug: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildDebug: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakSunOS32x86Config>>postBuildActionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildDebugITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakSunOS32x86Config>>postBuildActionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakSunOS32x86Config>>postBuildActionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreaded: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakSunOS32x86Config>>postBuildActionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreadedAssert: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakSunOS32x86Config>>postBuildActionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreadedDebug: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuild: aMaker + "do nothing (so far) on Unix. + + SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystemBuild:' + "! Item was added: + ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsAfterDetermineSystemBuildAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsAfterDetermineSystemBuildDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsBuild: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuild: aMaker + " + SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsBuild' + " + self flag:'tty'. "I do not know that SunOS uses these compilers. This probably needs to change" + aMaker set: 'CMAKE_C_COMPILER' to: '/usr/bin/gcc'. + aMaker set: 'CMAKE_CXX_COMPILER' to: '/usr/bin/g++'. + ! Item was added: + ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsBuildAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildAssert: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildAssertITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsBuildDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildDebug: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildDebugITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreaded: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreadedAssert: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreadedDebug: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was changed: ----- Method: SqueakSunOS32x86Config>>standardIncludesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- standardIncludesBuildMultiThreadedDebug ^ self standardIncludesBuild! Item was added: + ----- Method: SqueakUnixConfig>>thirdpartyLibsBuild (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuild + ^ thirdpartyLibs ifNil: [ thirdpartyLibs := OrderedCollection new ].! Item was added: + ----- Method: SqueakUnixConfig>>thirdpartyLibsBuildAssert (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuildAssert + ^ self thirdpartyLibs ! Item was added: + ----- Method: SqueakUnixConfig>>thirdpartyLibsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuildAssertITimerHeartbeat + ^ self thirdpartyLibs ! Item was added: + ----- Method: SqueakUnixConfig>>thirdpartyLibsBuildDebug (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuildDebug + ^ self thirdpartyLibs ! Item was added: + ----- Method: SqueakUnixConfig>>thirdpartyLibsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuildDebugITimerHeartbeat + ^ self thirdpartyLibs ! Item was added: + ----- Method: SqueakUnixConfig>>thirdpartyLibsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuildITimerHeartbeat + ^ self thirdpartyLibs ! Item was added: + ----- Method: SqueakUnixConfig>>thirdpartyLibsBuildMultiThreaded (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuildMultiThreaded + ^ self thirdpartyLibs ! Item was added: + ----- Method: SqueakUnixConfig>>thirdpartyLibsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuildMultiThreadedAssert + ^ self thirdpartyLibs ! Item was added: + ----- Method: SqueakUnixConfig>>thirdpartyLibsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuildMultiThreadedDebug + ^ self thirdpartyLibs ! Item was added: + ----- Method: SqueakWin32x86Config>>externalPluginsBuild (in category 'cmake buildType redirects') ----- + externalPluginsBuild + ^ externalPlugins ifNil: [ externalPlugins := self defaultExternalPlugins ]! Item was added: + ----- Method: SqueakWin32x86Config>>externalPluginsBuildAssert (in category 'cmake buildType redirects') ----- + externalPluginsBuildAssert + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakWin32x86Config>>externalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + externalPluginsBuildAssertITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakWin32x86Config>>externalPluginsBuildDebug (in category 'cmake buildType redirects') ----- + externalPluginsBuildDebug + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakWin32x86Config>>externalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + externalPluginsBuildDebugITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakWin32x86Config>>externalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + externalPluginsBuildITimerHeartbeat + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakWin32x86Config>>externalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- + externalPluginsBuildMultiThreaded + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakWin32x86Config>>externalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + externalPluginsBuildMultiThreadedAssert + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakWin32x86Config>>externalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + externalPluginsBuildMultiThreadedDebug + ^ self externalPluginsBuild! Item was added: + ----- Method: SqueakWin32x86Config>>internalPluginsBuild (in category 'cmake buildType redirects') ----- + internalPluginsBuild + ^ internalPlugins ifNil: [ internalPlugins := self defaultInternalPlugins ]! Item was added: + ----- Method: SqueakWin32x86Config>>internalPluginsBuildAssert (in category 'cmake buildType redirects') ----- + internalPluginsBuildAssert + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakWin32x86Config>>internalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + internalPluginsBuildAssertITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakWin32x86Config>>internalPluginsBuildDebug (in category 'cmake buildType redirects') ----- + internalPluginsBuildDebug + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakWin32x86Config>>internalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + internalPluginsBuildDebugITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakWin32x86Config>>internalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + internalPluginsBuildITimerHeartbeat + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakWin32x86Config>>internalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- + internalPluginsBuildMultiThreaded + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakWin32x86Config>>internalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + internalPluginsBuildMultiThreadedAssert + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakWin32x86Config>>internalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + internalPluginsBuildMultiThreadedDebug + " internalPlugins := self defaultInternalPlugins" + ^self internalPluginsBuild! Item was added: + ----- Method: SqueakWin32x86Config>>postBuildActionsBuild: (in category 'cmake buildType redirects') ----- + postBuildActionsBuild: gen + "SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActionsBuild:'"! Item was added: + ----- Method: SqueakWin32x86Config>>postBuildActionsBuildAssert: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildAssert: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakWin32x86Config>>postBuildActionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildAssertITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakWin32x86Config>>postBuildActionsBuildDebug: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildDebug: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakWin32x86Config>>postBuildActionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildDebugITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakWin32x86Config>>postBuildActionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildITimerHeartbeat: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakWin32x86Config>>postBuildActionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreaded: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakWin32x86Config>>postBuildActionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreadedAssert: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakWin32x86Config>>postBuildActionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + postBuildActionsBuildMultiThreadedDebug: aMaker + ^self postBuildActionsBuild: aMaker! Item was added: + ----- Method: SqueakWin32x86Config>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuild: aMaker + "do nothing (so far) on Unix. + + SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystemBuild:' + "! Item was added: + ----- Method: SqueakWin32x86Config>>setGlobalOptionsAfterDetermineSystemBuildAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakWin32x86Config>>setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakWin32x86Config>>setGlobalOptionsAfterDetermineSystemBuildDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakWin32x86Config>>setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakWin32x86Config>>setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakWin32x86Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakWin32x86Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakWin32x86Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker + ! Item was added: + ----- Method: SqueakWin32x86Config>>setGlobalOptionsBuild: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuild: aMaker + "does nothing. included for framework consistency/testing + + SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsBuild' + " + ! Item was added: + ----- Method: SqueakWin32x86Config>>setGlobalOptionsBuildAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildAssert: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakWin32x86Config>>setGlobalOptionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildAssertITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakWin32x86Config>>setGlobalOptionsBuildDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildDebug: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakWin32x86Config>>setGlobalOptionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildDebugITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakWin32x86Config>>setGlobalOptionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildITimerHeartbeat: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakWin32x86Config>>setGlobalOptionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreaded: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakWin32x86Config>>setGlobalOptionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreadedAssert: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakWin32x86Config>>setGlobalOptionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + setGlobalOptionsBuildMultiThreadedDebug: aMaker + ^self setGlobalOptionsBuild: aMaker + ! Item was added: + ----- Method: SqueakWindowsConfig>>thirdpartyLibsBuild (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuild + ^ thirdpartyLibs ifNil: [ thirdpartyLibs := OrderedCollection new ].! Item was added: + ----- Method: SqueakWindowsConfig>>thirdpartyLibsBuildAssert (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuildAssert + ^ self thirdpartyLibs ! Item was added: + ----- Method: SqueakWindowsConfig>>thirdpartyLibsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuildAssertITimerHeartbeat + ^ self thirdpartyLibs ! Item was added: + ----- Method: SqueakWindowsConfig>>thirdpartyLibsBuildDebug (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuildDebug + ^ self thirdpartyLibs ! Item was added: + ----- Method: SqueakWindowsConfig>>thirdpartyLibsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuildDebugITimerHeartbeat + ^ self thirdpartyLibs ! Item was added: + ----- Method: SqueakWindowsConfig>>thirdpartyLibsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuildITimerHeartbeat + ^ self thirdpartyLibs ! Item was added: + ----- Method: SqueakWindowsConfig>>thirdpartyLibsBuildMultiThreaded (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuildMultiThreaded + ^ self thirdpartyLibs ! Item was added: + ----- Method: SqueakWindowsConfig>>thirdpartyLibsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuildMultiThreadedAssert + ^ self thirdpartyLibs ! Item was added: + ----- Method: SqueakWindowsConfig>>thirdpartyLibsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + thirdpartyLibsBuildMultiThreadedDebug + ^ self thirdpartyLibs !

1 0

[commit][3018] Fix snafu with the linux vm Makefile; got to add sqUnixSpurMemory.o to the mix.
by commits＠squeakvm.org 25 Jun '14

25 Jun '14

Revision: 3018 Author: eliot Date: 2014-06-25 14:06:58 -0700 (Wed, 25 Jun 2014) Log Message: ----------- Fix snafu with the linux vm Makefile; got to add sqUnixSpurMemory.o to the mix. Modified Paths: -------------- branches/Cog/platforms/unix/vm/Makefile.in Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Jun 25 13:16:16 PDT 2014 + Wed Jun 25 14:06:14 PDT 2014 Modified: branches/Cog/platforms/unix/vm/Makefile.in =================================================================== --- branches/Cog/platforms/unix/vm/Makefile.in 2014-06-25 20:21:12 UTC (rev 3017) +++ branches/Cog/platforms/unix/vm/Makefile.in 2014-06-25 21:06:58 UTC (rev 3018) @@ -43,12 +43,14 @@ TARGET = vm$a COBJS = $(INTERP)$o cogit$o sqNamedPrims$o sqVirtualMachine$o sqHeapMap$o\ sqExternalSemaphores$o sqTicker$o aio$o debug$o osExports$o \ - sqUnixExternalPrims$o sqUnixMemory$o sqUnixCharConv$o sqUnixMain$o \ + sqUnixExternalPrims$o sqUnixMemory$o sqUnixSpurMemory$o \ + sqUnixCharConv$o sqUnixMain$o \ sqUnixVMProfile$o sqUnixHeartbeat$o sqUnixThreads$o IOBJS = $(INTERP)$o sqNamedPrims$o sqVirtualMachine$o sqHeapMap$o\ sqExternalSemaphores$o sqTicker$o aio$o debug$o osExports$o \ - sqUnixExternalPrims$o sqUnixMemory$o sqUnixCharConv$o sqUnixMain$o \ + sqUnixExternalPrims$o sqUnixMemory$o sqUnixSpurMemory$o \ + sqUnixCharConv$o sqUnixMain$o \ sqUnixVMProfile$o sqUnixHeartbeat$o sqUnixThreads$o OBJS = [COBJS_OR_IOBJS] # see mkmf

1 0

[commit][3017] Rewrite Spur memory allocation on win32 similarly to unix.
by commits＠squeakvm.org 25 Jun '14

25 Jun '14

Revision: 3017 Author: eliot Date: 2014-06-25 13:21:12 -0700 (Wed, 25 Jun 2014) Log Message: ----------- Rewrite Spur memory allocation on win32 similarly to unix. Can now allocate up to 1.8Gb on Windows XP (which has a 2Gb address space limit). Add a flag to indicate if the win32 exe is running as a console app and don't write to the in-window console if so. Fix a slip in sqWin32VMProfile.c. Fix access to revisionAsString in sqUnixHeartbeat.c (it should include sqSCCSVersion.h) and revert revisionAsString to static. Modified Paths: -------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h branches/Cog/platforms/unix/vm/sqUnixHeartbeat.c branches/Cog/platforms/win32/vm/sqWin32.h branches/Cog/platforms/win32/vm/sqWin32Alloc.c branches/Cog/platforms/win32/vm/sqWin32Intel.c branches/Cog/platforms/win32/vm/sqWin32VMProfile.c Added Paths: ----------- branches/Cog/platforms/win32/vm/sqWin32SpurAlloc.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h =================================================================== --- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h 2014-06-24 18:38:36 UTC (rev 3016) +++ branches/Cog/platforms/Cross/vm/sqSCCSVersion.h 2014-06-25 20:21:12 UTC (rev 3017) @@ -33,7 +33,7 @@ static char SvnRawRepositoryURL[] = "$URL$"; # define URL_START (SvnRawRepositoryURL + 6) -char * +static char * revisionAsString() { char *maybe_space = strchr(REV_START,' '); Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Jun 24 11:38:03 PDT 2014 + Wed Jun 25 13:16:16 PDT 2014 Modified: branches/Cog/platforms/unix/vm/sqUnixHeartbeat.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixHeartbeat.c 2014-06-24 18:38:36 UTC (rev 3016) +++ branches/Cog/platforms/unix/vm/sqUnixHeartbeat.c 2014-06-25 20:21:12 UTC (rev 3017) @@ -26,6 +26,7 @@ #include "sq.h" #include "sqAssert.h" #include "sqMemoryFence.h" +#include "sqSCCSVersion.h" #include <errno.h> #include <pthread.h> #include <stdio.h> /* for fprintf */ Modified: branches/Cog/platforms/win32/vm/sqWin32.h =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32.h 2014-06-24 18:38:36 UTC (rev 3016) +++ branches/Cog/platforms/win32/vm/sqWin32.h 2014-06-25 20:21:12 UTC (rev 3017) @@ -283,6 +283,7 @@ extern BITMAPINFO *bmi16; /* 16 bit depth bitmap info */ extern BITMAPINFO *bmi32; /* 32 bit depth bitmap info */ extern BOOL fWindows95; /* Are we running on Win95 or NT? */ +extern BOOL fIsConsole; /* Are we running as a console app? */ /* Startup options */ extern BOOL fHeadlessImage; /* Do we run headless? */ Modified: branches/Cog/platforms/win32/vm/sqWin32Alloc.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Alloc.c 2014-06-24 18:38:36 UTC (rev 3016) +++ branches/Cog/platforms/win32/vm/sqWin32Alloc.c 2014-06-25 20:21:12 UTC (rev 3017) @@ -13,7 +13,7 @@ #include <windows.h> #include "sq.h" -#ifndef NO_VIRTUAL_MEMORY +#if !defined(NO_VIRTUAL_MEMORY) && !SPURVM /* Spur uses sqWin32SpurAlloc.c */ /* For Qwaq Forums: Disallow memory shrinking to avoid crashes due to GC/OpenGL relocation problems within glDrawElements. @@ -176,12 +176,11 @@ } return bytesLeft; } -#endif /* NO_VIRTUAL_MEMORY */ #define roundDownToPage(v) ((v)&pageMask) #define roundUpToPage(v) (((v)+pageSize-1)&pageMask) -#if COGVM +# if COGVM void sqMakeMemoryExecutableFromTo(unsigned long startAddr, unsigned long endAddr) { @@ -205,70 +204,5 @@ &previous)) perror("VirtualProtect(x,y,PAGE_EXECUTE_READWRITE)"); } -#endif /* COGVM */ - -#if SPURVM -/* Allocate a region of memory of at least size bytes, at or above minAddress. - * If the attempt fails, answer null. If the attempt succeeds, answer the - * start of the region and assign its size through allocatedSizePointer. - * - * This from the VirtualFree doc is rather scary: - dwSize [in] - - The size of the region of memory to be freed, in bytes. - - If the dwFreeType parameter is MEM_RELEASE, this parameter must be 0 - (zero). The function frees the entire region that is reserved in the - initial allocation call to VirtualAlloc. - * - * So we rely on the SpurMemoryManager to free exactly the segments that were - * allocated. - */ -#define SizeForRelease(bytes) 0 -void * -sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto(sqInt size, void *minAddress, sqInt *allocatedSizePointer) -{ - void *alloc; - long bytes = roundUpToPage(size); - - *allocatedSizePointer = bytes; -#if 0 /* It appears VirtualAlloc answers low memory by default. */ - alloc = VirtualAlloc(0, bytes, MEM_COMMIT, PAGE_READWRITE); - if (!alloc) { - sqMessageBox(MB_OK | MB_ICONSTOP, TEXT("VM Error:"), - "Unable to VirtualAlloc committed memory (%d bytes requested), Error: %ul", - bytes, GetLastError()); - return NULL; - } - if ((unsigned long)alloc >= (unsigned long)minAddress) - return alloc; - if (!VirtualFree(alloc, SizeForRelease(bytes), MEM_RELEASE)) - sqMessageBox(MB_OK | MB_ICONSTOP, TEXT("VM Warning:"), - "Unable to VirtualFree committed memory (%d bytes requested), Error: %ul", - bytes, GetLastError()); -#endif /* 0 */ - alloc = VirtualAlloc(0, bytes, MEM_COMMIT+MEM_TOP_DOWN, PAGE_READWRITE); - if ((unsigned long)alloc >= (unsigned long)minAddress) - return alloc; - if (alloc && !VirtualFree(alloc, SizeForRelease(bytes), MEM_RELEASE)) - sqMessageBox(MB_OK | MB_ICONSTOP, TEXT("VM Warning:"), - "Unable to VirtualFree committed memory (%d bytes requested), Error: %ul", - bytes, GetLastError()); - sqMessageBox(MB_OK | MB_ICONSTOP, TEXT("VM Error:"), - "Unable to VirtualAlloc committed memory at desired address (%d bytes requested at or above %p), Error: %ul", - bytes, minAddress, GetLastError()); - return NULL; -} - -/* Deallocate a region of memory previously allocated by - * sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto. Cannot fail. - */ -void -sqDeallocateMemorySegmentAtOfSize(void *addr, sqInt sz) -{ - if (!VirtualFree(addr, SizeForRelease(sz), MEM_RELEASE)) - sqMessageBox(MB_OK | MB_ICONSTOP, TEXT("VM Warning:"), - "Unable to VirtualFree committed memory (%d bytes requested), Error: %ul", - sz, GetLastError()); -} -#endif /* SPURVM */ +# endif /* COGVM */ +#endif /* !defined(NO_VIRTUAL_MEMORY) && !SPURVM */ Modified: branches/Cog/platforms/win32/vm/sqWin32Intel.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32Intel.c 2014-06-24 18:38:36 UTC (rev 3016) +++ branches/Cog/platforms/win32/vm/sqWin32Intel.c 2014-06-25 20:21:12 UTC (rev 3017) @@ -63,6 +63,7 @@ static char **clargv; /* console buffer */ +BOOL fIsConsole = 0; TCHAR consoleBuffer[4096]; /* stderr and stdout names */ @@ -231,8 +232,10 @@ { va_list al; va_start(al, fmt); - wvsprintf(consoleBuffer, fmt, al); - OutputDebugString(consoleBuffer); + if (!fIsConsole) { + wvsprintf(consoleBuffer, fmt, al); + OutputDebugString(consoleBuffer); + } vfprintf(stdout, fmt, al); va_end(al); return 1; @@ -248,10 +251,12 @@ int result; va_start(al, fmt); - wvsprintf(consoleBuffer, fmt, al); - OutputLogMessage(consoleBuffer); - if(IsWindow(stWindow)) /* not running as service? */ - OutputConsoleString(consoleBuffer); + if (!fIsConsole) { + wvsprintf(consoleBuffer, fmt, al); + OutputLogMessage(consoleBuffer); + if(IsWindow(stWindow)) /* not running as service? */ + OutputConsoleString(consoleBuffer); + } result = vfprintf(stdout, fmt, al); va_end(al); return result; @@ -263,7 +268,7 @@ int result; va_start(al, fmt); - if(fp == stdout || fp == stderr) + if(!fIsConsole && (fp == stdout || fp == stderr)) { wvsprintf(consoleBuffer, fmt, al); OutputLogMessage(consoleBuffer); @@ -277,10 +282,7 @@ int __cdecl -putchar(int c) -{ - return printf("%c",c); -} +putchar(int c) { return printf("%c",c); } #endif /* !defined(_MSC_VER) && !defined(NODBGPRINT) */ @@ -1510,11 +1512,18 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { + DWORD mode; + /* a few things which need to be done first */ gatherSystemInfo(); /* check if we're running NT or 95 */ fWindows95 = (GetVersion() & 0x80000000) != 0; + /* Determine if we're running as a console application We can't report + * allocation failures unless running as a console app because doing so + * via a MessageBox will make the system unusable. + */ + fIsConsole = GetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE), &mode); /* fetch us a copy of the command line */ initialCmdLine = _strdup(lpCmdLine); Added: branches/Cog/platforms/win32/vm/sqWin32SpurAlloc.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32SpurAlloc.c (rev 0) +++ branches/Cog/platforms/win32/vm/sqWin32SpurAlloc.c 2014-06-25 20:21:12 UTC (rev 3017) @@ -0,0 +1,286 @@ +/**************************************************************************** +* PROJECT: Squeak port for Win32 (NT / Win95) +* FILE: sqWin32SpurAlloc.c +* CONTENT: Virtual Memory Management For Spur +* +* AUTHOR: Eliot Miranda +* EMAIL: eliot.miranda(a)gmail.com +* +*****************************************************************************/ + +#include <windows.h> +#include "sq.h" + +#if SPURVM /* Non-spur uses sqWin32Alloc.c */ + +/* Why does this have to be *here*?? eem 6/24/2014 */ +#if !defined(NDEBUG) +/* in debug mode, let the system crash so that we can see where it happened */ +#define EXCEPTION_WRONG_ACCESS EXCEPTION_CONTINUE_SEARCH +#else +/* in release mode, execute the exception handler notifying the user what happened */ +#define EXCEPTION_WRONG_ACCESS EXCEPTION_EXECUTE_HANDLER +#endif + +LONG CALLBACK sqExceptionFilter(LPEXCEPTION_POINTERS exp) +{ + /* always wrong access - we handle memory differently now */ + return EXCEPTION_WRONG_ACCESS; +} + +static DWORD pageMask; /* bit mask for the start of a memory page */ +static DWORD pageSize; /* size of a memory page */ +static char *minAppAddr; /* SYSTEM_INFO lpMinimumApplicationAddress */ +static char *maxAppAddr; /* SYSTEM_INFO lpMaximumApplicationAddress */ + +# define roundDownToPage(v) ((v)&pageMask) +# define roundUpToPage(v) (((v)+pageSize-1)&pageMask) + +/************************************************************************/ +/* sqAllocateMemory: Initialize virtual memory */ +/************************************************************************/ +void * +sqAllocateMemory(usqInt minHeapSize, usqInt desiredHeapSize) +{ + char *hint, *address, *alloc; + unsigned long alignment; + sqInt allocBytes; + SYSTEM_INFO sysInfo; + + if (pageSize) { + sqMessageBox(MB_OK | MB_ICONSTOP, TEXT("VM Error:"), + "sqAllocateMemory already called"); + exit(1); + } + + /* determine page boundaries & available address space */ + GetSystemInfo(&sysInfo); + pageSize = sysInfo.dwPageSize; + pageMask = ~(pageSize - 1); + minAppAddr = sysInfo.lpMinimumApplicationAddress; + maxAppAddr = sysInfo.lpMaximumApplicationAddress; + + /* choose a suitable starting point. In MinGW the malloc heap is below the + * program, so take the max of a malloc and something form uninitialized + * data. + */ + hint = malloc(1); + free(hint); + hint = max(hint,(char *)&fIsConsole); + + alignment = max(pageSize,1024*1024); + address = (char *)(((usqInt)hint + alignment - 1) & ~(alignment - 1)); + + alloc = sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto + (roundUpToPage(desiredHeapSize), address, &allocBytes); + if (!alloc) { + exit(errno); + sqMessageBox(MB_OK | MB_ICONSTOP, TEXT("VM Error:"), + "sqAllocateMemory: initial alloc failed!\n"); + exit(1); + } + return alloc; +} + +#define roundDownToPage(v) ((v)&pageMask) +#define roundUpToPage(v) (((v)+pageSize-1)&pageMask) + +/* Allocate a region of memory of at least size bytes, at or above minAddress. + * If the attempt fails, answer null. If the attempt succeeds, answer the + * start of the region and assign its size through allocatedSizePointer. + * + * This from the VirtualFree doc is rather scary: + dwSize [in] + + The size of the region of memory to be freed, in bytes. + + If the dwFreeType parameter is MEM_RELEASE, this parameter must be 0 + (zero). The function frees the entire region that is reserved in the + initial allocation call to VirtualAlloc. + * + * So we rely on the SpurMemoryManager to free exactly the segments that were + * allocated. + */ +#define SizeForRelease(bytes) 0 + +static int +address_space_used(char *address, unsigned long bytes) +{ + MEMORY_BASIC_INFORMATION info; + int addressSpaceUnused; + + if (address < minAppAddr || address > maxAppAddr) + return 1; + if (!VirtualQuery(address, &info, sizeof(info))) + sqMessageBox(MB_OK | MB_ICONSTOP, TEXT("VM Error:"), + "Unable to VirtualQuery range [%p, %p), Error: %u", + address, (char *)address + bytes, GetLastError()); + + addressSpaceUnused = info.BaseAddress == address + && info.RegionSize >= bytes + && info.State == MEM_FREE; + + return !addressSpaceUnused; +} + +void * +sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto(sqInt size, void *minAddress, sqInt *allocatedSizePointer) +{ + char *address, *alloc; + long bytes, delta; + + address = (char *)roundUpToPage((unsigned long)minAddress); + bytes = roundUpToPage(size); + delta = max(pageSize,1024*1024); + +# define printProbes 0 +# define printMaps 0 + while ((unsigned long)(address + bytes) > (unsigned long)address) { + if (printProbes && fIsConsole) + printf("probing [%p,%p)\n", address, address + bytes); + if (address_space_used(address, bytes)) { + address += delta; + continue; + } + alloc = VirtualAlloc(address, bytes, MEM_COMMIT|MEM_RESERVE, PAGE_READWRITE); + /* For some reason (large page support?) we can ask for a page-aligned + * address such as 0xNNNNf000 but VirtualAlloc will answer 0xNNNN0000. + * So accept allocs above minAddress rather than allocs above address + */ + if (alloc >= minAddress && alloc <= address + delta) { + if (printMaps && fIsConsole) + fprintf(stderr, + "VirtualAlloc [%p,%p) above %p)\n", + address, address+bytes, minAddress); + *allocatedSizePointer = bytes; + return alloc; + } + if (!alloc) { + DWORD lastError = GetLastError(); +#if 0 /* Can't report this without making the system unusable... */ + sqMessageBox(MB_OK | MB_ICONSTOP, TEXT("VM Error:"), + "Unable to VirtualAlloc committed memory at desired address (%d bytes requested at %p, above %p), Error: %ul", + bytes, address, minAddress, lastError); +#else + if (fIsConsole) + fprintf(stderr, + "Unable to VirtualAlloc committed memory at desired address (%d bytes requested at %p, above %p), Error: %ul\n", + bytes, address, minAddress, lastError); +#endif + return 0; + } + /* VirtualAlloc answered a mapping well away from where Spur prefers. + * Discard the mapping and try again delta higher. + */ + if (alloc && !VirtualFree(alloc, SizeForRelease(bytes), MEM_RELEASE)) + sqMessageBox(MB_OK | MB_ICONSTOP, TEXT("VM Warning:"), + "Unable to VirtualFree committed memory (%d bytes requested), Error: %ul", + bytes, GetLastError()); + address += delta; + } + return 0; +} + +/* Deallocate a region of memory previously allocated by + * sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto. Cannot fail. + */ +void +sqDeallocateMemorySegmentAtOfSize(void *addr, sqInt sz) +{ + if (!VirtualFree(addr, SizeForRelease(sz), MEM_RELEASE)) + sqMessageBox(MB_OK | MB_ICONSTOP, TEXT("VM Warning:"), + "Unable to VirtualFree committed memory (%d bytes requested), Error: %ul", + sz, GetLastError()); +} + +# if COGVM +void +sqMakeMemoryExecutableFromTo(unsigned long startAddr, unsigned long endAddr) +{ + DWORD previous; + + if (!VirtualProtect((void *)startAddr, + endAddr - startAddr + 1, + PAGE_EXECUTE_READWRITE, + &previous)) + perror("VirtualProtect(x,y,PAGE_EXECUTE_READWRITE)"); +} + +void +sqMakeMemoryNotExecutableFromTo(unsigned long startAddr, unsigned long endAddr) +{ + DWORD previous; + + if (!VirtualProtect((void *)startAddr, + endAddr - startAddr + 1, + PAGE_READWRITE, + &previous)) + perror("VirtualProtect(x,y,PAGE_EXECUTE_READWRITE)"); +} +# endif /* COGVM */ + +# if TEST_MEMORY + +# define MBytes *1024UL*1024UL + +BOOL fIsConsole = 1; + +int +main() +{ + char *mem; + usqInt i, t = 16 MBytes; + + mem= (char *)sqAllocateMemory(t, t); + printf("memory allocated at %p\n", mem); + *mem = 1; + /* create some roadbumps */ + for (i = 80 MBytes; i < 2048UL MBytes; i += 80 MBytes) { + void *alloc = VirtualAlloc(mem + i, pageSize, MEM_COMMIT|MEM_RESERVE, PAGE_READWRITE); + printf("roadbump created at %p (%p)\n", mem + i, alloc); + *(char *)alloc = 1; + } + for (;;) { + sqInt segsz = 0; + char *seg = sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto(32 MBytes, mem + 16 MBytes, &segsz); + if (!seg) + return 0; + *seg = 1; + t += segsz; + printf("memory extended at %p (total %ld Mb)\n", seg, t / (1 MBytes)); + } + return 0; +} +int __cdecl +sqMessageBox(DWORD dwFlags, const TCHAR *titleString, const char* fmt, ...) +{ + va_list args; + int result; + char buf[1024]; + + strcpy(buf, titleString); + strcat(buf, fmt); + strcat(buf, "\n"); + va_start(args, fmt); +#if 0 + result = vfprintf(stderr, buf, args); +#else + result = vprintf(buf, args); +#endif + va_end(args); + printLastError((char *)titleString); + return result; +} +void printLastError(TCHAR *prefix) +{ LPVOID lpMsgBuf; + DWORD lastError; + + lastError = GetLastError(); + FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, GetLastError(), MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPTSTR) &lpMsgBuf, 0, NULL ); + fprintf(stderr,TEXT("%s (%d) -- %s\n"), prefix, lastError, lpMsgBuf); + LocalFree( lpMsgBuf ); +} +# endif /* TEST_MEMORY */ +#endif /* SPURVM */ Modified: branches/Cog/platforms/win32/vm/sqWin32VMProfile.c =================================================================== --- branches/Cog/platforms/win32/vm/sqWin32VMProfile.c 2014-06-24 18:38:36 UTC (rev 3016) +++ branches/Cog/platforms/win32/vm/sqWin32VMProfile.c 2014-06-25 20:21:12 UTC (rev 3017) @@ -54,8 +54,8 @@ * entire address space. */ -extern void btext(void); -extern void etext(void); +extern void *btext(void); +extern void *etext(void); void ioProfileTextRange(void **startpc, void **endpc)

1 0

[commit][3016] Further simplification in platforms/unix/vm/sqUnixSpurMemory .c.
by commits＠squeakvm.org 24 Jun '14

24 Jun '14

Revision: 3016 Author: eliot Date: 2014-06-24 11:38:36 -0700 (Tue, 24 Jun 2014) Log Message: ----------- Further simplification in platforms/unix/vm/sqUnixSpurMemory.c. Fix snafu in platforms/unix/vm/sqUnixMemory.c. Modified Paths: -------------- branches/Cog/platforms/unix/vm/sqUnixMemory.c branches/Cog/platforms/unix/vm/sqUnixSpurMemory.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Jun 24 10:27:03 PDT 2014 + Tue Jun 24 11:38:03 PDT 2014 Modified: branches/Cog/platforms/unix/vm/sqUnixMemory.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixMemory.c 2014-06-24 17:30:28 UTC (rev 3015) +++ branches/Cog/platforms/unix/vm/sqUnixMemory.c 2014-06-24 18:38:36 UTC (rev 3016) @@ -39,7 +39,7 @@ #include "config.h" #include "debug.h" -#!if SPURVM /* Spur uses sqUnixSpurMemory.c */ +#if !SPURVM /* Spur uses sqUnixSpurMemory.c */ void *uxAllocateMemory(usqInt minHeapSize, usqInt desiredHeapSize); /* Note: Modified: branches/Cog/platforms/unix/vm/sqUnixSpurMemory.c =================================================================== --- branches/Cog/platforms/unix/vm/sqUnixSpurMemory.c 2014-06-24 17:30:28 UTC (rev 3015) +++ branches/Cog/platforms/unix/vm/sqUnixSpurMemory.c 2014-06-24 18:38:36 UTC (rev 3016) @@ -84,13 +84,13 @@ static int min(int x, int y) { return (x < y) ? x : y; } static int max(int x, int y) { return (x > y) ? x : y; } -/* answer the address of minHeapSize rounded up to page size bytes of memory. */ +/* Answer the address of minHeapSize rounded up to page size bytes of memory. */ usqInt sqAllocateMemory(usqInt minHeapSize, usqInt desiredHeapSize) { char *hint, *address, *alloc; - long bytes, allocBytes; + unsigned long alignment, allocBytes; if (pageSize) { fprintf(stderr, "sqAllocateMemory: already called\n"); @@ -101,31 +101,18 @@ hint = sbrk(0); - bytes = max(pageSize,1024*1024); - address = (char *)(((usqInt)hint + bytes - 1) & ~(bytes - 1)); - allocBytes = roundUpToPage(desiredHeapSize); + alignment = max(pageSize,1024*1024); + address = (char *)(((usqInt)hint + alignment - 1) & ~(alignment - 1)); -# if TEST_MEMORY - printf("hint at %p\n", hint); - alloc = mmap(0, allocBytes, PROT_READ | PROT_WRITE, - MAP_ANON | MAP_PRIVATE, -1, 0); - printf("mmap at %p\n", alloc); - if (alloc != MAP_FAILED) - (void)munmap(alloc, allocBytes); -# endif - - alloc = mmap(address, allocBytes, PROT_READ | PROT_WRITE, - MAP_ANON | MAP_FIXED | MAP_PRIVATE, -1, 0); - if (alloc != MAP_FAILED) - return (usqInt)alloc; - mmapErrno = errno; - perror("sqAllocateMemory initial allocation mmap"); - exit(errno); - return 0; + alloc = sqAllocateMemorySegmentOfSizeAboveAllocatedSizeInto + (roundUpToPage(desiredHeapSize), address, &allocBytes); + if (!alloc) { + fprintf(stderr, "sqAllocateMemory: initial alloc failed!\n"); + exit(errno); + } + return (usqInt)alloc; } -static long map_flags = MAP_ANON | MAP_PRIVATE; - /* Allocate a region of memory of at least size bytes, at or above minAddress. * If the attempt fails, answer null. If the attempt succeeds, answer the * start of the region and assign its size through allocatedSizePointer. @@ -204,11 +191,14 @@ # define MBytes *1024UL*1024UL -int main() +int +main() { char *mem; usqInt i, t = 16 MBytes; + printf("hint at %p\n", sbrk(0)); + mem= (char *)sqAllocateMemory(t, t); printf("memory allocated at %p\n", mem); /* create some roadbumps */

1 0

[commit][3015] Rewrite platforms/unix/vm/sqUnixSpurMemory.c to stand alone.
by commits＠squeakvm.org 24 Jun '14

24 Jun '14

Revision: 3015 Author: eliot Date: 2014-06-24 10:30:28 -0700 (Tue, 24 Jun 2014) Log Message: ----------- Rewrite platforms/unix/vm/sqUnixSpurMemory.c to stand alone. Use it in place of sqMacMemory.c with Spur on Mac OS. Now Spur can grow the heap to 2.9Gb on both linux (CentOS 5.3) and Mac OS X (10.6.8). Move the nuking of version.o from the xcodeproj (where it was inoperative) to the makevm scripts. Modified Paths: -------------- branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/newspeak.cog.spur/makevm branches/Cog/build.macos32x86/newspeak.cog.v3/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/newspeak.cog.v3/makevm branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/newspeak.stack.spur/makevm branches/Cog/build.macos32x86/newspeak.stack.v3/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/newspeak.stack.v3/makevm branches/Cog/build.macos32x86/squeak.cog.spur/CoreMTVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.cog.spur/makevm branches/Cog/build.macos32x86/squeak.cog.v3/CoreMTVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.cog.v3/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.cog.v3/makevm branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.sista.spur/makevm branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.sista.v3/makevm branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.stack.spur/makevm branches/Cog/build.macos32x86/squeak.stack.v3/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.stack.v3/makevm branches/Cog/platforms/Mac OS/vm/sqMacMemory.h branches/Cog/platforms/Mac OS/vm/sqPlatformSpecific.h branches/Cog/platforms/unix/vm/sqUnixMemory.c branches/Cog/platforms/unix/vm/sqUnixSpurMemory.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2014-06-24 02:18:33 UTC (rev 3014) +++ branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2014-06-24 17:30:28 UTC (rev 3015) @@ -112,7 +112,6 @@ 941A3B5909AA144000C9D25A /* UUIDPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFD902EB4E0A0100013C /* UUIDPlugin.h */; }; 941A3B5A09AA144000C9D25A /* sq.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFDC02EB4E0A0100013C /* sq.h */; }; 941A3B5B09AA144000C9D25A /* sqVirtualMachine.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFDF02EB4E0A0100013C /* sqVirtualMachine.h */; }; - 941A3B5C09AA144000C9D25A /* sqMacMemory.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */; }; 941A3B5D09AA144000C9D25A /* sqGnu.h in Headers */ = {isa = PBXBuildFile; fileRef = 66A8FED80300824600A80109 /* sqGnu.h */; }; 941A3B5E09AA144000C9D25A /* sqMacEncoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 9405366D057BC0EB0080D7FF /* sqMacEncoding.h */; }; 941A3B6309AA144000C9D25A /* sqMacUnixInterfaceSound.h in Headers */ = {isa = PBXBuildFile; fileRef = 94D42B2B07B2C8DC001CCA37 /* sqMacUnixInterfaceSound.h */; }; @@ -124,7 +123,7 @@ 941A3B7009AA144000C9D25A /* sqMacFileLogic.h in Headers */ = {isa = PBXBuildFile; fileRef = 948AE67B09942EF2006256FE /* sqMacFileLogic.h */; }; 941A3B7509AA144000C9D25A /* SqueakPlugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 664A73DF0300584000A80109 /* SqueakPlugin.icns */; }; 941A3B9E09AA144000C9D25A /* sqMacUUID.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE6A02EB4E0A0100013C /* sqMacUUID.c */; }; - 941A3BA109AA144000C9D25A /* sqMacMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */; }; + 941A3BA109AA144000C9D25A /* sqUnixSpurMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */; }; 941A3BA209AA144000C9D25A /* sqMacTime.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */; }; 941A3BA309AA144000C9D25A /* sqMacUIAppleEvents.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFC02EB4E0A0100013C /* sqMacUIAppleEvents.c */; }; 941A3BA409AA144000C9D25A /* sqMacUIClipBoard.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFE02EB4E0A0100013C /* sqMacUIClipBoard.c */; }; @@ -405,8 +404,7 @@ F5F8AEED02EB4E0A0100013C /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqConfig.h; sourceTree = "<group>"; }; F5F8AEF402EB4E0A0100013C /* sqMacMain.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacMain.c; sourceTree = "<group>"; }; F5F8AEF502EB4E0A0100013C /* sqMacMain.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacMain.h; sourceTree = "<group>"; }; - F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacMemory.c; sourceTree = "<group>"; }; - F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacMemory.h; sourceTree = "<group>"; }; + F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sqUnixSpurMemory.c; path = ../../platforms/unix/vm/sqUnixSpurMemory.c; sourceTree = SOURCE_ROOT; }; F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacTime.c; sourceTree = "<group>"; }; F5F8AEFB02EB4E0A0100013C /* sqMacTime.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacTime.h; sourceTree = "<group>"; }; F5F8AEFC02EB4E0A0100013C /* sqMacUIAppleEvents.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacUIAppleEvents.c; sourceTree = "<group>"; }; @@ -881,8 +879,7 @@ F5F8AEF502EB4E0A0100013C /* sqMacMain.h */, 946DD91C099015C5006BBA1E /* sqMacImageIO.c */, 946DD91D099015C5006BBA1E /* sqMacImageIO.h */, - F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */, - F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */, + F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */, F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */, F5F8AEFB02EB4E0A0100013C /* sqMacTime.h */, F5F8AEFC02EB4E0A0100013C /* sqMacUIAppleEvents.c */, @@ -1156,7 +1153,6 @@ 941A3B5909AA144000C9D25A /* UUIDPlugin.h in Headers */, 941A3B5A09AA144000C9D25A /* sq.h in Headers */, 941A3B5B09AA144000C9D25A /* sqVirtualMachine.h in Headers */, - 941A3B5C09AA144000C9D25A /* sqMacMemory.h in Headers */, 941A3B5D09AA144000C9D25A /* sqGnu.h in Headers */, 941A3B5E09AA144000C9D25A /* sqMacEncoding.h in Headers */, 941A3B6309AA144000C9D25A /* sqMacUnixInterfaceSound.h in Headers */, @@ -1276,7 +1272,7 @@ 733AC8E70FEAAE29007C6206 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; - comments = "Script deletes version.o to ensure vmBuildString is up-to-date."; + comments = "Script creates sqNamedPrims.h."; files = ( ); inputPaths = ( @@ -1285,7 +1281,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "rm -f \"$TARGET_BUILD_DIR/version.o\" \"$BUILT_PRODUCTS_DIR/version.o\" \"$TEMP_FILES_DIR/version.o\"\n$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n"; + shellScript = "$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -1295,7 +1291,7 @@ buildActionMask = 2147483647; files = ( 941A3B9E09AA144000C9D25A /* sqMacUUID.c in Sources */, - 941A3BA109AA144000C9D25A /* sqMacMemory.c in Sources */, + 941A3BA109AA144000C9D25A /* sqUnixSpurMemory.c in Sources */, 941A3BA209AA144000C9D25A /* sqMacTime.c in Sources */, 941A3BA309AA144000C9D25A /* sqMacUIAppleEvents.c in Sources */, 941A3BA409AA144000C9D25A /* sqMacUIClipBoard.c in Sources */, Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/makevm =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.spur/makevm 2014-06-24 02:18:33 UTC (rev 3014) +++ branches/Cog/build.macos32x86/newspeak.cog.spur/makevm 2014-06-24 17:30:28 UTC (rev 3015) @@ -7,6 +7,7 @@ NSD_BUILD_CONFIGURATION=Deployment XCD_BUILD_CONFIGURATION=Release DEST="Newspeak Virtual Machine.app" +OBJDIR="Newspeak Virtual Machine.build/Objects-normal/i386" CONF=FAST KEEP= @@ -52,7 +53,9 @@ test "$KEEP" = 1 || rm -rf "$DEST"/* "$DEST"/.??* # Build CoreVM using xcode -echo +echo # maddeningly xcode has no equivalent of .FORCE and if you use an Xcode script to nuke this file the build fails +echo rm \"build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\" +rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo CoreVM xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then Modified: branches/Cog/build.macos32x86/newspeak.cog.v3/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.v3/CoreVM.xcodeproj/project.pbxproj 2014-06-24 02:18:33 UTC (rev 3014) +++ branches/Cog/build.macos32x86/newspeak.cog.v3/CoreVM.xcodeproj/project.pbxproj 2014-06-24 17:30:28 UTC (rev 3015) @@ -1276,7 +1276,7 @@ 733AC8E70FEAAE29007C6206 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; - comments = "Script deletes version.o to ensure vmBuildString is up-to-date."; + comments = "Script creates sqNamedPrims.h."; files = ( ); inputPaths = ( @@ -1285,7 +1285,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "rm -f \"$TARGET_BUILD_DIR/version.o\" \"$BUILT_PRODUCTS_DIR/version.o\" \"$TEMP_FILES_DIR/version.o\"\n$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n"; + shellScript = "$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n"; }; /* End PBXShellScriptBuildPhase section */ Modified: branches/Cog/build.macos32x86/newspeak.cog.v3/makevm =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.v3/makevm 2014-06-24 02:18:33 UTC (rev 3014) +++ branches/Cog/build.macos32x86/newspeak.cog.v3/makevm 2014-06-24 17:30:28 UTC (rev 3015) @@ -7,6 +7,7 @@ NSD_BUILD_CONFIGURATION=Deployment XCD_BUILD_CONFIGURATION=Release DEST="Newspeak Virtual Machine.app" +OBJDIR="Newspeak Virtual Machine.build/Objects-normal/i386" CONF=FAST KEEP= @@ -52,7 +53,9 @@ test "$KEEP" = 1 || rm -rf "$DEST"/* "$DEST"/.??* # Build CoreVM using xcode -echo +echo # maddeningly xcode has no equivalent of .FORCE and if you use an Xcode script to nuke this file the build fails +echo rm \"build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\" +rm "build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo CoreVM xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then Modified: branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2014-06-24 02:18:33 UTC (rev 3014) +++ branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2014-06-24 17:30:28 UTC (rev 3015) @@ -107,7 +107,6 @@ 941A3B5909AA144000C9D25A /* UUIDPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFD902EB4E0A0100013C /* UUIDPlugin.h */; }; 941A3B5A09AA144000C9D25A /* sq.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFDC02EB4E0A0100013C /* sq.h */; }; 941A3B5B09AA144000C9D25A /* sqVirtualMachine.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFDF02EB4E0A0100013C /* sqVirtualMachine.h */; }; - 941A3B5C09AA144000C9D25A /* sqMacMemory.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */; }; 941A3B5D09AA144000C9D25A /* sqGnu.h in Headers */ = {isa = PBXBuildFile; fileRef = 66A8FED80300824600A80109 /* sqGnu.h */; }; 941A3B5E09AA144000C9D25A /* sqMacEncoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 9405366D057BC0EB0080D7FF /* sqMacEncoding.h */; }; 941A3B6309AA144000C9D25A /* sqMacUnixInterfaceSound.h in Headers */ = {isa = PBXBuildFile; fileRef = 94D42B2B07B2C8DC001CCA37 /* sqMacUnixInterfaceSound.h */; }; @@ -119,7 +118,7 @@ 941A3B7009AA144000C9D25A /* sqMacFileLogic.h in Headers */ = {isa = PBXBuildFile; fileRef = 948AE67B09942EF2006256FE /* sqMacFileLogic.h */; }; 941A3B7509AA144000C9D25A /* SqueakPlugin.icns in Resources */ = {isa = PBXBuildFile; fileRef = 664A73DF0300584000A80109 /* SqueakPlugin.icns */; }; 941A3B9E09AA144000C9D25A /* sqMacUUID.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE6A02EB4E0A0100013C /* sqMacUUID.c */; }; - 941A3BA109AA144000C9D25A /* sqMacMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */; }; + 941A3BA109AA144000C9D25A /* sqUnixSpurMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */; }; 941A3BA209AA144000C9D25A /* sqMacTime.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */; }; 941A3BA309AA144000C9D25A /* sqMacUIAppleEvents.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFC02EB4E0A0100013C /* sqMacUIAppleEvents.c */; }; 941A3BA409AA144000C9D25A /* sqMacUIClipBoard.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFE02EB4E0A0100013C /* sqMacUIClipBoard.c */; }; @@ -395,8 +394,7 @@ F5F8AEED02EB4E0A0100013C /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqConfig.h; sourceTree = "<group>"; }; F5F8AEF402EB4E0A0100013C /* sqMacMain.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacMain.c; sourceTree = "<group>"; }; F5F8AEF502EB4E0A0100013C /* sqMacMain.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacMain.h; sourceTree = "<group>"; }; - F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacMemory.c; sourceTree = "<group>"; }; - F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacMemory.h; sourceTree = "<group>"; }; + F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sqUnixSpurMemory.c; path = ../../platforms/unix/vm/sqUnixSpurMemory.c; sourceTree = SOURCE_ROOT; }; F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacTime.c; sourceTree = "<group>"; }; F5F8AEFB02EB4E0A0100013C /* sqMacTime.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacTime.h; sourceTree = "<group>"; }; F5F8AEFC02EB4E0A0100013C /* sqMacUIAppleEvents.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacUIAppleEvents.c; sourceTree = "<group>"; }; @@ -867,8 +865,7 @@ F5F8AEF502EB4E0A0100013C /* sqMacMain.h */, 946DD91C099015C5006BBA1E /* sqMacImageIO.c */, 946DD91D099015C5006BBA1E /* sqMacImageIO.h */, - F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */, - F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */, + F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */, F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */, F5F8AEFB02EB4E0A0100013C /* sqMacTime.h */, F5F8AEFC02EB4E0A0100013C /* sqMacUIAppleEvents.c */, @@ -1141,7 +1138,6 @@ 941A3B5909AA144000C9D25A /* UUIDPlugin.h in Headers */, 941A3B5A09AA144000C9D25A /* sq.h in Headers */, 941A3B5B09AA144000C9D25A /* sqVirtualMachine.h in Headers */, - 941A3B5C09AA144000C9D25A /* sqMacMemory.h in Headers */, 941A3B5D09AA144000C9D25A /* sqGnu.h in Headers */, 941A3B5E09AA144000C9D25A /* sqMacEncoding.h in Headers */, 941A3B6309AA144000C9D25A /* sqMacUnixInterfaceSound.h in Headers */, @@ -1257,7 +1253,7 @@ 733AC8E70FEAAE29007C6206 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; - comments = "Script deletes version.o to ensure vmBuildString is up-to-date."; + comments = "Script creates sqNamedPrims.h."; files = ( ); inputPaths = ( @@ -1266,7 +1262,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "rm -f \"$TARGET_BUILD_DIR/version.o\" \"$BUILT_PRODUCTS_DIR/version.o\" \"$TEMP_FILES_DIR/version.o\"\n$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n"; + shellScript = "$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -1276,7 +1272,7 @@ buildActionMask = 2147483647; files = ( 941A3B9E09AA144000C9D25A /* sqMacUUID.c in Sources */, - 941A3BA109AA144000C9D25A /* sqMacMemory.c in Sources */, + 941A3BA109AA144000C9D25A /* sqUnixSpurMemory.c in Sources */, 941A3BA209AA144000C9D25A /* sqMacTime.c in Sources */, 941A3BA309AA144000C9D25A /* sqMacUIAppleEvents.c in Sources */, 941A3BA409AA144000C9D25A /* sqMacUIClipBoard.c in Sources */, Modified: branches/Cog/build.macos32x86/newspeak.stack.spur/makevm =================================================================== --- branches/Cog/build.macos32x86/newspeak.stack.spur/makevm 2014-06-24 02:18:33 UTC (rev 3014) +++ branches/Cog/build.macos32x86/newspeak.stack.spur/makevm 2014-06-24 17:30:28 UTC (rev 3015) @@ -7,6 +7,7 @@ NSD_BUILD_CONFIGURATION=Deployment XCD_BUILD_CONFIGURATION=Release DEST="Newspeak Virtual Machine.app" +OBJDIR="Newspeak Virtual Machine.build/Objects-normal/i386" CONF=FAST KEEP= @@ -52,7 +53,9 @@ test "$KEEP" = 1 || rm -rf "$DEST"/* "$DEST"/.??* # Build CoreVM using xcode -echo +echo # maddeningly xcode has no equivalent of .FORCE and if you use an Xcode script to nuke this file the build fails +echo rm \"build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\" +rm "build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo CoreVM xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then Modified: branches/Cog/build.macos32x86/newspeak.stack.v3/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/newspeak.stack.v3/CoreVM.xcodeproj/project.pbxproj 2014-06-24 02:18:33 UTC (rev 3014) +++ branches/Cog/build.macos32x86/newspeak.stack.v3/CoreVM.xcodeproj/project.pbxproj 2014-06-24 17:30:28 UTC (rev 3015) @@ -1257,7 +1257,7 @@ 733AC8E70FEAAE29007C6206 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; - comments = "Script deletes version.o to ensure vmBuildString is up-to-date."; + comments = "Script creates sqNamedPrims.h."; files = ( ); inputPaths = ( @@ -1266,7 +1266,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "rm -f \"$TARGET_BUILD_DIR/version.o\" \"$BUILT_PRODUCTS_DIR/version.o\" \"$TEMP_FILES_DIR/version.o\"\n$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n"; + shellScript = "$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n"; }; /* End PBXShellScriptBuildPhase section */ Modified: branches/Cog/build.macos32x86/newspeak.stack.v3/makevm =================================================================== --- branches/Cog/build.macos32x86/newspeak.stack.v3/makevm 2014-06-24 02:18:33 UTC (rev 3014) +++ branches/Cog/build.macos32x86/newspeak.stack.v3/makevm 2014-06-24 17:30:28 UTC (rev 3015) @@ -7,6 +7,7 @@ NSD_BUILD_CONFIGURATION=Deployment XCD_BUILD_CONFIGURATION=Release DEST="Newspeak Virtual Machine.app" +OBJDIR="Newspeak Virtual Machine.build/Objects-normal/i386" CONF=FAST KEEP= @@ -52,7 +53,9 @@ test "$KEEP" = 1 || rm -rf "$DEST"/* "$DEST"/.??* # Build CoreVM using xcode -echo +echo # maddeningly xcode has no equivalent of .FORCE and if you use an Xcode script to nuke this file the build fails +echo rm \"build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\" +rm "build/CoreVM.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo CoreVM xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION xcodebuild -project CoreVM.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then Modified: branches/Cog/build.macos32x86/squeak.cog.spur/CoreMTVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/CoreMTVM.xcodeproj/project.pbxproj 2014-06-24 02:18:33 UTC (rev 3014) +++ branches/Cog/build.macos32x86/squeak.cog.spur/CoreMTVM.xcodeproj/project.pbxproj 2014-06-24 17:30:28 UTC (rev 3015) @@ -72,7 +72,6 @@ 941A3B5909AA144000C9D25A /* UUIDPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFD902EB4E0A0100013C /* UUIDPlugin.h */; }; 941A3B5A09AA144000C9D25A /* sq.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFDC02EB4E0A0100013C /* sq.h */; }; 941A3B5B09AA144000C9D25A /* sqVirtualMachine.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFDF02EB4E0A0100013C /* sqVirtualMachine.h */; }; - 941A3B5C09AA144000C9D25A /* sqMacMemory.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */; }; 941A3B5D09AA144000C9D25A /* sqGnu.h in Headers */ = {isa = PBXBuildFile; fileRef = 66A8FED80300824600A80109 /* sqGnu.h */; }; 941A3B5E09AA144000C9D25A /* sqMacEncoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 9405366D057BC0EB0080D7FF /* sqMacEncoding.h */; }; 941A3B6209AA144000C9D25A /* MacMenubarPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 940AFA4206DFD0280062E19F /* MacMenubarPlugin.h */; }; @@ -102,7 +101,7 @@ 941A3B9B09AA144000C9D25A /* sqMacJoystickAndTablet.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE3F02EB4E090100013C /* sqMacJoystickAndTablet.c */; }; 941A3B9C09AA144000C9D25A /* sqMacMIDI.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE4302EB4E090100013C /* sqMacMIDI.c */; }; 941A3B9E09AA144000C9D25A /* sqMacUUID.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE6A02EB4E0A0100013C /* sqMacUUID.c */; }; - 941A3BA109AA144000C9D25A /* sqMacMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */; }; + 941A3BA109AA144000C9D25A /* sqUnixSpurMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */; }; 941A3BA209AA144000C9D25A /* sqMacTime.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */; }; 941A3BA309AA144000C9D25A /* sqMacUIAppleEvents.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFC02EB4E0A0100013C /* sqMacUIAppleEvents.c */; }; 941A3BA409AA144000C9D25A /* sqMacUIClipBoard.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFE02EB4E0A0100013C /* sqMacUIClipBoard.c */; }; @@ -409,8 +408,7 @@ F5F8AEED02EB4E0A0100013C /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqConfig.h; sourceTree = "<group>"; }; F5F8AEF402EB4E0A0100013C /* sqMacMain.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacMain.c; sourceTree = "<group>"; }; F5F8AEF502EB4E0A0100013C /* sqMacMain.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacMain.h; sourceTree = "<group>"; }; - F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacMemory.c; sourceTree = "<group>"; }; - F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacMemory.h; sourceTree = "<group>"; }; + F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sqUnixSpurMemory.c; path = ../../platforms/unix/vm/sqUnixSpurMemory.c; sourceTree = SOURCE_ROOT; }; F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacTime.c; sourceTree = "<group>"; }; F5F8AEFB02EB4E0A0100013C /* sqMacTime.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacTime.h; sourceTree = "<group>"; }; F5F8AEFC02EB4E0A0100013C /* sqMacUIAppleEvents.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacUIAppleEvents.c; sourceTree = "<group>"; }; @@ -957,8 +955,7 @@ F5F8AEF502EB4E0A0100013C /* sqMacMain.h */, 946DD91C099015C5006BBA1E /* sqMacImageIO.c */, 946DD91D099015C5006BBA1E /* sqMacImageIO.h */, - F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */, - F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */, + F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */, 9454DFE603E1C93E00DA393B /* sqMacNSPlugin.c */, 9481DDB309B38AE3005C4088 /* sqMacNSPluginUILogic.c */, F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */, @@ -1316,7 +1313,6 @@ 941A3B5909AA144000C9D25A /* UUIDPlugin.h in Headers */, 941A3B5A09AA144000C9D25A /* sq.h in Headers */, 941A3B5B09AA144000C9D25A /* sqVirtualMachine.h in Headers */, - 941A3B5C09AA144000C9D25A /* sqMacMemory.h in Headers */, 941A3B5D09AA144000C9D25A /* sqGnu.h in Headers */, 941A3B5E09AA144000C9D25A /* sqMacEncoding.h in Headers */, 941A3B6209AA144000C9D25A /* MacMenubarPlugin.h in Headers */, @@ -1434,7 +1430,7 @@ 733AC8E70FEAAE29007C6206 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; - comments = "Script deletes version.o to ensure vmBuildString is up-to-date."; + comments = "Script creates sqNamedPrims.h."; files = ( ); inputPaths = ( @@ -1443,7 +1439,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "rm -f \"$TARGET_BUILD_DIR/version.o\" \"$BUILT_PRODUCTS_DIR/version.o\" \"$TEMP_FILES_DIR/version.o\"\n$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n"; + shellScript = "$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -1456,7 +1452,7 @@ 941A3B9B09AA144000C9D25A /* sqMacJoystickAndTablet.c in Sources */, 941A3B9C09AA144000C9D25A /* sqMacMIDI.c in Sources */, 941A3B9E09AA144000C9D25A /* sqMacUUID.c in Sources */, - 941A3BA109AA144000C9D25A /* sqMacMemory.c in Sources */, + 941A3BA109AA144000C9D25A /* sqUnixSpurMemory.c in Sources */, 941A3BA209AA144000C9D25A /* sqMacTime.c in Sources */, 941A3BA309AA144000C9D25A /* sqMacUIAppleEvents.c in Sources */, 941A3BA409AA144000C9D25A /* sqMacUIClipBoard.c in Sources */, Modified: branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2014-06-24 02:18:33 UTC (rev 3014) +++ branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2014-06-24 17:30:28 UTC (rev 3015) @@ -73,7 +73,6 @@ 941A3B5909AA144000C9D25A /* UUIDPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFD902EB4E0A0100013C /* UUIDPlugin.h */; }; 941A3B5A09AA144000C9D25A /* sq.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFDC02EB4E0A0100013C /* sq.h */; }; 941A3B5B09AA144000C9D25A /* sqVirtualMachine.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFDF02EB4E0A0100013C /* sqVirtualMachine.h */; }; - 941A3B5C09AA144000C9D25A /* sqMacMemory.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */; }; 941A3B5D09AA144000C9D25A /* sqGnu.h in Headers */ = {isa = PBXBuildFile; fileRef = 66A8FED80300824600A80109 /* sqGnu.h */; }; 941A3B5E09AA144000C9D25A /* sqMacEncoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 9405366D057BC0EB0080D7FF /* sqMacEncoding.h */; }; 941A3B6209AA144000C9D25A /* MacMenubarPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 940AFA4206DFD0280062E19F /* MacMenubarPlugin.h */; }; @@ -103,7 +102,7 @@ 941A3B9B09AA144000C9D25A /* sqMacJoystickAndTablet.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE3F02EB4E090100013C /* sqMacJoystickAndTablet.c */; }; 941A3B9C09AA144000C9D25A /* sqMacMIDI.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE4302EB4E090100013C /* sqMacMIDI.c */; }; 941A3B9E09AA144000C9D25A /* sqMacUUID.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE6A02EB4E0A0100013C /* sqMacUUID.c */; }; - 941A3BA109AA144000C9D25A /* sqMacMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */; }; + 941A3BA109AA144000C9D25A /* sqUnixSpurMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */; }; 941A3BA209AA144000C9D25A /* sqMacTime.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */; }; 941A3BA309AA144000C9D25A /* sqMacUIAppleEvents.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFC02EB4E0A0100013C /* sqMacUIAppleEvents.c */; }; 941A3BA409AA144000C9D25A /* sqMacUIClipBoard.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFE02EB4E0A0100013C /* sqMacUIClipBoard.c */; }; @@ -409,8 +408,7 @@ F5F8AEED02EB4E0A0100013C /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqConfig.h; sourceTree = "<group>"; }; F5F8AEF402EB4E0A0100013C /* sqMacMain.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacMain.c; sourceTree = "<group>"; }; F5F8AEF502EB4E0A0100013C /* sqMacMain.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacMain.h; sourceTree = "<group>"; }; - F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacMemory.c; sourceTree = "<group>"; }; - F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacMemory.h; sourceTree = "<group>"; }; + F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sqUnixSpurMemory.c; path = ../../platforms/unix/vm/sqUnixSpurMemory.c; sourceTree = SOURCE_ROOT; }; F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacTime.c; sourceTree = "<group>"; }; F5F8AEFB02EB4E0A0100013C /* sqMacTime.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacTime.h; sourceTree = "<group>"; }; F5F8AEFC02EB4E0A0100013C /* sqMacUIAppleEvents.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacUIAppleEvents.c; sourceTree = "<group>"; }; @@ -957,8 +955,7 @@ F5F8AEF502EB4E0A0100013C /* sqMacMain.h */, 946DD91C099015C5006BBA1E /* sqMacImageIO.c */, 946DD91D099015C5006BBA1E /* sqMacImageIO.h */, - F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */, - F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */, + F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */, 9454DFE603E1C93E00DA393B /* sqMacNSPlugin.c */, 9481DDB309B38AE3005C4088 /* sqMacNSPluginUILogic.c */, F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */, @@ -1316,7 +1313,6 @@ 941A3B5909AA144000C9D25A /* UUIDPlugin.h in Headers */, 941A3B5A09AA144000C9D25A /* sq.h in Headers */, 941A3B5B09AA144000C9D25A /* sqVirtualMachine.h in Headers */, - 941A3B5C09AA144000C9D25A /* sqMacMemory.h in Headers */, 941A3B5D09AA144000C9D25A /* sqGnu.h in Headers */, 941A3B5E09AA144000C9D25A /* sqMacEncoding.h in Headers */, 941A3B6209AA144000C9D25A /* MacMenubarPlugin.h in Headers */, @@ -1434,7 +1430,7 @@ 733AC8E70FEAAE29007C6206 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; - comments = "Script deletes version.o to ensure vmBuildString is up-to-date."; + comments = "Script creates sqNamedPrims.h."; files = ( ); inputPaths = ( @@ -1443,7 +1439,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "rm -f \"$TARGET_BUILD_DIR/version.o\" \"$BUILT_PRODUCTS_DIR/version.o\" \"$TEMP_FILES_DIR/version.o\"\n$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n"; + shellScript = "$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -1456,7 +1452,7 @@ 941A3B9B09AA144000C9D25A /* sqMacJoystickAndTablet.c in Sources */, 941A3B9C09AA144000C9D25A /* sqMacMIDI.c in Sources */, 941A3B9E09AA144000C9D25A /* sqMacUUID.c in Sources */, - 941A3BA109AA144000C9D25A /* sqMacMemory.c in Sources */, + 941A3BA109AA144000C9D25A /* sqUnixSpurMemory.c in Sources */, 941A3BA209AA144000C9D25A /* sqMacTime.c in Sources */, 941A3BA309AA144000C9D25A /* sqMacUIAppleEvents.c in Sources */, 941A3BA409AA144000C9D25A /* sqMacUIClipBoard.c in Sources */, Modified: branches/Cog/build.macos32x86/squeak.cog.spur/makevm =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/makevm 2014-06-24 02:18:33 UTC (rev 3014) +++ branches/Cog/build.macos32x86/squeak.cog.spur/makevm 2014-06-24 17:30:28 UTC (rev 3015) @@ -7,6 +7,7 @@ NSD_BUILD_CONFIGURATION=Deployment XCD_BUILD_CONFIGURATION=Release APP=Squeak.app +OBJDIR=Squeak.build/Objects-normal/i386 VMAPP=".app" DEST="Squeak" VMXCP=CoreVM @@ -58,7 +59,9 @@ test "$KEEP" = 1 || rm -rf "$DEST"/* "$DEST"/.??* # Build CoreVM/CoreMTVM using xcode -echo +echo # maddeningly xcode has no equivalent of .FORCE and if you use an Xcode script to nuke this file the build fails +echo rm \"build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\" +rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo $VMXCP xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then Modified: branches/Cog/build.macos32x86/squeak.cog.v3/CoreMTVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.v3/CoreMTVM.xcodeproj/project.pbxproj 2014-06-24 02:18:33 UTC (rev 3014) +++ branches/Cog/build.macos32x86/squeak.cog.v3/CoreMTVM.xcodeproj/project.pbxproj 2014-06-24 17:30:28 UTC (rev 3015) @@ -1434,7 +1434,7 @@ 733AC8E70FEAAE29007C6206 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; - comments = "Script deletes version.o to ensure vmBuildString is up-to-date."; + comments = "Script creates sqNamedPrims.h."; files = ( ); inputPaths = ( @@ -1443,7 +1443,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "rm -f \"$TARGET_BUILD_DIR/version.o\" \"$BUILT_PRODUCTS_DIR/version.o\" \"$TEMP_FILES_DIR/version.o\"\n$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n"; + shellScript = "$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n"; }; /* End PBXShellScriptBuildPhase section */ Modified: branches/Cog/build.macos32x86/squeak.cog.v3/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.v3/CoreVM.xcodeproj/project.pbxproj 2014-06-24 02:18:33 UTC (rev 3014) +++ branches/Cog/build.macos32x86/squeak.cog.v3/CoreVM.xcodeproj/project.pbxproj 2014-06-24 17:30:28 UTC (rev 3015) @@ -1436,7 +1436,7 @@ 733AC8E70FEAAE29007C6206 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; - comments = "Script deletes version.o to ensure vmBuildString is up-to-date."; + comments = "Script creates sqNamedPrims.h."; files = ( ); inputPaths = ( @@ -1445,7 +1445,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "rm -f \"$TARGET_BUILD_DIR/version.o\" \"$BUILT_PRODUCTS_DIR/version.o\" \"$TEMP_FILES_DIR/version.o\"\n$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n"; + shellScript = "$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n"; }; /* End PBXShellScriptBuildPhase section */ Modified: branches/Cog/build.macos32x86/squeak.cog.v3/makevm =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.v3/makevm 2014-06-24 02:18:33 UTC (rev 3014) +++ branches/Cog/build.macos32x86/squeak.cog.v3/makevm 2014-06-24 17:30:28 UTC (rev 3015) @@ -7,6 +7,7 @@ NSD_BUILD_CONFIGURATION=Deployment XCD_BUILD_CONFIGURATION=Release APP=Squeak.app +OBJDIR=Squeak.build/Objects-normal/i386 VMAPP=".app" DEST="Squeak" VMXCP=CoreVM @@ -58,7 +59,9 @@ test "$KEEP" = 1 || rm -rf "$DEST"/* "$DEST"/.??* # Build CoreVM/CoreMTVM using xcode -echo +echo # maddeningly xcode has no equivalent of .FORCE and if you use an Xcode script to nuke this file the build fails +echo rm \"build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\" +rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo $VMXCP xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then @@ -123,11 +126,5 @@ rm -rf "$DEST/Contents/Resources/UnixOSProcessPlugin.bundle" cp -R UnixOSProcessPlugin/build/$XCD_BUILD_CONFIGURATION/UnixOSProcessPlugin.bundle "$DEST/Contents/Resources" -# Build the UnixOSProcessPlugin -echo UnixOSProcessPlugin xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj -xcodebuild -configuration $XCD_BUILD_CONFIGURATION -project UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj -rm -rf "$DEST/Contents/Resources/UnixOSProcessPlugin.bundle" -cp -R UnixOSProcessPlugin/build/$XCD_BUILD_CONFIGURATION/UnixOSProcessPlugin.bundle "$DEST/Contents/Resources" - # Clean out any .svn directories (result of copying) in the VM find "$DEST" -name .svn -exec rm -rf {} \; Modified: branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.xcodeproj/project.pbxproj 2014-06-24 02:18:33 UTC (rev 3014) +++ branches/Cog/build.macos32x86/squeak.sista.spur/CoreVM.xcodeproj/project.pbxproj 2014-06-24 17:30:28 UTC (rev 3015) @@ -73,7 +73,6 @@ 941A3B5909AA144000C9D25A /* UUIDPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFD902EB4E0A0100013C /* UUIDPlugin.h */; }; 941A3B5A09AA144000C9D25A /* sq.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFDC02EB4E0A0100013C /* sq.h */; }; 941A3B5B09AA144000C9D25A /* sqVirtualMachine.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFDF02EB4E0A0100013C /* sqVirtualMachine.h */; }; - 941A3B5C09AA144000C9D25A /* sqMacMemory.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */; }; 941A3B5D09AA144000C9D25A /* sqGnu.h in Headers */ = {isa = PBXBuildFile; fileRef = 66A8FED80300824600A80109 /* sqGnu.h */; }; 941A3B5E09AA144000C9D25A /* sqMacEncoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 9405366D057BC0EB0080D7FF /* sqMacEncoding.h */; }; 941A3B6209AA144000C9D25A /* MacMenubarPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 940AFA4206DFD0280062E19F /* MacMenubarPlugin.h */; }; @@ -103,7 +102,7 @@ 941A3B9B09AA144000C9D25A /* sqMacJoystickAndTablet.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE3F02EB4E090100013C /* sqMacJoystickAndTablet.c */; }; 941A3B9C09AA144000C9D25A /* sqMacMIDI.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE4302EB4E090100013C /* sqMacMIDI.c */; }; 941A3B9E09AA144000C9D25A /* sqMacUUID.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE6A02EB4E0A0100013C /* sqMacUUID.c */; }; - 941A3BA109AA144000C9D25A /* sqMacMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */; }; + 941A3BA109AA144000C9D25A /* sqUnixSpurMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */; }; 941A3BA209AA144000C9D25A /* sqMacTime.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */; }; 941A3BA309AA144000C9D25A /* sqMacUIAppleEvents.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFC02EB4E0A0100013C /* sqMacUIAppleEvents.c */; }; 941A3BA409AA144000C9D25A /* sqMacUIClipBoard.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFE02EB4E0A0100013C /* sqMacUIClipBoard.c */; }; @@ -409,8 +408,7 @@ F5F8AEED02EB4E0A0100013C /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqConfig.h; sourceTree = "<group>"; }; F5F8AEF402EB4E0A0100013C /* sqMacMain.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacMain.c; sourceTree = "<group>"; }; F5F8AEF502EB4E0A0100013C /* sqMacMain.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacMain.h; sourceTree = "<group>"; }; - F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacMemory.c; sourceTree = "<group>"; }; - F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacMemory.h; sourceTree = "<group>"; }; + F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sqUnixSpurMemory.c; path = ../../platforms/unix/vm/sqUnixSpurMemory.c; sourceTree = SOURCE_ROOT; }; F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacTime.c; sourceTree = "<group>"; }; F5F8AEFB02EB4E0A0100013C /* sqMacTime.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacTime.h; sourceTree = "<group>"; }; F5F8AEFC02EB4E0A0100013C /* sqMacUIAppleEvents.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacUIAppleEvents.c; sourceTree = "<group>"; }; @@ -957,8 +955,7 @@ F5F8AEF502EB4E0A0100013C /* sqMacMain.h */, 946DD91C099015C5006BBA1E /* sqMacImageIO.c */, 946DD91D099015C5006BBA1E /* sqMacImageIO.h */, - F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */, - F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */, + F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */, 9454DFE603E1C93E00DA393B /* sqMacNSPlugin.c */, 9481DDB309B38AE3005C4088 /* sqMacNSPluginUILogic.c */, F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */, @@ -1316,7 +1313,6 @@ 941A3B5909AA144000C9D25A /* UUIDPlugin.h in Headers */, 941A3B5A09AA144000C9D25A /* sq.h in Headers */, 941A3B5B09AA144000C9D25A /* sqVirtualMachine.h in Headers */, - 941A3B5C09AA144000C9D25A /* sqMacMemory.h in Headers */, 941A3B5D09AA144000C9D25A /* sqGnu.h in Headers */, 941A3B5E09AA144000C9D25A /* sqMacEncoding.h in Headers */, 941A3B6209AA144000C9D25A /* MacMenubarPlugin.h in Headers */, @@ -1434,7 +1430,7 @@ 733AC8E70FEAAE29007C6206 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; - comments = "Script deletes version.o to ensure vmBuildString is up-to-date."; + comments = "Script creates sqNamedPrims.h."; files = ( ); inputPaths = ( @@ -1443,7 +1439,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "rm -f \"$TARGET_BUILD_DIR/version.o\" \"$BUILT_PRODUCTS_DIR/version.o\" \"$TEMP_FILES_DIR/version.o\"\n$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n"; + shellScript = "$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -1456,7 +1452,7 @@ 941A3B9B09AA144000C9D25A /* sqMacJoystickAndTablet.c in Sources */, 941A3B9C09AA144000C9D25A /* sqMacMIDI.c in Sources */, 941A3B9E09AA144000C9D25A /* sqMacUUID.c in Sources */, - 941A3BA109AA144000C9D25A /* sqMacMemory.c in Sources */, + 941A3BA109AA144000C9D25A /* sqUnixSpurMemory.c in Sources */, 941A3BA209AA144000C9D25A /* sqMacTime.c in Sources */, 941A3BA309AA144000C9D25A /* sqMacUIAppleEvents.c in Sources */, 941A3BA409AA144000C9D25A /* sqMacUIClipBoard.c in Sources */, Modified: branches/Cog/build.macos32x86/squeak.sista.spur/makevm =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.spur/makevm 2014-06-24 02:18:33 UTC (rev 3014) +++ branches/Cog/build.macos32x86/squeak.sista.spur/makevm 2014-06-24 17:30:28 UTC (rev 3015) @@ -7,6 +7,7 @@ NSD_BUILD_CONFIGURATION=Deployment XCD_BUILD_CONFIGURATION=Release APP=Squeak.app +OBJDIR=Squeak.build/Objects-normal/i386 VMAPP=".app" DEST="Squeak" VMXCP=CoreVM @@ -58,7 +59,9 @@ test "$KEEP" = 1 || rm -rf "$DEST"/* "$DEST"/.??* # Build CoreVM/CoreMTVM using xcode -echo +echo # maddeningly xcode has no equivalent of .FORCE and if you use an Xcode script to nuke this file the build fails +echo rm \"build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\" +rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo $VMXCP xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then Modified: branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.xcodeproj/project.pbxproj 2014-06-24 02:18:33 UTC (rev 3014) +++ branches/Cog/build.macos32x86/squeak.sista.v3/CoreVM.xcodeproj/project.pbxproj 2014-06-24 17:30:28 UTC (rev 3015) @@ -1434,7 +1434,7 @@ 733AC8E70FEAAE29007C6206 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; - comments = "Script deletes version.o to ensure vmBuildString is up-to-date."; + comments = "Script creates sqNamedPrims.h."; files = ( ); inputPaths = ( @@ -1443,7 +1443,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "rm -f \"$TARGET_BUILD_DIR/version.o\" \"$BUILT_PRODUCTS_DIR/version.o\" \"$TEMP_FILES_DIR/version.o\"\n$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n"; + shellScript = "$SRCROOT/mkNamedPrims.sh $SRCROOT/plugins.int >$SRCROOT/sqNamedPrims.h\n"; }; /* End PBXShellScriptBuildPhase section */ Modified: branches/Cog/build.macos32x86/squeak.sista.v3/makevm =================================================================== --- branches/Cog/build.macos32x86/squeak.sista.v3/makevm 2014-06-24 02:18:33 UTC (rev 3014) +++ branches/Cog/build.macos32x86/squeak.sista.v3/makevm 2014-06-24 17:30:28 UTC (rev 3015) @@ -7,6 +7,7 @@ NSD_BUILD_CONFIGURATION=Deployment XCD_BUILD_CONFIGURATION=Release APP=Squeak.app +OBJDIR=Squeak.build/Objects-normal/i386 VMAPP=".app" DEST="Squeak" VMXCP=CoreVM @@ -58,7 +59,9 @@ test "$KEEP" = 1 || rm -rf "$DEST"/* "$DEST"/.??* # Build CoreVM/CoreMTVM using xcode -echo +echo # maddeningly xcode has no equivalent of .FORCE and if you use an Xcode script to nuke this file the build fails +echo rm \"build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o\" +rm "build/$VMXCP.build/$BUILD_CONFIGURATION/$OBJDIR/version.o" echo $VMXCP xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION xcodebuild -project $VMXCP.xcodeproj -configuration $BUILD_CONFIGURATION if [ -d "$DEST" ]; then Modified: branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2014-06-24 02:18:33 UTC (rev 3014) +++ branches/Cog/build.macos32x86/squeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2014-06-24 17:30:28 UTC (rev 3015) @@ -68,7 +68,6 @@ 941A3B5909AA144000C9D25A /* UUIDPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFD902EB4E0A0100013C /* UUIDPlugin.h */; }; 941A3B5A09AA144000C9D25A /* sq.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFDC02EB4E0A0100013C /* sq.h */; }; 941A3B5B09AA144000C9D25A /* sqVirtualMachine.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AFDF02EB4E0A0100013C /* sqVirtualMachine.h */; }; - 941A3B5C09AA144000C9D25A /* sqMacMemory.h in Headers */ = {isa = PBXBuildFile; fileRef = F5F8AEF702EB4E0A0100013C /* sqMacMemory.h */; }; 941A3B5D09AA144000C9D25A /* sqGnu.h in Headers */ = {isa = PBXBuildFile; fileRef = 66A8FED80300824600A80109 /* sqGnu.h */; }; 941A3B5E09AA144000C9D25A /* sqMacEncoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 9405366D057BC0EB0080D7FF /* sqMacEncoding.h */; }; 941A3B6209AA144000C9D25A /* MacMenubarPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 940AFA4206DFD0280062E19F /* MacMenubarPlugin.h */; }; @@ -98,7 +97,7 @@ 941A3B9B09AA144000C9D25A /* sqMacJoystickAndTablet.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE3F02EB4E090100013C /* sqMacJoystickAndTablet.c */; }; 941A3B9C09AA144000C9D25A /* sqMacMIDI.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE4302EB4E090100013C /* sqMacMIDI.c */; }; 941A3B9E09AA144000C9D25A /* sqMacUUID.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AE6A02EB4E0A0100013C /* sqMacUUID.c */; }; - 941A3BA109AA144000C9D25A /* sqMacMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF602EB4E0A0100013C /* sqMacMemory.c */; }; + 941A3BA109AA144000C9D25A /* sqUnixSpurMemory.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEF602EB4E0A0100013C /* sqUnixSpurMemory.c */; }; 941A3BA209AA144000C9D25A /* sqMacTime.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFA02EB4E0A0100013C /* sqMacTime.c */; }; 941A3BA309AA144000C9D25A /* sqMacUIAppleEvents.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFC02EB4E0A0100013C /* sqMacUIAppleEvents.c */; }; 941A3BA409AA144000C9D25A /* sqMacUIClipBoard.c in Sources */ = {isa = PBXBuildFile; fileRef = F5F8AEFE02EB4E0A0100013C /* sqMacUIClipBoard.c */; }; @@ -399,8 +398,7 @@ F5F8AEED02EB4E0A0100013C /* sqConfig.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqConfig.h; sourceTree = "<group>"; }; F5F8AEF402EB4E0A0100013C /* sqMacMain.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqMacMain.c; sourceTree = "<group>"; }; F5F8AEF502EB4E0A0100013C /* sqMacMain.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = sqMacMain.h; sourceTree = "<group>"; }; @@ Diff output truncated at 50000 characters. @@

1 0

← Newer
1
2
3
4
5
6
7
...
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