Vm-dev July 2014

vm-dev@lists.squeakfoundation.org

22 participants
157 discussions

What is the term for vm-display-null, vm-sound-ALSA etc??
by gettimothy 18 Jul '14

18 Jul '14

Hi All. For CMake I need the proper term to refer to things like the following: ^#( 'vm-display-Quartz' 'vm-display-X11' 'vm-display-custom' 'vm-display-fbdev' 'vm-display-null' 'vm-sound-ALSA' 'vm-sound-MacOSX' 'vm-sound-NAS' 'vm-sound-OSS' 'vm-sound-Sun' 'vm-sound-custom' 'vm-sound-null' ) currently the term VMDriver is used. Is this correct? Reason for asking is I want the wrapper class for these things to reflect the correct terminology. thx. tty

5 8

VM Maker: CMakeVMMakerSqueak-tty.90.mcz
by commits＠source.squeak.org 18 Jul '14

18 Jul '14

Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.90.mcz ==================== Summary ==================== Name: CMakeVMMakerSqueak-tty.90 Author: tty Time: 17 July 2014, 8:09:42.532 pm UUID: 2d37bd0f-f980-4488-ac98-ee0e48339d72 Ancestors: CMakeVMMakerSqueak-tty.89 vmDrivers: becomes vmPlugins because turtles* are our friends *turtles are consistent naming conventions, as in "turtles all the way down" =============== Diff against CMakeVMMakerSqueak-tty.89 =============== Item was changed: SystemOrganization addCategory: #CMakeVMMakerSqueak! SystemOrganization addCategory: #'CMakeVMMakerSqueak-Android'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-BSD32x86'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-Builder'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-CMakeCompositeTemplates'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-CMakeCustomTemplates'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-CMakeTemplates'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-Help'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-IA32-Bochs'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-IOS'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-Libs'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-Linux32ARMv6'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-Linux32x86'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-Linux64X86-32BitCompatibility'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-LinuxX86-64'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-MacOSPowerPC'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-MacOSX32x86'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-SunOS32x86'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-Tests'! + SystemOrganization addCategory: #'CMakeVMMakerSqueak-VMPlugins'! - SystemOrganization addCategory: #'CMakeVMMakerSqueak-VMDriver'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-Win32x86'! Item was changed: + CMakeVMPlugin subclass: #CMakeVMDisplayCustom - CMakeVMDriverWrapper subclass: #CMakeVMDisplayCustom instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' + category: 'CMakeVMMakerSqueak-VMPlugins'! - category: 'CMakeVMMakerSqueak-VMDriver'! Item was changed: + CMakeVMPlugin subclass: #CMakeVMDisplayFbdev - CMakeVMDriverWrapper subclass: #CMakeVMDisplayFbdev instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' + category: 'CMakeVMMakerSqueak-VMPlugins'! - category: 'CMakeVMMakerSqueak-VMDriver'! Item was changed: + CMakeVMPlugin subclass: #CMakeVMDisplayNull - CMakeVMDriverWrapper subclass: #CMakeVMDisplayNull instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' + category: 'CMakeVMMakerSqueak-VMPlugins'! - category: 'CMakeVMMakerSqueak-VMDriver'! Item was changed: + CMakeVMPlugin subclass: #CMakeVMDisplayQuartz - CMakeVMDriverWrapper subclass: #CMakeVMDisplayQuartz instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' + category: 'CMakeVMMakerSqueak-VMPlugins'! - category: 'CMakeVMMakerSqueak-VMDriver'! Item was changed: + CMakeVMPlugin subclass: #CMakeVMDisplayX11 - CMakeVMDriverWrapper subclass: #CMakeVMDisplayX11 instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' + category: 'CMakeVMMakerSqueak-VMPlugins'! - category: 'CMakeVMMakerSqueak-VMDriver'! Item was removed: - Object subclass: #CMakeVMDriverWrapper - instanceVariableNames: 'driver sources compilerdefinitions compilerflags externallibraries linkerflags includedirectories' - classVariableNames: '' - poolDictionaries: '' - category: 'CMakeVMMakerSqueak-VMDriver'! - - !CMakeVMDriverWrapper commentStamp: 'tty 7/17/2014 13:41' prior: 0! - A CMakeVMDriverWrapper is a data bucket for things like: - - 'vm-display-Quartz' - 'vm-display-X11' - 'vm-display-custom' - 'vm-display-fbdev' - 'vm-display-null' - 'vm-sound-ALSA' - 'vm-sound-MacOSX' - 'vm-sound-NAS' - 'vm-sound-OSS' - 'vm-sound-Sun' - 'vm-sound-custom' - 'vm-sound-null' - - - ! Item was removed: - ----- Method: CMakeVMDriverWrapper>>compilerdefinitions (in category 'accessing') ----- - compilerdefinitions - - ^ compilerdefinitions! Item was removed: - ----- Method: CMakeVMDriverWrapper>>compilerdefinitions: (in category 'accessing') ----- - compilerdefinitions: anObject - - compilerdefinitions := anObject! Item was removed: - ----- Method: CMakeVMDriverWrapper>>compilerflags (in category 'accessing') ----- - compilerflags - - ^ compilerflags! Item was removed: - ----- Method: CMakeVMDriverWrapper>>compilerflags: (in category 'accessing') ----- - compilerflags: anObject - - compilerflags := anObject! Item was removed: - ----- Method: CMakeVMDriverWrapper>>driver (in category 'accessing') ----- - driver - - ^ driver! Item was removed: - ----- Method: CMakeVMDriverWrapper>>driver: (in category 'accessing') ----- - driver: anObject - - driver := anObject! Item was removed: - ----- Method: CMakeVMDriverWrapper>>driver:sources:compilerdefinitions:compilerflags:externallibraries:linkerflags:includedirectories: (in category 'accessing') ----- - driver:dString sources:sCollection compilerdefinitions: cdCollection compilerflags: cfCollection externallibraries:elCollection linkerflags: lfCollection includedirectories: idCollection - driver:= dString. - sources:= sCollection. - compilerdefinitions:= cdCollection. - compilerflags:= cfCollection. - externallibraries := elCollection. - linkerflags:= lfCollection. - includedirectories := idCollection.! Item was removed: - ----- Method: CMakeVMDriverWrapper>>externallibraries (in category 'accessing') ----- - externallibraries - - ^ externallibraries! Item was removed: - ----- Method: CMakeVMDriverWrapper>>externallibraries: (in category 'accessing') ----- - externallibraries: anObject - - externallibraries := anObject! Item was removed: - ----- Method: CMakeVMDriverWrapper>>includedirectories (in category 'accessing') ----- - includedirectories - - ^ includedirectories! Item was removed: - ----- Method: CMakeVMDriverWrapper>>includedirectories: (in category 'accessing') ----- - includedirectories: anObject - - includedirectories := anObject! Item was removed: - ----- Method: CMakeVMDriverWrapper>>initialize (in category 'initialize-release') ----- - initialize - "force CPlatformConfigurations to set my internal state explicitly by filling me with initial nonsense values" - sources := OrderedCollection with: 'sources' with: 'paths'. - compilerdefinitions := OrderedCollection with:'-DCompiler' with: '-DDefinitions'. - compilerflags := OrderedCollection with:'-compiler' with: '-flags'. - externallibraries := OrderedCollection with:'cxternal'with:'library'. - linkerflags := OrderedCollection with:'linker' with:'flags'. - includedirectories := OrderedCollection with:'include' with:'directories'.! Item was removed: - ----- Method: CMakeVMDriverWrapper>>linkerflags (in category 'accessing') ----- - linkerflags - - ^ linkerflags! Item was removed: - ----- Method: CMakeVMDriverWrapper>>linkerflags: (in category 'accessing') ----- - linkerflags: anObject - - linkerflags := anObject! Item was removed: - ----- Method: CMakeVMDriverWrapper>>sources (in category 'accessing') ----- - sources - - ^ sources! Item was removed: - ----- Method: CMakeVMDriverWrapper>>sources: (in category 'accessing') ----- - sources: anObject - - sources := anObject! Item was changed: ----- Method: CMakeVMGeneratorForSqueak>>generateByTemplate (in category 'code generation') ----- generateByTemplate "attempt to move way from string based writing to template based. Think Seaside renderOn composition" | extPlugins intPlugins | self flag: 'tty'. "refactor so that the cascade reflects CMake terminilogy" output := String new writeStream. config templates: OrderedCollection new. config setGlobalOptions: self; cmakePrefixPath; cmakeIncludePath; cmakeLibraryPath; cmakeIncludeModules; cmakeCFlags; cmakeAddDefinitions; cmakeSharedLinkerFlags; setGlobalOptionsAfterDetermineSystem: self; setDirectories: self; cmakeIncludeDirectories: self; preferredIncludes; standardIncludes; extraVMSettings: self; setCoreSources: self; setPlatformSources: self; setCrossSources: self; setExtraSources; cmakeSetSourceFilesProperties; cmakeListAppend:'LINKLIBS' elements: (config externalLibs); cmakeAddExecutableNameOptionSource: self; setExecutableOutputPath; + addVMPlugins: self. - addVMDrivers: self. " self addVMDrivers: aMaker. " config templates do: [:each | self puts: each content]. extPlugins := self generatePluginConfigs: config internalPlugins internal: true. intPlugins := self generatePluginConfigs: config externalPlugins internal: false. self processThirdpartyLibraries. self processPlugins: intPlugins, extPlugins. " config setExtraTargetProperties: self." self cmd: 'target_link_libraries' params: self moduleName , ' ${LINKLIBS}'. config postBuildActions: self.. self saveFile. self generateBuildScript! Item was changed: ----- Method: CMakeVMMakerSqueakUnixConfigTest>>testAddVMDrivers (in category 'as yet unclassified') ----- testAddVMDrivers self flag:'tty'. "Is the self shouldnt sufficient?" #( #SqueakUnixConfig ) 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 addVMPlugins: vmGenerator] raise: Error]]]]. - self shouldnt: [o addVMDrivers: vmGenerator] raise: Error]]]]. ! Item was added: + Object subclass: #CMakeVMPlugin + instanceVariableNames: 'driver sources compilerdefinitions compilerflags externallibraries linkerflags includedirectories' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-VMPlugins'! + + !CMakeVMPlugin commentStamp: 'tty 7/17/2014 19:53' prior: 0! + A CMakeVMPlugin is a data bucket for things like: + + 'vm-display-Quartz' + 'vm-display-X11' + 'vm-display-custom' + 'vm-display-fbdev' + 'vm-display-null' + 'vm-sound-ALSA' + 'vm-sound-MacOSX' + 'vm-sound-NAS' + 'vm-sound-OSS' + 'vm-sound-Sun' + 'vm-sound-custom' + 'vm-sound-null' + + + + + ! Item was added: + ----- Method: CMakeVMPlugin>>compilerdefinitions (in category 'accessing') ----- + compilerdefinitions + + ^ compilerdefinitions! Item was added: + ----- Method: CMakeVMPlugin>>compilerdefinitions: (in category 'accessing') ----- + compilerdefinitions: anObject + + compilerdefinitions := anObject! Item was added: + ----- Method: CMakeVMPlugin>>compilerflags (in category 'accessing') ----- + compilerflags + + ^ compilerflags! Item was added: + ----- Method: CMakeVMPlugin>>compilerflags: (in category 'accessing') ----- + compilerflags: anObject + + compilerflags := anObject! Item was added: + ----- Method: CMakeVMPlugin>>driver (in category 'accessing') ----- + driver + + ^ driver! Item was added: + ----- Method: CMakeVMPlugin>>driver: (in category 'accessing') ----- + driver: anObject + + driver := anObject! Item was added: + ----- Method: CMakeVMPlugin>>driver:sources:compilerdefinitions:compilerflags:externallibraries:linkerflags:includedirectories: (in category 'accessing') ----- + driver:dString sources:sCollection compilerdefinitions: cdCollection compilerflags: cfCollection externallibraries:elCollection linkerflags: lfCollection includedirectories: idCollection + driver:= dString. + sources:= sCollection. + compilerdefinitions:= cdCollection. + compilerflags:= cfCollection. + externallibraries := elCollection. + linkerflags:= lfCollection. + includedirectories := idCollection.! Item was added: + ----- Method: CMakeVMPlugin>>externallibraries (in category 'accessing') ----- + externallibraries + + ^ externallibraries! Item was added: + ----- Method: CMakeVMPlugin>>externallibraries: (in category 'accessing') ----- + externallibraries: anObject + + externallibraries := anObject! Item was added: + ----- Method: CMakeVMPlugin>>includedirectories (in category 'accessing') ----- + includedirectories + + ^ includedirectories! Item was added: + ----- Method: CMakeVMPlugin>>includedirectories: (in category 'accessing') ----- + includedirectories: anObject + + includedirectories := anObject! Item was added: + ----- Method: CMakeVMPlugin>>initialize (in category 'initialize-release') ----- + initialize + "force CPlatformConfigurations to set my internal state explicitly by filling me with initial nonsense values" + sources := OrderedCollection with: 'sources' with: 'paths'. + compilerdefinitions := OrderedCollection with:'-DCompiler' with: '-DDefinitions'. + compilerflags := OrderedCollection with:'-compiler' with: '-flags'. + externallibraries := OrderedCollection with:'cxternal'with:'library'. + linkerflags := OrderedCollection with:'linker' with:'flags'. + includedirectories := OrderedCollection with:'include' with:'directories'.! Item was added: + ----- Method: CMakeVMPlugin>>linkerflags (in category 'accessing') ----- + linkerflags + + ^ linkerflags! Item was added: + ----- Method: CMakeVMPlugin>>linkerflags: (in category 'accessing') ----- + linkerflags: anObject + + linkerflags := anObject! Item was added: + ----- Method: CMakeVMPlugin>>sources (in category 'accessing') ----- + sources + + ^ sources! Item was added: + ----- Method: CMakeVMPlugin>>sources: (in category 'accessing') ----- + sources: anObject + + sources := anObject! Item was changed: + CMakeVMPlugin subclass: #CMakeVMSoundALSA - CMakeVMDriverWrapper subclass: #CMakeVMSoundALSA instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' + category: 'CMakeVMMakerSqueak-VMPlugins'! - category: 'CMakeVMMakerSqueak-VMDriver'! Item was changed: + CMakeVMPlugin subclass: #CMakeVMSoundCustom - CMakeVMDriverWrapper subclass: #CMakeVMSoundCustom instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' + category: 'CMakeVMMakerSqueak-VMPlugins'! - category: 'CMakeVMMakerSqueak-VMDriver'! Item was changed: + CMakeVMPlugin subclass: #CMakeVMSoundMacOSX - CMakeVMDriverWrapper subclass: #CMakeVMSoundMacOSX instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' + category: 'CMakeVMMakerSqueak-VMPlugins'! - category: 'CMakeVMMakerSqueak-VMDriver'! Item was changed: + CMakeVMPlugin subclass: #CMakeVMSoundNAS - CMakeVMDriverWrapper subclass: #CMakeVMSoundNAS instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' + category: 'CMakeVMMakerSqueak-VMPlugins'! - category: 'CMakeVMMakerSqueak-VMDriver'! Item was changed: + CMakeVMPlugin subclass: #CMakeVMSoundNull - CMakeVMDriverWrapper subclass: #CMakeVMSoundNull instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' + category: 'CMakeVMMakerSqueak-VMPlugins'! - category: 'CMakeVMMakerSqueak-VMDriver'! Item was changed: + CMakeVMPlugin subclass: #CMakeVMSoundOSS - CMakeVMDriverWrapper subclass: #CMakeVMSoundOSS instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' + category: 'CMakeVMMakerSqueak-VMPlugins'! - category: 'CMakeVMMakerSqueak-VMDriver'! Item was changed: + CMakeVMPlugin subclass: #CMakeVMSoundSun - CMakeVMDriverWrapper subclass: #CMakeVMSoundSun instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' + category: 'CMakeVMMakerSqueak-VMPlugins'! - category: 'CMakeVMMakerSqueak-VMDriver'! Item was changed: ----- Method: CPlatformConfigForSqueak>>addVMDrivers: (in category 'cmake buildType redirects') ----- addVMDrivers: aMaker + "CMakeVMMaker compat" + self deprecated:'CMakeVMMaker holdover from pharo. use addVMPlugins: aMaker'. + ^self addVMPlugins: aMaker - "Route this message send to the message appropriate for my buildType " - |d | - d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. - d - at: #build put: [self addVMDriversBuild: aMaker]; - at: #buildAssert put: [self addVMDriversBuildAssert: aMaker]; - at: #buildAssertITimerHeartbeat put: [self addVMDriversBuildAssertITimerHeartbeat: aMaker]; - at:#buildDebug put: [self addVMDriversBuildDebug: aMaker]; - at: #buildDebugITimerHeartbeat put: [self addVMDriversBuildDebugITimerHeartbeat: aMaker ]; - at: #buildITimerHeartbeat put: [self addVMDriversBuildITimerHeartbeat: aMaker]; - at: #buildMultiThreaded put: [self addVMDriversBuildMultiThreaded: aMaker ]; - at: #buildMultiThreadedAssert put: [self addVMDriversBuildMultiThreadedAssert: aMaker]; - at: #buildMultiThreadedDebug put: [self addVMDriversBuildMultiThreadedDebug: aMaker ]; - at: #buildNone put:[self addVMDriversNoBuildType: aMaker]. - ^(d at: buildType) value ! Item was removed: - ----- Method: CPlatformConfigForSqueak>>addVMDriversBuild: (in category 'cmake buildType redirects') ----- - addVMDriversBuild: aMaker - "SqueakUnixConfig browse" - self subclassResponsibility.! Item was removed: - ----- Method: CPlatformConfigForSqueak>>addVMDriversBuildAssert: (in category 'cmake buildType redirects') ----- - addVMDriversBuildAssert: aMaker - "SqueakUnixConfig browse" - self subclassResponsibility.! Item was removed: - ----- Method: CPlatformConfigForSqueak>>addVMDriversBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - addVMDriversBuildAssertITimerHeartbeat: aMaker - "SqueakUnixConfig browse" - self subclassResponsibility.! Item was removed: - ----- Method: CPlatformConfigForSqueak>>addVMDriversBuildDebug: (in category 'cmake buildType redirects') ----- - addVMDriversBuildDebug: aMaker - "SqueakUnixConfig browse" - self subclassResponsibility.! Item was removed: - ----- Method: CPlatformConfigForSqueak>>addVMDriversBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - addVMDriversBuildDebugITimerHeartbeat: aMaker - "SqueakUnixConfig browse" - self subclassResponsibility.! Item was removed: - ----- Method: CPlatformConfigForSqueak>>addVMDriversBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - addVMDriversBuildITimerHeartbeat: aMaker - "SqueakUnixConfig browse" - self subclassResponsibility.! Item was removed: - ----- Method: CPlatformConfigForSqueak>>addVMDriversBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - addVMDriversBuildMultiThreaded: aMaker - "SqueakUnixConfig browse" - self subclassResponsibility.! Item was removed: - ----- Method: CPlatformConfigForSqueak>>addVMDriversBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - addVMDriversBuildMultiThreadedAssert: aMaker - "SqueakUnixConfig browse" - self subclassResponsibility.! Item was removed: - ----- Method: CPlatformConfigForSqueak>>addVMDriversBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - addVMDriversBuildMultiThreadedDebug: aMaker - "SqueakUnixConfig browse" - self subclassResponsibility.! Item was removed: - ----- Method: CPlatformConfigForSqueak>>addVMDriversNoBuildType: (in category 'cmake buildType redirects') ----- - addVMDriversNoBuildType: aMaker - "SHOULD NOT GET HERE" - self shouldNotImplement. - ! Item was added: + ----- Method: CPlatformConfigForSqueak>>addVMPlugins: (in category 'cmake buildType redirects') ----- + addVMPlugins: aMaker + "Route this message send to the message appropriate for my buildType " + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self addVMPluginsBuild: aMaker]; + at: #buildAssert put: [self addVMPluginsBuildAssert: aMaker]; + at: #buildAssertITimerHeartbeat put: [self addVMPluginsBuildAssertITimerHeartbeat: aMaker]; + at:#buildDebug put: [self addVMPluginsBuildDebug: aMaker]; + at: #buildDebugITimerHeartbeat put: [self addVMPluginsBuildDebugITimerHeartbeat: aMaker ]; + at: #buildITimerHeartbeat put: [self addVMPluginsBuildITimerHeartbeat: aMaker]; + at: #buildMultiThreaded put: [self addVMPluginsBuildMultiThreaded: aMaker ]; + at: #buildMultiThreadedAssert put: [self addVMPluginsBuildMultiThreadedAssert: aMaker]; + at: #buildMultiThreadedDebug put: [self addVMPluginsBuildMultiThreadedDebug: aMaker ]; + at: #buildNone put:[self addVMPluginsNoBuildType: aMaker]. + ^(d at: buildType) value + ! Item was added: + ----- Method: CPlatformConfigForSqueak>>addVMPluginsBuild: (in category 'cmake buildType redirects') ----- + addVMPluginsBuild: aMaker + self subclassResponsibility.! Item was added: + ----- Method: CPlatformConfigForSqueak>>addVMPluginsBuildAssert: (in category 'cmake buildType redirects') ----- + addVMPluginsBuildAssert: aMaker + self subclassResponsibility.! Item was added: + ----- Method: CPlatformConfigForSqueak>>addVMPluginsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- + addVMPluginsBuildAssertITimerHeartbeat: aMaker + self subclassResponsibility.! Item was added: + ----- Method: CPlatformConfigForSqueak>>addVMPluginsBuildDebug: (in category 'cmake buildType redirects') ----- + addVMPluginsBuildDebug: aMaker + self subclassResponsibility.! Item was added: + ----- Method: CPlatformConfigForSqueak>>addVMPluginsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- + addVMPluginsBuildDebugITimerHeartbeat: aMaker + "SqueakUnixConfig browse" + self subclassResponsibility.! Item was added: + ----- Method: CPlatformConfigForSqueak>>addVMPluginsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- + addVMPluginsBuildITimerHeartbeat: aMaker + self subclassResponsibility.! Item was added: + ----- Method: CPlatformConfigForSqueak>>addVMPluginsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + addVMPluginsBuildMultiThreaded: aMaker + self subclassResponsibility.! Item was added: + ----- Method: CPlatformConfigForSqueak>>addVMPluginsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- + addVMPluginsBuildMultiThreadedAssert: aMaker + self subclassResponsibility.! Item was added: + ----- Method: CPlatformConfigForSqueak>>addVMPluginsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- + addVMPluginsBuildMultiThreadedDebug: aMaker + self subclassResponsibility.! Item was added: + ----- Method: CPlatformConfigForSqueak>>addVMPluginsNoBuildType: (in category 'cmake buildType redirects') ----- + addVMPluginsNoBuildType: aMaker + "SHOULD NOT GET HERE" + self shouldNotImplement. + ! Item was removed: - ----- Method: Linux32ARMv6Config>>addVMDriversBuild: (in category 'cmake buildType redirects') ----- - addVMDriversBuild: aMaker - aMaker message: 'addVMDrivers: aMaker'. - self - addDriver: 'vm-display-null' - sources: #( - '${targetPlatform}/vm-display-null/sqUnixDisplayNull' ) - generator: aMaker - externalLibs: #(); - - addDriver: 'vm-display-X11' - sources: #( - '${targetPlatform}/vm-display-X11/sqUnixX11' - '${targetPlatform}/vm-display-X11/sqUnixMozilla' ) - generator: aMaker - externalLibs: (self externalLibs); - - addDriver: 'vm-sound-ALSA' - sources: #( - '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' ) - generator: aMaker - externalLibs: #(); - - addDriver: 'vm-sound-null' - sources: #( - '${targetPlatform}/vm-sound-null/sqUnixSoundNull' ) - generator: aMaker - externalLibs: #(). - ! Item was added: + ----- Method: Linux32ARMv6Config>>addVMPluginsBuild: (in category 'cmake buildType redirects') ----- + addVMPluginsBuild: aMaker + aMaker message: 'addVMDrivers: aMaker'. + self + addDriver: 'vm-display-null' + sources: #( + '${targetPlatform}/vm-display-null/sqUnixDisplayNull' ) + generator: aMaker + externalLibs: #(); + + addDriver: 'vm-display-X11' + sources: #( + '${targetPlatform}/vm-display-X11/sqUnixX11' + '${targetPlatform}/vm-display-X11/sqUnixMozilla' ) + generator: aMaker + externalLibs: (self externalLibs); + + addDriver: 'vm-sound-ALSA' + sources: #( + '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' ) + generator: aMaker + externalLibs: #(); + + addDriver: 'vm-sound-null' + sources: #( + '${targetPlatform}/vm-sound-null/sqUnixSoundNull' ) + generator: aMaker + externalLibs: #(). + ! Item was changed: ----- Method: Linux32ARMv6Config>>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 cmd:'set_target_properties' params: '${_name} PROPERTIES LINK_FLAGS "-undefined gl"'. aMaker addExternalLibraries: #( 'uuid' "" 'ssl' "" 'crypto' "" 'm' 'dl' 'pthread' ). aMaker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. + self addVMPlugins: aMaker.! - self addVMDrivers: aMaker.! Item was removed: - ----- Method: Linux32x86Config>>addVMDriversBuild: (in category 'cmake buildType redirects') ----- - addVMDriversBuild: aMaker - aMaker message: 'addVMDrivers: aMaker'. - self - addDriver: 'vm-display-null' - sources: #( - '${targetPlatform}/vm-display-null/sqUnixDisplayNull' ) - generator: aMaker - externalLibs: #(); - - addDriver: 'vm-display-X11' - sources: #( - '${targetPlatform}/vm-display-X11/sqUnixX11' - '${targetPlatform}/vm-display-X11/sqUnixMozilla' ) - generator: aMaker - externalLibs: (self externalLibs); - - addDriver: 'vm-sound-ALSA' - sources: #( - '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' ) - generator: aMaker - externalLibs: #(); - - addDriver: 'vm-sound-null' - sources: #( - '${targetPlatform}/vm-sound-null/sqUnixSoundNull' ) - generator: aMaker - externalLibs: #(). - ! Item was added: + ----- Method: Linux32x86Config>>addVMPluginsBuild: (in category 'cmake buildType redirects') ----- + addVMPluginsBuild: aMaker + aMaker message: 'addVMDrivers: aMaker'. + self + addDriver: 'vm-display-null' + sources: #( + '${targetPlatform}/vm-display-null/sqUnixDisplayNull' ) + generator: aMaker + externalLibs: #(); + + addDriver: 'vm-display-X11' + sources: #( + '${targetPlatform}/vm-display-X11/sqUnixX11' + '${targetPlatform}/vm-display-X11/sqUnixMozilla' ) + generator: aMaker + externalLibs: (self externalLibs); + + addDriver: 'vm-sound-ALSA' + sources: #( + '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' ) + generator: aMaker + externalLibs: #(); + + addDriver: 'vm-sound-null' + sources: #( + '${targetPlatform}/vm-sound-null/sqUnixSoundNull' ) + generator: aMaker + externalLibs: #(). + ! Item was changed: ----- Method: Linux32x86Config>>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 cmd:'set_target_properties' params: '${_name} PROPERTIES LINK_FLAGS "-undefined gl"'. aMaker addExternalLibraries: #( 'uuid' "" 'ssl' "" 'crypto' "" 'm' 'dl' 'pthread' ). aMaker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. + self addVMPlugins: aMaker.! - self addVMDrivers: aMaker.! Item was removed: - ----- Method: Linux64Config>>addVMDriversBuild: (in category 'cmake buildType redirects') ----- - addVMDriversBuild: aMaker - aMaker message: 'addVMDrivers: aMaker'. - self - addDriver: 'vm-display-null' - sources: #( - '${targetPlatform}/vm-display-null/sqUnixDisplayNull' ) - generator: aMaker - externalLibs: #(); - - addDriver: 'vm-display-X11' - sources: #( - '${targetPlatform}/vm-display-X11/sqUnixX11' - '${targetPlatform}/vm-display-X11/sqUnixMozilla' ) - generator: aMaker - externalLibs: (self externalLibs); - - addDriver: 'vm-sound-ALSA' - sources: #( - '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' ) - generator: aMaker - externalLibs: #(); - - addDriver: 'vm-sound-null' - sources: #( - '${targetPlatform}/vm-sound-null/sqUnixSoundNull' ) - generator: aMaker - externalLibs: #(). - ! Item was added: + ----- Method: Linux64Config>>addVMPluginsBuild: (in category 'cmake buildType redirects') ----- + addVMPluginsBuild: aMaker + aMaker message: 'addVMDrivers: aMaker'. + self + addDriver: 'vm-display-null' + sources: #( + '${targetPlatform}/vm-display-null/sqUnixDisplayNull' ) + generator: aMaker + externalLibs: #(); + + addDriver: 'vm-display-X11' + sources: #( + '${targetPlatform}/vm-display-X11/sqUnixX11' + '${targetPlatform}/vm-display-X11/sqUnixMozilla' ) + generator: aMaker + externalLibs: (self externalLibs); + + addDriver: 'vm-sound-ALSA' + sources: #( + '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' ) + generator: aMaker + externalLibs: #(); + + addDriver: 'vm-sound-null' + sources: #( + '${targetPlatform}/vm-sound-null/sqUnixSoundNull' ) + generator: aMaker + externalLibs: #(). + ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>addVMDriversBuild: (in category 'cmake buildType redirects') ----- - addVMDriversBuild: aMaker - |temp o| - self flag:'tty'. "I am writing sub-directory CMakeLists.txt here. Should I also write the config.cmake files?" - enabledebugmessages - ifTrue: [templates "this message will go to the top level CMakeLists.txt file" - addLast: (CMakeMessage new message: self class name , 'addVMDriversBuild:')]. - vmdrivers do:[ :vmd | - o := String new writeStream. "each VMDriver gets its own CMakeLists.txt file." - temp := OrderedCollection new. - temp - addAllLast:((CMakeVMDriver new) "<--confusing name. This is a CompositTemplate, not the CMakeVMDriverWrapper class" - config: self - definitions: (vmd compilerdefinitions) - driver: (vmd driver) - sources: (vmd sources) - includedirectories: (vmd includedirectories)). - temp do: [:each | o nextPutAll: (each content); cr]. - - (self buildDir) createDirectory: (vmd driver). - " (FileDirectory default) createDirectory: (self buildDir) , FileDirectory slash , vmd driver." - self write: (o contents) toFile: vmd driver , FileDirectory slash , aMaker outputFileName. - templates "this will go to the top level CMakeLists.txt file" - addLast: ((CMakeAddSubDirectory new) sourcedir: (vmd driver)) - ]. - - - - - - - - - - ! Item was added: + ----- Method: Linux64x86w32BitConfig>>addVMPluginsBuild: (in category 'cmake buildType redirects') ----- + addVMPluginsBuild: aMaker + |temp o| + self flag:'tty'. "I am writing sub-directory CMakeLists.txt here. Should I also write the config.cmake files?" + enabledebugmessages + ifTrue: [templates "this message will go to the top level CMakeLists.txt file" + addLast: (CMakeMessage new message: self class name , 'addVMDriversBuild:')]. + vmdrivers do:[ :vmd | + o := String new writeStream. "each VMDriver gets its own CMakeLists.txt file." + temp := OrderedCollection new. + temp + addAllLast:((CMakeVMDriver new) "<--confusing name. This is a CompositTemplate, not the CMakeVMDriverWrapper class" + config: self + definitions: (vmd compilerdefinitions) + driver: (vmd driver) + sources: (vmd sources) + includedirectories: (vmd includedirectories)). + temp do: [:each | o nextPutAll: (each content); cr]. + "need a check exists here" + (self buildDir) createDirectory: (vmd driver). + " (FileDirectory default) createDirectory: (self buildDir) , FileDirectory slash , vmd driver." + self write: (o contents) toFile: vmd driver , FileDirectory slash , aMaker outputFileName. + templates "this will go to the top level CMakeLists.txt file" + addLast: ((CMakeAddSubDirectory new) sourcedir: (vmd driver)) + ]. + + + + + + + + + + ! Item was changed: ----- Method: Linux64x86w32BitConfig>>setExtraTargetPropertiesBuild: (in category 'cmake buildType redirects') ----- setExtraTargetPropertiesBuild: aMaker aMaker addExternalLibraries: (self externalLibs). aMaker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. + self addVMPlugins: aMaker.! - self addVMDrivers: aMaker.! Item was removed: - ----- Method: SqueakBSDConfig>>addVMDriversBuild: (in category 'cmake buildType redirects') ----- - addVMDriversBuild: aMaker - aMaker message: 'addVMDrivers: aMaker'. - self - addDriver: 'vm-display-null' - sources: #( - '${targetPlatform}/vm-display-null/sqUnixDisplayNull' ) - generator: aMaker - externalLibs: #(); - - addDriver: 'vm-display-X11' - sources: #( - '${targetPlatform}/vm-display-X11/sqUnixX11' - '${targetPlatform}/vm-display-X11/sqUnixMozilla' ) - generator: aMaker - externalLibs: (self externalLibs); - - addDriver: 'vm-sound-ALSA' - sources: #( - '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' ) - generator: aMaker - externalLibs: #(); - - addDriver: 'vm-sound-null' - sources: #( - '${targetPlatform}/vm-sound-null/sqUnixSoundNull' ) - generator: aMaker - externalLibs: #(). - ! Item was added: + ----- Method: SqueakBSDConfig>>addVMPluginsBuild: (in category 'cmake buildType redirects') ----- + addVMPluginsBuild: aMaker + aMaker message: 'addVMDrivers: aMaker'. + self + addDriver: 'vm-display-null' + sources: #( + '${targetPlatform}/vm-display-null/sqUnixDisplayNull' ) + generator: aMaker + externalLibs: #(); + + addDriver: 'vm-display-X11' + sources: #( + '${targetPlatform}/vm-display-X11/sqUnixX11' + '${targetPlatform}/vm-display-X11/sqUnixMozilla' ) + generator: aMaker + externalLibs: (self externalLibs); + + addDriver: 'vm-sound-ALSA' + sources: #( + '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' ) + generator: aMaker + externalLibs: #(); + + addDriver: 'vm-sound-null' + sources: #( + '${targetPlatform}/vm-sound-null/sqUnixSoundNull' ) + generator: aMaker + externalLibs: #(). + ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>addVMDriversBuild: (in category 'cmake buildType redirects') ----- - addVMDriversBuild: aMaker - aMaker message: 'addVMDrivers: aMaker'. - self - addDriver: 'vm-display-null' - sources: #( - '${targetPlatform}/vm-display-null/sqUnixDisplayNull' ) - generator: aMaker - externalLibs: #(); - - addDriver: 'vm-display-X11' - sources: #( - '${targetPlatform}/vm-display-X11/sqUnixX11' - '${targetPlatform}/vm-display-X11/sqUnixMozilla' ) - generator: aMaker - externalLibs: (self externalLibs); - - addDriver: 'vm-sound-ALSA' - sources: #( - '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' ) - generator: aMaker - externalLibs: #(); - - addDriver: 'vm-sound-null' - sources: #( - '${targetPlatform}/vm-sound-null/sqUnixSoundNull' ) - generator: aMaker - externalLibs: #(). - ! Item was added: + ----- Method: SqueakSunOS32x86Config>>addVMPluginsBuild: (in category 'cmake buildType redirects') ----- + addVMPluginsBuild: aMaker + aMaker message: 'addVMDrivers: aMaker'. + self + addDriver: 'vm-display-null' + sources: #( + '${targetPlatform}/vm-display-null/sqUnixDisplayNull' ) + generator: aMaker + externalLibs: #(); + + addDriver: 'vm-display-X11' + sources: #( + '${targetPlatform}/vm-display-X11/sqUnixX11' + '${targetPlatform}/vm-display-X11/sqUnixMozilla' ) + generator: aMaker + externalLibs: (self externalLibs); + + addDriver: 'vm-sound-ALSA' + sources: #( + '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' ) + generator: aMaker + externalLibs: #(); + + addDriver: 'vm-sound-null' + sources: #( + '${targetPlatform}/vm-sound-null/sqUnixSoundNull' ) + generator: aMaker + externalLibs: #(). + !

1 0

VM Maker: Cog-eem.168.mcz
by commits＠source.squeak.org 17 Jul '14

17 Jul '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.168.mcz ==================== Summary ==================== Name: Cog-eem.168 Author: eem Time: 17 July 2014, 2:35:32.852 pm UUID: 99b3b7ea-49fe-4a0f-9d64-a9276b5dc560 Ancestors: Cog-eem.167 Add a normative recreateSpecialObejctsArray to the Spur bootstrap and put it early in the transformed image. Eliminate compact class init of large integer classes in Integer>>initialize prototype. Add a single file monticello package patcher entry-point. Nuke the empty Cog-Benchmarks category. =============== Diff against Cog-eem.167 =============== Item was changed: SystemOrganization addCategory: #'Cog-Benchmarks-DeltaBlue'! SystemOrganization addCategory: #'Cog-Benchmarks-Richards'! SystemOrganization addCategory: #'Cog-Benchmarks-SMark'! SystemOrganization addCategory: #'Cog-Benchmarks-Shootout'! SystemOrganization addCategory: #'Cog-Bootstrapping'! SystemOrganization addCategory: #'Cog-Morphing Bytecode Set'! SystemOrganization addCategory: #'Cog-ProcessorPlugins'! SystemOrganization addCategory: #'Cog-Processors'! SystemOrganization addCategory: #'Cog-Processors-Tests'! SystemOrganization addCategory: #'Cog-Scripting'! SystemOrganization addCategory: #'Cog-Scripts'! SystemOrganization addCategory: #'Cog-Tests'! - SystemOrganization addCategory: #'Cog-Benchmarks'! Item was added: + ----- Method: SpurBootstrap class>>IntegerclassPROTOTYPEinitialize (in category 'method prototypes') ----- + IntegerclassPROTOTYPEinitialize + "Integer initialize" + self initializeLowBitPerByteTable! Item was added: + ----- Method: SpurBootstrap class>>SmalltalkImagePROTOTYPErecreateSpecialObjectsArray (in category 'method prototypes') ----- + SmalltalkImagePROTOTYPErecreateSpecialObjectsArray + "Smalltalk recreateSpecialObjectsArray" + + "To external package developers: + **** DO NOT OVERRIDE THIS METHOD. ***** + If you are writing a plugin and need additional special object(s) for your own use, + use addGCRoot() function and use own, separate special objects registry " + + "The Special Objects Array is an array of objects used by the Squeak virtual machine. + Its contents are critical and accesses to it by the VM are unchecked, so don't even + think of playing here unless you know what you are doing." + | newArray | + newArray := Array new: 58. + "Nil false and true get used throughout the interpreter" + newArray at: 1 put: nil. + newArray at: 2 put: false. + newArray at: 3 put: true. + "This association holds the active process (a ProcessScheduler)" + newArray at: 4 put: (self specialObjectsArray at: 4) "(self bindingOf: #Processor) but it answers an Alias". + "Numerous classes below used for type checking and instantiation" + newArray at: 5 put: Bitmap. + newArray at: 6 put: SmallInteger. + newArray at: 7 put: ByteString. + newArray at: 8 put: Array. + newArray at: 9 put: Smalltalk. + newArray at: 10 put: Float. + newArray at: 11 put: MethodContext. + newArray at: 12 put: BlockContext. + newArray at: 13 put: Point. + newArray at: 14 put: LargePositiveInteger. + newArray at: 15 put: Display. + newArray at: 16 put: Message. + newArray at: 17 put: CompiledMethod. + newArray at: 18 put: (self specialObjectsArray at: 18). "(low space Semaphore)" + newArray at: 19 put: Semaphore. + newArray at: 20 put: Character. + newArray at: 21 put: #doesNotUnderstand:. + newArray at: 22 put: #cannotReturn:. + newArray at: 23 put: nil. "This is the process signalling low space." + "An array of the 32 selectors that are compiled as special bytecodes, + paired alternately with the number of arguments each takes." + newArray at: 24 put: #( #+ 1 #- 1 #< 1 #> 1 #<= 1 #>= 1 #= 1 #~= 1 + #* 1 #/ 1 #\\ 1 #@ 1 #bitShift: 1 #// 1 #bitAnd: 1 #bitOr: 1 + #at: 1 #at:put: 2 #size 0 #next 0 #nextPut: 1 #atEnd 0 #== 1 #class 0 + #blockCopy: 1 #value 0 #value: 1 #do: 1 #new 0 #new: 1 #x 0 #y 0 ). + "An array of the 255 Characters in ascii order. + Cog inlines table into machine code at: prim so do not regenerate it. + This is nil in Spur, which has immediate Characters." + newArray at: 25 put: (self specialObjectsArray at: 25). + newArray at: 26 put: #mustBeBoolean. + newArray at: 27 put: ByteArray. + newArray at: 28 put: Process. + "An array of up to 31 classes whose instances will have compact headers; an empty array in Spur" + newArray at: 29 put: self compactClassesArray. + newArray at: 30 put: (self specialObjectsArray at: 30). "(delay Semaphore)" + newArray at: 31 put: (self specialObjectsArray at: 31). "(user interrupt Semaphore)" + "Entries 32 - 34 unreferenced. Previously these contained prototype instances to be copied for fast initialization" + newArray at: 32 put: nil. "was the prototype Float" + newArray at: 33 put: nil. "was the prototype 4-byte LargePositiveInteger" + newArray at: 34 put: nil. "was the prototype Point" + newArray at: 35 put: #cannotInterpret:. + newArray at: 36 put: nil. "was the prototype MethodContext" + newArray at: 37 put: BlockClosure. + newArray at: 38 put: nil. "was the prototype BlockContext" + "array of objects referred to by external code" + newArray at: 39 put: (self specialObjectsArray at: 39). "external semaphores" + newArray at: 40 put: nil. "Reserved for Mutex in Cog VMs" + newArray at: 41 put: ((self specialObjectsArray at: 39) ifNil: [LinkedList new]). "Reserved for a LinkedList instance for overlapped calls in CogMT" + newArray at: 42 put: ((self specialObjectsArray at: 42) ifNil: [Semaphore new]). "finalization Semaphore" + newArray at: 43 put: LargeNegativeInteger. + "External objects for callout. + Note: Written so that one can actually completely remove the FFI." + newArray at: 44 put: (self at: #ExternalAddress ifAbsent: []). + newArray at: 45 put: (self at: #ExternalStructure ifAbsent: []). + newArray at: 46 put: (self at: #ExternalData ifAbsent: []). + newArray at: 47 put: (self at: #ExternalFunction ifAbsent: []). + newArray at: 48 put: (self at: #ExternalLibrary ifAbsent: []). + newArray at: 49 put: #aboutToReturn:through:. + newArray at: 50 put: #run:with:in:. + "51 reserved for immutability message" + newArray at: 51 put: #attemptToAssign:withIndex:. + newArray at: 52 put: #(nil "nil => generic error" #'bad receiver' + #'bad argument' #'bad index' + #'bad number of arguments' + #'inappropriate operation' #'unsupported operation' + #'no modification' #'insufficient object memory' + #'insufficient C memory' #'not found' #'bad method' + #'internal error in named primitive machinery' + #'object may move' #'resource limit exceeded' + #'object is pinned' #'primitive write beyond end of object'). + "53 to 55 are for Alien" + newArray at: 53 put: (self at: #Alien ifAbsent: []). + newArray at: 54 put: #invokeCallbackContext::. "use invokeCallback:stack:registers:jmpbuf: for old Alien callbacks." + newArray at: 55 put: (self at: #UnsafeAlien ifAbsent: []). + + "Used to be WeakFinalizationList for WeakFinalizationList hasNewFinalization, obsoleted by ephemeron support." + newArray at: 56 put: nil. + + "reserved for foreign callback process" + newArray at: 57 put: (self specialObjectsArray at: 57 ifAbsent: []). + + newArray at: 58 put: #unusedBytecode. + + "Now replace the interpreter's reference in one atomic operation" + self specialObjectsArray becomeForward: newArray! Item was changed: ----- Method: SpurBootstrap>>allPrototypeMethodSymbols (in category 'method prototypes') ----- allPrototypeMethodSymbols "self basicNew allPrototypeMethodSymbols" | symbols | symbols := Set new. self prototypeClassNameMetaSelectorMethodDo: + [:className :isMeta :selector :method | | adder | - [:className :isMeta :selector :method | symbols add: className; + add: selector. + adder := [:lit| + (lit isSymbol and: [lit ~~ method selector]) ifTrue: [symbols add: lit]. + lit isArray ifTrue: [lit do: adder]]. + method literals do: adder]. - add: selector; - addAll: (method literals select: [:l| l isSymbol and: [l ~~ method selector]])]. ^symbols! Item was changed: ----- Method: SpurBootstrap>>bootstrapImageUsingFileDirectory: (in category 'public access') ----- bootstrapImageUsingFileDirectory: imageName | dirName baseName dir | dirName := FileDirectory dirPathFor: imageName. baseName := (imageName endsWith: '.image') ifTrue: [FileDirectory baseNameFor: imageName] ifFalse: [FileDirectory localNameFor: imageName]. + dir := dirName isEmpty ifTrue: [FileDirectory default] ifFalse: [FileDirectory on: dirName]. - dir := FileDirectory on: dirName. self on: (dir fullNameFor: baseName, '.image'). [self transform] on: Halt do: [:ex| "suppress halts from the usual suspects (development time halts)" (#(fullGC compactImage) includes: ex signalerContext sender selector) ifTrue: [ex resume] ifFalse: [ex pass]]. self writeSnapshot: (dir fullNameFor: baseName, '-spur.image') ofTransformedImage: newHeap headerFlags: oldInterpreter getImageHeaderFlags screenSize: oldInterpreter savedWindowSize. dir copyFileNamed: (dir fullNameFor: baseName, '.changes') toFileNamed: (dir fullNameFor: baseName, '-spur.changes')! Item was changed: ----- Method: SpurBootstrap>>cloneArrayLiteral: (in category 'bootstrap methods') ----- cloneArrayLiteral: anArray "Currently serves only to clone the #(0 0) literal in SpaceTallyPROTOTYPEspaceForInstancesOf:" | array | array := oldHeap instantiateClass: (oldHeap splObj: ClassArray) indexableSize: anArray size. 1 to: anArray size do: [:i| | lit | lit := anArray at: i. lit class caseOf: { [SmallInteger] -> [oldHeap storePointerUnchecked: i - 1 ofObject: array + withValue: (oldHeap integerObjectOf: lit)]. + [ByteSymbol] -> [oldHeap + storePointer: i - 1 + ofObject: array + withValue: (self findSymbol: lit)]. + [UndefinedObject] -> [oldHeap + storePointerUnchecked: i - 1 + ofObject: array + withValue: oldHeap nilObject] }]. - withValue: (oldHeap integerObjectOf: lit)] }]. ^array ! Item was changed: ----- Method: SpurBootstrap>>cloneObjects (in category 'bootstrap image') ----- cloneObjects + | specialObjectsArray characterClass characterTable compactClasses oldObj oldClass | + specialObjectsArray := oldHeap specialObjectsOop. - | characterClass characterTable compactClasses oldObj oldClass | characterClass := oldHeap classCharacter. characterTable := oldHeap characterTable. compactClasses := oldHeap splObj: CompactClasses. + self clone: specialObjectsArray + classIndex: (classToIndex at: (oldHeap fetchClassOfNonImm: specialObjectsArray)). oldObj := oldHeap objectAfter: oldHeap trueObject. [oldObj < oldHeap freeStart] whileTrue: [oldClass := oldHeap fetchClassOfNonImm: oldObj. (oldObj ~= characterTable + and: [oldObj ~= specialObjectsArray and: [oldObj ~= compactClasses + and: [oldClass ~= characterClass]]]) ifTrue: - and: [oldClass ~= characterClass]]) ifTrue: [self clone: oldObj classIndex: (classToIndex at: oldClass)]. oldObj := oldHeap objectAfter: oldObj]. newHeap specialObjectsOop: (map at: oldHeap specialObjectsOop); lastHash: oldHeap lastHash! Item was changed: ----- Method: SpurBootstrap>>findSymbol: (in category 'bootstrap methods') ----- findSymbol: aString "Find the Symbol equal to aString in oldHeap." | symbolClass | + (literalMap at: aString ifAbsent: nil) ifNotNil: + [:oop| ^oop]. symbolClass := self symbolClass. oldHeap allObjectsDo: + [:obj| + (symbolClass = (oldHeap fetchClassOfNonImm: obj) + and: [(oldHeap byteLengthOf: obj) = aString size + and: [aString = (oldHeap stringOf: obj)]]) ifTrue: + [^obj]]. - [:o| - (symbolClass = (oldHeap fetchClassOfNonImm: o) - and: [(oldHeap byteLengthOf: o) = aString size - and: [aString = (oldHeap stringOf: o)]]) ifTrue: - [^o]]. ^nil! Item was changed: ----- Method: SpurBootstrap>>interpreter:object:perform:withArguments: (in category 'bootstrap methods') ----- interpreter: sim object: receiver perform: selector withArguments: arguments "Interpret an expression in oldHeap using oldInterpreter. Answer the result." | fp savedpc savedsp result startByteCount | savedpc := sim localIP. savedsp := sim localSP. sim internalPush: receiver. arguments do: [:arg| sim internalPush: arg]. sim argumentCount: arguments size; messageSelector: selector. fp := sim localFP. startByteCount := sim byteCount. "sim byteCount = 66849 ifTrue: [self halt]." sim normalSend. sim incrementByteCount. "otherwise, send is not counted" + ["sim printFrame: sim localFP WithSP: sim localSP" + "sim setBreakSelector: #elementsForwardIdentityTo:" + "sim byteCount = 66849 ifTrue: [self halt]." - ["sim byteCount = 66849 ifTrue: [self halt]." "(sim byteCount > 7508930 and: [sim localFP = -16r27894]) ifTrue: [self halt]." fp = sim localFP] whileFalse: [sim singleStep]. result := sim internalPopStack. self assert: savedsp = sim localSP. self assert: sim localIP - 1 = savedpc. sim localIP: savedpc. ^result! Item was added: + ----- Method: SpurBootstrap>>recreateSpecialObjectsArray (in category 'bootstrap image') ----- + recreateSpecialObjectsArray + "This is tricky. We want to recreate the specialObjectsArray according to + the class side SmalltalkImagePROTOTYPErecreateSpecialObjectsArray. + But that version destroys the CompactClassesArray upon which the V3 + image depends. The bootstrap will get rid of it later. So save it before + the recreation and restore it." + self withExecutableInterpreter: oldInterpreter + do: [| compactClassesArray | + compactClassesArray := oldHeap splObj: CompactClasses. + self + interpreter: oldInterpreter + object: (oldHeap splObj: 8) + perform: (self findSymbol: #recreateSpecialObjectsArray) + withArguments: #(). + oldHeap splObj: CompactClasses put: compactClassesArray]! Item was changed: ----- Method: SpurBootstrap>>transform (in category 'bootstrap image') ----- transform self rememberRehashSymbol. self findRequiredGlobals. self installModifiedMethods. + self recreateSpecialObjectsArray. self bootstrapImage. self validate. self rememberRehashSymbol. self rehashImage. self followForwardingPointers. self scavengeImage. self freeForwarders. self compactImage. self reportSizes! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>patchFile: (in category 'patching') ----- + patchFile: packageFile + "(SpurBootstrapMonticelloPackagePatcher new + from: '/Users/eliot/oscogvm/image/package-cache' + to: '/Users/eliot/oscogvm/image/spurpackages') + patchFile: 'Collections-ul.573(nice.572).mcd'" + + sourceDir exists ifFalse: + [self error: 'source directory doest not exist']. + destDir assureExistence. + self packagesAndPatches keysAndValuesDo: + [:package :patches| + ((packageFile beginsWith: package name) + and: [(packageFile at: package name size + 1) isLetter not]) ifTrue: + [self patchPackage: packageFile with: patches for: package]]!

1 0

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

17 Jul '14

Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.89.mcz ==================== Summary ==================== Name: CMakeVMMakerSqueak-tty.89 Author: tty Time: 17 July 2014, 4:39:52.956 pm UUID: 67a2d2c6-6474-40c3-9edd-b5870a5d5b31 Ancestors: CMakeVMMakerSqueak-tty.88 Milestone save. vmDriver (i.e. vm-display-X11) now writes via template to created subdirectory and outputs a CMakeLists.txt. Compiliation and cmake . fails, but tty.87 still works. Lots of cmake command templates added. transition of vm-display-X11 (aka vmDrivers) to pluggable template. added bucket classes and initialization code for wrapping vmDriver data used in the output. next up. get some sleep. then, fix cmake error then port plugins per Ian's templates very similar to what I have done with vmDisplay stuff. getting close to an acceptable product. =============== Diff against CMakeVMMakerSqueak-tty.88 =============== Item was changed: SystemOrganization addCategory: #CMakeVMMakerSqueak! SystemOrganization addCategory: #'CMakeVMMakerSqueak-Android'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-BSD32x86'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-Builder'! + SystemOrganization addCategory: #'CMakeVMMakerSqueak-CMakeCompositeTemplates'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-CMakeCustomTemplates'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-CMakeTemplates'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-Help'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-IA32-Bochs'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-IOS'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-Libs'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-Linux32ARMv6'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-Linux32x86'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-Linux64X86-32BitCompatibility'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-LinuxX86-64'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-MacOSPowerPC'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-MacOSX32x86'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-SunOS32x86'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-Tests'! + SystemOrganization addCategory: #'CMakeVMMakerSqueak-VMDriver'! SystemOrganization addCategory: #'CMakeVMMakerSqueak-Win32x86'! Item was added: + CMakeTemplate subclass: #CMakeAddCompileOptions + instanceVariableNames: 'options' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-CMakeTemplates'! + + !CMakeAddCompileOptions commentStamp: 'tty 7/16/2014 15:01' prior: 0! + cmake --help-command add_compile_options + add_compile_options + ------------------- + + Adds options to the compilation of source files. + + :: + + add_compile_options(<option> ...) + + Adds options to the compiler command line for sources in the current + directory and below. This command can be used to add any options, but + alternative commands exist to add preprocessor definitions + (``target_compile_definitions()`` and ``add_definitions()``) or + include directories (``target_include_directories()`` and + ``include_directories()``). See documentation of the + ``directory`` and + `` target`` ``COMPILE_OPTIONS`` properties. + + Arguments to ``add_compile_options`` may use "generator expressions" with + the syntax ``$<...>``. See the ``cmake-generator-expressions(7)`` + manual for available expressions. See the ``cmake-buildsystem(7)`` + manual for more on defining buildsystem properties. + ! Item was added: + ----- Method: CMakeAddCompileOptions>>initialize (in category 'initialize-release') ----- + initialize + options := OrderedCollection with: '-enable-FOO' with: '--disable-BAR' . + self content:' add_compile_options(',self options,')'! Item was added: + ----- Method: CMakeAddCompileOptions>>options (in category 'accessing') ----- + options + ^ String streamContents: [:stream | options asStringOn: stream delimiter: ' ' ] + ! Item was added: + ----- Method: CMakeAddCompileOptions>>options: (in category 'accessing') ----- + options: anObject + options := anObject. + self content:' add_compile_options(',self options,')' + ! Item was added: + CMakeTemplate subclass: #CMakeAddCustomCommandOutput + instanceVariableNames: 'outputs commandsandargs depends implicitdepends workingdir comment verbatim append maindependency' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-CMakeTemplates'! + + !CMakeAddCustomCommandOutput commentStamp: 'tty 7/15/2014 09:40' prior: 0! + A CMakeSetTemplate 's contents look like + + + + I need to be modified to support the multiple targets, outputs, comand/args/implicit_depends as I only support 1 of each because tty is lazy + + from the CMake --help-command add_custom_command + + add_custom_command + ------------------ + + Add a custom build rule to the generated build system. + + There are two main signatures for add_custom_command The first + signature is for adding a custom command to produce an output. + + :: + + add_custom_command(OUTPUT output1 [output2 ...] + COMMAND command1 [ARGS] [args1...] + [COMMAND command2 [ARGS] [args2...] ...] + [MAIN_DEPENDENCY depend] + [DEPENDS [depends...]] + [IMPLICIT_DEPENDS <lang1> depend1 + [<lang2> depend2] ...] + [WORKING_DIRECTORY dir] + [COMMENT comment] [VERBATIM] [APPEND]) + + This defines a command to generate specified OUTPUT file(s). A target + created in the same directory (CMakeLists.txt file) that specifies any + output of the custom command as a source file is given a rule to + generate the file using the command at build time. Do not list the + output in more than one independent target that may build in parallel + or the two instances of the rule may conflict (instead use + add_custom_target to drive the command and make the other targets + depend on that one). If an output name is a relative path it will be + interpreted relative to the build tree directory corresponding to the + current source directory. Note that MAIN_DEPENDENCY is completely + optional and is used as a suggestion to visual studio about where to + hang the custom command. In makefile terms this creates a new target + in the following form: + + :: + + OUTPUT: MAIN_DEPENDENCY DEPENDS + COMMAND + + If more than one command is specified they will be executed in order. + The optional ARGS argument is for backward compatibility and will be + ignored. + + The second signature adds a custom command to a target such as a + library or executable. This is useful for performing an operation + before or after building the target. The command becomes part of the + target and will only execute when the target itself is built. If the + target is already built, the command will not execute. + ! Item was added: + ----- Method: CMakeAddCustomCommandOutput>>append (in category 'accessing') ----- + append + + ^ append! Item was added: + ----- Method: CMakeAddCustomCommandOutput>>commandsandargs (in category 'accessing') ----- + commandsandargs + ^ String streamContents: [:stream | commandsandargs asStringOn: stream delimiter: ' ' ]! Item was added: + ----- Method: CMakeAddCustomCommandOutput>>comment (in category 'accessing') ----- + comment + ^ 'COMMENT "' , comment,'"'! Item was added: + ----- Method: CMakeAddCustomCommandOutput>>depends (in category 'accessing') ----- + depends + ^ String streamContents: [:stream | depends asStringOn: stream delimiter: ' ' ] + ! Item was added: + ----- Method: CMakeAddCustomCommandOutput>>implicitdepends (in category 'accessing') ----- + implicitdepends + ^ String streamContents: [:stream | implicitdepends asStringOn: stream delimiter: ' ' ] + ! Item was added: + ----- Method: CMakeAddCustomCommandOutput>>initialize (in category 'initialize-release') ----- + initialize + + self + initializeOutputs; + initializeCommandsAndArgs; + initializeDepends; + initializeImplicitDepends. + + maindependency:= 'MAIN_DEPENDENCY'. + workingdir := ' [WORKING_DIRECTORY dir]'. + comment :='[COMMENT comment]'. + verbatim :='[VERBATIM]'. + append:='[APPEND]'. + self content:' + ADD_CUSTOM_COMMAND(OUTPUT ' + ,self outputs, ' ' + , self commandsandargs , ' ' + , self maindependency, ' ' + , self depends , ' ' + , self implicitdepends, ' ' + , self workingdir , ' ' + , self comment, ' ' + , verbatim , ' ' + , append , ')'. + + ! Item was added: + ----- Method: CMakeAddCustomCommandOutput>>initializeCommandsAndArgs (in category 'initialize-release') ----- + initializeCommandsAndArgs + commandsandargs := OrderedCollection new. + commandsandargs + addLast:('COMMAND command1 [ARGS] [args1...]'); + addLast:('[COMMAND command2 [ARGS] [args2...] ...]'). + ! Item was added: + ----- Method: CMakeAddCustomCommandOutput>>initializeDepends (in category 'initialize-release') ----- + initializeDepends + depends := OrderedCollection new. + depends + addLast:('[DEPENDS' ); + addLast:('[depends...]' ); + addLast:(']' ).! Item was added: + ----- Method: CMakeAddCustomCommandOutput>>initializeImplicitDepends (in category 'initialize-release') ----- + initializeImplicitDepends + implicitdepends := OrderedCollection new. + implicitdepends + addLast:('[ [IMPLICIT_DEPENDS <lang1> depend1' ); + addLast:('[ [<lang2> depend2]' ); + addLast:('...]' ).! Item was added: + ----- Method: CMakeAddCustomCommandOutput>>initializeOutputs (in category 'initialize-release') ----- + initializeOutputs + outputs := OrderedCollection new. + outputs + addLast:('output1' ); + addLast:('[output2' ); + addLast:('...]' ). + ! Item was added: + ----- Method: CMakeAddCustomCommandOutput>>maindependency (in category 'accessing') ----- + maindependency + + ^ maindependency! Item was added: + ----- Method: CMakeAddCustomCommandOutput>>output:commandsandargs:comment: (in category 'accessing') ----- + output: anObject commandsandargs: cObject comment: cString + outputs:= anObject. + commandsandargs:= cObject. + depends:=OrderedCollection new. + implicitdepends :=OrderedCollection new. + maindependency:= ''. + workingdir := ''. + comment := cString. + verbatim :=''. + append:=''. + self content:' add_custom_command(OUTPUT ' + ,self outputs, ' ' + , self commandsandargs , ' ' + , self maindependency, ' ' + , self depends , ' ' + , self implicitdepends, ' ' + , self workingdir , ' ' + , self comment, ' ' + , verbatim , ' ' + , append , ')'. + ! Item was added: + ----- Method: CMakeAddCustomCommandOutput>>output:commandsandargs:maindependency:implicitdepends:workingdir:comment:verbatim:append: (in category 'accessing') ----- + output: anObject commandsandargs: cObject maindependency: mdObject implicitdepends: idObject workingdir: wString comment: cString verbatim: vString append: aString + output:= anObject. + commandsandargs := cObject . + maindependency := mdObject. + implicitdepends := idObject. + workingdir := wString. + comment:=cString. + verbatim:= vString. + append := aString. + self content:' add_custom_command(OUTPUT ' + ,self outputs, ' ' + , self commandsandargs , ' ' + , self maindependency, ' ' + , self depends , ' ' + , self implicitdepends, ' ' + , self workingdir , ' ' + , self comment, ' ' + , verbatim , ' ' + , append , ')'.! Item was added: + ----- Method: CMakeAddCustomCommandOutput>>outputs (in category 'accessing') ----- + outputs + ^ String streamContents: [:stream | outputs asStringOn: stream delimiter: ' ' ]! Item was added: + ----- Method: CMakeAddCustomCommandOutput>>verbatim (in category 'accessing') ----- + verbatim + + ^ verbatim! Item was added: + ----- Method: CMakeAddCustomCommandOutput>>workingdir (in category 'accessing') ----- + workingdir + + ^ workingdir! Item was added: + CMakeTemplate subclass: #CMakeAddDefinitions + instanceVariableNames: 'definitions' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-CMakeTemplates'! + + !CMakeAddDefinitions commentStamp: 'tty 7/16/2014 09:21' prior: 0! + CMakeAddDefinitions wraps its cmake command namesake + + cmake --help-command add_definitions + add_definitions + --------------- + + Adds -D define flags to the compilation of source files. + + :: + + add_definitions(-DFOO -DBAR ...) + + Adds definitions to the compiler command line for sources in the current + directory and below. This command can be used to add any flags, but + it is intended to add preprocessor definitions. Flags + beginning in -D or /D that look like preprocessor definitions are + automatically added to the ``COMPILE_DEFINITIONS`` directory + property for the current directory. Definitions with non-trivial values + may be left in the set of flags instead of being converted for reasons of + backwards compatibility. See documentation of the + ``directory``, + ``target``, + ``source file`` ``COMPILE_DEFINITIONS`` + properties for details on adding preprocessor definitions to specific + scopes and configurations. + + See the ``cmake-buildsystem(7)`` manual for more on defining + buildsystem properties. + ! Item was added: + ----- Method: CMakeAddDefinitions>>definitions (in category 'accessing') ----- + definitions + ^ String streamContents: [:stream | definitions asStringOn: stream delimiter: ' ' ] + ! Item was added: + ----- Method: CMakeAddDefinitions>>definitions: (in category 'accessing') ----- + definitions: anObject + definitions := anObject. + self content:' add_definitions(',self definitions,')' + ! Item was added: + ----- Method: CMakeAddDefinitions>>initialize (in category 'initialize-release') ----- + initialize + definitions:= OrderedCollection with: '-DFOO' with: '-DBAR' . + self content:' add_definitions(',self definitions,')'! Item was added: + CMakeTemplate subclass: #CMakeAddExecutableNameOptionSource + instanceVariableNames: 'executablename optionalproperty sources' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-CMakeTemplates'! + + !CMakeAddExecutableNameOptionSource commentStamp: 'tty 7/15/2014 13:26' prior: 0! + A CMakeAddExecutableNameOptionSource looks like this: + + + ADD_EXECUTABLE(name option source); + + I only implement the first idiom of the cmake command shown below + + + cmake --help-command add_executable + -------------- + + Add an executable to the project using the specified source files. + + :: + + add_executable(<name> [WIN32] [MACOSX_BUNDLE] + [EXCLUDE_FROM_ALL] + source1 [source2 ...]) + + Adds an executable target called ``<name>`` to be built from the source + files listed in the command invocation. The ``<name>`` corresponds to the + logical target name and must be globally unique within a project. The + actual file name of the executable built is constructed based on + conventions of the native platform (such as ``<name>.exe`` or just + ``<name>``. + + By default the executable file will be created in the build tree + directory corresponding to the source tree directory in which the + command was invoked. See documentation of the + ``RUNTIME_OUTPUT_DIRECTORY`` target property to change this + location. See documentation of the ``OUTPUT_NAME`` target property + to change the ``<name>`` part of the final file name. + + If ``WIN32`` is given the property ``WIN32_EXECUTABLE`` will be + set on the target created. See documentation of that target property for + details. + + If ``MACOSX_BUNDLE`` is given the corresponding property will be set on + the created target. See documentation of the ``MACOSX_BUNDLE`` + target property for details. + + If ``EXCLUDE_FROM_ALL`` is given the corresponding property will be set on + the created target. See documentation of the ``EXCLUDE_FROM_ALL`` + target property for details. + + See the ``cmake-buildsystem(7)`` manual for more on defining + buildsystem properties. + + -------------------------------------------------------------------------- + + :: + + add_executable(<name> IMPORTED [GLOBAL]) + + An :ref:`IMPORTED executable target <Imported Targets>` references an + executable file located outside the project. No rules are generated to + build it, and the ``IMPORTED`` target property is ``True``. The + target name has scope in the directory in which it is created and below, but + the ``GLOBAL`` option extends visibility. It may be referenced like any + target built within the project. ``IMPORTED`` executables are useful + for convenient reference from commands like ``add_custom_command()``. + Details about the imported executable are specified by setting properties + whose names begin in ``IMPORTED_``. The most important such property is + ``IMPORTED_LOCATION`` (and its per-configuration version + ``IMPORTED_LOCATION_<CONFIG>``) which specifies the location of + the main executable file on disk. See documentation of the ``IMPORTED_*`` + properties for more information. + + -------------------------------------------------------------------------- + + :: + + add_executable(<name> ALIAS <target>) + + Creates an :ref:`Alias Target <Alias Targets>`, such that ``<name>`` can + be used to refer to ``<target>`` in subsequent commands. The ``<name>`` + does not appear in the generated buildsystem as a make target. The + ``<target>`` may not be an :ref:`Imported Target <Imported Targets>` or an + ``ALIAS``. ``ALIAS`` targets can be used as targets to read properties + from, executables for custom commands and custom targets. They can also be + tested for existance with the regular ``if(TARGET)`` subcommand. + The ``<name>`` may not be used to modify properties of ``<target>``, that + is, it may not be used as the operand of ``set_property()``, + ``set_target_properties()``, ``target_link_libraries()`` etc. + An ``ALIAS`` target may not be installed or exported. + ! Item was added: + ----- Method: CMakeAddExecutableNameOptionSource>>executableName:optionalproperty:sources: (in category 'accessing') ----- + executableName: eString optionalproperty: oString sources: anOrderedCollection + executablename := eString. + optionalproperty := oString. + sources:= anOrderedCollection. + self content:' add_executable(', executablename, ' ' , optionalproperty, ' ' ,self sources,')'. + + ! Item was added: + ----- Method: CMakeAddExecutableNameOptionSource>>executablename (in category 'accessing') ----- + executablename + + ^ executablename! Item was added: + ----- Method: CMakeAddExecutableNameOptionSource>>initialize (in category 'initialize-release') ----- + initialize + executablename := 'foo'. + optionalproperty := 'bar'. + sources:= OrderedCollection with: 'dude'. + self content:' + ADD_EXECUTABLE(', executablename, ' ' , optionalproperty, ' ' ,self sources,')'. + ! Item was added: + ----- Method: CMakeAddExecutableNameOptionSource>>optionalproperty (in category 'accessing') ----- + optionalproperty + + ^ optionalproperty! Item was added: + ----- Method: CMakeAddExecutableNameOptionSource>>sources (in category 'accessing') ----- + sources + ^ String streamContents: [:stream | sources asStringOn: stream delimiter: ' ' ] + ! Item was added: + CMakeTemplate subclass: #CMakeAddLibrary + instanceVariableNames: 'library type sources exclude' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-CMakeTemplates'! + + !CMakeAddLibrary commentStamp: 'tty 7/17/2014 10:47' prior: 0! + I encapsulate the simplest version of the CMake add_library command. + + If you want additional versions, either copy me or enhance me. + + You can see the documentation with cmake --help-command add_library + + add_library + ----------- + + Add a library to the project using the specified source files. + + :: + + add_library(<name> [STATIC | SHARED | MODULE] + [EXCLUDE_FROM_ALL] + source1 [source2 ...]) + + ! Item was added: + ----- Method: CMakeAddLibrary>>initialize (in category 'initialize-release') ----- + initialize + library := '<name>'. + type := '[STATIC | SHARED | MODULE]'. + exclude := ' [EXCLUDE_FROM_ALL]'. + sources := OrderedCollection with: 'source1' with: '[source2....]' . + self content:' add_library(', library, ' ' , ' ' , type, ' ' , ' ' , exclude , ' ' ,self sources, ')' + ! Item was added: + ----- Method: CMakeAddLibrary>>library:type:exclude:sources: (in category 'accessing') ----- + library: lString type: tString exclude: eString sources: anObject + library := lString. + type := tString. + exclude:= eString. + sources := anObject. + self content:' add_library(', library, ' ' , ' ' , type, ' ' , ' ' , exclude , ' ' ,self sources, ')' + ! Item was added: + ----- Method: CMakeAddLibrary>>library:type:sources: (in category 'accessing') ----- + library: lString type: tString sources: anObject + library := lString. + type := tString. + exclude:= ''. + sources := anObject. + self content:' add_library(', library, ' ' , ' ' , type, ' ' , ' ' , exclude , ' ' ,self sources, ')' + ! Item was added: + ----- Method: CMakeAddLibrary>>list:elements: (in category 'accessing') ----- + list: aString elements: anObject + list:=aString. + elements := anObject. + self content:' list( APPEND ', list, ' ' , self elements, ')' + ! Item was added: + ----- Method: CMakeAddLibrary>>sources (in category 'accessing') ----- + sources + ^ String streamContents: [:stream | sources asStringOn: stream delimiter: ' ' ] + ! Item was added: + ----- Method: CMakeAddLibrary>>sources: (in category 'accessing') ----- + sources: anObject + + sources := anObject! Item was added: + ----- Method: CMakeAddLibrary>>type (in category 'accessing') ----- + type + + ^ type! Item was added: + ----- Method: CMakeAddLibrary>>type: (in category 'accessing') ----- + type: anObject + + type := anObject! Item was added: + CMakeTemplate subclass: #CMakeAddSubDirectory + instanceVariableNames: 'sourcedir binarydir excludefromall' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-CMakeTemplates'! + + !CMakeAddSubDirectory commentStamp: 'tty 7/17/2014 16:02' prior: 0! + I wrap the following cmake command + + cmake --help-command add_subdirectory + add_subdirectory + ---------------- + + Add a subdirectory to the build. + + :: + + add_subdirectory(source_dir [binary_dir] + [EXCLUDE_FROM_ALL]) + + Add a subdirectory to the build. The source_dir specifies the + directory in which the source CMakeLists.txt and code files are + located. If it is a relative path it will be evaluated with respect + to the current directory (the typical usage), but it may also be an + absolute path. The binary_dir specifies the directory in which to + place the output files. If it is a relative path it will be evaluated + with respect to the current output directory, but it may also be an + absolute path. If binary_dir is not specified, the value of + source_dir, before expanding any relative path, will be used (the + typical usage). The CMakeLists.txt file in the specified source + directory will be processed immediately by CMake before processing in + the current input file continues beyond this command. + + If the EXCLUDE_FROM_ALL argument is provided then targets in the + subdirectory will not be included in the ALL target of the parent + directory by default, and will be excluded from IDE project files. + Users must explicitly build targets in the subdirectory. This is + meant for use when the subdirectory contains a separate part of the + project that is useful but not necessary, such as a set of examples. + Typically the subdirectory should contain its own project() command + invocation so that a full build system will be generated in the + subdirectory (such as a VS IDE solution file). Note that inter-target + dependencies supercede this exclusion. If a target built by the + parent project depends on a target in the subdirectory, the dependee + target will be included in the parent project build system to satisfy + the dependency. + ! Item was added: + ----- Method: CMakeAddSubDirectory>>initialize (in category 'initialize-release') ----- + initialize + sourcedir := 'source_dir'. + binarydir := '[binary_dir]'. + excludefromall := '[EXCLUDE_FROM_ALL]'. + self content:' add_subdirectory (',sourcedir, ' ' ,binarydir, ' ' , excludefromall, ')' + ! Item was added: + ----- Method: CMakeAddSubDirectory>>sourcedir: (in category 'accessing') ----- + sourcedir: sString + sourcedir := '"', (sString copyReplaceAll: '"' with: '\"'), '"'. + self content:' add_subdirectory (',sourcedir,')'! Item was added: + ----- Method: CMakeAddSubDirectory>>sourcedir:binarydir:excludefromall: (in category 'accessing') ----- + sourcedir: sString binarydir: bString excludefromall: eString + sourcedir := sString. + binarydir := bString. + excludefromall := eString. + self content:' add_subdirectory (',sourcedir, ' ' ,binarydir, ' ' , excludefromall, ')' + ! Item was changed: ----- Method: CMakeCheckFunctionExists>>function:variable: (in category 'accessing') ----- function: fString variable: vString function := fString. variable:= vString. + content:=' check_function_exists(', function ,' ', variable,') - content:=' - CHECK_FUNCTION_EXISTS(', function ,' ', variable,') IF(', variable ,') + config_define(', variable,') - CONFIG_DEFINE(', variable,') ENDIF(', variable ,')'! Item was changed: ----- Method: CMakeCheckIncludeFile>>include:variable: (in category 'accessing') ----- include: iString variable: vString include:=iString. variable:=vString. + self content:' check_include_file("', include ,'" ', variable,') - self content:' - CHECK_INCLUDE_FILE("', include ,'" ', variable,') IF(', variable ,') + config_define(', variable,') - CONFIG_DEFINE(', variable,') ENDIF(', variable ,')' ! Item was changed: ----- Method: CMakeCheckIncludeFile>>include:variable:path: (in category 'accessing') ----- include: iString variable: vString path: pString include:=iString. variable:=vString. path:= pString. + self content:' check_include_file("', include ,'" ', variable,' ', path ,') - self content:' - CHECK_INCLUDE_FILE("', include ,'" ', variable,' ', path ,') IF(', variable ,') + config_define(', variable,') - CONFIG_DEFINE(', variable,') ENDIF(', variable ,')' ! Item was changed: + ----- Method: CMakeCheckLibraryExists>>library:function:location:variable: (in category 'accessing') ----- - ----- Method: CMakeCheckLibraryExists>>library:function:location:variable: (in category 'initialize-release') ----- library: lString function: fString location: locString variable: vString library:= lString. function:=fString. location:=locString. variable:=vString. + content:=' check_library_exists(', library, ' ', function, ' "', location ,'" ', variable ,') - content:=' - CHECK_LIBRARY_EXISTS (', library, ' ', function, ' "', location ,'" ', variable ,') IF (', variable, ') + config_define(', variable, ') - CONFIG_DEFINE(', variable, ') ENDIF (', variable, ')' ! Item was changed: ----- Method: CMakeCheckStructHasMember>>struct:member:header:variable: (in category 'accessing') ----- struct: sString member: mString header: hString variable: vString struct:= sString. member:= mString. header := hString. variable:= vString. + content:=' check_struct_has_member(', struct, ' ', member,' ', header,' ', variable, ') + config_define(', variable,')' - content:=' - CHECK_STRUCT_HAS_MEMBER (', struct, ' ', member,' ', header,' ', variable, ') - CONFIG_DEFINE(', variable,')' ! Item was changed: ----- Method: CMakeCheckTypeSize>>initialize (in category 'initialize-release') ----- initialize self content:' + message("Determine Type Sizes") + check_type_size (int SIZEOF_INT) + check_type_size (long SIZEOF_LONG) + check_type_size ("long long" SIZEOF_LONG_LONG) + check_type_size ("void *" SIZEOF_VOID_P) - MESSAGE("Determine Type Sizes") - CHECK_TYPE_SIZE (int SIZEOF_INT) - CHECK_TYPE_SIZE (long SIZEOF_LONG) - CHECK_TYPE_SIZE ("long long" SIZEOF_LONG_LONG) - CHECK_TYPE_SIZE ("void *" SIZEOF_VOID_P) + config_define (SIZEOF_INT) + config_define (SIZEOF_LONG) + config_define (SIZEOF_LONG_LONG) + config_define (SIZEOF_VOID_P)'! - CONFIG_DEFINE (SIZEOF_INT) - CONFIG_DEFINE (SIZEOF_LONG) - CONFIG_DEFINE (SIZEOF_LONG_LONG) - CONFIG_DEFINE (SIZEOF_VOID_P)'! Item was changed: ----- Method: CMakeCheckVariableExists>>initialize (in category 'initialize-release') ----- initialize var:='var'. variable:= 'HAVE_',(var asUppercase). + content:=' check_variable_exists(', var ,' ', variable,') - content:=' - CHECK_VARIABLE_EXISTS(', var ,' ', variable,') IF(', variable ,') + config_define(', variable,') - CONFIG_DEFINE(', variable,') ENDIF(', variable ,')'! Item was changed: ----- Method: CMakeConfigDefine>>initialize (in category 'initialize-release') ----- initialize variable:='foo'. value:='bar'. + self content:' config_define(',variable,' ',value,')'! - self content:' - CONFIG_DEFINE(',variable,' ',value,')'! Item was changed: ----- Method: CMakeConfigUnDefine>>initialize (in category 'initialize-release') ----- initialize variable:='foo'. self content:' + config_undefine(',variable,')'! - CONFIG_UNDEFINE(',variable,')'! Item was removed: - ----- Method: CMakeConfigUnDefine>>variable:value: (in category 'accessing') ----- - variable: aString value: vString - - variable := aString. - value := vString. - self content:' - CONFIG_DEFINE(',variable,' ',value,')'! Item was changed: ----- Method: CMakeDebug>>initialize (in category 'initialize-release') ----- initialize self content:' + message("CMAKE_C_COMPILER=${CMAKE_C_COMPILER}") + message("CMAKE_C_FLAGS=${CMAKE_C_FLAGS}") + message("CMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}") + message("CMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}") + message("CMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}") + message("CMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}") + get_directory_property ( DirDefs DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS ) + foreach( d ${DirDefs} ) + message( STATUS "Found Define: " ${d} ) + endforeach() + message( STATUS "DirDefs: " ${DirDefs} )' + + ! - MESSAGE("CMAKE_C_FLAGS=${CMAKE_C_FLAGS}") - MESSAGE("CMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}") - MESSAGE("CMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}") - MESSAGE("CMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}") - MESSAGE("CMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}") - GET_DIRECTORY_PROPERTY( DirDefs DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS ) - FOREACH( d ${DirDefs} ) - MESSAGE( STATUS "Found Define: " ${d} ) - ENDFOREACH() - MESSAGE( STATUS "DirDefs: " ${DirDefs} )'! Item was added: + CMakeTemplate subclass: #CMakeDirDefs + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-CMakeCustomTemplates'! + + !CMakeDirDefs commentStamp: 'tty 7/14/2014 15:18' prior: 0! + A CMakeDirDefs looks like this: + + FOREACH( d ${DirDefs} ) + MESSAGE( STATUS "Found Define: " ${d} ) + ENDFOREACH() + MESSAGE( STATUS "DirDefs: " ${DirDefs} )'! Item was added: + ----- Method: CMakeDirDefs>>initialize (in category 'initialize-release') ----- + initialize + self content:' + FOREACH( d ${DirDefs} ) + MESSAGE( STATUS "Found Define: " ${d} ) + ENDFOREACH() + MESSAGE( STATUS "DirDefs: " ${DirDefs} )'.! Item was removed: - ----- Method: CMakeFindPackage>>packagename (in category 'accessing') ----- - packagename - - ^ packagename! Item was changed: ----- Method: CMakeFindPackage>>packagename: (in category 'accessing') ----- packagename: anObject packagename := anObject. + content:=' find_package(', packagename ,') + if (',packagename,'_FOUND) + list (REMOVE_DUPLICATES ',packagename,'_INCLUDE_DIR) + set(USE_', packagename,' 1) + config_define(USE_', packagename,') + endif (',packagename,'_FOUND) - content:=' - FIND_PACKAGE (', packagename ,') - IF (',packagename,'_FOUND) - LIST (REMOVE_DUPLICATES ',packagename,'_INCLUDE_DIR) - SET(USE_', packagename,' 1) - CONFIG_DEFINE(USE_', packagename,') - ENDIF (',packagename,'_FOUND) '.! Item was added: + CMakeTemplate subclass: #CMakeHeader + instanceVariableNames: 'configurationName' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-CMakeCustomTemplates'! + + !CMakeHeader commentStamp: 'tty 7/14/2014 13:40' prior: 0! + A CMakeHeader is looks something like this:. + # This is automatically generated file using Linux64x86w32BitSqueakCogV3Config on 14 July 2014 1:33:18.378 pm + + ! Item was added: + ----- Method: CMakeHeader>>configurationName (in category 'accessing') ----- + configurationName + + ^ configurationName! Item was added: + ----- Method: CMakeHeader>>configurationName: (in category 'accessing') ----- + configurationName: anObject + + configurationName := anObject. + self content: + '# This is automatically generated file using ', self configurationName, ' on ', Date current asString, ' ' , Time current asString. + ! Item was added: + ----- Method: CMakeHeader>>initialize (in category 'initialize-release') ----- + initialize + configurationName='foo'. + self content: '# This is automatically generated file using ', self configurationName, ' on ', Date current asString, ' ' , Time current asString. + + ! Item was changed: ----- Method: CMakeIfDefinedConfigDefine>>variable: (in category 'accessing') ----- variable: vString variable:=vString. + self content:' if (DEFINED ', variable ,') + config_define(', variable,') + endif (DEFINED ', variable ,')' - self content:' - IF(DEFINED ', variable ,') - CONFIG_DEFINE(', variable,') - ENDIF(DEFINED ', variable ,')' ! Item was changed: ----- Method: CMakeIfNotFlagSetConfigDefine>>flag:variable: (in category 'accessing') ----- flag: fString variable: vString flag:= fString. variable:= vString. + self content:' if(NOT ', flag ,') + set (',variable,' 1) + endif(NOT ', flag ,') + config_define(', variable,')'! - self content:' - IF(NOT ', flag ,') - SET (',variable,' 1) - ENDIF(NOT ', flag ,') - CONFIG_DEFINE(', variable,')'! Item was changed: ----- Method: CMakeIfNotSetConfigDefine>>variable: (in category 'accessing') ----- variable: vString variable:=vString. + self content:' if(NOT ', variable ,') + set (',variable,' 1) + endif(NOT', variable ,') + config_define(', variable,')' - self content:' - IF(NOT ', variable ,') - SET (',variable,' 1) - ENDIF(', variable ,') - CONFIG_DEFINE(', variable,')' ! Item was changed: ----- Method: CMakeInclude>>file: (in category 'accessing') ----- file: fString file := fString. + self content:' include (',file,')'! - self content:' - INCLUDE(',file,')'! Item was added: + CMakeTemplate subclass: #CMakeIncludeDirectories + instanceVariableNames: 'afterorbefore system dirs' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-CMakeTemplates'! + + !CMakeIncludeDirectories commentStamp: 'tty 7/15/2014 15:30' prior: 0! + A CMakeIncludeDirectories + + cmake --help-command include_directories + include_directories + ------------------- + + Add include directories to the build. + + :: + + include_directories([AFTER|BEFORE] [SYSTEM] dir1 [dir2 ...]) + + Add the given directories to those the compiler uses to search for + include files. Relative paths are interpreted as relative to the + current source directory. + + The include directories are added to the ``INCLUDE_DIRECTORIES`` + directory property for the current ``CMakeLists`` file. They are also + added to the ``INCLUDE_DIRECTORIES`` target property for each + target in the current ``CMakeLists`` file. The target property values + are the ones used by the generators. + + By default the directories specified are appended onto the current list of + directories. This default behavior can be changed by setting + ``CMAKE_INCLUDE_DIRECTORIES_BEFORE`` to ``ON``. By using + ``AFTER`` or ``BEFORE`` explicitly, you can select between appending and + prepending, independent of the default. + + If the ``SYSTEM`` option is given, the compiler will be told the + directories are meant as system include directories on some platforms. + Signalling this setting might achieve effects such as the compiler + skipping warnings, or these fixed-install system files not being + considered in dependency calculations - see compiler docs. + + Arguments to ``include_directories`` may use "generator expressions" with + the syntax "$<...>". See the ``cmake-generator-expressions(7)`` + manual for available expressions. See the ``cmake-buildsystem(7)`` + manual for more on defining buildsystem properties. + ! Item was added: + ----- Method: CMakeIncludeDirectories>>afterOrBefore:dirs: (in category 'accessing') ----- + afterOrBefore: aString dirs: anObject + dirs := anObject.. + afterorbefore:= aString. + system := ''. + self content:' include_directories(', afterorbefore, ' ' , system, ' ' ,self dirs,')'! Item was added: + ----- Method: CMakeIncludeDirectories>>afterOrBefore:system:dirs: (in category 'accessing') ----- + afterOrBefore: aString system: sString dirs: anObject + dirs := anObject.. + afterorbefore:= aString. + system := sString. + self content:' include_directories(', afterorbefore, ' ' , system, ' ' ,self dirs,')'! Item was added: + ----- Method: CMakeIncludeDirectories>>afterorbefore (in category 'accessing') ----- + afterorbefore + + ^ afterorbefore! Item was added: + ----- Method: CMakeIncludeDirectories>>dirs (in category 'accessing') ----- + dirs + ^ String streamContents: [:stream | dirs asStringOn: stream delimiter: ' ' ] + ! Item was added: + ----- Method: CMakeIncludeDirectories>>dirs: (in category 'accessing') ----- + dirs: anObject + dirs := anObject.. + afterorbefore:= ''. + system := ''. + self content:' include_directories(', afterorbefore, ' ' , system, ' ' ,self dirs,')'! Item was added: + ----- Method: CMakeIncludeDirectories>>initialize (in category 'initialize-release') ----- + initialize + dirs:= OrderedCollection with: 'foo' with: 'bar' with: 'directories' with:'dude'. + afterorbefore := '[AFTER|BEFORE]'. + system:= '[SYSTEM]'. + self content:' include_directories(', afterorbefore, ' ' , system, ' ' ,self dirs,')'! Item was added: + ----- Method: CMakeIncludeDirectories>>system (in category 'accessing') ----- + system + + ^ system! Item was added: + ----- Method: CMakeIncludeDirectories>>system: (in category 'accessing') ----- + system: anObject + + system := anObject! Item was added: + ----- Method: CMakeIncludeDirectories>>system:dirs: (in category 'accessing') ----- + system: sString dirs: anObject + dirs := anObject.. + afterorbefore:= ''. + system := sString. + self content:' include_directories(', afterorbefore, ' ' , system, ' ' ,self dirs,')'! Item was added: + CMakeTemplate subclass: #CMakeListAppend + instanceVariableNames: 'list elements' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-CMakeTemplates'! + + !CMakeListAppend commentStamp: 'tty 7/17/2014 08:29' prior: 0! + I handle the APPEND functionality for the cmake list commmand. + + cmake --help-command list + list + ---- + + List operations. + + :: + + list(LENGTH <list> <output variable>) + list(GET <list> <element index> [<element index> ...] + <output variable>) + list(APPEND <list> [<element> ...]) + list(FIND <list> <value> <output variable>) + list(INSERT <list> <element_index> <element> [<element> ...]) + list(REMOVE_ITEM <list> <value> [<value> ...]) + list(REMOVE_AT <list> <index> [<index> ...]) + list(REMOVE_DUPLICATES <list>) + list(REVERSE <list>) + list(SORT <list>) + + LENGTH will return a given list's length. + + GET will return list of elements specified by indices from the list. + + APPEND will append elements to the list. + + FIND will return the index of the element specified in the list or -1 + if it wasn't found. + + INSERT will insert elements to the list to the specified location. + + REMOVE_AT and REMOVE_ITEM will remove items from the list. The + difference is that REMOVE_ITEM will remove the given items, while + REMOVE_AT will remove the items at the given indices. + + REMOVE_DUPLICATES will remove duplicated items in the list. + + REVERSE reverses the contents of the list in-place. + + SORT sorts the list in-place alphabetically. + + The list subcommands APPEND, INSERT, REMOVE_AT, REMOVE_ITEM, + REMOVE_DUPLICATES, REVERSE and SORT may create new values for the list + within the current CMake variable scope. Similar to the SET command, + the LIST command creates new variable values in the current scope, + even if the list itself is actually defined in a parent scope. To + propagate the results of these operations upwards, use SET with + PARENT_SCOPE, SET with CACHE INTERNAL, or some other means of value + propagation. + + NOTES: A list in cmake is a ; separated group of strings. To create a + list the set command can be used. For example, set(var a b c d e) + creates a list with a;b;c;d;e, and set(var "a b c d e") creates a + string or a list with one item in it. (Note macro arguments are not + variables, and therefore cannot be used in LIST commands.) + + When specifying index values, if <element index> is 0 or greater, it + is indexed from the beginning of the list, with 0 representing the + first list element. If <element index> is -1 or lesser, it is indexed + from the end of the list, with -1 representing the last list element. + Be careful when counting with negative indices: they do not start from + 0. -0 is equivalent to 0, the first list element. + ! Item was added: + ----- Method: CMakeListAppend>>elements (in category 'accessing') ----- + elements + ^ String streamContents: [:stream | elements asStringOn: stream delimiter: ' ' ] + ! Item was added: + ----- Method: CMakeListAppend>>initialize (in category 'initialize-release') ----- + initialize + list:='<list>'. + elements := OrderedCollection with: 'foo' with: 'bar' . + self content:' list( APPEND ', list, ' ' , self elements, ')'! Item was added: + ----- Method: CMakeListAppend>>list (in category 'accessing') ----- + list + + ^ list! Item was added: + ----- Method: CMakeListAppend>>list:elements: (in category 'accessing') ----- + list: aString elements: anObject + list:=aString. + elements := anObject. + self content:' list( APPEND ', list, ' ' , self elements, ')' + ! Item was changed: ----- Method: CMakeMessage>>optionalkeyword:message: (in category 'as yet unclassified') ----- optionalkeyword: oString message: mString optionalkeyword:=oString. message := mString. + self content:' message(', optionalkeyword, ' "', message,'")'! - self content:' - MESSAGE(', optionalkeyword, ' "', message,'")'! Item was added: + CMakeTemplate subclass: #CMakeMinimumRequired + instanceVariableNames: 'version' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-CMakeTemplates'! + + !CMakeMinimumRequired commentStamp: 'tty 7/14/2014 14:43' prior: 0! + A CMakeSetTemplate 's contents looks something like + + 'cmake_minimum_required(VERSION 2.6.2)' + + cmake --help-command cmake_minimum_required + + Set the minimum required version of cmake for a project. + cmake_minimum_required(VERSION major[.minor[.patch[.tweak]]] + [FATAL_ERROR]) + + If the current version of CMake is lower than that required it will + stop processing the project and report an error. When a version + higher than 2.4 is specified the command implicitly invokes + + cmake_policy(VERSION major[.minor[.patch[.tweak]]]) + + which sets the cmake policy version level to the version specified. + When version 2.4 or lower is given the command implicitly invokes + + cmake_policy(VERSION 2.4) + + which enables compatibility features for CMake 2.4 and lower. + + The FATAL_ERROR option is accepted but ignored by CMake 2.6 and + higher. It should be specified so CMake versions 2.4 and lower fail + with an error instead of just a warning. + + ! Item was added: + ----- Method: CMakeMinimumRequired>>initialize (in category 'initialize-release') ----- + initialize + version := 'foo'. + self content:' + CMAKE_MINIMUM_REQUIRED(VERSION ',version,')'! Item was added: + ----- Method: CMakeMinimumRequired>>version (in category 'accessing') ----- + version + + ^ version! Item was added: + ----- Method: CMakeMinimumRequired>>version: (in category 'accessing') ----- + version: anObject + version := anObject. + self content:' cmake_minimum_required(VERSION ',version,')'! Item was changed: CMakeTemplate subclass: #CMakePluginExternal instanceVariableNames: 'plugindefinitions pluginlinkdirectories pluginincludedirectories bld src cross srcplugins unixvm unixplugins unix crossplugins plugin pluginsources plunklinklibraries plgdir' classVariableNames: '' poolDictionaries: '' + category: 'CMakeVMMakerSqueak-CMakeCompositeTemplates'! - category: 'CMakeVMMakerSqueak-CMakeCustomTemplates'! !CMakePluginExternal commentStamp: 'tty 7/13/2014 19:02' prior: 0! A CMakePluginExternal is what Ian Piumarta wrote in trunk/platforms/unix/cmake/PlatformExternal.cmake. I .look like this in the original: ADD_DEFINITIONS (${@plugin@_definitions}) LINK_DIRECTORIES (${@plugin@_link_directories}) INCLUDE_DIRECTORIES (${@plugin@_include_directories} ${bld} ${src}/vm ${cross}/vm ${src}/plugins/@plugin@ ${unix}/vm ${unix}/plugins/@plugin@ ${unix}/@plugin@ ${cross}/plugins/@plugin@ ) ADD_LIBRARY (@plugin@ MODULE @plugin_sources@) TARGET_LINK_LIBRARIES (@plugin@ ${@plugin@_link_libraries}) INSTALL (TARGETS @plugin@ LIBRARY DESTINATION @plgdir@)! Item was removed: - CMakeTemplate subclass: #CMakePluginExternalTemplate - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'CMakeVMMakerSqueak'! - - !CMakePluginExternalTemplate commentStamp: 'tty 7/11/2014 10:53' prior: 0! - An Internal Plugin is configured by CMake using the following template: - - ADD_DEFINITIONS (${@plugin@_definitions}) - LINK_DIRECTORIES (${@plugin@_link_directories}) - INCLUDE_DIRECTORIES (${@plugin@_include_directories} - ${bld} - ${src}/vm - ${cross}/vm - ${src}/plugins/@plugin@ - ${unix}/vm - ${unix}/plugins/@plugin@ - ${unix}/@plugin@ - ${cross}/plugins/@plugin@ - ) - - ADD_LIBRARY (@plugin@ MODULE @plugin_sources@) - - TARGET_LINK_LIBRARIES (@plugin@ ${@plugin@_link_libraries}) - - - Just fill me in and print my contents! Item was changed: CMakeTemplate subclass: #CMakePluginInternal instanceVariableNames: 'plugindefinitions pluginlinkdirectories pluginincludedirectories bld src cross srcplugins unixvm unixplugins unix crossplugins plugin pluginsources' classVariableNames: '' poolDictionaries: '' + category: 'CMakeVMMakerSqueak-CMakeCompositeTemplates'! - category: 'CMakeVMMakerSqueak-CMakeCustomTemplates'! !CMakePluginInternal commentStamp: 'tty 7/13/2014 20:32' prior: 0! A CMakePluginInternal is what Ian Piumarta wrote in trunk/platforms/unix/cmake/PlatformInternal.cmake. I .look like this in the original: MESSAGE ("${@plugin@_definitions}") ADD_DEFINITIONS (-DSQUEAK_BUILTIN_PLUGIN=1 ${@plugin@_definitions}) LINK_DIRECTORIES (${@plugin@_link_directories}) INCLUDE_DIRECTORIES (${@plugin@_include_directories} ${bld} ${src}/vm ${cross}/vm ${src}/plugins/@plugin@ ${unix}/vm ${unix}/plugins/@plugin@ ${unix}/@plugin@ ${cross}/plugins/@plugin@ ) ADD_LIBRARY (@plugin@ STATIC @plugin_sources@) ! Item was added: + CMakeTemplate subclass: #CMakeProject + instanceVariableNames: 'variable' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-CMakeTemplates'! + + !CMakeProject commentStamp: 'tty 7/14/2014 13:27' prior: 0! + A CMakeProject looks like this: + + PROJECT (squeak)! Item was added: + ----- Method: CMakeProject>>initialize (in category 'initialize-release') ----- + initialize + variable := 'foo'. + self content:' + PROJECT (', variable, ')' + ! Item was added: + ----- Method: CMakeProject>>variable (in category 'accessing') ----- + variable + + ^ variable! Item was added: + ----- Method: CMakeProject>>variable: (in category 'accessing') ----- + variable: anObject + + variable := anObject. + self content:' project (', variable, ')'! Item was added: + ----- Method: CMakeSet>>variable:quotedValue: (in category 'accessing') ----- + variable: aString quotedValue: vString + + variable := aString. + value := '"', (vString copyReplaceAll: '"' with: '\"'), '"'. + self content:' set(',variable,' ',value,')'! Item was changed: ----- Method: CMakeSet>>variable:value: (in category 'accessing') ----- variable: aString value: vString variable := aString. value := vString. + self content:' set(',variable,' ',value,')'! - self content:' - SET(',variable,' ',value,')'! Item was changed: ----- Method: CMakeSetConfigDefine>>variable:value: (in category 'accessing') ----- variable: aString value: vString variable := aString. value := vString. + self content:' set(',variable,' ',value,') + config_define (',variable,')'. - self content:' - SET(',variable,' ',value,') - CONFIG_DEFINE (',variable,')'. ! Item was added: + CMakeTemplate subclass: #CMakeSetSourceFilesProperties + instanceVariableNames: 'files propertiesandvalues' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-CMakeTemplates'! + + !CMakeSetSourceFilesProperties commentStamp: 'tty 7/15/2014 12:24' prior: 0! + A CMakeSetSourceFilesProperties looks like this: + + TODO: generalize to match the cmake documentation. + + SET_SOURCE_FILES_PROPERTIES(file PROPERTIES prop1 value1) + + + cmake --help-command set_source_files_properties + --------------------------- + + Source files can have properties that affect how they are built. + + :: + + set_source_files_properties([file1 [file2 [...]]] + PROPERTIES prop1 value1 + [prop2 value2 [...]]) + + Set properties associated with source files using a key/value paired + list. See properties documentation for those known to CMake. + Unrecognized properties are ignored. Source file properties are + visible only to targets added in the same directory (CMakeLists.txt). + ! Item was added: + ----- Method: CMakeSetSourceFilesProperties>>files (in category 'accessing') ----- + files + ^ String streamContents: [:stream | files asStringOn: stream delimiter: ' ' ] + ! Item was added: + ----- Method: CMakeSetSourceFilesProperties>>files:propertiesandvalues: (in category 'accessing') ----- + files: fOrderedCollection propertiesandvalues: pOrderedCollection + + files := fOrderedCollection. + propertiesandvalues := pOrderedCollection. + self content:' set_source_files_properties (', self files, ' ' , 'PROPERTIES ', self propertiesandvalues , ')'! Item was added: + ----- Method: CMakeSetSourceFilesProperties>>initialize (in category 'initialize-release') ----- + initialize + self + initializeFiles; + initializePropertiesAndValues. + self content:' set_source_files_properties (', self files, ' ' , 'PROPERTIES ', self propertiesandvalues , ')' + ! Item was added: + ----- Method: CMakeSetSourceFilesProperties>>initializeFiles (in category 'initialize-release') ----- + initializeFiles + files:= OrderedCollection new. + files + addLast:('[file1'); + addLast:('[file2'); + addLast:('[...]]]'). + ! Item was added: + ----- Method: CMakeSetSourceFilesProperties>>initializePropertiesAndValues (in category 'initialize-release') ----- + initializePropertiesAndValues + propertiesandvalues := OrderedCollection new. + propertiesandvalues + addLast:('prop1 value1'); + addLast:('[prop 2 value2'); + addLast:('[...]]'). + ! Item was added: + ----- Method: CMakeSetSourceFilesProperties>>propertiesandvalues (in category 'accessing') ----- + propertiesandvalues + ^ String streamContents: [:stream | propertiesandvalues asStringOn: stream delimiter: ' ' ] + ! Item was added: + CMakeTemplate subclass: #CMakeSetTargetProperties + instanceVariableNames: 'target propertiesandvalues' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-CMakeTemplates'! + + !CMakeSetTargetProperties commentStamp: 'tty 7/16/2014 15:52' prior: 0! + cmake --help-command set_target_properties + + Targets can have properties that affect how they are built. + :: + + set_target_properties(target1 target2 ... + PROPERTIES prop1 value1 + prop2 value2 ...) + + Set properties on a target. The syntax for the command is to list all + the files you want to change, and then provide the values you want to + set next. You can use any prop value pair you want and extract it + later with the GET_TARGET_PROPERTY command. + + Properties that affect the name of a target's output file are as + follows. The PREFIX and SUFFIX properties override the default target + name prefix (such as "lib") and suffix (such as ".so"). IMPORT_PREFIX + and IMPORT_SUFFIX are the equivalent properties for the import library + corresponding to a DLL (for SHARED library targets). OUTPUT_NAME sets + the real name of a target when it is built and can be used to help + create two targets of the same name even though CMake requires unique + logical target names. There is also a <CONFIG>_OUTPUT_NAME that can + set the output name on a per-configuration basis. <CONFIG>_POSTFIX + sets a postfix for the real name of the target when it is built under + the configuration named by <CONFIG> (in upper-case, such as + "DEBUG_POSTFIX"). The value of this property is initialized when the + target is created to the value of the variable CMAKE_<CONFIG>_POSTFIX + (except for executable targets because earlier CMake versions which + did not use this variable for executables). + + The LINK_FLAGS property can be used to add extra flags to the link + step of a target. LINK_FLAGS_<CONFIG> will add to the configuration + <CONFIG>, for example, DEBUG, RELEASE, MINSIZEREL, RELWITHDEBINFO. + DEFINE_SYMBOL sets the name of the preprocessor symbol defined when + compiling sources in a shared library. If not set here then it is set + to target_EXPORTS by default (with some substitutions if the target is + not a valid C identifier). This is useful for headers to know whether + they are being included from inside their library or outside to + properly setup dllexport/dllimport decorations. The COMPILE_FLAGS + property sets additional compiler flags used to build sources within + the target. It may also be used to pass additional preprocessor + definitions. + + The LINKER_LANGUAGE property is used to change the tool used to link + an executable or shared library. The default is set the language to + match the files in the library. CXX and C are common values for this + property. + + For shared libraries VERSION and SOVERSION can be used to specify the + build version and API version respectively. When building or + installing appropriate symlinks are created if the platform supports + symlinks and the linker supports so-names. If only one of both is + specified the missing is assumed to have the same version number. For + executables VERSION can be used to specify the build version. When + building or installing appropriate symlinks are created if the + platform supports symlinks. For shared libraries and executables on + Windows the VERSION attribute is parsed to extract a "major.minor" + version number. These numbers are used as the image version of the + binary. + + There are a few properties used to specify RPATH rules. INSTALL_RPATH + is a semicolon-separated list specifying the rpath to use in installed + targets (for platforms that support it). INSTALL_RPATH_USE_LINK_PATH + is a boolean that if set to true will append directories in the linker + search path and outside the project to the INSTALL_RPATH. + SKIP_BUILD_RPATH is a boolean specifying whether to skip automatic + generation of an rpath allowing the target to run from the build tree. + BUILD_WITH_INSTALL_RPATH is a boolean specifying whether to link the + target in the build tree with the INSTALL_RPATH. This takes + precedence over SKIP_BUILD_RPATH and avoids the need for relinking + before installation. INSTALL_NAME_DIR is a string specifying the + directory portion of the "install_name" field of shared libraries on + Mac OSX to use in the installed targets. When the target is created + the values of the variables CMAKE_INSTALL_RPATH, + CMAKE_INSTALL_RPATH_USE_LINK_PATH, CMAKE_SKIP_BUILD_RPATH, + CMAKE_BUILD_WITH_INSTALL_RPATH, and CMAKE_INSTALL_NAME_DIR are used to + initialize these properties. + + PROJECT_LABEL can be used to change the name of the target in an IDE + like visual studio. VS_KEYWORD can be set to change the visual studio + keyword, for example Qt integration works better if this is set to + Qt4VSv1.0. + + VS_SCC_PROJECTNAME, VS_SCC_LOCALPATH, VS_SCC_PROVIDER and + VS_SCC_AUXPATH can be set to add support for source control bindings + in a Visual Studio project file. + + VS_GLOBAL_<variable> can be set to add a Visual Studio + project-specific global variable. Qt integration works better if + VS_GLOBAL_QtVersion is set to the Qt version FindQt4.cmake found. For + example, "4.7.3" + + The PRE_INSTALL_SCRIPT and POST_INSTALL_SCRIPT properties are the old + way to specify CMake scripts to run before and after installing a + target. They are used only when the old INSTALL_TARGETS command is + used to install the target. Use the INSTALL command instead. + + The EXCLUDE_FROM_DEFAULT_BUILD property is used by the visual studio + generators. If it is set to 1 the target will not be part of the + default build when you select "Build Solution". This can also be set + on a per-configuration basis using + EXCLUDE_FROM_DEFAULT_BUILD_<CONFIG>. + ! Item was added: + ----- Method: CMakeSetTargetProperties>>initialize (in category 'initialize-release') ----- + initialize + target := 'target1'. + propertiesandvalues := OrderedCollection with: 'prop1' with: 'value1' with: 'prop2' with:'value2' . + self content:' set_target_properties(',self target ,' PROPERTIES ', self propertiesandvalues,')'! Item was added: + ----- Method: CMakeSetTargetProperties>>propertiesandvalues (in category 'accessing') ----- + propertiesandvalues + ^ String streamContents: [:stream | propertiesandvalues asStringOn: stream delimiter: ' ' ]! Item was added: + ----- Method: CMakeSetTargetProperties>>propertiesandvalues: (in category 'accessing') ----- + propertiesandvalues: anObject + + propertiesandvalues := anObject! Item was added: + ----- Method: CMakeSetTargetProperties>>target (in category 'accessing') ----- + target + ^ target! Item was added: + ----- Method: CMakeSetTargetProperties>>target: (in category 'accessing') ----- + target: tString + target := tString! Item was added: + ----- Method: CMakeSetTargetProperties>>target:propertiesandvalues: (in category 'accessing') ----- + target: tString propertiesandvalues:pOrderedCollection + target := tString. + propertiesandvalues := pOrderedCollection. + self content:' set_target_properties(',self target ,' PROPERTIES ', self propertiesandvalues,')' + ! Item was removed: - CMakeGenerator subclass: #CMakeSourceDistroGeneratorForSqueak - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'CMakeVMMakerSqueak'! - - !CMakeSourceDistroGeneratorForSqueak commentStamp: 'tty 6/18/2014 08:12' prior: 0! - A CMakeSourceDistroGeneratorForSqueak does nothing at the moment. Here is why I am here (2014.06.16 vm-dev list): - - - Hi Bert - Linux distros never package binaries compiled by someone else (*). What they need is a source tar ball that builds cleanly, and a list of dependencies. - - hmmmm.... - - CMakeVMMaker has a CMakePluginGenerator and CMakeVMGenerator; I have a hunch a CMakeSourceDistroGenerator would fit right in. - - - The Design of CMakeVMaker is a big-ole Visitor pattern where configurations visit the Generators. We should be able to have them visit a CMakeSourceDistroGenerator and provide it - with the relevant information. - - I will put in a stub-class for it as a reminder to look at when release 1 of this puppy is ready. - - - cheers. - - tty - ! Item was changed: CMakeTemplate subclass: #CMakeSqConfigH instanceVariableNames: 'config templates' classVariableNames: '' poolDictionaries: '' + category: 'CMakeVMMakerSqueak-CMakeCompositeTemplates'! - category: 'CMakeVMMakerSqueak-CMakeCustomTemplates'! !CMakeSqConfigH commentStamp: 'tty 7/11/2014 11:05' prior: 0! I am the outermost wrapper on config.cmake IF (NOT DEFINED __sq_config_h) rest of config.cmake here ENDIF (NOT DEFINED __sq_config_h) ! Item was added: + CMakeTemplate subclass: #CMakeTargetLinkLibraries + instanceVariableNames: 'target items' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-CMakeTemplates'! + + !CMakeTargetLinkLibraries commentStamp: 'tty 7/17/2014 11:29' prior: 0! + I am a simple wrapper for the CMake target_link_libraries command. + The CMake command has many more options than I offer. If you want more, modify me or create a different template. + + cmake --help-command target-link-libraries + + target_link_libraries + --------------------- + + Link a target to given libraries. + + :: + + target_link_libraries(<target> [item1 [item2 [...]]] + [[debug|optimized|general] <item>] ...) + + Specify libraries or flags to use when linking a given target. The + named ``<target>`` must have been created in the current directory by a + command such as ``add_executable()`` or ``add_library()``. The + remaining arguments specify library names or flags. Repeated calls for + the same ``<target>`` append items in the order called. + + If a library name matches that of another target in the project a + dependency will automatically be added in the build system to make sure + the library being linked is up-to-date before the target links. Item names + starting with ``-``, but not ``-l`` or ``-framework``, are treated as + linker flags. + + A ``debug``, ``optimized``, or ``general`` keyword indicates that the + library immediately following it is to be used only for the + corresponding build configuration. The ``debug`` keyword corresponds to + the Debug configuration (or to configurations named in the + ``DEBUG_CONFIGURATIONS`` global property if it is set). The + ``optimized`` keyword corresponds to all other configurations. The + ``general`` keyword corresponds to all configurations, and is purely + optional (assumed if omitted). Higher granularity may be achieved for + per-configuration rules by creating and linking to + :ref:`IMPORTED library targets <Imported Targets>`. + + Library dependencies are transitive by default with this signature. + When this target is linked into another target then the libraries + linked to this target will appear on the link line for the other + target too. This transitive "link interface" is stored in the + ``INTERFACE_LINK_LIBRARIES`` target property and may be overridden + by setting the property directly. When ``CMP0022`` is not set to + ``NEW``, transitive linking is built in but may be overridden by the + ``LINK_INTERFACE_LIBRARIES`` property. Calls to other signatures + of this command may set the property making any libraries linked + exclusively by this signature private. + + CMake will also propagate :ref:`usage requirements <Target Usage Requirements>` + from linked library targets. Usage requirements of dependencies affect + compilation of sources in the ``<target>``. + + If an ``<item>`` is a library in a Mac OX framework, the ``Headers`` + directory of the framework will also be processed as a + :ref:`usage requirement <Target Usage Requirements>`. This has the same + effect as passing the framework directory as an include directory. + ! Item was added: + ----- Method: CMakeTargetLinkLibraries>>initialize (in category 'initialize-release') ----- + initialize + target := OrderedCollection with: 'target1' with:'target2'. + items := OrderedCollection with: 'item1' with: 'item2'. + self content:' target_link_libraries(', target ,' ', self items,')' + + " target_link_libraries(<target> [item1 [item2 [...]]] + [[debug|optimized|general] <item>] ...)"! Item was added: + ----- Method: CMakeTargetLinkLibraries>>items (in category 'accessing') ----- + items + ^ String streamContents: [:stream | items asStringOn: stream delimiter: ' ' ]! Item was added: + ----- Method: CMakeTargetLinkLibraries>>target (in category 'accessing') ----- + target + ^ target! Item was added: + ----- Method: CMakeTargetLinkLibraries>>target: (in category 'accessing') ----- + target: tString + target := tString! Item was added: + ----- Method: CMakeTargetLinkLibraries>>target:items: (in category 'accessing') ----- + target: tString items: anOrderedCollection + target := tString. + items := anOrderedCollection. + self content:' target_link_libraries(', target ,' ', self items,')' + ! Item was added: + CMakeVMDriverWrapper subclass: #CMakeVMDisplayCustom + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-VMDriver'! Item was added: + ----- Method: CMakeVMDisplayCustom>>initialize (in category 'initialize-release') ----- + initialize + super initialize. + driver:='vm-display-custom'! Item was added: + CMakeVMDriverWrapper subclass: #CMakeVMDisplayFbdev + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-VMDriver'! Item was added: + ----- Method: CMakeVMDisplayFbdev>>initialize (in category 'initialize-release') ----- + initialize + super initialize. + driver:='vm-display-fbdev'! Item was added: + CMakeVMDriverWrapper subclass: #CMakeVMDisplayNull + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-VMDriver'! Item was added: + ----- Method: CMakeVMDisplayNull>>initialize (in category 'initialize-release') ----- + initialize + super initialize. + driver:='vm-display-null'! Item was added: + CMakeVMDriverWrapper subclass: #CMakeVMDisplayQuartz + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-VMDriver'! Item was added: + ----- Method: CMakeVMDisplayQuartz>>initialize (in category 'initialize-release') ----- + initialize + super initialize. + driver:='vm-display-Quartz'! Item was added: + CMakeVMDriverWrapper subclass: #CMakeVMDisplayX11 + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-VMDriver'! Item was added: + ----- Method: CMakeVMDisplayX11>>initialize (in category 'initialize-release') ----- + initialize + super initialize. + driver:='vm-display-X11'! Item was added: + CMakeTemplate subclass: #CMakeVMDriver + instanceVariableNames: 'config definitions driver sources includedirectories' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-CMakeCompositeTemplates'! + + !CMakeVMDriver commentStamp: 'tty 7/17/2014 11:50' prior: 0! + A CMakeVMDriver is a composite template that simplifies outputing vm drivers like vm-display-X11 to a CMakeLists.txt file. + I replace the output of pharo's CMakeVMMaker + + CogFamilyUnixConfig addDriver: name sources: aSources generator: cmakeGen externalLibs: extLibs which was invoked like so: + + aMaker message: 'addVMDrivers: aMaker'. + self + addDriver: 'vm-display-null' + sources: #( + '${targetPlatform}/vm-display-null/sqUnixDisplayNull' ) + generator: aMaker + externalLibs: #(); + ! Item was added: + ----- Method: CMakeVMDriver>>config (in category 'accessing') ----- + config + + ^ config! Item was added: + ----- Method: CMakeVMDriver>>config:definitions:driver:sources:includedirectories: (in category 'accessing') ----- + config: anObject definitions: dOrderedCollection driver: dString sources: sOrderedCollection includedirectories: iOrderedCollection + config:= anObject. + definitions:= dOrderedCollection. + driver:=dString. + sources :=sOrderedCollection. + includedirectories := iOrderedCollection. + ^self template + + ! Item was added: + ----- Method: CMakeVMDriver>>definitions (in category 'accessing') ----- + definitions + ^ definitions! Item was added: + ----- Method: CMakeVMDriver>>driver (in category 'accessing') ----- + driver + + ^ driver! Item was added: + ----- Method: CMakeVMDriver>>includedirectories (in category 'accessing') ----- + includedirectories + + ^ includedirectories! Item was added: + ----- Method: CMakeVMDriver>>sources (in category 'accessing') ----- + sources + + ^ sources! Item was added: + ----- Method: CMakeVMDriver>>template (in category 'accessing') ----- + template + |temp sourcesString| + sourcesString := String streamContents: [:stream | sources asStringOn: stream delimiter: ' ' ]. + temp := OrderedCollection new. + temp + addLast: ((CMakeHeader new) configurationName: config class name ); + addLast: ((CMakeProject new)variable: config executableName ); + addLast: ((CMakeInclude new) file: ((config buildDirName), FileDirectory slash, 'directories.cmake')); "??" + addLast:((CMakeAddDefinitions new) definitions: config compilerFlags asOrderedCollection); + addLast:((CMakeAddDefinitions new) definitions: definitions); + addLast:((CMakeSet new) variable:'sources' quotedValue: sourcesString); + addLast:((CMakeAddLibrary new) + library: driver + type: 'SHARED' + sources: sources); + addLast: ((CMakeIncludeDirectories new) dirs: includedirectories); + addLast:((CMakeSet new) variable: 'LIBRARY_OUTPUT_PATH' quotedValue: (config outputDir fullName)); + addLast:((CMakeListAppend new) list: 'LINKLIBS' elements: (config externalLibs)); + addLast:((CMakeTargetLinkLibraries new) target: driver items: (OrderedCollection with: '${LINKLIBS}')); + addLast:((CMakeSetTargetProperties new) + target: driver + propertiesandvalues: (OrderedCollection with: 'PREFIX "" ' with: 'SUFFIX "" ' with: 'LINK_FLAGS ' , (config compilerFlags))). + ^temp! Item was added: + Object subclass: #CMakeVMDriverWrapper + instanceVariableNames: 'driver sources compilerdefinitions compilerflags externallibraries linkerflags includedirectories' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-VMDriver'! + + !CMakeVMDriverWrapper commentStamp: 'tty 7/17/2014 13:41' prior: 0! + A CMakeVMDriverWrapper is a data bucket for things like: + + 'vm-display-Quartz' + 'vm-display-X11' + 'vm-display-custom' + 'vm-display-fbdev' + 'vm-display-null' + 'vm-sound-ALSA' + 'vm-sound-MacOSX' + 'vm-sound-NAS' + 'vm-sound-OSS' + 'vm-sound-Sun' + 'vm-sound-custom' + 'vm-sound-null' + + + ! Item was added: + ----- Method: CMakeVMDriverWrapper>>compilerdefinitions (in category 'accessing') ----- + compilerdefinitions + + ^ compilerdefinitions! Item was added: + ----- Method: CMakeVMDriverWrapper>>compilerdefinitions: (in category 'accessing') ----- + compilerdefinitions: anObject + + compilerdefinitions := anObject! Item was added: + ----- Method: CMakeVMDriverWrapper>>compilerflags (in category 'accessing') ----- + compilerflags + + ^ compilerflags! Item was added: + ----- Method: CMakeVMDriverWrapper>>compilerflags: (in category 'accessing') ----- + compilerflags: anObject + + compilerflags := anObject! Item was added: + ----- Method: CMakeVMDriverWrapper>>driver (in category 'accessing') ----- + driver + + ^ driver! Item was added: + ----- Method: CMakeVMDriverWrapper>>driver: (in category 'accessing') ----- + driver: anObject + + driver := anObject! Item was added: + ----- Method: CMakeVMDriverWrapper>>driver:sources:compilerdefinitions:compilerflags:externallibraries:linkerflags:includedirectories: (in category 'accessing') ----- + driver:dString sources:sCollection compilerdefinitions: cdCollection compilerflags: cfCollection externallibraries:elCollection linkerflags: lfCollection includedirectories: idCollection + driver:= dString. + sources:= sCollection. + compilerdefinitions:= cdCollection. + compilerflags:= cfCollection. + externallibraries := elCollection. + linkerflags:= lfCollection. + includedirectories := idCollection.! Item was added: + ----- Method: CMakeVMDriverWrapper>>externallibraries (in category 'accessing') ----- + externallibraries + + ^ externallibraries! Item was added: + ----- Method: CMakeVMDriverWrapper>>externallibraries: (in category 'accessing') ----- + externallibraries: anObject + + externallibraries := anObject! Item was added: + ----- Method: CMakeVMDriverWrapper>>includedirectories (in category 'accessing') ----- + includedirectories + + ^ includedirectories! Item was added: + ----- Method: CMakeVMDriverWrapper>>includedirectories: (in category 'accessing') ----- + includedirectories: anObject + + includedirectories := anObject! Item was added: + ----- Method: CMakeVMDriverWrapper>>initialize (in category 'initialize-release') ----- + initialize + "force CPlatformConfigurations to set my internal state explicitly by filling me with initial nonsense values" + sources := OrderedCollection with: 'sources' with: 'paths'. + compilerdefinitions := OrderedCollection with:'-DCompiler' with: '-DDefinitions'. + compilerflags := OrderedCollection with:'-compiler' with: '-flags'. + externallibraries := OrderedCollection with:'cxternal'with:'library'. + linkerflags := OrderedCollection with:'linker' with:'flags'. + includedirectories := OrderedCollection with:'include' with:'directories'.! Item was added: + ----- Method: CMakeVMDriverWrapper>>linkerflags (in category 'accessing') ----- + linkerflags + + ^ linkerflags! Item was added: + ----- Method: CMakeVMDriverWrapper>>linkerflags: (in category 'accessing') ----- + linkerflags: anObject + + linkerflags := anObject! Item was added: + ----- Method: CMakeVMDriverWrapper>>sources (in category 'accessing') ----- + sources + + ^ sources! Item was added: + ----- Method: CMakeVMDriverWrapper>>sources: (in category 'accessing') ----- + sources: anObject + + sources := anObject! Item was added: + ----- Method: CMakeVMGeneratorForSqueak class>>generateByTemplate: (in category 'as yet unclassified') ----- + generateByTemplate: aConfigOrClass + ^self new + generateByTemplate: aConfigOrClass; + yourself ! Item was added: + ----- Method: CMakeVMGeneratorForSqueak>>generateByTemplate (in category 'code generation') ----- + generateByTemplate + "attempt to move way from string based writing to template based. Think Seaside renderOn composition" + | extPlugins intPlugins | + self flag: 'tty'. "refactor so that the cascade reflects CMake terminilogy" + output := String new writeStream. + config templates: OrderedCollection new. + config + setGlobalOptions: self; + cmakePrefixPath; + cmakeIncludePath; + cmakeLibraryPath; + cmakeIncludeModules; + cmakeCFlags; + cmakeAddDefinitions; + cmakeSharedLinkerFlags; + setGlobalOptionsAfterDetermineSystem: self; + setDirectories: self; + cmakeIncludeDirectories: self; + preferredIncludes; + standardIncludes; + extraVMSettings: self; + setCoreSources: self; + setPlatformSources: self; + setCrossSources: self; + setExtraSources; + cmakeSetSourceFilesProperties; + cmakeListAppend:'LINKLIBS' elements: (config externalLibs); + cmakeAddExecutableNameOptionSource: self; + setExecutableOutputPath; + addVMDrivers: self. + + " + self addVMDrivers: aMaker. + " + config templates do: [:each | self puts: each content]. + + extPlugins := self generatePluginConfigs: config internalPlugins internal: true. + intPlugins := self generatePluginConfigs: config externalPlugins internal: false. + self processThirdpartyLibraries. + self processPlugins: intPlugins, extPlugins. + + " config setExtraTargetProperties: self." + self cmd: 'target_link_libraries' + params: self moduleName , ' ${LINKLIBS}'. + config postBuildActions: self.. + self saveFile. + self generateBuildScript! Item was added: + ----- Method: CMakeVMGeneratorForSqueak>>generateByTemplate: (in category 'as yet unclassified') ----- + generateByTemplate: aConfigOrClass + + config := aConfigOrClass isBehavior ifTrue: [ aConfigOrClass new ] ifFalse: [aConfigOrClass]. + ^ self generateByTemplate! Item was changed: ----- Method: CMakeVMGeneratorForSqueak>>processThirdpartyLibraries (in category 'as yet unclassified') ----- processThirdpartyLibraries + config thirdpartyLibs do: [:each | - config thirdpartyLibs do: [:each | each generateFor: self ] ! Item was changed: ----- Method: CMakeVMGeneratorForSqueak>>sources (in category 'as yet unclassified') ----- sources + self flag: 'tty'. "code smell. I have moved the 'self set:' stuff to addCMakeExectuableTemplate: aMaker" + " self set: #coreSources to: (self append: '${srcVMDir}/' toAll: config coreSources). + self set: #platformVMSources to: (self append: '${targetPlatform}/vm/' toAll: config platformSources). + self set: #crossVMSources to: (self append: '${crossDir}/vm/' toAll: config crossSources). + self set: #extraSources to: config extraSources." - - self set: #coreSources to: - (self append: '${srcVMDir}/' toAll: config coreSources). - - self set: #platformVMSources to: - (self append: '${targetPlatform}/vm/' toAll: config platformSources). - - - self set: #crossVMSources to: - (self append: '${crossDir}/vm/' toAll: config crossSources). - - self set: #extraSources to: config extraSources. - ^ '${coreSources} ${crossVMSources} ${platformVMSources} ${extraSources}'! Item was changed: ----- Method: CMakeVMMakerSqueakDeveloperHelp class>>pages (in category 'pages') ----- pages + ^#(overview prerequisites terms igorStasenkoDesign buildersAndConfigs plugins pthreads configDotCmake templates vmdrivers)! - ^#(overview prerequisites terms igorStasenkoDesign buildersAndConfigs plugins pthreads configDotCmake templates)! Item was added: + ----- Method: CMakeVMMakerSqueakDeveloperHelp class>>vmdrivers (in category 'pages') ----- + vmdrivers + ^HelpTopic + title:'VMDrivers' + contents:' + + TODO CMakeVMMakerSqueak-VMDriver purpose, configuration and use'! Item was removed: - ----- Method: CMakeVMMakerSqueakMacintoshConfigTest>>testCMakeMacros (in category 'as yet unclassified') ----- - testCMakeMacros - #( SqueakMacintoshConfig) - do:[:each | - (Smalltalk at:each) - allSubclassesDo:[:configuration | | o | - o:= configuration new. - (o excludeFromBuild not) - ifTrue:[self assert:(o cMakeMacros isString)]]] - - - - ! Item was added: + CMakeVMDriverWrapper subclass: #CMakeVMSoundALSA + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-VMDriver'! Item was added: + ----- Method: CMakeVMSoundALSA>>initialize (in category 'initialize-release') ----- + initialize + super initialize. + driver:='vm-sound-ALSA'! Item was added: + CMakeVMDriverWrapper subclass: #CMakeVMSoundCustom + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-VMDriver'! Item was added: + ----- Method: CMakeVMSoundCustom>>initialize (in category 'initialize-release') ----- + initialize + super initialize. + driver:='vm-sound-custom'! Item was added: + CMakeVMDriverWrapper subclass: #CMakeVMSoundMacOSX + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-VMDriver'! Item was added: + ----- Method: CMakeVMSoundMacOSX>>initialize (in category 'initialize-release') ----- + initialize + super initialize. + driver:='vm-sound-MacOSX'! Item was added: + CMakeVMDriverWrapper subclass: #CMakeVMSoundNAS + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-VMDriver'! Item was added: + ----- Method: CMakeVMSoundNAS>>initialize (in category 'initialize-release') ----- + initialize + super initialize. + driver:='vm-sound-NAS'! Item was added: + CMakeVMDriverWrapper subclass: #CMakeVMSoundNull + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-VMDriver'! Item was added: + ----- Method: CMakeVMSoundNull>>initialize (in category 'initialize-release') ----- + initialize + super initialize. + driver:='vm-sound-null'! Item was added: + CMakeVMDriverWrapper subclass: #CMakeVMSoundOSS + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-VMDriver'! Item was added: + ----- Method: CMakeVMSoundOSS>>initialize (in category 'initialize-release') ----- + initialize + super initialize. + driver:='vm-sound-OSS'! Item was added: + CMakeVMDriverWrapper subclass: #CMakeVMSoundSun + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-VMDriver'! Item was added: + ----- Method: CMakeVMSoundSun>>initialize (in category 'initialize-release') ----- + initialize + super initialize. + driver:='vm-sound-Sun'! Item was changed: CPlatformConfig subclass: #CPlatformConfigForSqueak + instanceVariableNames: 'buildType generateBuild generateBuildAssert generateBuildAssertITimerHeartbeat generateBuildDebug generateBuildDebugITimerHeartbeat generateBuildDebugMultiThreaded generateBuildIHeartbeatTimer generateBuildMultiThreaded generateBuildMultiThreadedAssert generateBuildMultiThreadedDebug templates enabledebugmessages vmdrivers' - instanceVariableNames: 'buildType generateBuild generateBuildAssert generateBuildAssertITimerHeartbeat generateBuildDebug generateBuildDebugITimerHeartbeat generateBuildDebugMultiThreaded generateBuildIHeartbeatTimer generateBuildMultiThreaded generateBuildMultiThreadedAssert generateBuildMultiThreadedDebug' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMakerSqueak'! CPlatformConfigForSqueak class instanceVariableNames: 'isAbstractBaseClass'! !CPlatformConfigForSqueak commentStamp: 'tty 6/23/2014 17:02' prior: 0! A CPlatformConfigForSqueak acts as a compatability layer for Squeak and an Abstract Base Class for extended functionality required for the Squeak CMakeVMMaker use-case. I make (very) heavy use of a specific design pattern for configuring myself and remaining compatible with pharo's CMakeVMMaker. The entry point for that pattern is my method 'configureForBuildType: aSymbol' . Each method send in there detects my buildType and routes the send to the approriate method for that buildType. Subclasses of me 'must' configure themselves for each build type per that pattern. However this can be very easy by just returning the base configuration. Tests are written to verify that this support infrastructure is in place. I have two important variables. excludeFromBuild and isAbstractBaseClass. excludeFromBuild is used to exclude a configuration from being built by a Builder. is used to exclude a configuration from Testing. isAbstractBaseClass is a class instance variable used by configurations that exclude themselves from being built by a Builder BUT need to be included in Testing. excludeFromBuild | isAbstractBaseClass | should build | should test T T NO YES T F NO NO F T YES YES F F YES YES The use-case is as follows. An abstract base class contains a lot of functionality that must be implemented and tested for the system to work, but it is not meant to be compiled. concrete classes of that AbstractBase class can exclude themselves from being built by builders and by doing so are not tested. However, once a concrete configuration is enabled to be built, it must pass all tests. Linux32x86Config is an example of an AbstractBase class that must pass all testing, but is not buildable. Its subclass Linux32x86SqueakCogV3Config needs testing, but a developer can toggle 'exclude from build' to hide it from Builders or make it available to them. Tests make the decision on what configurations to test. Here are some examples. (o excludeFromBuild not) & (configuration isAbstractBaseClass not) this is a concrete [Lang][VM][MemoryManager][etc] configuration that will be built. No platform classes considered (o excludeFromBuild) & (configuration isAbstractBaseClass not) This is a concrete [Lang][VM][MemoryManager][etc] configuration that will be NOT built. (o excludeFromBuild not) | (configuration isAbstractBaseClass) concrete implementation may depend on its [OS][VMWordSize][Processor] AbstractBaseClass for platform level methods. example: Linux32x86Config ccBuild has the '-m32' compiler flag that is common to all builds on that platform (o excludeFromBuild not) & (configuration isAbstractBaseClass) Not allowed. [OS][VMWordSize][Processor] AbstractBaseClasses should not be built. This is a useful test in its own right. (o excludeFromBuild) & (configuration isAbstractBaseClass) These are the AbstractBaseClasses. An AbstractBaseClass should always be excluded from a build tty.! CPlatformConfigForSqueak class instanceVariableNames: 'isAbstractBaseClass'! Item was added: + ----- Method: CPlatformConfigForSqueak>>addVMDriversBuildMultiThreaded: (in category 'cmake buildType redirects') ----- + addVMDriversBuildMultiThreaded: aMaker + "SqueakUnixConfig browse" + self subclassResponsibility.! Item was changed: + ----- Method: CPlatformConfigForSqueak>>availableBuildTypes (in category 'cmake') ----- - ----- Method: CPlatformConfigForSqueak>>availableBuildTypes (in category 'cmake configuration') ----- availableBuildTypes self subclassResponsibility. " ^SqueakCMakeVMMakerAbstractBuilder default noBuildTypes ^(SqueakCMakeVMMakerAbstractBuilder default allBuildTypes copyWithoutAll: #( #assertWithHeartbeatTimer #debugWithHeartbeatTimer debugMultiThreadedFFI.....etc)) "! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeAddDefinitions (in category 'cmake buildType redirects') ----- + cmakeAddDefinitions + "Route this message send to the message appropriate for my buildType " + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self cmakeAddDefinitionsBuild]; + at: #buildAssert put: [self cmakeAddDefinitionsBuildAssert]; + at: #buildAssertITimerHeartbeat put: [self cmakeAddDefinitionsBuildAssertITimerHeartbeat]; + at:#buildDebug put: [self cmakeAddDefinitionsPathBuildDebug]; + at: #buildDebugITimerHeartbeat put: [self cmakeAddDefinitionsBuildDebugITimerHeartbeat ]; + at: #buildITimerHeartbeat put: [self cmakeAddDefinitionsBuildITimerHeartbeat]; + at: #buildMultiThreaded put: [self cmakeAddDefinitionsBuildMultiThreaded]; + at: #buildMultiThreadedAssert put: [self cmakeAddDefinitionsBuildMultiThreadedAssert]; + at: #buildMultiThreadedDebug put: [self cmakeAddDefinitionsBuildMultiThreadedDebug ]; + at: #buildNone put:[self cmakeAddDefinitionsNoBuildType]. + ^(d at: buildType) value! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeAddDefinitionsBuild (in category 'cmake buildType redirects') ----- + cmakeAddDefinitionsBuild + "" + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeAddDefinitionsBuildAssert (in category 'cmake buildType redirects') ----- + cmakeAddDefinitionsBuildAssert + "" + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeAddDefinitionsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + cmakeAddDefinitionsBuildAssertITimerHeartbeat + "" + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeAddDefinitionsBuildDebug (in category 'cmake buildType redirects') ----- + cmakeAddDefinitionsBuildDebug + "" + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeAddDefinitionsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + cmakeAddDefinitionsBuildDebugITimerHeartbeat + "" + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeAddDefinitionsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + cmakeAddDefinitionsBuildITimerHeartbeat + "" + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeAddDefinitionsBuildMultiThreaded (in category 'cmake buildType redirects') ----- + cmakeAddDefinitionsBuildMultiThreaded + "" + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeAddDefinitionsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + cmakeAddDefinitionsBuildMultiThreadedAssert + "" + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeAddDefinitionsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + cmakeAddDefinitionsBuildMultiThreadedDebug + "" + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeAddDefinitionsNoBuildType (in category 'cmake buildType redirects') ----- + cmakeAddDefinitionsNoBuildType + "SHOULD NOT GET HERE" + self shouldNotImplement. + ! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeAddExecutableNameOptionSource: (in category 'cmake') ----- + cmakeAddExecutableNameOptionSource: aMaker + (enabledebugmessages) + ifTrue:[ templates + addLast:((CMakeMessage new) message: (self class name) , 'cmakeAddExecutableNameOptionSource: aMaker') + ]. + templates + addLast:((CMakeAddExecutableNameOptionSource new) + executableName: (self executableName) + optionalproperty: (self executableType) + sources: (OrderedCollection with: aMaker sources)). + + ! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeCFlags (in category 'cmake buildType redirects') ----- + cmakeCFlags + "Route this message send to the message appropriate for my buildType " + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self cmakeCFlagsBuild]; + at: #buildAssert put: [self cmakeCFlagsBuildAssert]; + at: #buildAssertITimerHeartbeat put: [self cmakeCFlagsBuildAssertITimerHeartbeat]; + at:#buildDebug put: [self cmakeCFlagsPathBuildDebug]; + at: #buildDebugITimerHeartbeat put: [self cmakeCFlagsBuildDebugITimerHeartbeat ]; + at: #buildITimerHeartbeat put: [self cmakeCFlagsBuildITimerHeartbeat]; + at: #buildMultiThreaded put: [self cmakeCFlagsBuildMultiThreaded]; + at: #buildMultiThreadedAssert put: [self cmakeCFlagsBuildMultiThreadedAssert]; + at: #buildMultiThreadedDebug put: [self cmakeCFlagsBuildMultiThreadedDebug ]; + at: #buildNone put:[self cmakeCFlagsNoBuildType]. + ^(d at: buildType) value! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeCFlagsBuild (in category 'cmake buildType redirects') ----- + cmakeCFlagsBuild + " + convenience method for customizing CMAKE_C_FLAGS CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_DEBUG variables based on #buildType. + + cmake --help-variable CMAKE_C_FLAGS + cmake --help-variable CMAKE_C_FLAGS_DEBUG + cmake --help-variable CMAKE_C_FLAGS_RELEASE + + cmake --help-variable CMAKE_CXX_FLAGS + cmake --help-variable CMAKE_CXX_FLAGS_DEBUG + cmake --help-variable CMAKE_CXX_FLAGS_RELEASE + + NOTE: be careful not to clobber existing flags unless you intend to. + You can avoid that with this form: set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -Wall -m32) which is created via cmake templates with + templates + addLast:((CMakeSet new) variable:'CMAKE_CXX_FLAGS' value: '${CMAKE_CXX_FLAGS} -Wall -m32'); + + + + + SystemNavigation default browseMethodsWhoseNamesContain: 'cmakeCFlagsBuild' + " + self subclassResponsibility.! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeCFlagsBuildAssert (in category 'cmake buildType redirects') ----- + cmakeCFlagsBuildAssert + "convenience method for customizing CMAKE_C_FLAGS CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_DEBUG variables based on #buildType." + ^self cmakeCFlagsBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeCFlagsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + cmakeCFlagsBuildAssertITimerHeartbeat + "convenience method for customizing CMAKE_C_FLAGS CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_DEBUG variables based on #buildType." + ^self cmakeCFlagsBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeCFlagsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + cmakeCFlagsBuildDebugITimerHeartbeat + "convenience method for customizing CMAKE_C_FLAGS CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_DEBUG variables based on #buildType." + ^self cmakeCFlagsBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeCFlagsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + cmakeCFlagsBuildITimerHeartbeat + "convenience method for customizing CMAKE_C_FLAGS CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_DEBUG variables based on #buildType." + ^self cmakeCFlagsBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeCFlagsBuildMultiThreaded (in category 'cmake buildType redirects') ----- + cmakeCFlagsBuildMultiThreaded + "convenience method for customizing CMAKE_C_FLAGS CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_DEBUG variables based on #buildType." + ^self cmakeCFlagsBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeCFlagsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + cmakeCFlagsBuildMultiThreadedAssert + "convenience method for customizing CMAKE_C_FLAGS CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_DEBUG variables based on #buildType." + ^self cmakeCFlagsBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeCFlagsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + cmakeCFlagsBuildMultiThreadedDebug + "convenience method for customizing CMAKE_C_FLAGS CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_DEBUG variables based on #buildType." + ^self cmakeCFlagsBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeCFlagsNoBuildType (in category 'cmake buildType redirects') ----- + cmakeCFlagsNoBuildType + "SHOULD NOT GET HERE" + self shouldNotImplement. + ! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeCFlagsPathBuildDebug (in category 'cmake buildType redirects') ----- + cmakeCFlagsPathBuildDebug + "convenience method for customizing CMAKE_C_FLAGS CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_DEBUG variables based on #buildType." + ^self cmakeCFlagsBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeIncludeDirectories: (in category 'cmake') ----- + cmakeIncludeDirectories: aMaker + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: (self class name), ' includeDirs: aMaker' ) + ]. + templates + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: (aMaker includeDirs))). + ! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeIncludeModules (in category 'cmake buildType redirects') ----- + cmakeIncludeModules + "Route this message send to the message appropriate for my buildType " + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self cmakeIncludeModulesBuild]; + at: #buildAssert put: [self cmakeIncludeModulesBuildAssert]; + at: #buildAssertITimerHeartbeat put: [self cmakeIncludeModulesBuildAssertITimerHeartbeat]; + at:#buildDebug put: [self cmakeIncludeModulesBuildDebug]; + at: #buildDebugITimerHeartbeat put: [self cmakeIncludeModulesBuildDebugITimerHeartbeat ]; + at: #buildITimerHeartbeat put: [self cmakeIncludeModulesBuildITimerHeartbeat]; + at: #buildMultiThreaded put: [self cmakeIncludeModulesMultiThreaded]; + at: #buildMultiThreadedAssert put: [self cmakeIncludeModulesBuildMultiThreadedAssert]; + at: #buildMultiThreadedDebug put: [self cmakeIncludeModulesBuildMultiThreadedDebug ]; + at: #buildNone put:[self cmakeIncludeModulesNoBuildType]. + ^(d at: buildType) value! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeIncludeModulesBuild (in category 'cmake buildType redirects') ----- + cmakeIncludeModulesBuild + "cmake Modules to include" + self subclassResponsibility.! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeIncludeModulesBuildAssert (in category 'cmake buildType redirects') ----- + cmakeIncludeModulesBuildAssert + "convenience method for including different CMake Modules for different buildType default #build " + ^self cmakeIncludeModulesBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeIncludeModulesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + cmakeIncludeModulesBuildAssertITimerHeartbeat + "convenience method for including different CMake Modules for different buildType default #build " + ^self cmakeIncludeModulesBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeIncludeModulesBuildDebug (in category 'cmake buildType redirects') ----- + cmakeIncludeModulesBuildDebug + "convenience method for including different CMake Modules for different buildType default #build " + ^self cmakeIncludeModulesBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeIncludeModulesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + cmakeIncludeModulesBuildDebugITimerHeartbeat + "convenience method for including different CMake Modules for different buildType default #build " + ^self cmakeIncludeModulesBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeIncludeModulesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + cmakeIncludeModulesBuildITimerHeartbeat + "convenience method for including different CMake Modules for different buildType default #build " + ^self cmakeIncludeModulesBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeIncludeModulesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + cmakeIncludeModulesBuildMultiThreadedAssert + "convenience method for including different CMake Modules for different buildType default #build " + ^self cmakeIncludeModulesBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeIncludeModulesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + cmakeIncludeModulesBuildMultiThreadedDebug + "convenience method for including different CMake Modules for different buildType default #build " + ^self cmakeIncludeModulesBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeIncludeModulesMultiThreaded (in category 'cmake buildType redirects') ----- + cmakeIncludeModulesMultiThreaded + "convenience method for including different CMake Modules for different buildType default #build " + ^self cmakeIncludeModulesBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeIncludeModulesNoBuildType (in category 'cmake buildType redirects') ----- + cmakeIncludeModulesNoBuildType + "SHOULD NOT GET HERE" + self shouldNotImplement. + ! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeIncludePath (in category 'cmake buildType redirects') ----- + cmakeIncludePath + "Route this message send to the message appropriate for my buildType " + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self cmakeIncludePathBuild]; + at: #buildAssert put: [self cmakeIncludePathBuildAssert]; + at: #buildAssertITimerHeartbeat put: [self cmakeIncludePathBuildAssertITimerHeartbeat]; + at:#buildDebug put: [self cmakeIncludePathBuildDebug]; + at: #buildDebugITimerHeartbeat put: [self cmakeIncludePathBuildDebugITimerHeartbeat ]; + at: #buildITimerHeartbeat put: [self cmakeIncludePathBuildITimerHeartbeat]; + at: #buildMultiThreaded put: [self cmakeIncludePathBuildMultiThreaded]; + at: #buildMultiThreadedAssert put: [self cmakeIncludePathBuildMultiThreadedAssert]; + at: #buildMultiThreadedDebug put: [self cmakeIncludePathBuildMultiThreadedDebug ]; + at: #buildNone put:[self cmakeIncludePathNoBuildType]. + ^(d at: buildType) value! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeIncludePathBuild (in category 'cmake buildType redirects') ----- + cmakeIncludePathBuild + " + cmake --help-variable CMAKE_INCLUDE_PATH + This is used when searching for include files e.g. using the FIND_PATH() command. If you have headers in non-standard locations, it may be useful to set this variable to this directory (e.g. /sw/include on Mac OS X). If you need several directories, separate them by the platform specific separators (e.g. ':' on UNIX) " + self subclassResponsibility.! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeIncludePathBuildAssert (in category 'cmake buildType redirects') ----- + cmakeIncludePathBuildAssert + "convenience method for cusomizing CMAKE_INCLUDE_PATH for different buildType " + ^self cmakeIncludePathBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeIncludePathBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + cmakeIncludePathBuildAssertITimerHeartbeat + "convenience method for cusomizing CMAKE_INCLUDE_PATH for different buildType " + ^self cmakeIncludePathBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeIncludePathBuildDebug (in category 'cmake buildType redirects') ----- + cmakeIncludePathBuildDebug + "convenience method for cusomizing CMAKE_INCLUDE_PATH for different buildType " + ^self cmakeIncludePathBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeIncludePathBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + cmakeIncludePathBuildDebugITimerHeartbeat + "convenience method for cusomizing CMAKE_INCLUDE_PATH for different buildType " + ^self cmakeIncludePathBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeIncludePathBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + cmakeIncludePathBuildITimerHeartbeat + "convenience method for cusomizing CMAKE_INCLUDE_PATH for different buildType " + ^self cmakeIncludePathBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeIncludePathBuildMultiThreaded (in category 'cmake buildType redirects') ----- + cmakeIncludePathBuildMultiThreaded + "convenience method for cusomizing CMAKE_INCLUDE_PATH for different buildType " + ^self cmakeIncludePathBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeIncludePathBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + cmakeIncludePathBuildMultiThreadedAssert + "convenience method for cusomizing CMAKE_INCLUDE_PATH for different buildType " + ^self cmakeIncludePathBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeIncludePathBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + cmakeIncludePathBuildMultiThreadedDebug + "convenience method for cusomizing CMAKE_INCLUDE_PATH for different buildType " + ^self cmakeIncludePathBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeIncludePathNoBuildType (in category 'cmake buildType redirects') ----- + cmakeIncludePathNoBuildType + "SHOULD NOT GET HERE" + self shouldNotImplement. + ! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeLibraryPath (in category 'cmake buildType redirects') ----- + cmakeLibraryPath + "Route this message send to the message appropriate for my buildType " + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self cmakeLibraryPathBuild]; + at: #buildAssert put: [self cmakeLibraryPathBuildAssert]; + at: #buildAssertITimerHeartbeat put: [self cmakeLibraryPathBuildAssertITimerHeartbeat]; + at:#buildDebug put: [self cmakeLibraryPathBuildDebug]; + at: #buildDebugITimerHeartbeat put: [self cmakeLibraryPathBuildDebugITimerHeartbeat ]; + at: #buildITimerHeartbeat put: [self cmakeLibraryPathBuildITimerHeartbeat]; + at: #buildMultiThreaded put: [self cmakeLibraryPathBuildMultiThreaded]; + at: #buildMultiThreadedAssert put: [self cmakeLibraryPathBuildMultiThreadedAssert]; + at: #buildMultiThreadedDebug put: [self cmakeLibraryPathBuildMultiThreadedDebug ]; + at: #buildNone put:[self cmakeLibraryPathNoBuildType]. + ^(d at: buildType) value! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeLibraryPathBuild (in category 'cmake buildType redirects') ----- + cmakeLibraryPathBuild + " + cmake --help-variable CMAKE_LIBRARY_PATH + This is used when searching for libraries e.g. using the FIND_LIBRARY() command. If you have libraries in non-standard locations, it may be useful to set this variable to this directory (e.g. /sw/lib on Mac OS X). If you need several directories, separate them by the platform specific separators (e.g. '':'' on UNIX) " + self subclassResponsibility.! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeLibraryPathBuildAssert (in category 'cmake buildType redirects') ----- + cmakeLibraryPathBuildAssert + "convenience method for cusomizing CMAKE_LIBRARY_PATH for different buildType " + ^self cmakeLibraryPathBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeLibraryPathBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + cmakeLibraryPathBuildAssertITimerHeartbeat + "convenience method for cusomizing CMAKE_LIBRARY_PATH for different buildType " + ^self cmakeLibraryPathBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeLibraryPathBuildDebug (in category 'cmake buildType redirects') ----- + cmakeLibraryPathBuildDebug + "convenience method for cusomizing CMAKE_LIBRARY_PATH for different buildType " + ^self cmakeLibraryPathBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeLibraryPathBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + cmakeLibraryPathBuildDebugITimerHeartbeat + "convenience method for cusomizing CMAKE_LIBRARY_PATH for different buildType " + ^self cmakeLibraryPathBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeLibraryPathBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + cmakeLibraryPathBuildITimerHeartbeat + "convenience method for cusomizing CMAKE_LIBRARY_PATH for different buildType " + ^self cmakeLibraryPathBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeLibraryPathBuildMultiThreaded (in category 'cmake buildType redirects') ----- + cmakeLibraryPathBuildMultiThreaded + "convenience method for cusomizing CMAKE_LIBRARY_PATH for different buildType " + ^self cmakeLibraryPathBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeLibraryPathBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + cmakeLibraryPathBuildMultiThreadedAssert + "convenience method for cusomizing CMAKE_LIBRARY_PATH for different buildType " + ^self cmakeLibraryPathBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeLibraryPathBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + cmakeLibraryPathBuildMultiThreadedDebug + "convenience method for cusomizing CMAKE_LIBRARY_PATH for different buildType " + ^self cmakeLibraryPathBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeLibraryPathNoBuildType (in category 'cmake buildType redirects') ----- + cmakeLibraryPathNoBuildType + "SHOULD NOT GET HERE" + self shouldNotImplement. + ! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeListAppend:elements: (in category 'cmake') ----- + cmakeListAppend: listString elements: anOrderedCollection + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: (self class name), ' cmakeListAppend: listString elements: eString' ) + ]. + templates + addLast: ((CMakeListAppend new) list: listString elements: anOrderedCollection). + + ! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakePrefixPath (in category 'cmake buildType redirects') ----- + cmakePrefixPath + "Route this message send to the message appropriate for my buildType " + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self cmakePrefixPathBuild]; + at: #buildAssert put: [self cmakePrefixPathBuildAssert]; + at: #buildAssertITimerHeartbeat put: [self cmakePrefixPathBuildAssertITimerHeartbeat]; + at:#buildDebug put: [self cmakePrefixPathBuildDebug]; + at: #buildDebugITimerHeartbeat put: [self cmakePrefixPathBuildDebugITimerHeartbeat ]; + at: #buildITimerHeartbeat put: [self cmakePrefixPathBuildITimerHeartbeat]; + at: #buildMultiThreaded put: [self cmakePrefixPathBuildMultiThreaded]; + at: #buildMultiThreadedAssert put: [self cmakePrefixPathBuildMultiThreadedAssert]; + at: #buildMultiThreadedDebug put: [self cmakePrefixPathBuildMultiThreadedDebug ]; + at: #buildNone put:[self cmakePrefixPathNoBuildType]. + ^(d at: buildType) value! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakePrefixPathBuild (in category 'cmake buildType redirects') ----- + cmakePrefixPathBuild + " + cmake --help-variable CMAKE_PREFIX_PATH + (since CMake 2.6.0) This is used when searching for include files, binaries, or libraries using either the FIND_PACKAGE(), FIND_PATH(), FIND_PROGRAM(), or FIND_LIBRARY() commands. For each path in the CMAKE_PREFIX_PATH list, CMake will check ''PATH/include'' and ''PATH'' when FIND_PATH() is called, ''PATH/bin'' and ''PATH'' when FIND_PROGRAM() is called, and ''PATH/lib'' and ''PATH'' when FIND_LIBRARY() is called. See the documentation for FIND_PACKAGE(), FIND_LIBRARY(), FIND_PATH(), and FIND_PROGRAM() for more details." + + self subclassResponsibility.! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakePrefixPathBuildAssert (in category 'cmake buildType redirects') ----- + cmakePrefixPathBuildAssert + "convenience method for cusomizing CMAKE_PREFIX_PATH for different buildType " + ^self cmakePrefixPathBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakePrefixPathBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + cmakePrefixPathBuildAssertITimerHeartbeat + "convenience method for cusomizing CMAKE_PREFIX_PATH for different buildType " + ^self cmakePrefixPathBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakePrefixPathBuildDebug (in category 'cmake buildType redirects') ----- + cmakePrefixPathBuildDebug + "convenience method for cusomizing CMAKE_PREFIX_PATH for different buildType " + ^self cmakePrefixPathBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakePrefixPathBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + cmakePrefixPathBuildDebugITimerHeartbeat + "convenience method for cusomizing CMAKE_PREFIX_PATH for different buildType " + ^self cmakePrefixPathBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakePrefixPathBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + cmakePrefixPathBuildITimerHeartbeat + "convenience method for cusomizing CMAKE_PREFIX_PATH for different buildType " + ^self cmakePrefixPathBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakePrefixPathBuildMultiThreaded (in category 'cmake buildType redirects') ----- + cmakePrefixPathBuildMultiThreaded + "convenience method for cusomizing CMAKE_PREFIX_PATH for different buildType " + ^self cmakePrefixPathBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakePrefixPathBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + cmakePrefixPathBuildMultiThreadedAssert + "convenience method for cusomizing CMAKE_PREFIX_PATH for different buildType " + ^self cmakePrefixPathBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakePrefixPathBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + cmakePrefixPathBuildMultiThreadedDebug + "convenience method for cusomizing CMAKE_PREFIX_PATH for different buildType " + ^self cmakePrefixPathBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakePrefixPathNoBuildType (in category 'cmake buildType redirects') ----- + cmakePrefixPathNoBuildType + "SHOULD NOT GET HERE" + self shouldNotImplement. + ! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeSetSourceFilesProperties (in category 'cmake buildType redirects') ----- + cmakeSetSourceFilesProperties + "Route this message send to the message appropriate for my buildType " + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self cmakeSetSourceFilesPropertiesBuild]; + at: #buildAssert put: [self cmakeSetSourceFilesPropertiesBuildAssert]; + at: #buildAssertITimerHeartbeat put: [self cmakeSetSourceFilesPropertiesBuildAssertITimerHeartbeat]; + at:#buildDebug put: [self cmakeSetSourceFilesPropertiesBuildDebug]; + at: #buildDebugITimerHeartbeat put: [self cmakeSetSourceFilesPropertiesBuildDebugITimerHeartbeat ]; + at: #buildITimerHeartbeat put: [self cmakeSetSourceFilesPropertiesBuildITimerHeartbeat]; + at: #buildMultiThreaded put: [self cmakeSetSourceFilesPropertiesBuildMultiThreaded]; + at: #buildMultiThreadedAssert put: [self cmakeSetSourceFilesPropertiesBuildMultiThreadedAssert]; + at: #buildMultiThreadedDebug put: [self cmakeSetSourceFilesPropertiesBuildMultiThreadedDebug ]; + at: #buildNone put:[self cmakeSetSourceFilesPropertiesNoBuildType]. + ^(d at: buildType) value! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeSetSourceFilesPropertiesBuild (in category 'cmake buildType redirects') ----- + cmakeSetSourceFilesPropertiesBuild + " + cmake --help-command set_source_files_properties + set_source_files_properties + --------------------------- + + Source files can have properties that affect how they are built. + + :: + + set_source_files_properties([file1 [file2 [...]]] + PROPERTIES prop1 value1 + [prop2 value2 [...]]) + + Set properties associated with source files using a key/value paired + list. See properties documentation for those known to CMake. + Unrecognized properties are ignored. Source file properties are + visible only to targets added in the same directory (CMakeLists.txt). + + ." + + self subclassResponsibility.! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeSetSourceFilesPropertiesBuildAssert (in category 'cmake buildType redirects') ----- + cmakeSetSourceFilesPropertiesBuildAssert + "convenience method for cusomizing for different buildType " + ^self cmakeSetSourceFilesPropertiesBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeSetSourceFilesPropertiesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + cmakeSetSourceFilesPropertiesBuildAssertITimerHeartbeat + "convenience method for cusomizing for different buildType " + ^self cmakeSetSourceFilesPropertiesBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeSetSourceFilesPropertiesBuildDebug (in category 'cmake buildType redirects') ----- + cmakeSetSourceFilesPropertiesBuildDebug + "convenience method for cusomizing for different buildType " + ^self cmakeSetSourceFilesPropertiesBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeSetSourceFilesPropertiesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + cmakeSetSourceFilesPropertiesBuildDebugITimerHeartbeat + "convenience method for cusomizing for different buildType " + ^self cmakeSetSourceFilesPropertiesBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeSetSourceFilesPropertiesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + cmakeSetSourceFilesPropertiesBuildITimerHeartbeat + "convenience method for cusomizing for different buildType " + ^self cmakeSetSourceFilesPropertiesBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeSetSourceFilesPropertiesBuildMultiThreaded (in category 'cmake buildType redirects') ----- + cmakeSetSourceFilesPropertiesBuildMultiThreaded + "convenience method for cusomizing for different buildType " + ^self cmakeSetSourceFilesPropertiesBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeSetSourceFilesPropertiesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + cmakeSetSourceFilesPropertiesBuildMultiThreadedAssert + "convenience method for cusomizing for different buildType " + ^self cmakeSetSourceFilesPropertiesBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeSetSourceFilesPropertiesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + cmakeSetSourceFilesPropertiesBuildMultiThreadedDebug + "convenience method for cusomizing for different buildType " + ^self cmakeSetSourceFilesPropertiesBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeSetSourceFilesPropertiesNoBuildType (in category 'cmake buildType redirects') ----- + cmakeSetSourceFilesPropertiesNoBuildType + "SHOULD NOT GET HERE" + self shouldNotImplement. + ! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeSharedLinkerFlags (in category 'cmake buildType redirects') ----- + cmakeSharedLinkerFlags + "Route this message send to the message appropriate for my buildType " + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self cmakeSharedLinkerFlagsBuild]; + at: #buildAssert put: [self cmakeSharedLinkerFlagsBuildAssert]; + at: #buildAssertITimerHeartbeat put: [self cmakeSharedLinkerFlagsBuildAssertITimerHeartbeat]; + at:#buildDebug put: [self cmakeSharedLinkerFlagsBuildDebug]; + at: #buildDebugITimerHeartbeat put: [self cmakeSharedLinkerFlagsBuildDebugITimerHeartbeat ]; + at: #buildITimerHeartbeat put: [self cmakeSharedLinkerFlagsBuildITimerHeartbeat]; + at: #buildMultiThreaded put: [self cmakeSharedLinkerFlagsBuildMultiThreaded]; + at: #buildMultiThreadedAssert put: [self cmakeSharedLinkerFlagsBuildMultiThreadedAssert]; + at: #buildMultiThreadedDebug put: [self cmakeSharedLinkerFlagsBuildMultiThreadedDebug ]; + at: #buildNone put:[self cmakeSharedLinkerFlagsNoBuildType]. + ^(d at: buildType) value! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeSharedLinkerFlagsBuild (in category 'cmake buildType redirects') ----- + cmakeSharedLinkerFlagsBuild + " + cmake --help-variable CMAKE_SHARED_LINKER_FLAGS + CMAKE_SHARED_LINKER_FLAGS + ------------------------- + + Linker flags to be used to create shared libraries. + + We want a command like this: + + set(CMAKE_SHARED_LINKER_FLAGS ''-Wl -z now'') + + using the template system, it looks like this: + + |flags| + flags := { + '-Wl' + . '-z' + . 'now' + } asOrderedCollection . + templates + addLast:((CMakeSet new) + variable:'CMAKE_SHARED_LINKER_FLAGS' + quotedValue:'${CMAKE_SHARED_LINKER_FLAGS} ', (String streamContents: [:stream | flags asStringOn: stream delimiter: ' ' ])). + + ." + self subclassResponsibility.! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeSharedLinkerFlagsBuildAssert (in category 'cmake buildType redirects') ----- + cmakeSharedLinkerFlagsBuildAssert + "convenience method for customizing CMAKE_SHARED_LINKER_FLAGS for different buildType " + ^self cmakeSharedLinkerFlagsBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeSharedLinkerFlagsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- + cmakeSharedLinkerFlagsBuildAssertITimerHeartbeat + "convenience method for customizing CMAKE_SHARED_LINKER_FLAGS for different buildType " + ^self cmakeSharedLinkerFlagsBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeSharedLinkerFlagsBuildDebug (in category 'cmake buildType redirects') ----- + cmakeSharedLinkerFlagsBuildDebug + "convenience method for customizing CMAKE_SHARED_LINKER_FLAGS for different buildType " + ^self cmakeSharedLinkerFlagsBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeSharedLinkerFlagsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- + cmakeSharedLinkerFlagsBuildDebugITimerHeartbeat + "convenience method for customizing CMAKE_SHARED_LINKER_FLAGS for different buildType " + ^self cmakeSharedLinkerFlagsBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeSharedLinkerFlagsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- + cmakeSharedLinkerFlagsBuildITimerHeartbeat + "convenience method for customizing CMAKE_SHARED_LINKER_FLAGS for different buildType " + ^self cmakeSharedLinkerFlagsBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeSharedLinkerFlagsBuildMultiThreaded (in category 'cmake buildType redirects') ----- + cmakeSharedLinkerFlagsBuildMultiThreaded + "convenience method for customizing CMAKE_SHARED_LINKER_FLAGS for different buildType " + ^self cmakeSharedLinkerFlagsBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeSharedLinkerFlagsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- + cmakeSharedLinkerFlagsBuildMultiThreadedAssert + "convenience method for customizing CMAKE_SHARED_LINKER_FLAGS for different buildType " + ^self cmakeSharedLinkerFlagsBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeSharedLinkerFlagsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- + cmakeSharedLinkerFlagsBuildMultiThreadedDebug + "convenience method for customizing CMAKE_SHARED_LINKER_FLAGS for different buildType " + ^self cmakeSharedLinkerFlagsBuild! Item was added: + ----- Method: CPlatformConfigForSqueak>>cmakeSharedLinkerFlagsNoBuildType (in category 'cmake buildType redirects') ----- + cmakeSharedLinkerFlagsNoBuildType + "SHOULD NOT GET HERE" + self shouldNotImplement. + ! Item was removed: - ----- Method: CPlatformConfigForSqueak>>comilerFlagsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - comilerFlagsBuildAssertITimerHeartbeat - "This will be going away in place of cC, cXX, lDFlags, libs methods - ^self cFlagsBuild - " - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>commonCompilerFlags (in category 'compiler flags') ----- - commonCompilerFlags - self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>compilerDefinitions (in category 'compiling') ----- + compilerDefinitions + "-DNDEBUG -DGNU_SOURCE...etc feed these into cmakeAddDefinitions" + self subclassResponsibility! Item was changed: + ----- Method: CPlatformConfigForSqueak>>compilerFlags (in category 'compiling') ----- - ----- Method: CPlatformConfigForSqueak>>compilerFlags (in category 'cmake buildType redirects') ----- compilerFlags + "-g -O1 -m32...define these in your concrete CPlatformConfigForSqueak and feed them to cmakeCFlags" + self subclassResponsibility! - |d flags| - d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. - d - at: #build put: [self compilerFlagsBuild]; - at: #buildAssert put: [self compilerFlagsBuildAssert]; - at: #buildAssertITimerHeartbeat put: [self compilerFlagsBuildAssertITimerHeartbeat]; - at:#buildDebug put: [self compilerFlagsBuildDebug]; - at: #buildDebugITimerHeartbeat put: [self compilerFlagsBuildDebugITimerHeartbeat ]; - at: #buildITimerHeartbeat put: [self compilerFlagsBuildITimerHeartbeat]; - at: #buildMultiThreaded put: [self compilerFlagsBuildMultiThreaded]; - at: #buildMultiThreadedAssert put: [self compilerFlagsBuildMultiThreadedAssert]; - at: #buildMultiThreadedDebug put: [self compilerFlagsBuildMultiThreadedDebug ]; - at: #buildNone put:[self compilerFlagsNoBuildType]. - flags := String - streamContents: [:stream | ((d at: buildType) value collect: #withBlanksTrimmed as: Set) - asStringOn: stream - delimiter: ' ']. - ^flags. - ! Item was removed: - ----- Method: CPlatformConfigForSqueak>>compilerFlagsBuild (in category 'cmake buildType redirects') ----- - compilerFlagsBuild - "" - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>compilerFlagsBuildAssert (in category 'cmake buildType redirects') ----- - compilerFlagsBuildAssert - "^self comilerFlagsBuild - " - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>compilerFlagsBuildDebug (in category 'cmake buildType redirects') ----- - compilerFlagsBuildDebug - "^self compilerFlagsBuild" - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>compilerFlagsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - compilerFlagsBuildDebugITimerHeartbeat - " ^self compilerFlagsBuild" - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>compilerFlagsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - compilerFlagsBuildITimerHeartbeat - "^self comilerFlagsBuild - " - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>compilerFlagsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - compilerFlagsBuildMultiThreaded - "^self comilerFlagsBuild - " - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>compilerFlagsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - compilerFlagsBuildMultiThreadedAssert - "^self comilerFlagsBuild - " - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>compilerFlagsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - compilerFlagsBuildMultiThreadedDebug - "^self comilerFlagsBuild - " - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>configureFlags (in category 'gnu build system mvm file') ----- - configureFlags - "Route this message send to the message appropriate for my buildType " - |d | - d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. - d - at: #build put: [self configureFlagsBuild]; - at: #buildAssert put: [self configureFlagsBuildAssert]; - at: #buildAssertITimerHeartbeat put: [self configureFlagsBuildAssertITimerHeartbeat]; - at:#buildDebug put: [self configureFlagsBuildDebug]; - at: #buildDebugITimerHeartbeat put: [self configureFlagsBuildDebugITimerHeartbeat ]; - at: #buildITimerHeartbeat put: [self configureFlagsBuildITimerHeartbeat]; - at: #buildMultiThreaded put: [self configureFlagsBuildMultiThreaded]; - at: #buildMultiThreadedAssert put: [self configureFlagsBuildMultiThreadedAssert]; - at: #buildMultiThreadedDebug put: [self configureFlagsBuildMultiThreadedDebug ]; - at: #buildNone put:[self configureFlagsNoBuildType]. - ^(d at: buildType) value! Item was removed: - ----- Method: CPlatformConfigForSqueak>>configureFlagsBuild (in category 'cmake buildType redirects') ----- - configureFlagsBuild - "flags to feed to a configure command in GNU - configure --without-npsqueak --with-src=stacksrc --with-plugins=src/plugins --disable-cogi --without-vm-display-fbdev --x-libraries=/usr/lib --without-gl - - ^{ - '-without-npsqueak' - . '--with-src=stacksrc' - . '--with-plugins=src/plugins' - . '--disable-cogit' - . '--without-vm-display-fbdev' - . '--x-libraries=/usr/lib' - . '--without-gl' - }" - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>configureFlagsBuildAssert (in category 'cmake buildType redirects') ----- - configureFlagsBuildAssert - "flags to feed to a configure command in GNU - configure --without-npsqueak --with-src=stacksrc --with-plugins=src/plugins --disable-cogi --without-vm-display-fbdev --x-libraries=/usr/lib --without-gl - - ^{ - '-without-npsqueak' - . '--with-src=stacksrc' - . '--with-plugins=src/plugins' - . '--disable-cogit' - . '--without-vm-display-fbdev' - . '--x-libraries=/usr/lib' - . '--without-gl' - } - - ^self configureFlagsBuild - " - - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>configureFlagsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - configureFlagsBuildAssertITimerHeartbeat - "flags to feed to a configure command in GNU - configure --without-npsqueak --with-src=stacksrc --with-plugins=src/plugins --disable-cogi --without-vm-display-fbdev --x-libraries=/usr/lib --without-gl - - ^{ - '-without-npsqueak' - . '--with-src=stacksrc' - . '--with-plugins=src/plugins' - . '--disable-cogit' - . '--without-vm-display-fbdev' - . '--x-libraries=/usr/lib' - . '--without-gl' - } - - ^self configureFlagsBuild - " - - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>configureFlagsBuildDebug (in category 'cmake buildType redirects') ----- - configureFlagsBuildDebug - "flags to feed to a configure command in GNU - configure --without-npsqueak --with-src=stacksrc --with-plugins=src/plugins --disable-cogi --without-vm-display-fbdev --x-libraries=/usr/lib --without-gl - - ^{ - '-without-npsqueak' - . '--with-src=stacksrc' - . '--with-plugins=src/plugins' - . '--disable-cogit' - . '--without-vm-display-fbdev' - . '--x-libraries=/usr/lib' - . '--without-gl' - } - - ^self configureFlagsBuild - " - - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>configureFlagsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - configureFlagsBuildDebugITimerHeartbeat - "flags to feed to a configure command in GNU - configure --without-npsqueak --with-src=stacksrc --with-plugins=src/plugins --disable-cogi --without-vm-display-fbdev --x-libraries=/usr/lib --without-gl - - ^{ - '-without-npsqueak' - . '--with-src=stacksrc' - . '--with-plugins=src/plugins' - . '--disable-cogit' - . '--without-vm-display-fbdev' - . '--x-libraries=/usr/lib' - . '--without-gl' - } - - ^self configureFlagsBuild - " - - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>configureFlagsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - configureFlagsBuildITimerHeartbeat - "flags to feed to a configure command in GNU - configure --without-npsqueak --with-src=stacksrc --with-plugins=src/plugins --disable-cogi --without-vm-display-fbdev --x-libraries=/usr/lib --without-gl - - ^{ - '-without-npsqueak' - . '--with-src=stacksrc' - . '--with-plugins=src/plugins' - . '--disable-cogit' - . '--without-vm-display-fbdev' - . '--x-libraries=/usr/lib' - . '--without-gl' - } - - ^self configureFlagsBuild - " - - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>configureFlagsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - configureFlagsBuildMultiThreaded - "flags to feed to a configure command in GNU - configure --without-npsqueak --with-src=stacksrc --with-plugins=src/plugins --disable-cogi --without-vm-display-fbdev --x-libraries=/usr/lib --without-gl - - ^{ - '-without-npsqueak' - . '--with-src=stacksrc' - . '--with-plugins=src/plugins' - . '--disable-cogit' - . '--without-vm-display-fbdev' - . '--x-libraries=/usr/lib' - . '--without-gl' - } - - ^self configureFlagsBuild - " - - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>configureFlagsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - configureFlagsBuildMultiThreadedAssert - "flags to feed to a configure command in GNU - configure --without-npsqueak --with-src=stacksrc --with-plugins=src/plugins --disable-cogi --without-vm-display-fbdev --x-libraries=/usr/lib --without-gl - - ^{ - '-without-npsqueak' - . '--with-src=stacksrc' - . '--with-plugins=src/plugins' - . '--disable-cogit' - . '--without-vm-display-fbdev' - . '--x-libraries=/usr/lib' - . '--without-gl' - } - - ^self configureFlagsBuild - " - - - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>configureFlagsNoBuildType (in category 'cmake buildType redirects') ----- - configureFlagsNoBuildType - "SHOULD NOT GET HERE" - self shouldNotImplement. - ! Item was changed: + ----- Method: CPlatformConfigForSqueak>>configureForBuildType: (in category 'cmake') ----- - ----- Method: CPlatformConfigForSqueak>>configureForBuildType: (in category 'cmake configuration') ----- configureForBuildType: aSymbol "Set my internal state appropriate for my build type". self subclassResponsibility. ! Item was changed: + ----- Method: CPlatformConfigForSqueak>>configureNoBuildType (in category 'cmake') ----- - ----- Method: CPlatformConfigForSqueak>>configureNoBuildType (in category 'cmake configuration') ----- configureNoBuildType generateBuild:=generateBuildAssert:=generateBuildAssertITimerHeartbeat:=generateBuildDebug:=generateBuildDebugITimerHeartbeat:= generateBuildDebugMultiThreaded:= generateBuildIHeartbeatTimer:= generateBuildMultiThreaded:= generateBuildMultiThreadedAssert:= generateBuildMultiThreadedDebug:=false.! Item was added: + ----- Method: CPlatformConfigForSqueak>>enabledebugmessages (in category 'accessing') ----- + enabledebugmessages + ^enabledebugmessages! Item was added: + ----- Method: CPlatformConfigForSqueak>>enabledebugmessages: (in category 'accessing') ----- + enabledebugmessages: aBoolean + enabledebugmessages := aBoolean! Item was changed: + ----- Method: CPlatformConfigForSqueak>>excludeFromBuild (in category 'cmake') ----- - ----- Method: CPlatformConfigForSqueak>>excludeFromBuild (in category 'cmake configuration') ----- excludeFromBuild " ^false" "build this configuration" " ^true" "do not build this configuration" self subclassResponsibility ! Item was changed: + ----- Method: CPlatformConfigForSqueak>>executableName (in category 'cmake executable names') ----- - ----- Method: CPlatformConfigForSqueak>>executableName (in category 'accessing') ----- executableName self subclassResponsibility " executableName ^ self vmCogExecutableName ^ self vmSistaExecutableName ^ self vmStackExectuableName " ! Item was changed: + ----- Method: CPlatformConfigForSqueak>>executableType (in category 'cmake executable names') ----- - ----- Method: CPlatformConfigForSqueak>>executableType (in category 'accessing') ----- executableType self subclassResponsibility. " SystemNavigation default browseMethodsWhoseNamesContain: ''executableType'' ^ 'MACOSX_BUNDLE' ^ 'WIN32'\ ^ '' "! Item was added: + ----- Method: CPlatformConfigForSqueak>>externalLibraries (in category 'compiling') ----- + externalLibraries + "-lX11 -luuid -lssl -lcrypto define these in your concrete CPlatformConfigForSqueak and feed them to cmakeListAppendLinkLibs" + self subclassResponsibility! Item was changed: + ----- Method: CPlatformConfigForSqueak>>externalModulesDir (in category 'cmake directory ') ----- - ----- Method: CPlatformConfigForSqueak>>externalModulesDir (in category 'accessing') ----- externalModulesDir "answer the location in VM bundle, where plugins and rest of dynamic libs will be copied, " self subclassResponsibility! Item was changed: ----- Method: CPlatformConfigForSqueak>>extraVMSettingsBuild: (in category 'cmake buildType redirects') ----- extraVMSettingsBuild: maker "convenience method to customize plugin settings for this buildType. + on unix writes out version.c custom command. + on mac/windows, I don't know. - Most configurations do nothing. SystemNavigation default browseMethodsWhoseNamesContain: 'extraVMSettings' " + self flag:'tty'. "move self setResourceProperties: aMaker. from extraVMSettingsBuild?" - self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>generateByTemplate (in category 'source generation') ----- + generateByTemplate + + self + generatePluginsList; "informative list of plugins for end user" + generateLicense; "Squeak license" + generateUtilsCmake; "Ian's useful CMake macros. used extensivelly." + generatePluginsCmake; "Ian's CMake Plugins Processing" + generateVmBuildCmake; "Ian's CMake Build script" + generateVmConfigCmake; "Ian's config.cmake file used to generate gnu config.h" + generateVmConfigIn; "Ian's code, not sure what it does yet" + generateTestDoubleWordAlignmentC; "Ian's platform tests used in configuration" + generateTestDoubleWordOrderC; + generateTestLanginfoCodesetC. + ^ CMakeVMGeneratorForSqueak generateByTemplate: self ! Item was added: + ----- Method: CPlatformConfigForSqueak>>initialize (in category 'initialize-release') ----- + initialize + enabledebugmessages := false. + self initializeVMDrivers. + self customizeVMDrivers.! Item was added: + ----- Method: CPlatformConfigForSqueak>>initializeVMDrivers (in category 'initialize-release') ----- + initializeVMDrivers + vmdrivers := OrderedCollection new. + vmdrivers + addLast:(CMakeVMDisplayCustom new); + addLast:(CMakeVMDisplayFbdev new); + addLast:(CMakeVMDisplayNull new); + addLast:(CMakeVMDisplayQuartz new); + addLast:(CMakeVMDisplayX11 new); + addLast:(CMakeVMSoundALSA new); + addLast:(CMakeVMSoundCustom new); + addLast:(CMakeVMSoundMacOSX new); + addLast:(CMakeVMSoundNAS new); + addLast:(CMakeVMSoundNull new); + addLast:(CMakeVMSoundOSS new); + addLast:(CMakeVMSoundSun new). + ! Item was removed: - ----- Method: CPlatformConfigForSqueak>>lDFlags (in category 'cmake buildType redirects') ----- - lDFlags - "Route this message send to the message appropriate for my buildType " - |d | - d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. - d - at: #build put: [self lDFlagsBuild]; - at: #buildAssert put: [self lDFlagsBuildAssert]; - at: #buildAssertITimerHeartbeat put: [self lDFlagsBuildAssertITimerHeartbeat]; - at:#buildDebug put: [self lDFlagsBuildDebug]; - at: #buildDebugITimerHeartbeat put: [self lDFlagsBuildDebugITimerHeartbeat ]; - at: #buildITimerHeartbeat put: [self lDFlagsBuildITimerHeartbeat]; - at: #buildMultiThreaded put: [self lDFlagsBuildMultiThreaded]; - at: #buildMultiThreadedAssert put: [self lDFlagsBuildMultiThreadedAssert]; - at: #buildMultiThreadedDebug put: [self lDFlagsBuildMultiThreadedDebug ]; - at: #buildNone put:[self lDFlagsNoBuildType]. - ^(d at: buildType) value - ! Item was removed: - ----- Method: CPlatformConfigForSqueak>>lDFlagsBuild (in category 'cmake buildType redirects') ----- - lDFlagsBuild - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file - cat Cog/build.linux32x86/squeak.cog.v3/build/mvm - ^ { - '-Wl' - . '-z' - . 'now' - } - - " - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>lDFlagsBuildAssert (in category 'cmake buildType redirects') ----- - lDFlagsBuildAssert - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file - cat Cog/build.linux32x86/squeak.cog.v3/build/mvm - ^ { - '-Wl' - . '-z' - . 'now' - } - - ^self lDFlagsBuild - " - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>lDFlagsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - lDFlagsBuildAssertITimerHeartbeat - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file - cat Cog/build.linux32x86/squeak.cog.v3/build/mvm - ^ { - '-Wl' - . '-z' - . 'now' - } - - ^self lDFlagsBuild - " - self subclassResponsibility - ! Item was removed: - ----- Method: CPlatformConfigForSqueak>>lDFlagsBuildDebug (in category 'cmake buildType redirects') ----- - lDFlagsBuildDebug - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file - cat Cog/build.linux32x86/squeak.cog.v3/build/mvm - ^ { - '-Wl' - . '-z' - . 'now' - } - - ^self lDFlagsBuild - " - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>lDFlagsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - lDFlagsBuildDebugITimerHeartbeat - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file - cat Cog/build.linux32x86/squeak.cog.v3/build/mvm - ^ { - '-Wl' - . '-z' - . 'now' - } - - ^self lDFlagsBuild - " - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>lDFlagsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - lDFlagsBuildITimerHeartbeat - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file - cat Cog/build.linux32x86/squeak.cog.v3/build/mvm - ^ { - '-Wl' - . '-z' - . 'now' - } - - ^self lDFlagsBuild - " - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>lDFlagsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - lDFlagsBuildMultiThreaded - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file - cat Cog/build.linux32x86/squeak.cog.v3/build/mvm - ^ { - '-Wl' - . '-z' - . 'now' - } - - ^self lDFlagsBuild - " - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>lDFlagsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - lDFlagsBuildMultiThreadedAssert - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file - cat Cog/build.linux32x86/squeak.cog.v3/build/mvm - ^ { - '-Wl' - . '-z' - . 'now' - } - - ^self lDFlagsBuild - " - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>lDFlagsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - lDFlagsBuildMultiThreadedDebug - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file - cat Cog/build.linux32x86/squeak.cog.v3/build/mvm - ^ { - '-Wl' - . '-z' - . 'now' - } - - ^self lDFlagsBuild - " - self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>lDFlagsNoBuildType (in category 'cmake buildType redirects') ----- - lDFlagsNoBuildType - "SHOULD NOT GET HERE" - self shouldNotImplement. - - ! Item was changed: ----- Method: CPlatformConfigForSqueak>>linkFlags (in category 'cmake buildType redirects') ----- linkFlags + " + cmake --help-property LINK_FLAGS + LINK_FLAGS + ---------- + + Additional flags to use when linking this target. + + The LINK_FLAGS property can be used to add extra flags to the link + step of a target. LINK_FLAGS_<CONFIG> will add to the configuration + <CONFIG>, for example, DEBUG, RELEASE, MINSIZEREL, RELWITHDEBINFO. + + '-lSM -lICE -ldl -lGL -lpthread -lm -lnsl -lX11' -L/usr/lib32 etc..." - " '-lSM -lICE -ldl -lGL -lpthread -lm -lnsl -lX11' -L/usr/lib32 etc..." |d flags| + self flag:'tty'. "is a link_flag really something like -lX11 or is it something else?" d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d at: #build put: [self linkFlagsBuild]; at: #buildAssert put: [self linkFlagsBuildAssert]; at: #buildAssertITimerHeartbeat put: [self linkFlagsBuildAssertITimerHeartbeat]; at:#buildDebug put: [self linkFlagsBuildDebug]; at: #buildDebugITimerHeartbeat put: [self linkFlagsBuildDebugITimerHeartbeat ]; at: #buildITimerHeartbeat put: [self linkFlagsBuildITimerHeartbeat]; at: #buildMultiThreaded put: [self linkFlagsBuildMultiThreaded ]; at: #buildMultiThreadedAssert put: [self linkFlagsBuildMultiThreadedAssert]; at: #buildMultiThreadedDebug put: [self linkFlagsBuildMultiThreadedDebug ]; at: #buildNone put:[self linkFlagsNoBuildType]. flags := String streamContents: [:stream | ((d at: buildType) value collect: #withBlanksTrimmed as: Set) asStringOn: stream delimiter: ' ']. ^flags. ! Item was added: + ----- Method: CPlatformConfigForSqueak>>linkerFlags (in category 'compiling') ----- + linkerFlags + "-Wl -z now define these in your concrete CPlatformConfigForSqueak and feed them to cmakeSharedLinkerFlags" + self subclassResponsibility! Item was changed: ----- Method: CPlatformConfigForSqueak>>preferredIncludesBuild (in category 'cmake buildType redirects') ----- preferredIncludesBuild "convencience method to customize for this build. + SystemNavigation default browseMethodsWhoseNamesContain: 'preferredIncludes'" - SystemNavigation default browseMethodsWhoseNamesContain: 'preferredIncludes' - - ^self preferredIncludes" self subclassResponsibility ! Item was changed: ----- Method: CPlatformConfigForSqueak>>preferredIncludesBuildAssert (in category 'cmake buildType redirects') ----- preferredIncludesBuildAssert + ^ self preferredIncludesBuild.! - "convencience method to customize for this build. - - SystemNavigation default browseMethodsWhoseNamesContain: 'preferredIncludes' - - ^self preferredIncludes" - - self subclassResponsibility - ! Item was changed: ----- Method: CPlatformConfigForSqueak>>preferredIncludesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- preferredIncludesBuildAssertITimerHeartbeat + ^ self preferredIncludesBuild.! - "convencience method to customize for this build. - - SystemNavigation default browseMethodsWhoseNamesContain: 'preferredIncludes' - - ^self preferredIncludes" - self subclassResponsibility - ! Item was changed: ----- Method: CPlatformConfigForSqueak>>preferredIncludesBuildDebug (in category 'cmake buildType redirects') ----- preferredIncludesBuildDebug + ^ self preferredIncludesBuild.! - "convencience method to customize for this build. - - SystemNavigation default browseMethodsWhoseNamesContain: 'preferredIncludes' - - ^self preferredIncludes" - self subclassResponsibility - ! Item was changed: ----- Method: CPlatformConfigForSqueak>>preferredIncludesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- preferredIncludesBuildDebugITimerHeartbeat + ^ self preferredIncludesBuild. - "convencience method to customize for this build. - - SystemNavigation default browseMethodsWhoseNamesContain: 'preferredIncludes' - - ^self preferredIncludes" - self subclassResponsibility ! Item was changed: ----- Method: CPlatformConfigForSqueak>>preferredIncludesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- preferredIncludesBuildITimerHeartbeat + ^ self preferredIncludesBuild.! - "convencience method to customize for this build. - - SystemNavigation default browseMethodsWhoseNamesContain: 'preferredIncludes' - - ^self preferredIncludes" - self subclassResponsibility - ! Item was changed: ----- Method: CPlatformConfigForSqueak>>preferredIncludesBuildMultiThreaded (in category 'cmake buildType redirects') ----- preferredIncludesBuildMultiThreaded + ^ self preferredIncludesBuild.! - "convencience method to customize for this build. - - SystemNavigation default browseMethodsWhoseNamesContain: 'preferredIncludes' - - ^self preferredIncludes" - self subclassResponsibility - ! Item was changed: ----- Method: CPlatformConfigForSqueak>>preferredIncludesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- preferredIncludesBuildMultiThreadedAssert + ^ self preferredIncludesBuild.! - "convencience method to customize for this build. - - SystemNavigation default browseMethodsWhoseNamesContain: 'preferredIncludes' - - ^self preferredIncludes" - self subclassResponsibility - ! Item was changed: ----- Method: CPlatformConfigForSqueak>>preferredIncludesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- preferredIncludesBuildMultiThreadedDebug + ^ self preferredIncludesBuild. - "convencience method to customize for this build. - - SystemNavigation default browseMethodsWhoseNamesContain: 'preferredIncludes' - - ^self preferredIncludes" - self subclassResponsibility ! Item was added: + ----- Method: CPlatformConfigForSqueak>>setCoreSources: (in category 'cmake') ----- + setCoreSources: aMaker + |core | + (enabledebugmessages) + ifTrue:[ templates + addLast:((CMakeMessage new) message: (self class name) , 'setCoreSources: aMaker') + ]. + core := aMaker append: '${srcVMDir}/' toAll: (self coreSources). + templates + addLast:((CMakeSet new) variable:'coreSources' value: core). + + ! Item was added: + ----- Method: CPlatformConfigForSqueak>>setCrossSources: (in category 'cmake') ----- + setCrossSources: aMaker + |cross | + (enabledebugmessages) + ifTrue:[ templates + addLast:((CMakeMessage new) message: (self class name) , 'setCrossSources: aMaker') + ]. + cross := aMaker append: '${crossDir}/vm/' toAll: (self crossSources). + templates + addLast:((CMakeSet new) variable:'crossVMSources' value: cross) + + ! Item was added: + ----- Method: CPlatformConfigForSqueak>>setDirectories: (in category 'cmake') ----- + setDirectories: aMaker + "SystemNavigation default browseMethodsWhoseNamesContain: 'setupDirectories:'" + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>setExecutableOutputPath (in category 'cmake') ----- + setExecutableOutputPath + (enabledebugmessages) + ifTrue:[ templates + addLast:((CMakeMessage new) message: (self class name) , 'setExecutableOutputPath: aMaker') + ]. + templates + addLast:((CMakeSet new) variable:'EXECUTABLE_OUTPUT_PATH' quotedValue: (self outputDir fullName)). + + ! Item was added: + ----- Method: CPlatformConfigForSqueak>>setExtraSources (in category 'cmake') ----- + setExtraSources + (enabledebugmessages) + ifTrue:[ templates + addLast:((CMakeMessage new) message: (self class name) , 'setExtraSources') + ]. + templates + addLast:((CMakeSet new) variable:'extraSources' value: (self extraSources)) + + ! Item was changed: ----- Method: CPlatformConfigForSqueak>>setGlobalOptions: (in category 'cmake buildType redirects') ----- setGlobalOptions: aMaker "Route this message send to the message appropriate for my buildType " |d | d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. d at: #build put: [self setGlobalOptionsBuild: aMaker]; at: #buildAssert put: [self setGlobalOptionsBuildAssert: aMaker]; at: #buildAssertITimerHeartbeat put: [self setGlobalOptionsBuildAssertITimerHeartbeat: aMaker]; at:#buildDebug put: [self setGlobalOptionsBuildDebug: aMaker]; at: #buildDebugITimerHeartbeat put: [self setGlobalOptionsBuildDebugITimerHeartbeat: aMaker ]; at: #buildITimerHeartbeat put: [self setGlobalOptionsBuildITimerHeartbeat: aMaker]; at: #buildMultiThreaded put: [self setGlobalOptionsBuildMultiThreaded: aMaker ]; at: #buildMultiThreadedAssert put: [self setGlobalOptionsBuildMultiThreadedAssert: aMaker]; at: #buildMultiThreadedDebug put: [self setGlobalOptionsBuildMultiThreadedDebug: aMaker ]; at: #buildNone put:[self setGlobalOptionsNoBuildType: aMaker]. ^(d at: buildType) value! Item was changed: ----- Method: CPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'cmake buildType redirects') ----- setGlobalOptionsAfterDetermineSystemBuild: aMaker + "If you need some extra CMake Commands generated for your platform, put them here. - "convenience method to customize for this build type. + SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystemBuild' - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystem' + " - usually do nothing" self subclassResponsibility ! Item was changed: ----- Method: CPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystemBuildAssert: (in category 'cmake buildType redirects') ----- setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker + "convenience method to customize for this build type. " + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker! - "convenience method to customize for this build type. - - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystem' - - usually do nothing" - self subclassResponsibility - ! Item was changed: ----- Method: CPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker + "convenience method to customize for this build type. " + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker! - "convenience method to customize for this build type. - - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystem' - - usually do nothing" - self subclassResponsibility! Item was changed: ----- Method: CPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystemBuildDebug: (in category 'cmake buildType redirects') ----- setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker + "convenience method to customize for this build type. " + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker! - "convenience method to customize for this build type. - - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystem' - - usually do nothing" - self subclassResponsibility - ! Item was changed: ----- Method: CPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: aMaker + "convenience method to customize for this build type. " + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker! - "convenience method to customize for this build type. - - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystem' - - usually do nothing" - self subclassResponsibility - - ! Item was changed: ----- Method: CPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker + "convenience method to customize for this build type. " + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker! - "convenience method to customize for this build type. - - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystem' - - usually do nothing" - self subclassResponsibility.! Item was changed: ----- Method: CPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: (in category 'cmake buildType redirects') ----- setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker + "convenience method to customize for this build type. " + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker! - "convenience method to customize for this build type. - - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystem' - - usually do nothing" - self subclassResponsibility.! Item was changed: ----- Method: CPlatformConfigForSqueak>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker + "convenience method to customize for this build type. " + ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker! - "convenience method to customize for this build type. - - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystem' - - usually do nothing" - self subclassResponsibility.! Item was changed: ----- Method: CPlatformConfigForSqueak>>setGlobalOptionsBuild: (in category 'cmake buildType redirects') ----- setGlobalOptionsBuild: aMaker + "These are CMakeLists.txt commands that span all platforms. Extend me as needed. + SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions'" + (enabledebugmessages) + ifTrue:[ templates + addLast: ((CMakeMessage new) message: (self class name), ' setGlobalOptionsBuild: aMaker') + ]. + templates + addLast: ((CMakeHeader new) configurationName: self class name ); + addLast: ((CMakeProject new)variable: self executableName ); + addLast: ((CMakeMinimumRequired new) version: '3.0.0'); + addLast: ((CMakeSet new) variable: 'CMAKE_CONFIGURATION_TYPES' value: 'Release'). + ! - "convenience method to customize for this build type. - - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions' - - usually do nothing" - self subclassResponsibility! Item was changed: ----- Method: CPlatformConfigForSqueak>>setGlobalOptionsBuildAssert: (in category 'cmake buildType redirects') ----- setGlobalOptionsBuildAssert: aMaker + "SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions'" - "convenience method to customize for this build type. + ^self setGlobalOptionsBuildDebug: aMaker! - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions' - - usually do nothing" - - self subclassResponsibility! Item was changed: ----- Method: CPlatformConfigForSqueak>>setGlobalOptionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- setGlobalOptionsBuildAssertITimerHeartbeat: aMaker + "SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions'" - "convenience method to customize for this build type. + ^self setGlobalOptionsBuildDebug: aMaker! - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions' - - usually do nothing" - self subclassResponsibility! Item was changed: ----- Method: CPlatformConfigForSqueak>>setGlobalOptionsBuildDebug: (in category 'cmake buildType redirects') ----- setGlobalOptionsBuildDebug: aMaker + "SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions'" + self flag: 'tty'. "study up on CMAKE_CONFIGURATION TYPES" + templates + addLast: ((CMakeMessage new) message: (self class name), ' setGlobalOptionsBuild: aMaker'); + addLast: ((CMakeHeader new) configurationName: self class name ); + addLast: ((CMakeProject new)variable: self executableName ); + addLast: ((CMakeMinimumRequired new) version: '3.0.0'); + addLast: ((CMakeMessage new) message: 'CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}'); + addLast: ((CMakeSet new) variable: 'CMAKE_CONFIGURATION_TYPES' value: 'Debug'). + ! - "convenience method to customize for this build type. - - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions' - - usually do nothing" - self subclassResponsibility! Item was changed: ----- Method: CPlatformConfigForSqueak>>setGlobalOptionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- setGlobalOptionsBuildDebugITimerHeartbeat: aMaker + "SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions'" - "convenience method to customize for this build type. + ^self setGlobalOptionsBuildDebug: aMaker! - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions' - - usually do nothing" - self subclassResponsibility! Item was changed: ----- Method: CPlatformConfigForSqueak>>setGlobalOptionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- setGlobalOptionsBuildITimerHeartbeat: aMaker + "SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions'" - "convenience method to customize for this build type. + ^self setGlobalOptionsBuild: aMaker! - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions' - - usually do nothing" - self subclassResponsibility! Item was changed: ----- Method: CPlatformConfigForSqueak>>setGlobalOptionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- setGlobalOptionsBuildMultiThreaded: aMaker + "SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions'" - "convenience method to customize for this build type. + ^self setGlobalOptionsBuild: aMaker! - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions' - - usually do nothing" - self subclassResponsibility! Item was changed: ----- Method: CPlatformConfigForSqueak>>setGlobalOptionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- setGlobalOptionsBuildMultiThreadedAssert: aMaker + "SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions'" - "convenience method to customize for this build type. + ^self setGlobalOptionsBuild: aMaker! - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions' - - usually do nothing" - self subclassResponsibility! Item was changed: ----- Method: CPlatformConfigForSqueak>>setGlobalOptionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- setGlobalOptionsBuildMultiThreadedDebug: aMaker + "SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions'" - "convenience method to customize for this build type. + ^self setGlobalOptionsBuildDebug: aMaker! - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions' - - usually do nothing" - self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>setPlatformSources: (in category 'cmake') ----- + setPlatformSources: aMaker + |platform | + (enabledebugmessages) + ifTrue:[ templates + addLast:((CMakeMessage new) message: (self class name) , 'setPlatformSources: aMaker') + ]. + platform := aMaker append: '${targetPlatform}/vm/' toAll: (self platformSources). + templates + addLast:((CMakeSet new) variable:'platformVMSources' value: platform) + + ! Item was added: + ----- Method: CPlatformConfigForSqueak>>setResourceProperties: (in category 'cmake buildType redirects') ----- + setResourceProperties: maker + "only on mac? tty" + self subclassResponsibility! Item was removed: - ----- Method: CPlatformConfigForSqueak>>setupDirectories: (in category 'squeak compatability') ----- - setupDirectories: aMaker - | dirsInclude | - "These are CMakeLists.txt variables. They are made available via INCLUDE(directories.cmake) in CMakeLists.txt " - dirsInclude := aMaker captureOutputDuring: [ - aMaker - set: #topDir toString: (self topDir fullName); - set: #buildDir toString: (self buildDir ifNil: ['${topDir}/build'] ifNotNil: [self buildDir fullName] ); - set: #thirdpartyDir toString: '${buildDir}/thirdParty'; - set: #platformsDir toString: self platformsDir; - set: #srcDir toString: self srcDir pathName; - set: #srcPluginsDir toString: (pluginsDir ifNil: [ '${srcDir}/plugins' ]); - set: #srcVMDir toString: '${srcDir}/vm'; - set: #platformName toString: self platformName; - set: #targetPlatform to: '${platformsDir}/${platformName}'; - set: #crossDir toString: '${platformsDir}/Cross'; - set: #platformVMDir toString: '${targetPlatform}/vm'; - set: #outputDir toString: self outputDir fullName. - ]. - - self write: dirsInclude toFile: 'directories.cmake'. - - aMaker include: 'directories.cmake'. - ! Item was changed: ----- Method: CPlatformConfigForSqueak>>standardIncludesBuildAssert (in category 'cmake buildType redirects') ----- standardIncludesBuildAssert + ^self standardIncludesBuild.! - self subclassResponsibility! Item was changed: ----- Method: CPlatformConfigForSqueak>>standardIncludesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- standardIncludesBuildAssertITimerHeartbeat + ^self standardIncludesBuild.! - self subclassResponsibility! Item was changed: ----- Method: CPlatformConfigForSqueak>>standardIncludesBuildDebug (in category 'cmake buildType redirects') ----- standardIncludesBuildDebug + ^self standardIncludesBuild.! - self subclassResponsibility! Item was changed: ----- Method: CPlatformConfigForSqueak>>standardIncludesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- standardIncludesBuildDebugITimerHeartbeat + ^self standardIncludesBuild.! - self subclassResponsibility! Item was changed: ----- Method: CPlatformConfigForSqueak>>standardIncludesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- standardIncludesBuildITimerHeartbeat + ^self standardIncludesBuild.! - self subclassResponsibility! Item was changed: ----- Method: CPlatformConfigForSqueak>>standardIncludesBuildMultiThreaded (in category 'cmake buildType redirects') ----- standardIncludesBuildMultiThreaded + ^self standardIncludesBuild.! - self subclassResponsibility! Item was changed: ----- Method: CPlatformConfigForSqueak>>standardIncludesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- standardIncludesBuildMultiThreadedAssert + ^self standardIncludesBuild.! - self subclassResponsibility! Item was changed: ----- Method: CPlatformConfigForSqueak>>standardIncludesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- standardIncludesBuildMultiThreadedDebug + ^self standardIncludesBuild.! - self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>templates (in category 'accessing') ----- + templates + ^ templates! Item was added: + ----- Method: CPlatformConfigForSqueak>>templates: (in category 'accessing') ----- + templates: anObject + templates := anObject! Item was changed: + ----- Method: CPlatformConfigForSqueak>>version (in category 'cmake executable names') ----- - ----- Method: CPlatformConfigForSqueak>>version (in category 'accessing') ----- version ^ ''! Item was added: + ----- Method: CPlatformConfigForSqueak>>vmDrivers (in category 'plugins') ----- + vmDrivers + "SystemNavigation default browseMethodsWhoseNamesContain: 'vmDrivers' + " + self subclassResponsibility! Item was added: + ----- Method: CPlatformConfigForSqueak>>vmdrivers (in category 'accessing') ----- + vmdrivers + ^vmdrivers! Item was changed: ----- Method: CPlatformConfigForSqueak>>write:toFile: (in category 'squeak compatability') ----- write: aContents toFile: aFileName "write a file to current output directory (buildDir). use line end convention appropriate for config platform" | bldDir | bldDir := self buildDir. bldDir isString ifTrue: [ bldDir := FileDirectory directoryEntryFor: bldDir ]. bldDir assureExistence. bldDir forceNewFileNamed: aFileName do: [:s | s + nextPutAll: (self fixLineEndsOf: aContents)] - nextPutAll: (self fixLineEndsOf: aContents)] ! Item was added: + ----- Method: CPlatformConfigForSqueak>>x (in category 'cmake buildType redirects') ----- + x + "Route this message send to the message appropriate for my buildType " + |d | + d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. + d + at: #build put: [self xBuild]; + at: #buildAssert put: [self xBuildAssert]; + at: #buildAssertITimerHeartbeat put: [self xBuildAssertITimerHeartbeat]; + at:#buildDebug put: [self xBuildDebug]; + at: #buildDebugITimerHeartbeat put: [self xBuildDebugITimerHeartbeat ]; + at: #buildITimerHeartbeat put: [self xBuildITimerHeartbeat]; + at: #buildMultiThreaded put: [self xBuildMultiThreaded]; + at: #buildMultiThreadedAssert put: [self xBuildMultiThreadedAssert]; + at: #buildMultiThreadedDebug put: [self xBuildMultiThreadedDebug ]; + at: #buildNone put:[self xNoBuildType]. + ^(d at: buildType) value! Item was added: + SqueakUnixConfig subclass: #Linux32ARMv6Config + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-Linux32ARMv6'! + + !Linux32ARMv6Config commentStamp: '<historical>' prior: 0! + A Linux32x86Config is a Squeak Compatibility Layer between the Pharo code in CMakeVMMaker and CMakeVMakerSqueak. + + I configure a VM according to my name's form: [Operating System] [WordSize] [Processor Language][VM MemoryManager][BuildType]Conf + + + I am not meant to be built. + + SqueakLinux32x86Builder + configureABuildFor: #ONE OF MY SUBCLASSES NAME HERE withBuildType: #build; + generateSources; + generate. + + HelpBrowser openOn: CMakeVMMakerSqueakEndUserHelp + HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp + + ! Item was added: + ----- Method: Linux32ARMv6Config class>>initialize (in category 'as yet unclassified') ----- + initialize + isAbstractBaseClass:=true! Item was added: + ----- Method: Linux32ARMv6Config>>addVMDriversBuild: (in category 'cmake buildType redirects') ----- + addVMDriversBuild: aMaker + aMaker message: 'addVMDrivers: aMaker'. + self + addDriver: 'vm-display-null' + sources: #( + '${targetPlatform}/vm-display-null/sqUnixDisplayNull' ) + generator: aMaker + externalLibs: #(); + + addDriver: 'vm-display-X11' + sources: #( + '${targetPlatform}/vm-display-X11/sqUnixX11' + '${targetPlatform}/vm-display-X11/sqUnixMozilla' ) + generator: aMaker + externalLibs: (self externalLibs); + + addDriver: 'vm-sound-ALSA' + sources: #( + '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' ) + generator: aMaker + externalLibs: #(); + + addDriver: 'vm-sound-null' + sources: #( + '${targetPlatform}/vm-sound-null/sqUnixSoundNull' ) + generator: aMaker + externalLibs: #(). + ! Item was added: + ----- Method: Linux32ARMv6Config>>availableBuildTypes (in category 'cmake') ----- + availableBuildTypes + ^SqueakCMakeVMMakerAbstractBuilder default allBuildTypes + " subclasses should use + + ^super availableBuildTypes copyWithoutAll: #( #assertWithHeartbeatTimer #debugWithHeartbeatTimer debugMultiThreadedFFI.....etc)) " + + ! Item was added: + ----- Method: Linux32ARMv6Config>>coreSourcesBuild (in category 'cmake buildType redirects') ----- + coreSourcesBuild + "files to include from src/vm dir" + ^ #( + 'cogit.c' + 'cointerp.c' + )! Item was added: + ----- Method: Linux32ARMv6Config>>coreSourcesBuildMultiThreaded (in category 'cmake buildType redirects') ----- + coreSourcesBuildMultiThreaded + "files to include from src/vm dir" + ^ #( + 'cogit.c' + 'cointerpmt.c' + )! Item was added: + ----- Method: Linux32ARMv6Config>>defaultExternalPlugins (in category 'plugins') ----- + defaultExternalPlugins + " tty 2014.06.10 cut-n-paste from Cog/build.linux32x86/newspeak.cog.spur/build/plugins.ext" + ^ #(B3DAcceleratorPlugin + BochsIA32Plugin + ThreadedFFIPlugin "moduleName->SqueakFFIPrims " + "FFIPlugin" "moduleName->SqueakFFIPrims " + SqueakSSLPlugin "moduleName->SqueakSSL" + LocalePlugin + UnixOSProcessPlugin + UUIDPlugin) + + + "N.B. Regarding ThreadedFFIPlugin and FFIPlugin from eem: + + Use ThreadedFFIPlugin. The FFIPlugin is obsolete (it requires assembler support files, and is non-reentrant). This should generate in src/plugins/SqueakFFIPrims/{SqueakFFIPrims.c,ARM32FFIPlugin.c,IA32FFIPlugin.c} and you should compile only src/plugins/SqueakFFIPrims/SqueakFFIPrims.c. src/plugins/SqueakFFIPrims/SqueakFFIPrims.c is a simple wrapper that includes ARM32FFIPlugin.c or IA32FFIPlugin.c as appropriate (and others can be added as they are developed). + + + "! Item was added: + ----- Method: Linux32ARMv6Config>>defaultInternalPlugins (in category 'plugins') ----- + defaultInternalPlugins + " tty 2014.06.10 cut-n-paste from Cog/build.linux32x86/newspeak.cog.spur/build/plugins.int + N.B. moduleName->XYZ means XYZ appears in the GNU-Build's plugins.int/ext. However, Smalltalk requires the class name. + XYZSmalltalkClass moduleName->XYZ as it appears in plugins.int/ext + " + ^ #( + ADPCMCodecPlugin + AsynchFilePlugin + BalloonEnginePlugin "moduleName -->B2DPlugin" + BitBltSimulation "moduleName->BitBltPlugin" + BMPReadWriterPlugin + CroquetPlugin + DeflatePlugin "moduleName->ZipPlugin" + DropPlugin + DSAPlugin "moduleName->DSAPrims" + FFTPlugin + FileCopyPlugin + FilePlugin + FloatArrayPlugin + FloatMathPlugin + IA32ABIPlugin "moduleName->IA32ABI" + " InflatePlugin" "moduleName->ZipPlugin" "already included with the DeflatePlugin" + JoystickTabletPlugin + JPEGReaderPlugin + JPEGReadWriter2Plugin + KlattSynthesizerPlugin "moduleName->Klatt" + LargeIntegersPlugin "moduleName->LargeIntegers" + Matrix2x3Plugin + MIDIPlugin + MiscPrimitivePlugin + Mpeg3Plugin + RePlugin + SecurityPlugin + SerialPlugin + SocketPlugin + SoundCodecPlugin "moduleName->SoundCodecPrims" + SoundGenerationPlugin + SoundPlugin + StarSqueakPlugin + SurfacePlugin + VMProfileLinuxSupportPlugin)! Item was added: + ----- Method: Linux32ARMv6Config>>dirBuildPlatform (in category 'cmake') ----- + dirBuildPlatform + "the directory for the platform. example: build.linux32x86" + ^self dirLinux32x86! Item was added: + ----- Method: Linux32ARMv6Config>>excludeFromBuild (in category 'cmake') ----- + excludeFromBuild + "over-ride to exclude yourself from a build" + ^true! Item was added: + ----- Method: Linux32ARMv6Config>>executableName (in category 'cmake') ----- + executableName + "AbstractBaseClass configurations are not meant to be executable" + ^ self vmIShouldNotBeHereExecutableName! Item was added: + ----- Method: Linux32ARMv6Config>>externalPluginsBuild (in category 'cmake buildType redirects') ----- + externalPluginsBuild + ^ externalPlugins ifNil: [ externalPlugins := self defaultExternalPlugins ]! Item was added: + ----- Method: Linux32ARMv6Config>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') ----- + extraPluginSettingsBuild: maker + maker isExternal ifTrue: [ + "copy lib to results dir " + maker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}' + ]. + ! Item was added: + ----- Method: Linux32ARMv6Config>>internalPluginsBuild (in category 'cmake buildType redirects') ----- + internalPluginsBuild + ^ internalPlugins ifNil: [ internalPlugins := self defaultInternalPlugins ]! Item was added: + ----- Method: Linux32ARMv6Config>>linkFlagsBuild (in category 'cmake buildType redirects') ----- + linkFlagsBuild + "Answer array of libraries to link to + SystemNavigation default browseMethodsWhoseNamesContain: 'libsBuild'" + ^ { + '-lpthread' + . '-luuid' + }! Item was added: + ----- Method: Linux32ARMv6Config>>postBuildActionsBuild: (in category 'cmake buildType redirects') ----- + postBuildActionsBuild: gen + "SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActionsBuild:'"! Item was added: + ----- Method: Linux32ARMv6Config>>preferredIncludesBuild (in category 'cmake buildType redirects') ----- + preferredIncludesBuild + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: (self class name), ' preferredIncludesBuild' ) + ]. + templates + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${targetPlatform}/plugins/B3DAcceleratorPlugin')). + + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_PATH = ${CMAKE_INCLUDE_PATH}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_SYSTEM_INCLUDE_PATH = ${CMAKE_SYSTEM_INCLUDE_PATH}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES = ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES = ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = ${CMAKE_FIND_ROOT_PATH_MODE_INCLUDE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = ${CMAKE_INCLUDE_CURRENT_DIR}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE = ${CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_DIRECTORIES_BEFORE = ${CMAKE_INCLUDE_DIRECTORIES_BEFORE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE = ${CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE}' ) + ]. + + + ! Item was added: + ----- Method: Linux32ARMv6Config>>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 + cmd:'set_target_properties' + params: '${_name} PROPERTIES LINK_FLAGS "-undefined gl"'. + + + aMaker addExternalLibraries: + #( + 'uuid' "" + 'ssl' "" + 'crypto' "" + 'm' + 'dl' + 'pthread' + ). + + + aMaker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. + self addVMDrivers: aMaker.! Item was removed: - Linux32x86Config subclass: #Linux32ARMv6StackV3CrossRaspbianConfig - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'CMakeVMMakerSqueak-Linux32ARMv6'! - - !Linux32ARMv6StackV3CrossRaspbianConfig commentStamp: 'tty 6/15/2014 14:04' prior: 0! - This is a concrete class which generates a StackVM for Raspbian (debian on RaspberryPi). But in cross compilation usage. - - I configure a VM according to my name's form: [Operating System] [WordSize] [Processor Language][VM MemoryManager][BuildType]Conf - - SqueakLinux32ARMv6Builder - configureABuildFor: #MY NAME HERE withBuildType: #build; - generateSources; - generate. - - HelpBrowser openOn: CMakeVMMakerSqueakEndUserHelp - HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp - - - ! Item was removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>availableBuildTypes (in category 'cmake') ----- - availableBuildTypes - ^SqueakCMakeVMMakerAbstractBuilder default noBuildTypes - ! Item was removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>cogitClass (in category 'source generation') ----- - cogitClass - ^ StackToRegisterMappingCogit - ! Item was removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>configHBuild (in category 'cmake buildType redirects') ----- - configHBuild - self flag:'tty'. "This needs to be customized" - ^ ' - #ifndef __sq_config_h - #define __sq_config_h - - /* explicit image width */ - - #define HAVE_INTERP_H 1 - - /* package options */ - - #define USE_X11 1 - #define USE_X11_GLX 1 - /* #undef USE_QUARTZ */ - /* #undef USE_QUARTZ_CGL */ - /* #undef USE_RFB */ - - /* libraries */ - - /* #undef HAVE_LIBX11 */ - /* #undef HAVE_LIBXEXT */ - #define HAVE_LIBDL 1 - /* #undef HAVE_DYLD */ - /* #undef HAVE_LIBFFI */ - /* #undef HAVE_ICONV */ - - /* #undef USE_AUDIO_NONE */ - /* #undef USE_AUDIO_SUN */ - /* #undef USE_AUDIO_NAS */ - /* #undef USE_AUDIO_OSS */ - /* #undef USE_AUDIO_MACOSX */ - /* #undef OSS_DEVICE */ - - /* header files */ - - #define HAVE_UNISTD_H 1 - /* #undef NEED_GETHOSTNAME_P */ - - #define HAVE_DIRENT_H 1 - /* #undef HAVE_SYS_NDIR_H */ - /* #undef HAVE_SYS_DIR_H */ - /* #undef HAVE_NDIR_H */ - #define HAVE_DLFCN_H 1 - #define HAVE_ICONV_H 1 - - #define HAVE_SYS_TIME_H 1 - #define TIME_WITH_SYS_TIME 1 - - /* #undef HAVE_SYS_FILIO_H */ - - /* #undef HAVE_SYS_AUDIOIO_H */ - /* #undef HAVE_SUN_AUDIOIO_H */ - - #define HAVE_PTY_H 1 - /* #undef HAVE_UTIL_H */ - /* #undef HAVE_LIBUTIL_H */ - #define HAVE_STROPTS_H 1 - - #define HAVE_GL_GL_H 1 - /* #undef HAVE_OPENGL_GL_H */ - - /* #undef NEED_SUNOS_H */ - - /* system calls/library functions */ - - #define AT_EXIT atexit - - #define HAVE_TZSET 1 - - #define HAVE_OPENPTY 1 - /* #undef HAVE_UNIX98_PTYS */ - - #define HAVE_SNPRINTF 1 - /* #undef HAVE___SNPRINTF */ - - #define HAVE_MMAP 1 - - /* #undef HAVE_DYLD */ - - #define HAVE_LANGINFO_CODESET 1 - - #define HAVE_ALLOCA 1 - #define HAVE_ALLOCA_H 1 - - #define HAVE_UNSETENV 1 - - #define HAVE_NANOSLEEP 1 - - /* widths of primitive types */ - - #define SIZEOF_INT 4 - #define SIZEOF_LONG 4 - #define SIZEOF_LONG_LONG 8 - #define SIZEOF_VOID_P 4 - - /* structures */ - - #define HAVE_TM_GMTOFF 1 - #define HAVE_TIMEZONE 1 - - /* typedefs */ - - /* #undef size_t */ - /* #undef socklen_t */ - - #define ENABLE_FAST_BLT 1 - #define squeakInt64 long long - - /* architecture */ - - #define OS_TYPE "unix" - #define __arm__ 1 - #define __ARM_ARCH_6__ 1 - #define VM_HOST "arm-pc-linux-gnu" - #define VM_HOST_CPU "arm" - /* #undef VM_HOST_VENDOR */ - #define VM_HOST_OS "linux-gnu" - #define VM_BUILD_STRING "Unix built on "__DATE__ " "__TIME__" Compiler: "__VERSION__ - - /* #undef WORDS_BIGENDIAN */ - /* #undef DOUBLE_WORD_ALIGNMENT */ - - /* damage containment */ - - /* #undef DARWIN */ - - #ifdef NEED_SUNOS_H - # include "sunos.h" - #endif - - /* other configured variables */ - - #define SQ_VERSION "3.9a-7024" - #define VM_VERSION "3.9-7" - #define VM_MODULE_PREFIX "" - /* #undef VM_DLSYM_PREFIX */ - #define VM_X11DIR "" - - /* avoid dependencies on glibc2.3 */ - - #define HAVE_FEATURES_H 1 - - #if defined(HAVE_FEATURES_H) - # include "glibc.h" - #endif - - - /* used by UUID plugin: */ - - #define HAVE_UUID_H 1 - - #endif /* __sq_config_h */ - - '! Item was removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>configureB3DAcceleratorPlugin: (in category 'plugin extra rules') ----- - configureB3DAcceleratorPlugin: maker - "extra rules for B3DAcceleratorPlugin" - - super configureB3DAcceleratorPlugin: maker. - maker includeDirectories: '${CMAKE_FIND_ROOT_PATH}/usr/include/'.! Item was removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>configureBitBltSimulation: (in category 'plugin extra rules') ----- - configureBitBltSimulation: maker - "extra rules for BitBltSimulation" - - maker includeDirectories: '${pluginCross}'. - - maker addCrossSources: #( - 'BitBltGeneric.c' - 'BitBltDispatch.c' - ). - ! Item was removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>defaultExternalPlugins (in category 'plugins') ----- - defaultExternalPlugins - self flag:'tty'. "InternetConfigPlugin is part of pharo build but not squeak. why?" - ^ #( - B3DAcceleratorPlugin - JPEGReaderPlugin - JPEGReadWriter2Plugin - RePlugin - " InternetConfigPlugin" - )! Item was removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>defaultInternalPlugins (in category 'plugins') ----- - defaultInternalPlugins - " took from unixbuild/bld/plugins.int" - ^ #( - ADPCMCodecPlugin - AsynchFilePlugin - BalloonEnginePlugin "B2DPlugin" - BitBltSimulation "BitBltPlugin" - BMPReadWriterPlugin - CroquetPlugin - DeflatePlugin "ZipPlugin" - DropPlugin - DSAPlugin "DSAPrims" - FFTPlugin - FileCopyPlugin - FilePlugin - FloatArrayPlugin - FloatMathPlugin - JoystickTabletPlugin - KlattSynthesizerPlugin "Klatt" - LargeIntegersPlugin "LargeIntegers" - Matrix2x3Plugin - MIDIPlugin - MiscPrimitivePlugin - Mpeg3Plugin - SecurityPlugin - SerialPlugin - SocketPlugin - SoundCodecPlugin "SoundCodecPrims" - SoundGenerationPlugin - SoundPlugin - StarSqueakPlugin - SurfacePlugin - LocalePlugin - )! Item was removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>dirBuildLanguageVMMM (in category 'cmake') ----- - dirBuildLanguageVMMM - "the directory under buildPlatformDir example: newspeak.cog.spur. use squeak.cog.v3 as default" - ^self squeakStackV3! Item was removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>dirBuildPlatform (in category 'cmake') ----- - dirBuildPlatform - "the directory for the platform. example: build.linux32x86" - ^self dirARMv6! Item was removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>excludeFromBuild (in category 'cmake') ----- - excludeFromBuild - ^true - ! Item was removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>executableName (in category 'cmake') ----- - executableName - ^ self vmStackExecutableName! Item was removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuild: maker - - maker isExternal ifTrue: [ - "copy lib to results dir " - maker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}' - ]. - - maker set: #linkFlags toString: '${linkFlags}' - ! Item was removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>interpreterClass (in category 'source generation') ----- - interpreterClass - ^ StackInterpreter! Item was removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>preferredIncludesBuild (in category 'source files') ----- - preferredIncludesBuild - ^ #('${CMAKE_FIND_ROOT_PATH}/usr/include/' - '${targetPlatform}/plugins/B3DAcceleratorPlugin') - ! Item was removed: - ----- 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 removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>setExtraTargetPropertiesBuildAssert: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildAssert: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>setExtraTargetPropertiesBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildAssertITimerHeartbeat: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>setExtraTargetPropertiesBuildDebug: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildDebug: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>setExtraTargetPropertiesBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildDebugITimerHeartbeat: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>setExtraTargetPropertiesBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildITimerHeartbeat: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>setExtraTargetPropertiesBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildMultiThreaded: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>setExtraTargetPropertiesBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildMultiThreadedAssert: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>setExtraTargetPropertiesBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildMultiThreadedDebug: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - Linux32ARMv6StackV3CrossRaspbianConfig subclass: #Linux32ARMv6StackV3CrossRaspbianFastBltConfig - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'CMakeVMMakerSqueak-Linux32ARMv6'! - - !Linux32ARMv6StackV3CrossRaspbianFastBltConfig commentStamp: 'tty 6/15/2014 14:05' prior: 0! - This is a concrete class which generates a StackVM for Raspbian (debian on RaspberryPi). But in cross compilation usage. - - I configure a VM according to my name's form: [Operating System] [WordSize] [Processor Language][VM MemoryManager][BuildType]Conf - - SqueakLinux32ARMv6Builder - configureABuildFor: #MY NAME HERE withBuildType: #build; - generateSources; - generate. - - HelpBrowser openOn: CMakeVMMakerSqueakEndUserHelp - HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp - - ! Item was removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianFastBltConfig>>commonCompilerFlags (in category 'compiler flags') ----- - commonCompilerFlags - ^ super commonCompilerFlags, { '-DENABLE_FAST_BLT' }.! Item was removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianFastBltConfig>>configureBitBltSimulation: (in category 'plugin extra rules') ----- - configureBitBltSimulation: maker - "extra rules for BitBltSimulation" - - maker includeDirectories: '${pluginCross}'. - maker set: 'can_use_assembler' to: 'TRUE'. - maker cmd: 'enable_language' params: 'ASM'. - maker set: 'CMAKE_ASM_COMPILE_OBJECT' to: '"asasm -cpu 6 -I ${pluginCross} -o <OBJECT> <SOURCE>"'. - - maker addCrossSources: #( - 'BitBltArm.c' - 'BitBltArmSimd.c' - 'BitBltDispatch.c' - 'BitBltGeneric.c' - 'BitBltArmLinux.c' - 'BitBltArmSimdAlphaBlend.s' - 'BitBltArmSimdBitLogical.s' - 'BitBltArmSimdPixPaint.s' - 'BitBltArmSimdSourceWord.s' - ). - ! Item was removed: - ----- Method: Linux32ARMv6StackV3CrossRaspbianFastBltConfig>>excludeFromBuild (in category 'cmake') ----- - excludeFromBuild - ^true - ! Item was removed: - Linux32x86Config subclass: #Linux32ARMv6StackV3RaspbianConfig - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'CMakeVMMakerSqueak-Linux32ARMv6'! - - !Linux32ARMv6StackV3RaspbianConfig commentStamp: 'tty 6/15/2014 14:05' prior: 0! - This is a concrete class which generates a StackVM for Raspbian (debian on RaspberryPi). - - I configure a VM according to my name's form: [Operating System] [WordSize] [Processor Language][VM MemoryManager][BuildType]Conf - - SqueakLinux32ARMv6Builder - configureABuildFor: #MY NAME HERE withBuildType: #build; - generateSources; - generate. - - HelpBrowser openOn: CMakeVMMakerSqueakEndUserHelp - HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp - - ! Item was removed: - ----- Method: Linux32ARMv6StackV3RaspbianConfig>>cogitClass (in category 'source generation') ----- - cogitClass - ^ StackToRegisterMappingCogit - ! Item was removed: - ----- Method: Linux32ARMv6StackV3RaspbianConfig>>configureBitBltSimulation: (in category 'plugin extra rules') ----- - configureBitBltSimulation: maker - "extra rules for BitBltSimulation" - - maker includeDirectories: '${pluginCross}'. - - maker addCrossSources: #( - 'BitBltGeneric.c' - 'BitBltDispatch.c' - ). - ! Item was removed: - ----- Method: Linux32ARMv6StackV3RaspbianConfig>>defaultExternalPlugins (in category 'plugins') ----- - defaultExternalPlugins - self flag:'tty'. "InternetConfigPlugin not available default svn co of Cog for unix. " - ^ #( - B3DAcceleratorPlugin - JPEGReaderPlugin - JPEGReadWriter2Plugin - RePlugin - " InternetConfigPlugin" - )! Item was removed: - ----- Method: Linux32ARMv6StackV3RaspbianConfig>>defaultInternalPlugins (in category 'plugins') ----- - defaultInternalPlugins - " took from unixbuild/bld/plugins.int" - ^ #( - ADPCMCodecPlugin - AsynchFilePlugin - BalloonEnginePlugin "B2DPlugin" - BitBltSimulation "BitBltPlugin" - BMPReadWriterPlugin - CroquetPlugin - DeflatePlugin "ZipPlugin" - DropPlugin - DSAPlugin "DSAPrims" - FFTPlugin - FileCopyPlugin - FilePlugin - FloatArrayPlugin - FloatMathPlugin - JoystickTabletPlugin - KlattSynthesizerPlugin "Klatt" - LargeIntegersPlugin "LargeIntegers" - Matrix2x3Plugin - MIDIPlugin - MiscPrimitivePlugin - Mpeg3Plugin - SecurityPlugin - SerialPlugin - SocketPlugin - SoundCodecPlugin "SoundCodecPrims" - SoundGenerationPlugin - SoundPlugin - StarSqueakPlugin - SurfacePlugin - LocalePlugin - )! Item was removed: - ----- Method: Linux32ARMv6StackV3RaspbianConfig>>dirBuildLanguageVMMM (in category 'cmake') ----- - dirBuildLanguageVMMM - "the directory under buildPlatformDir example: newspeak.cog.spur. use squeak.cog.v3 as default" - ^self squeakStackV3! Item was removed: - ----- Method: Linux32ARMv6StackV3RaspbianConfig>>dirBuildPlatform (in category 'cmake') ----- - dirBuildPlatform - "the directory for the platform. example: build.linux32x86" - ^self dirARMv6! Item was removed: - ----- Method: Linux32ARMv6StackV3RaspbianConfig>>excludeFromBuild (in category 'cmake') ----- - excludeFromBuild - ^true - ! Item was removed: - ----- Method: Linux32ARMv6StackV3RaspbianConfig>>executableName (in category 'cmake') ----- - executableName - ^ self vmStackExecutableName! Item was removed: - ----- Method: Linux32ARMv6StackV3RaspbianConfig>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuild: aMaker - - aMaker isExternal ifTrue: [ - "copy lib to results dir " - aMaker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}' - ]. - - aMaker set: #linkFlags toString: '${linkFlags}' - ! Item was removed: - ----- Method: Linux32ARMv6StackV3RaspbianConfig>>interpreterClass (in category 'source generation') ----- - interpreterClass - ^ StackInterpreter! Item was removed: - ----- 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 removed: - ----- Method: Linux32ARMv6StackV3RaspbianConfig>>setExtraTargetPropertiesBuildAssert: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildAssert: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux32ARMv6StackV3RaspbianConfig>>setExtraTargetPropertiesBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildAssertITimerHeartbeat: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux32ARMv6StackV3RaspbianConfig>>setExtraTargetPropertiesBuildDebug: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildDebug: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux32ARMv6StackV3RaspbianConfig>>setExtraTargetPropertiesBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildDebugITimerHeartbeat: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux32ARMv6StackV3RaspbianConfig>>setExtraTargetPropertiesBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildITimerHeartbeat: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux32ARMv6StackV3RaspbianConfig>>setExtraTargetPropertiesBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildMultiThreaded: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux32ARMv6StackV3RaspbianConfig>>setExtraTargetPropertiesBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildMultiThreadedAssert: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux32ARMv6StackV3RaspbianConfig>>setExtraTargetPropertiesBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildMultiThreadedDebug: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - Linux32ARMv6StackV3RaspbianConfig subclass: #Linux32ARMv6StackV3RaspbianFastBltConfig - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'CMakeVMMakerSqueak-Linux32ARMv6'! - - !Linux32ARMv6StackV3RaspbianFastBltConfig commentStamp: 'tty 6/15/2014 14:05' prior: 0! - http://www.cmake.org/Wiki/CMake/Assembler - I configure a VM according to my name's form: [Operating System] [WordSize] [Processor Language][VM MemoryManager][BuildType]Conf - - SqueakLinux32ARMv6Builder - configureABuildFor: #MY NAME HERE withBuildType: #build; - generateSources; - generate. - - HelpBrowser openOn: CMakeVMMakerSqueakEndUserHelp - HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp - - ! Item was removed: - ----- Method: Linux32ARMv6StackV3RaspbianFastBltConfig>>commonCompilerFlags (in category 'compiler flags') ----- - commonCompilerFlags - ^ super commonCompilerFlags, { '-DENABLE_FAST_BLT' }.! Item was removed: - ----- Method: Linux32ARMv6StackV3RaspbianFastBltConfig>>configureBitBltSimulation: (in category 'plugin extra rules') ----- - configureBitBltSimulation: maker - "extra rules for BitBltSimulation" - - maker includeDirectories: '${pluginCross}'. - - maker set: 'can_use_assembler' to: 'TRUE'. - - maker addCrossSources: #( - 'BitBltArm.c' - 'BitBltArmSimd.c' - 'BitBltDispatch.c' - 'BitBltGeneric.c' - 'BitBltArmLinux.c' - 'BitBltArmSimdAlphaBlend.s' - 'BitBltArmSimdBitLogical.s' - 'BitBltArmSimdPixPaint.s' - 'BitBltArmSimdSourceWord.s' - ). - ! Item was removed: - ----- Method: Linux32ARMv6StackV3RaspbianFastBltConfig>>excludeFromBuild (in category 'cmake') ----- - excludeFromBuild - ^true - ! Item was removed: - ----- Method: Linux32x86Config>>addVMDriversBuildAssert: (in category 'cmake buildType redirects') ----- - addVMDriversBuildAssert: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>addVMDriversBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - addVMDriversBuildAssertITimerHeartbeat: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>addVMDriversBuildDebug: (in category 'cmake buildType redirects') ----- - addVMDriversBuildDebug: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>addVMDriversBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - addVMDriversBuildDebugITimerHeartbeat: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>addVMDriversBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - addVMDriversBuildITimerHeartbeat: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>addVMDriversBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - addVMDriversBuildMultiThreaded: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>addVMDriversBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - addVMDriversBuildMultiThreadedAssert: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>addVMDriversBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - addVMDriversBuildMultiThreadedDebug: aMaker - ^self addVMDriversBuild: aMaker! Item was changed: + ----- Method: Linux32x86Config>>availableBuildTypes (in category 'cmake') ----- - ----- Method: Linux32x86Config>>availableBuildTypes (in category 'cmake configuration') ----- availableBuildTypes ^SqueakCMakeVMMakerAbstractBuilder default allBuildTypes " subclasses should use ^super availableBuildTypes copyWithoutAll: #( #assertWithHeartbeatTimer #debugWithHeartbeatTimer debugMultiThreadedFFI.....etc)) " ! Item was removed: - ----- Method: Linux32x86Config>>commonCompilerFlags (in category 'compiler flags') ----- - commonCompilerFlags - ^{ } - ! Item was removed: - ----- Method: Linux32x86Config>>coreSourcesBuildAssert (in category 'cmake buildType redirects') ----- - coreSourcesBuildAssert - ^self coreSourcesBuild ! Item was removed: - ----- Method: Linux32x86Config>>coreSourcesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - coreSourcesBuildAssertITimerHeartbeat - ^self coreSourcesBuild ! Item was removed: - ----- Method: Linux32x86Config>>coreSourcesBuildDebug (in category 'cmake buildType redirects') ----- - coreSourcesBuildDebug - ^self coreSourcesBuild ! Item was removed: - ----- Method: Linux32x86Config>>coreSourcesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - coreSourcesBuildDebugITimerHeartbeat - ^self coreSourcesBuild ! Item was removed: - ----- Method: Linux32x86Config>>coreSourcesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - coreSourcesBuildITimerHeartbeat - ^self coreSourcesBuild ! Item was changed: ----- Method: Linux32x86Config>>coreSourcesBuildMultiThreaded (in category 'cmake buildType redirects') ----- coreSourcesBuildMultiThreaded "files to include from src/vm dir" ^ #( 'cogit.c' 'cointerpmt.c' )! Item was removed: - ----- Method: Linux32x86Config>>coreSourcesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - coreSourcesBuildMultiThreadedAssert - ^self coreSourcesBuildMultiThreaded ! Item was removed: - ----- Method: Linux32x86Config>>coreSourcesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - coreSourcesBuildMultiThreadedDebug - ^self coreSourcesBuildMultiThreaded ! Item was removed: - ----- Method: Linux32x86Config>>crossSources (in category 'sources') ----- - crossSources - ^#( - 'sqHeapMap.c' - 'sqTicker.c' - 'sqExternalSemaphores.c' - 'sqNamedPrims.c' - 'sqVirtualMachine.c' - )! Item was removed: - ----- Method: Linux32x86Config>>externalPluginsBuildAssert (in category 'cmake buildType redirects') ----- - externalPluginsBuildAssert - ^ self externalPluginsBuild! Item was removed: - ----- Method: Linux32x86Config>>externalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildAssertITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: Linux32x86Config>>externalPluginsBuildDebug (in category 'cmake buildType redirects') ----- - externalPluginsBuildDebug - ^ self externalPluginsBuild! Item was removed: - ----- Method: Linux32x86Config>>externalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildDebugITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: Linux32x86Config>>externalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: Linux32x86Config>>externalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreaded - ^ self externalPluginsBuild! Item was removed: - ----- Method: Linux32x86Config>>externalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreadedAssert - ^ self externalPluginsBuild! Item was removed: - ----- Method: Linux32x86Config>>externalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreadedDebug - ^ self externalPluginsBuild! Item was removed: - ----- Method: Linux32x86Config>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildAssert: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: Linux32x86Config>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildAssertITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: Linux32x86Config>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildDebug: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: Linux32x86Config>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildDebugITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: Linux32x86Config>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: Linux32x86Config>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreaded: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: Linux32x86Config>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreadedAssert: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: Linux32x86Config>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreadedDebug: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: Linux32x86Config>>extraVMSettingsBuild: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuild: aMaker - | versionC | - "self generateConfigH. supplanted by new auto generate of config" - - "add a generated version.c" - - versionC := 'version.c'. - - aMaker cmd: 'add_custom_command' params: 'OUTPUT ', - versionC , ' - COMMAND ${platformsDir}/unix/config/verstamp ',versionC,' gcc - COMMENT "Generating version.c" - '. - - ! Item was removed: - ----- Method: Linux32x86Config>>extraVMSettingsBuildAssert: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildAssert: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>extraVMSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildAssertITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>extraVMSettingsBuildDebug: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildDebug: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>extraVMSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildDebugITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>extraVMSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>extraVMSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreaded: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>extraVMSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreadedAssert: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>extraVMSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreadedDebug: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>internalPluginsBuildAssert (in category 'cmake buildType redirects') ----- - internalPluginsBuildAssert - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: Linux32x86Config>>internalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildAssertITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: Linux32x86Config>>internalPluginsBuildDebug (in category 'cmake buildType redirects') ----- - internalPluginsBuildDebug - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: Linux32x86Config>>internalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildDebugITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: Linux32x86Config>>internalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: Linux32x86Config>>internalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreaded - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: Linux32x86Config>>internalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreadedAssert - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: Linux32x86Config>>internalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreadedDebug - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: Linux32x86Config>>lDFlagsBuild (in category 'cmake buildType redirects') ----- - lDFlagsBuild - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm" - ^ { - '-Wl' - . '-z' - . 'now' - - } - ! Item was removed: - ----- Method: Linux32x86Config>>lDFlagsBuildAssert (in category 'cmake buildType redirects') ----- - lDFlagsBuildAssert - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm" - ^self lDFlagsBuild! Item was removed: - ----- Method: Linux32x86Config>>lDFlagsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - lDFlagsBuildAssertITimerHeartbeat - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm" - ^self lDFlagsBuild! Item was removed: - ----- Method: Linux32x86Config>>lDFlagsBuildDebug (in category 'cmake buildType redirects') ----- - lDFlagsBuildDebug - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm" - ^self lDFlagsBuild! Item was removed: - ----- Method: Linux32x86Config>>lDFlagsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - lDFlagsBuildDebugITimerHeartbeat - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm" - ^self lDFlagsBuild! Item was removed: - ----- Method: Linux32x86Config>>lDFlagsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - lDFlagsBuildITimerHeartbeat - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm" - ^self lDFlagsBuild! Item was removed: - ----- Method: Linux32x86Config>>lDFlagsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - lDFlagsBuildMultiThreaded - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm" - ^self lDFlagsBuild! Item was removed: - ----- Method: Linux32x86Config>>lDFlagsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - lDFlagsBuildMultiThreadedAssert - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm" - ^self lDFlagsBuild! Item was removed: - ----- Method: Linux32x86Config>>lDFlagsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - lDFlagsBuildMultiThreadedDebug - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm" - ^self lDFlagsBuild! Item was removed: - ----- Method: Linux32x86Config>>linkFlagsBuildAssert (in category 'cmake buildType redirects') ----- - linkFlagsBuildAssert - ^self linkFlagsBuild! Item was removed: - ----- Method: Linux32x86Config>>linkFlagsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - linkFlagsBuildAssertITimerHeartbeat - ^self linkFlagsBuild! Item was removed: - ----- Method: Linux32x86Config>>linkFlagsBuildDebug (in category 'cmake buildType redirects') ----- - linkFlagsBuildDebug - ^self linkFlagsBuild! Item was removed: - ----- Method: Linux32x86Config>>linkFlagsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - linkFlagsBuildDebugITimerHeartbeat - ^self linkFlagsBuild! Item was removed: - ----- Method: Linux32x86Config>>linkFlagsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - linkFlagsBuildITimerHeartbeat - ^self linkFlagsBuild! Item was removed: - ----- Method: Linux32x86Config>>linkFlagsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - linkFlagsBuildMultiThreaded - ^self linkFlagsBuild! Item was removed: - ----- Method: Linux32x86Config>>linkFlagsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - linkFlagsBuildMultiThreadedAssert - ^self linkFlagsBuild! Item was removed: - ----- Method: Linux32x86Config>>linkFlagsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - linkFlagsBuildMultiThreadedDebug - ^self linkFlagsBuild! Item was removed: - ----- Method: Linux32x86Config>>postBuildActionsBuildAssert: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildAssert: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>postBuildActionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildAssertITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>postBuildActionsBuildDebug: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildDebug: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>postBuildActionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildDebugITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>postBuildActionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>postBuildActionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreaded: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>postBuildActionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreadedAssert: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>postBuildActionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreadedDebug: aMaker - ^self postBuildActionsBuild: aMaker! Item was changed: + ----- Method: Linux32x86Config>>preferredIncludesBuild (in category 'cmake buildType redirects') ----- - ----- Method: Linux32x86Config>>preferredIncludesBuild (in category 'source files') ----- preferredIncludesBuild + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: (self class name), ' preferredIncludesBuild' ) + ]. + templates + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${targetPlatform}/plugins/B3DAcceleratorPlugin')). - self flag:'tty'. "pharo does not support newspeak or sista., yet sets this in CogUnixConfig. Is this appropriate here? Revisit when coding newspeak etc" - ^ #( '${targetPlatform}/plugins/B3DAcceleratorPlugin') + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_PATH = ${CMAKE_INCLUDE_PATH}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_SYSTEM_INCLUDE_PATH = ${CMAKE_SYSTEM_INCLUDE_PATH}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES = ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES = ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = ${CMAKE_FIND_ROOT_PATH_MODE_INCLUDE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = ${CMAKE_INCLUDE_CURRENT_DIR}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE = ${CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_DIRECTORIES_BEFORE = ${CMAKE_INCLUDE_DIRECTORIES_BEFORE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE = ${CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE}' ) + ]. - - "SystemNavigation default browseMethodsWhoseNamesContain: 'preferredIncludes'" ! Item was removed: - ----- Method: Linux32x86Config>>preferredIncludesBuildAssert (in category 'source files') ----- - preferredIncludesBuildAssert - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: Linux32x86Config>>preferredIncludesBuildAssertITimerHeartbeat (in category 'source files') ----- - preferredIncludesBuildAssertITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: Linux32x86Config>>preferredIncludesBuildDebug (in category 'source files') ----- - preferredIncludesBuildDebug - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: Linux32x86Config>>preferredIncludesBuildDebugITimerHeartbeat (in category 'source files') ----- - preferredIncludesBuildDebugITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: Linux32x86Config>>preferredIncludesBuildITimerHeartbeat (in category 'source files') ----- - preferredIncludesBuildITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: Linux32x86Config>>preferredIncludesBuildMultiThreaded (in category 'source files') ----- - preferredIncludesBuildMultiThreaded - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: Linux32x86Config>>preferredIncludesBuildMultiThreadedAssert (in category 'source files') ----- - preferredIncludesBuildMultiThreadedAssert - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: Linux32x86Config>>preferredIncludesBuildMultiThreadedDebug (in category 'source files') ----- - preferredIncludesBuildMultiThreadedDebug - ^self preferredIncludesBuild - ! Item was changed: + ----- Method: Linux32x86Config>>setExtraTargetPropertiesBuild: (in category 'cmake buildType redirects') ----- - ----- 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 cmd:'set_target_properties' params: '${_name} PROPERTIES LINK_FLAGS "-undefined gl"'. aMaker addExternalLibraries: #( 'uuid' "" 'ssl' "" 'crypto' "" 'm' 'dl' 'pthread' ). aMaker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. self addVMDrivers: aMaker.! Item was removed: - ----- Method: Linux32x86Config>>setExtraTargetPropertiesBuildAssert: (in category 'utils') ----- - setExtraTargetPropertiesBuildAssert: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>setExtraTargetPropertiesBuildAssertITimerHeartbeat: (in category 'utils') ----- - setExtraTargetPropertiesBuildAssertITimerHeartbeat: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>setExtraTargetPropertiesBuildDebug: (in category 'utils') ----- - setExtraTargetPropertiesBuildDebug: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>setExtraTargetPropertiesBuildDebugITimerHeartbeat: (in category 'utils') ----- - setExtraTargetPropertiesBuildDebugITimerHeartbeat: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>setExtraTargetPropertiesBuildITimerHeartbeat: (in category 'utils') ----- - setExtraTargetPropertiesBuildITimerHeartbeat: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>setExtraTargetPropertiesBuildMultiThreaded: (in category 'utils') ----- - setExtraTargetPropertiesBuildMultiThreaded: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>setExtraTargetPropertiesBuildMultiThreadedAssert: (in category 'utils') ----- - setExtraTargetPropertiesBuildMultiThreadedAssert: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>setExtraTargetPropertiesBuildMultiThreadedDebug: (in category 'utils') ----- - setExtraTargetPropertiesBuildMultiThreadedDebug: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux32x86Config>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'utils') ----- - setGlobalOptionsAfterDetermineSystemBuild: aMaker - "SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystemBuild:'" - " - aMaker set: 'CMAKE_C_COMPILER' to: '/usr/bin/gcc'. - aMaker set: 'CMAKE_CXX_COMPILER' to: '/usr/bin/g++'. - "! Item was removed: - ----- Method: Linux32x86Config>>setGlobalOptionsAfterDetermineSystemBuildAssert: (in category 'utils') ----- - setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: Linux32x86Config>>setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: (in category 'utils') ----- - setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: Linux32x86Config>>setGlobalOptionsAfterDetermineSystemBuildDebug: (in category 'utils') ----- - setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: Linux32x86Config>>setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: (in category 'utils') ----- - setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: Linux32x86Config>>setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: (in category 'utils') ----- - setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: Linux32x86Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: (in category 'utils') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: Linux32x86Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: (in category 'utils') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: Linux32x86Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: (in category 'utils') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: Linux32x86Config>>setGlobalOptionsBuild: (in category 'utils') ----- - setGlobalOptionsBuild: aMaker - "do nothing (so far) on Unix. - - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsBuild:' - " - ! Item was removed: - ----- Method: Linux32x86Config>>setGlobalOptionsBuildAssert: (in category 'utils') ----- - setGlobalOptionsBuildAssert: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: Linux32x86Config>>setGlobalOptionsBuildAssertITimerHeartbeat: (in category 'utils') ----- - setGlobalOptionsBuildAssertITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: Linux32x86Config>>setGlobalOptionsBuildDebug: (in category 'utils') ----- - setGlobalOptionsBuildDebug: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: Linux32x86Config>>setGlobalOptionsBuildDebugITimerHeartbeat: (in category 'utils') ----- - setGlobalOptionsBuildDebugITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: Linux32x86Config>>setGlobalOptionsBuildITimerHeartbeat: (in category 'utils') ----- - setGlobalOptionsBuildITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: Linux32x86Config>>setGlobalOptionsBuildMultiThreaded: (in category 'utils') ----- - setGlobalOptionsBuildMultiThreaded: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: Linux32x86Config>>setGlobalOptionsBuildMultiThreadedAssert: (in category 'utils') ----- - setGlobalOptionsBuildMultiThreadedAssert: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: Linux32x86Config>>setGlobalOptionsBuildMultiThreadedDebug: (in category 'utils') ----- - setGlobalOptionsBuildMultiThreadedDebug: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: Linux32x86Config>>standardIncludesBuild (in category 'source files') ----- - standardIncludesBuild - ^#()! Item was removed: - ----- Method: Linux32x86Config>>standardIncludesBuildAssert (in category 'source files') ----- - standardIncludesBuildAssert - ^ self standardIncludesBuild! Item was removed: - ----- Method: Linux32x86Config>>standardIncludesBuildAssertITimerHeartbeat (in category 'source files') ----- - standardIncludesBuildAssertITimerHeartbeat - ^ self standardIncludesBuild! Item was removed: - ----- Method: Linux32x86Config>>standardIncludesBuildDebug (in category 'source files') ----- - standardIncludesBuildDebug - ^ self standardIncludesBuild! Item was removed: - ----- Method: Linux32x86Config>>standardIncludesBuildDebugITimerHeartbeat (in category 'source files') ----- - standardIncludesBuildDebugITimerHeartbeat - ^ self standardIncludesBuild! Item was removed: - ----- Method: Linux32x86Config>>standardIncludesBuildITimerHeartbeat (in category 'source files') ----- - standardIncludesBuildITimerHeartbeat - ^ self standardIncludesBuild! Item was removed: - ----- Method: Linux32x86Config>>standardIncludesBuildMultiThreaded (in category 'source files') ----- - standardIncludesBuildMultiThreaded - ^ self standardIncludesBuild! Item was removed: - ----- Method: Linux32x86Config>>standardIncludesBuildMultiThreadedAssert (in category 'source files') ----- - standardIncludesBuildMultiThreadedAssert - ^ self standardIncludesBuild! Item was removed: - ----- Method: Linux32x86Config>>standardIncludesBuildMultiThreadedDebug (in category 'source files') ----- - standardIncludesBuildMultiThreadedDebug - ^ self standardIncludesBuild! Item was removed: - Linux32x86Config subclass: #Linux32x86SqueakCogV3Config - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'CMakeVMMakerSqueak-Linux32x86'! - - !Linux32x86SqueakCogV3Config commentStamp: 'tty 6/15/2014 14:03' prior: 0! - I configure a VM according to my name's form: [Operating System] [WordSize] [Processor Language][VM MemoryManager][BuildType]Conf - - - I am not meant to be built. - - SqueakLinux32x86Builder - configureABuildFor: #MY NAME HERE withBuildType: #build; - generateSources; - generate. - - HelpBrowser openOn: CMakeVMMakerSqueakEndUserHelp - HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp - ! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>cogitClass (in category 'source generation') ----- - cogitClass - "answer a class for machine code generation or nil" - - ^ StackToRegisterMappingCogit ! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>compilerFlagsBuild (in category 'cmake buildType redirects') ----- - compilerFlagsBuild - "Some gcc versions (3.4*) create a broken VM using -O2, so try -O1 if you have problems" - ^{ - '-g3' "more debugging" - .'-O1' "low optiomization level" - .'-m32' - .'-msse2' - .'-D_GNU_SOURCE' - .'-D_FILE_OFFSET_BITS=64' - .'-DNDEBUG' "disable assertions" - .'-DLSB_FIRST=1' "" - .'-DUSE_GLOBAL_STRUCT=0' - .'-DDEBUGVM=0' - .'-DCOGMTVM=0' - .'-fno-tree-pre ' - .'-fno-caller-saves' - } - - - ! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>compilerFlagsBuildAssert (in category 'cmake buildType redirects') ----- - compilerFlagsBuildAssert - ^ self compilerFlagsBuild - ! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>compilerFlagsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - compilerFlagsBuildAssertITimerHeartbeat - ^ self compilerFlagsBuild! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>compilerFlagsBuildDebug (in category 'cmake buildType redirects') ----- - compilerFlagsBuildDebug - ^ self compilerFlagsBuild! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>compilerFlagsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - compilerFlagsBuildDebugITimerHeartbeat - ^self compilerFlagsBuild - ! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>compilerFlagsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - compilerFlagsBuildITimerHeartbeat - ^self compilerFlagsBuild - ! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>compilerFlagsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - compilerFlagsBuildMultiThreaded - ^self compilerFlagsBuild - ! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>compilerFlagsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - compilerFlagsBuildMultiThreadedAssert - ^self compilerFlagsBuild - ! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>compilerFlagsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - compilerFlagsBuildMultiThreadedDebug - ^self compilerFlagsBuild - ! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>configureFlagsBuild (in category 'cmake buildType redirects') ----- - configureFlagsBuild - ^{'-without-npsqueak' . ''}! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>configureFlagsBuildAssert (in category 'cmake buildType redirects') ----- - configureFlagsBuildAssert - ^self configureFlagsBuild! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>configureFlagsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - configureFlagsBuildAssertITimerHeartbeat - ^self configureFlagsBuild! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>configureFlagsBuildDebug (in category 'cmake buildType redirects') ----- - configureFlagsBuildDebug - ^self configureFlagsBuild! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>configureFlagsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - configureFlagsBuildDebugITimerHeartbeat - ^self configureFlagsBuild! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>configureFlagsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - configureFlagsBuildITimerHeartbeat - ^self configureFlagsBuild! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>configureFlagsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - configureFlagsBuildMultiThreaded - ^self configureFlagsBuild! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>configureFlagsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - configureFlagsBuildMultiThreadedAssert - ^self configureFlagsBuild! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>configureFlagsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - configureFlagsBuildMultiThreadedDebug - ^self configureFlagsBuild! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>dirBuildLanguageVMMM (in category 'cmake') ----- - dirBuildLanguageVMMM - "the directory under buildPlatformDir example: newspeak.cog.spur. use squeak.cog.v3 as default" - ^self squeakCogV3! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>dirInstall (in category 'cmake directory ') ----- - dirInstall - "the directory of the finished product.. the place where 'make install' puts stuff. - SystemNavigation default browseMethodsWhoseNamesContain: 'outputDir' - " - ^self squeakCogV3! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>excludeFromBuild (in category 'cmake') ----- - excludeFromBuild - "over-ride to exclude yourself from a build or not" - ^false! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>executableName (in category 'cmake') ----- - executableName - ^ self vmCogExecutableName! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>externalLibsBuild (in category 'cmake buildType redirects') ----- - externalLibsBuild - self flag:'tty'. "this is dependent on plugins? what if I don't have SqueakSSLPlugin?" - ^#( - 'uuid' "" - 'ssl' "" - 'crypto' "" - 'm' "C math library" - 'dl' "dynamic linking library" - 'pthread' "POSIX threads library" - 'SM' "session management library for X11" - 'ICE' "ICE is the Inter Client Exchange protocol, part of X11" - 'GL' "libGL implements the GLX interface as well as the main OpenGL API entrypoints" - 'X11' - 'nsl' "network services library" - ). - - - ! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>externalLibsBuildAssert (in category 'cmake buildType redirects') ----- - externalLibsBuildAssert - ^ self externalLibsBuild - ! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>externalLibsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalLibsBuildAssertITimerHeartbeat - ^ self externalLibsBuild - ! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>externalLibsBuildDebug (in category 'cmake buildType redirects') ----- - externalLibsBuildDebug - ^ self externalLibsBuild - ! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>externalLibsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalLibsBuildDebugITimerHeartbeat - ^ self externalLibsBuild - ! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>externalLibsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalLibsBuildITimerHeartbeat - ^ self externalLibsBuild - ! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>externalLibsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - externalLibsBuildMultiThreaded - ^ self externalLibsBuild - ! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>externalLibsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - externalLibsBuildMultiThreadedAssert - ^ self externalLibsBuild - ! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>externalLibsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - externalLibsBuildMultiThreadedDebug - ^ self externalLibsBuild - ! Item was removed: - ----- Method: Linux32x86SqueakCogV3Config>>interpreterClass (in category 'source generation') ----- - interpreterClass - ^ CoInterpreter! Item was removed: - ----- Method: Linux64Config>>addVMDriversBuildAssert: (in category 'cmake buildType redirects') ----- - addVMDriversBuildAssert: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: Linux64Config>>addVMDriversBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - addVMDriversBuildAssertITimerHeartbeat: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: Linux64Config>>addVMDriversBuildDebug: (in category 'cmake buildType redirects') ----- - addVMDriversBuildDebug: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: Linux64Config>>addVMDriversBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - addVMDriversBuildDebugITimerHeartbeat: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: Linux64Config>>addVMDriversBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - addVMDriversBuildITimerHeartbeat: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: Linux64Config>>addVMDriversBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - addVMDriversBuildMultiThreaded: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: Linux64Config>>addVMDriversBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - addVMDriversBuildMultiThreadedAssert: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: Linux64Config>>addVMDriversBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - addVMDriversBuildMultiThreadedDebug: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: Linux64Config>>coreSourcesBuildAssert (in category 'cmake buildType redirects') ----- - coreSourcesBuildAssert - ^self coreSourcesBuild ! Item was removed: - ----- Method: Linux64Config>>coreSourcesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - coreSourcesBuildAssertITimerHeartbeat - ^self coreSourcesBuild ! Item was removed: - ----- Method: Linux64Config>>coreSourcesBuildDebug (in category 'cmake buildType redirects') ----- - coreSourcesBuildDebug - ^self coreSourcesBuild ! Item was removed: - ----- Method: Linux64Config>>coreSourcesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - coreSourcesBuildDebugITimerHeartbeat - ^self coreSourcesBuild ! Item was removed: - ----- Method: Linux64Config>>coreSourcesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - coreSourcesBuildITimerHeartbeat - ^self coreSourcesBuild ! Item was removed: - ----- Method: Linux64Config>>coreSourcesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - coreSourcesBuildMultiThreadedAssert - ^self coreSourcesBuildMultiThreaded ! Item was removed: - ----- Method: Linux64Config>>coreSourcesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - coreSourcesBuildMultiThreadedDebug - ^self coreSourcesBuildMultiThreaded ! Item was removed: - ----- Method: Linux64Config>>crossSources (in category 'source files') ----- - crossSources - ^#( - 'sqHeapMap.c' - 'sqTicker.c' - 'sqExternalSemaphores.c' - 'sqNamedPrims.c' - 'sqVirtualMachine.c' - )! Item was changed: + ----- Method: Linux64Config>>excludeFromBuild (in category 'cmake configuration') ----- - ----- Method: Linux64Config>>excludeFromBuild (in category 'cmake') ----- excludeFromBuild "over-ride to exclude yourself from a build" ^true! Item was changed: ----- Method: Linux64Config>>executableName (in category 'cmake') ----- executableName "AbstractBaseClass configurations are not meant to be executable" ^ self vmIShouldNotBeHereExecutableName! Item was changed: + ----- Method: Linux64Config>>externalPluginsBuild (in category 'cmake buildType redirects') ----- - ----- Method: Linux64Config>>externalPluginsBuild (in category 'as yet unclassified') ----- externalPluginsBuild ^ externalPlugins ifNil: [ externalPlugins := self defaultExternalPlugins ]! Item was removed: - ----- Method: Linux64Config>>externalPluginsBuildAssert (in category 'as yet unclassified') ----- - externalPluginsBuildAssert - ^ self externalPluginsBuild! Item was removed: - ----- Method: Linux64Config>>externalPluginsBuildAssertITimerHeartbeat (in category 'as yet unclassified') ----- - externalPluginsBuildAssertITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: Linux64Config>>externalPluginsBuildDebug (in category 'as yet unclassified') ----- - externalPluginsBuildDebug - ^ self externalPluginsBuild! Item was removed: - ----- Method: Linux64Config>>externalPluginsBuildDebugITimerHeartbeat (in category 'as yet unclassified') ----- - externalPluginsBuildDebugITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: Linux64Config>>externalPluginsBuildITimerHeartbeat (in category 'as yet unclassified') ----- - externalPluginsBuildITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: Linux64Config>>externalPluginsBuildMultiThreaded (in category 'as yet unclassified') ----- - externalPluginsBuildMultiThreaded - ^ self externalPluginsBuild! Item was removed: - ----- Method: Linux64Config>>externalPluginsBuildMultiThreadedAssert (in category 'as yet unclassified') ----- - externalPluginsBuildMultiThreadedAssert - ^ self externalPluginsBuild! Item was removed: - ----- Method: Linux64Config>>externalPluginsBuildMultiThreadedDebug (in category 'as yet unclassified') ----- - externalPluginsBuildMultiThreadedDebug - ^ self externalPluginsBuild! Item was removed: - ----- Method: Linux64Config>>extraVMSettingsBuild: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuild: aMaker - "SystemNavigation default browseMethodsWhoseNamesContain: 'extraVMSettingsBuild:'"! Item was removed: - ----- Method: Linux64Config>>extraVMSettingsBuildAssert: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildAssert: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: Linux64Config>>extraVMSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildAssertITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: Linux64Config>>extraVMSettingsBuildDebug: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildDebug: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: Linux64Config>>extraVMSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildDebugITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: Linux64Config>>extraVMSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: Linux64Config>>extraVMSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreaded: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: Linux64Config>>extraVMSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreadedAssert: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: Linux64Config>>extraVMSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreadedDebug: aMaker - ^self extraVMSettingsBuild: aMaker! Item was changed: + ----- Method: Linux64Config>>internalPluginsBuild (in category 'cmake buildType redirects') ----- - ----- Method: Linux64Config>>internalPluginsBuild (in category 'as yet unclassified') ----- internalPluginsBuild ^ internalPlugins ifNil: [ internalPlugins := self defaultInternalPlugins ]! Item was removed: - ----- Method: Linux64Config>>internalPluginsBuildAssert (in category 'as yet unclassified') ----- - internalPluginsBuildAssert - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: Linux64Config>>internalPluginsBuildAssertITimerHeartbeat (in category 'as yet unclassified') ----- - internalPluginsBuildAssertITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: Linux64Config>>internalPluginsBuildDebug (in category 'as yet unclassified') ----- - internalPluginsBuildDebug - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: Linux64Config>>internalPluginsBuildDebugITimerHeartbeat (in category 'as yet unclassified') ----- - internalPluginsBuildDebugITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: Linux64Config>>internalPluginsBuildITimerHeartbeat (in category 'as yet unclassified') ----- - internalPluginsBuildITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: Linux64Config>>internalPluginsBuildMultiThreaded (in category 'as yet unclassified') ----- - internalPluginsBuildMultiThreaded - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: Linux64Config>>internalPluginsBuildMultiThreadedAssert (in category 'as yet unclassified') ----- - internalPluginsBuildMultiThreadedAssert - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: Linux64Config>>internalPluginsBuildMultiThreadedDebug (in category 'as yet unclassified') ----- - internalPluginsBuildMultiThreadedDebug - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: Linux64Config>>postBuildActionsBuildAssert: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildAssert: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: Linux64Config>>postBuildActionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildAssertITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: Linux64Config>>postBuildActionsBuildDebug: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildDebug: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: Linux64Config>>postBuildActionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildDebugITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: Linux64Config>>postBuildActionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: Linux64Config>>postBuildActionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreaded: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: Linux64Config>>postBuildActionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreadedAssert: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: Linux64Config>>postBuildActionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreadedDebug: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: Linux64Config>>preferredIncludesBuild (in category 'cmake buildType redirects') ----- - preferredIncludesBuild - "SystemNavigation default browseMethodsWhoseNamesContain: 'preferredIncludes'" - ^ #( ) - - - ! Item was removed: - ----- Method: Linux64Config>>preferredIncludesBuildAssert (in category 'cmake buildType redirects') ----- - preferredIncludesBuildAssert - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: Linux64Config>>preferredIncludesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - preferredIncludesBuildAssertITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: Linux64Config>>preferredIncludesBuildDebug (in category 'cmake buildType redirects') ----- - preferredIncludesBuildDebug - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: Linux64Config>>preferredIncludesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - preferredIncludesBuildDebugITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: Linux64Config>>preferredIncludesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - preferredIncludesBuildITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: Linux64Config>>preferredIncludesBuildMultiThreaded (in category 'cmake buildType redirects') ----- - preferredIncludesBuildMultiThreaded - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: Linux64Config>>preferredIncludesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - preferredIncludesBuildMultiThreadedAssert - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: Linux64Config>>preferredIncludesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - preferredIncludesBuildMultiThreadedDebug - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: Linux64Config>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'as yet unclassified') ----- - setGlobalOptionsAfterDetermineSystemBuild: aMaker - "do nothing is an option - - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystemBuild:'" - ! Item was removed: - ----- Method: Linux64Config>>setGlobalOptionsAfterDetermineSystemBuildAssert: (in category 'as yet unclassified') ----- - setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: Linux64Config>>setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: (in category 'as yet unclassified') ----- - setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: Linux64Config>>setGlobalOptionsAfterDetermineSystemBuildDebug: (in category 'as yet unclassified') ----- - setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: Linux64Config>>setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: (in category 'as yet unclassified') ----- - setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: Linux64Config>>setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: (in category 'as yet unclassified') ----- - setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: Linux64Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: (in category 'as yet unclassified') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: Linux64Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: (in category 'as yet unclassified') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: Linux64Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: (in category 'as yet unclassified') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- 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 removed: - ----- Method: Linux64Config>>setGlobalOptionsBuildAssert: (in category 'as yet unclassified') ----- - setGlobalOptionsBuildAssert: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: Linux64Config>>setGlobalOptionsBuildAssertITimerHeartbeat: (in category 'as yet unclassified') ----- - setGlobalOptionsBuildAssertITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: Linux64Config>>setGlobalOptionsBuildDebug: (in category 'as yet unclassified') ----- - setGlobalOptionsBuildDebug: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: Linux64Config>>setGlobalOptionsBuildDebugITimerHeartbeat: (in category 'as yet unclassified') ----- - setGlobalOptionsBuildDebugITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: Linux64Config>>setGlobalOptionsBuildITimerHeartbeat: (in category 'as yet unclassified') ----- - setGlobalOptionsBuildITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: Linux64Config>>setGlobalOptionsBuildMultiThreaded: (in category 'as yet unclassified') ----- - setGlobalOptionsBuildMultiThreaded: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: Linux64Config>>setGlobalOptionsBuildMultiThreadedAssert: (in category 'as yet unclassified') ----- - setGlobalOptionsBuildMultiThreadedAssert: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: Linux64Config>>setGlobalOptionsBuildMultiThreadedDebug: (in category 'as yet unclassified') ----- - setGlobalOptionsBuildMultiThreadedDebug: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: Linux64Config>>standardIncludesBuild (in category 'cmake buildType redirects') ----- - standardIncludesBuild - ^#()! Item was removed: - ----- Method: Linux64Config>>standardIncludesBuildAssert (in category 'cmake buildType redirects') ----- - standardIncludesBuildAssert - ^ self standardIncludesBuild! Item was removed: - ----- Method: Linux64Config>>standardIncludesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - standardIncludesBuildAssertITimerHeartbeat - ^ self standardIncludesBuild! Item was removed: - ----- Method: Linux64Config>>standardIncludesBuildDebug (in category 'cmake buildType redirects') ----- - standardIncludesBuildDebug - ^ self standardIncludesBuild! Item was removed: - ----- Method: Linux64Config>>standardIncludesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - standardIncludesBuildDebugITimerHeartbeat - ^ self standardIncludesBuild! Item was removed: - ----- Method: Linux64Config>>standardIncludesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - standardIncludesBuildITimerHeartbeat - ^ self standardIncludesBuild! Item was removed: - ----- Method: Linux64Config>>standardIncludesBuildMultiThreaded (in category 'cmake buildType redirects') ----- - standardIncludesBuildMultiThreaded - ^ self standardIncludesBuild! Item was removed: - ----- Method: Linux64Config>>standardIncludesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - standardIncludesBuildMultiThreadedAssert - ^ self standardIncludesBuild! Item was removed: - ----- Method: Linux64Config>>standardIncludesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - standardIncludesBuildMultiThreadedDebug - ^ self standardIncludesBuild! Item was changed: ----- Method: Linux64x86w32BitConfig>>addVMDriversBuild: (in category 'cmake buildType redirects') ----- addVMDriversBuild: aMaker + |temp o| + self flag:'tty'. "I am writing sub-directory CMakeLists.txt here. Should I also write the config.cmake files?" + enabledebugmessages + ifTrue: [templates "this message will go to the top level CMakeLists.txt file" + addLast: (CMakeMessage new message: self class name , 'addVMDriversBuild:')]. + vmdrivers do:[ :vmd | + o := String new writeStream. "each VMDriver gets its own CMakeLists.txt file." + temp := OrderedCollection new. + temp + addAllLast:((CMakeVMDriver new) "<--confusing name. This is a CompositTemplate, not the CMakeVMDriverWrapper class" + config: self + definitions: (vmd compilerdefinitions) + driver: (vmd driver) + sources: (vmd sources) + includedirectories: (vmd includedirectories)). + temp do: [:each | o nextPutAll: (each content); cr]. - aMaker message: 'addVMDrivers: aMaker'. - self - addDriver: 'vm-display-null' - sources: #( - '${targetPlatform}/vm-display-null/sqUnixDisplayNull' ) - generator: aMaker - externalLibs: #(); - - addDriver: 'vm-display-X11' - sources: #( - '${targetPlatform}/vm-display-X11/sqUnixX11' - '${targetPlatform}/vm-display-X11/sqUnixMozilla' ) - generator: aMaker - externalLibs: (self externalLibs); "#( SM ICE GL X11 nsl dl); " + (self buildDir) createDirectory: (vmd driver). + " (FileDirectory default) createDirectory: (self buildDir) , FileDirectory slash , vmd driver." + self write: (o contents) toFile: vmd driver , FileDirectory slash , aMaker outputFileName. + templates "this will go to the top level CMakeLists.txt file" + addLast: ((CMakeAddSubDirectory new) sourcedir: (vmd driver)) + ]. - addDriver: 'vm-sound-ALSA' - sources: #( - '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' ) - generator: aMaker - externalLibs: #(); + + + + + + + + - addDriver: 'vm-sound-null' - sources: #( - '${targetPlatform}/vm-sound-null/sqUnixSoundNull' ) - generator: aMaker - externalLibs: #(). ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>addVMDriversBuildAssert: (in category 'cmake buildType redirects') ----- - addVMDriversBuildAssert: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>addVMDriversBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - addVMDriversBuildAssertITimerHeartbeat: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>addVMDriversBuildDebug: (in category 'cmake buildType redirects') ----- - addVMDriversBuildDebug: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>addVMDriversBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - addVMDriversBuildDebugITimerHeartbeat: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>addVMDriversBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - addVMDriversBuildITimerHeartbeat: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>addVMDriversBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - addVMDriversBuildMultiThreaded: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>addVMDriversBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - addVMDriversBuildMultiThreadedAssert: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>addVMDriversBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - addVMDriversBuildMultiThreadedDebug: aMaker - ^self addVMDriversBuild: aMaker! Item was changed: + ----- Method: Linux64x86w32BitConfig>>availableBuildTypes (in category 'cmake') ----- - ----- Method: Linux64x86w32BitConfig>>availableBuildTypes (in category 'cmake configuration') ----- availableBuildTypes ^SqueakCMakeVMMakerAbstractBuilder default allBuildTypes " subclasses should use ^super availableBuildTypes copyWithoutAll: #( #assertWithHeartbeatTimer #debugWithHeartbeatTimer debugMultiThreadedFFI.....etc)) " ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>coreSourcesBuildAssert (in category 'cmake buildType redirects') ----- - coreSourcesBuildAssert - ^self coreSourcesBuild ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>coreSourcesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - coreSourcesBuildAssertITimerHeartbeat - ^self coreSourcesBuild ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>coreSourcesBuildDebug (in category 'cmake buildType redirects') ----- - coreSourcesBuildDebug - ^self coreSourcesBuild ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>coreSourcesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - coreSourcesBuildDebugITimerHeartbeat - ^self coreSourcesBuild ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>coreSourcesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - coreSourcesBuildITimerHeartbeat - ^self coreSourcesBuild ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>coreSourcesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - coreSourcesBuildMultiThreadedAssert - ^self coreSourcesBuildMultiThreaded ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>coreSourcesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - coreSourcesBuildMultiThreadedDebug - ^self coreSourcesBuildMultiThreaded ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>crossSources (in category 'sources') ----- - crossSources - ^#( - 'sqHeapMap.c' - 'sqTicker.c' - 'sqExternalSemaphores.c' - 'sqNamedPrims.c' - 'sqVirtualMachine.c' - )! Item was added: + ----- Method: Linux64x86w32BitConfig>>customizeCMakeVMDisplayNull (in category 'plugins') ----- + customizeCMakeVMDisplayNull + |vmdriver| + vmdriver := vmdrivers detect: [:vmd | #CMakeVMDisplayNull = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" + vmdriver + sources: #('${targetPlatform}/vm-display-null/sqUnixDisplayNull') ; + compilerdefinitions:(OrderedCollection with: '-fPIC' with: '-DPIC'); + compilerflags: (self compilerFlags); + externallibraries: #(); + linkerflags: (self linkerFlags); + includedirectories:(OrderedCollection + with:'${crossDir}/plugins/FilePlugin' + with: '${targetPlatform}/plugins/B3DAcceleratorPlugin' + with: '${crossDir}/plugins/B3DAcceleratorPlugin'). + self flag:'tty'. "I don't think includedirectories is correct. revisit" + + + + + + + ! Item was added: + ----- Method: Linux64x86w32BitConfig>>customizeCMakeVMDisplayX11 (in category 'plugins') ----- + customizeCMakeVMDisplayX11 + |vmdriver| + vmdriver := vmdrivers detect: [:vmd | #CMakeVMDisplayX11 = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" + vmdriver + sources: #( '${targetPlatform}/vm-display-X11/sqUnixX11' '${targetPlatform}/vm-display-X11/sqUnixMozilla' ); + compilerdefinitions:(OrderedCollection with: '-fPIC' with: '-DPIC'); + compilerflags: (self compilerFlags); + externallibraries: (self externalLibraries); + linkerflags: (self linkerFlags); + includedirectories:(OrderedCollection + with:'${crossDir}/plugins/FilePlugin' + with: '${targetPlatform}/plugins/B3DAcceleratorPlugin' + with: '${crossDir}/plugins/B3DAcceleratorPlugin'). + ! Item was added: + ----- Method: Linux64x86w32BitConfig>>customizeCMakeVMSoundALSA (in category 'plugins') ----- + customizeCMakeVMSoundALSA + |vmdriver| + vmdriver := vmdrivers detect: [:vmd | #CMakeVMSoundALSA = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" + vmdriver + sources: #( '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' ); + compilerdefinitions:(OrderedCollection with: '-fPIC' with: '-DPIC'); + compilerflags: (self compilerFlags); + externallibraries: (self externalLibraries); + linkerflags: (self linkerFlags); + includedirectories: #(). + ! Item was added: + ----- Method: Linux64x86w32BitConfig>>customizeCMakeVMSoundNull (in category 'plugins') ----- + customizeCMakeVMSoundNull + |vmdriver| + vmdriver := vmdrivers detect: [:vmd | #CMakeVMSoundNull = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" + vmdriver + sources: #( '${targetPlatform}/vm-sound-null/sqUnixSoundNull' ); + compilerdefinitions:(OrderedCollection with: '-fPIC' with: '-DPIC'); + compilerflags: (self compilerFlags); + externallibraries: (self externalLibraries); + linkerflags: (self linkerFlags); + includedirectories:#() + + ! Item was added: + ----- Method: Linux64x86w32BitConfig>>customizeVMDrivers (in category 'plugins') ----- + customizeVMDrivers + |subset iwantonly| + "trim the vmdrivers ordered collection of CMakeVMDriver subclasses to only those I want. then customize them for use" + iwantonly := #(#CMakeVMDisplayNull #CMakeVMDisplayX11 #CMakeVMSoundALSA #CMakeVMSoundNull ). + subset := vmdrivers select: [:vmd | 0 < (iwantonly occurrencesOf: (vmd class name) asSymbol)]. + vmdrivers := subset. + self + customizeCMakeVMDisplayNull; + customizeCMakeVMDisplayX11; + customizeCMakeVMSoundALSA; + customizeCMakeVMSoundNull. + + + + ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>externalPluginsBuildAssert (in category 'cmake buildType redirects') ----- - externalPluginsBuildAssert - ^ self externalPluginsBuild! Item was removed: - ----- Method: Linux64x86w32BitConfig>>externalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildAssertITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: Linux64x86w32BitConfig>>externalPluginsBuildDebug (in category 'cmake buildType redirects') ----- - externalPluginsBuildDebug - ^ self externalPluginsBuild! Item was removed: - ----- Method: Linux64x86w32BitConfig>>externalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildDebugITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: Linux64x86w32BitConfig>>externalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: Linux64x86w32BitConfig>>externalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreaded - ^ self externalPluginsBuild! Item was removed: - ----- Method: Linux64x86w32BitConfig>>externalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreadedAssert - ^ self externalPluginsBuild! Item was removed: - ----- Method: Linux64x86w32BitConfig>>externalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreadedDebug - ^ self externalPluginsBuild! Item was removed: - ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildAssert: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildAssertITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildDebug: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildDebugITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreaded: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreadedAssert: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreadedDebug: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>extraVMSettingsBuild: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuild: aMaker - "SystemNavigation default browseMethodsWhoseNamesContain: 'extraVMSettingsBuild:'" - - | versionC | - aMaker message: 'extraVMSettingsBuild: aMaker'. - "self generateConfigH. supplanted by new auto generate of config" - - "add a generated version.c" - - versionC := 'version.c'. - - aMaker cmd: 'add_custom_command' params: 'OUTPUT ', - versionC , ' - COMMAND ${platformsDir}/unix/config/verstamp ',versionC,' gcc - COMMENT "Generating version.c" - '. - - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>extraVMSettingsBuildAssert: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildAssert: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>extraVMSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildAssertITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>extraVMSettingsBuildDebug: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildDebug: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>extraVMSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildDebugITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>extraVMSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>extraVMSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreaded: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>extraVMSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreadedAssert: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>extraVMSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreadedDebug: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>internalPluginsBuildAssert (in category 'cmake buildType redirects') ----- - internalPluginsBuildAssert - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: Linux64x86w32BitConfig>>internalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildAssertITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: Linux64x86w32BitConfig>>internalPluginsBuildDebug (in category 'cmake buildType redirects') ----- - internalPluginsBuildDebug - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: Linux64x86w32BitConfig>>internalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildDebugITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: Linux64x86w32BitConfig>>internalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: Linux64x86w32BitConfig>>internalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreaded - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: Linux64x86w32BitConfig>>internalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreadedAssert - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: Linux64x86w32BitConfig>>internalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreadedDebug - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: Linux64x86w32BitConfig>>postBuildActionsBuildAssert: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildAssert: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>postBuildActionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildAssertITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>postBuildActionsBuildDebug: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildDebug: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>postBuildActionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildDebugITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>postBuildActionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>postBuildActionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreaded: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>postBuildActionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreadedAssert: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>postBuildActionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreadedDebug: aMaker - ^self postBuildActionsBuild: aMaker! Item was changed: + ----- Method: Linux64x86w32BitConfig>>preferredIncludesBuild (in category 'cmake buildType redirects') ----- - ----- Method: Linux64x86w32BitConfig>>preferredIncludesBuild (in category 'source files') ----- preferredIncludesBuild + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: (self class name), ' preferredIncludesBuild' ) + ]. + templates + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${targetPlatform}/plugins/B3DAcceleratorPlugin')). - ^ #( '${targetPlatform}/plugins/B3DAcceleratorPlugin') + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_PATH = ${CMAKE_INCLUDE_PATH}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_SYSTEM_INCLUDE_PATH = ${CMAKE_SYSTEM_INCLUDE_PATH}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES = ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES = ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = ${CMAKE_FIND_ROOT_PATH_MODE_INCLUDE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = ${CMAKE_INCLUDE_CURRENT_DIR}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE = ${CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_DIRECTORIES_BEFORE = ${CMAKE_INCLUDE_DIRECTORIES_BEFORE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE = ${CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE}' ) + ].! - - - - "SystemNavigation default browseMethodsWhoseNamesContain: 'preferredIncludes'" - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>preferredIncludesBuildAssert (in category 'source files') ----- - preferredIncludesBuildAssert - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>preferredIncludesBuildAssertITimerHeartbeat (in category 'source files') ----- - preferredIncludesBuildAssertITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>preferredIncludesBuildDebug (in category 'source files') ----- - preferredIncludesBuildDebug - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>preferredIncludesBuildDebugITimerHeartbeat (in category 'source files') ----- - preferredIncludesBuildDebugITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>preferredIncludesBuildITimerHeartbeat (in category 'source files') ----- - preferredIncludesBuildITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>preferredIncludesBuildMultiThreaded (in category 'source files') ----- - preferredIncludesBuildMultiThreaded - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>preferredIncludesBuildMultiThreadedAssert (in category 'source files') ----- - preferredIncludesBuildMultiThreadedAssert - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>preferredIncludesBuildMultiThreadedDebug (in category 'source files') ----- - preferredIncludesBuildMultiThreadedDebug - ^self preferredIncludesBuild - ! Item was changed: ----- 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 "' , self compilerFlags , '")'. - - aMaker - cmd: 'set_source_files_properties' - params: ' ${targetPlatform}/vm/sqUnixHeartbeat.c PROPERTIES - COMPILE_FLAGS "' , self compilerFlags , '"'. - aMaker addExternalLibraries: (self externalLibs). aMaker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. self addVMDrivers: aMaker.! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setExtraTargetPropertiesBuildAssert: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildAssert: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setExtraTargetPropertiesBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildAssertITimerHeartbeat: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setExtraTargetPropertiesBuildDebug: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildDebug: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setExtraTargetPropertiesBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildDebugITimerHeartbeat: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setExtraTargetPropertiesBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildITimerHeartbeat: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setExtraTargetPropertiesBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildMultiThreaded: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setExtraTargetPropertiesBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildMultiThreadedAssert: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setExtraTargetPropertiesBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildMultiThreadedDebug: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuild: aMaker - " - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystemBuild:'" - aMaker message: 'setGlobalOptionsAfterDetermineSystemBuild: aMaker'. - aMaker puts: ' - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -m32") - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -m32") - SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall -m32") - SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wall -m32") - SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wall -m32") - SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -m32") - MESSAGE("CMAKE_C_FLAGS=${CMAKE_C_FLAGS}") - MESSAGE("CMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}") - MESSAGE("CMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}") - MESSAGE("CMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}") - MESSAGE("CMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}") - GET_DIRECTORY_PROPERTY( DirDefs DIRECTORY ${CMAKE_SOURCE_DIR} COMPILE_DEFINITIONS ) - FOREACH( d ${DirDefs} ) - MESSAGE( STATUS "Found Define: " ${d} ) - ENDFOREACH() - MESSAGE( STATUS "DirDefs: " ${DirDefs} )'. - aMaker - include: 'Utils.cmake'; - include: 'Plugins.cmake'; - include: 'TestBigEndian'; - include: 'CheckIncludeFile'; - include: 'CheckLibraryExists'; - include: 'CheckTypeSize'; - include: 'CheckFunctionExists'; - include: 'CheckVariableExists'; - include: 'CheckStructHasMember'; - include: 'FindPkgConfig'. - - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsAfterDetermineSystemBuildAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsAfterDetermineSystemBuildDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuild: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuild: aMaker - aMaker message: 'setGlobalOptionsBuild: aMaker'. - " aMaker linkDirectories: '/usr/lib'." - - " SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions:' "! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuildAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildAssert: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildAssertITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuildDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildDebug: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildDebugITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreaded: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreadedAssert: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreadedDebug: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>standardIncludesBuild (in category 'cmake buildType redirects') ----- - standardIncludesBuild - ^#()! Item was removed: - ----- Method: Linux64x86w32BitConfig>>standardIncludesBuildAssert (in category 'cmake buildType redirects') ----- - standardIncludesBuildAssert - ^ self standardIncludesBuild! Item was removed: - ----- Method: Linux64x86w32BitConfig>>standardIncludesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - standardIncludesBuildAssertITimerHeartbeat - ^self standardIncludesBuild - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>standardIncludesBuildDebug (in category 'cmake buildType redirects') ----- - standardIncludesBuildDebug - ^ self standardIncludesBuild! Item was removed: - ----- Method: Linux64x86w32BitConfig>>standardIncludesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - standardIncludesBuildDebugITimerHeartbeat - ^self standardIncludesBuild - ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>standardIncludesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - standardIncludesBuildITimerHeartbeat - ^ self standardIncludesBuild! Item was removed: - ----- Method: Linux64x86w32BitConfig>>standardIncludesBuildMultiThreaded (in category 'cmake buildType redirects') ----- - standardIncludesBuildMultiThreaded - ^ self standardIncludesBuild! Item was removed: - ----- Method: Linux64x86w32BitConfig>>standardIncludesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - standardIncludesBuildMultiThreadedAssert - ^ self standardIncludesBuild! Item was removed: - ----- Method: Linux64x86w32BitConfig>>standardIncludesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - standardIncludesBuildMultiThreadedDebug - ^ self standardIncludesBuild! Item was added: + ----- Method: Linux64x86w32BitConfig>>zaddVMDriversBuild: (in category 'cmake buildType redirects') ----- + zaddVMDriversBuild: aMaker + |temp o| + "We could put these inline, but other components include the directories.cmake file. So, we continue that convention" + o := String new writeStream. + temp := OrderedCollection new. + (enabledebugmessages) + ifTrue:[ templates + addLast:((CMakeMessage new) message: (self class name) , 'addVMDriversBuild:') + ] . + temp + " cmakeGen printHeader; + project: name; + include: '../directories.cmake';" + addLast: ((CMakeHeader new) configurationName: self class name ); + addLast: ((CMakeProject new)variable: self executableName ); + addLast: ((CMakeInclude new) file: ((self buildDirName), FileDirectory slash, 'directories.cmake')); "??" + addLast:((CMakeAddDefinitions new) definitions: self compilerFlags asOrderedCollection); + addLast:((CMakeAddDefinitions new) definitions: (OrderedCollection with:'-fPIC' with:'-DPIC' )); + addLast:((CMakeSet new) variable:'sources' quotedValue: '${targetPlatform}/vm-display-null/sqUnixDisplayNull'); + addLast:((CMakeAddLibrary new) + library: 'vm-display-null' + type: 'SHARED' + sources: #('${targetPlatform}/vm-display-null/sqUnixDisplayNull')); + addLast: ((CMakeIncludeDirectories new) + dirs: (OrderedCollection + with: #('${crossDir}/plugins/FilePlugin' '${targetPlatform}/plugins/B3DAcceleratorPlugin' '${crossDir}/plugins/B3DAcceleratorPlugin'))); + addLast:((CMakeSet new) variable: 'LIBRARY_OUTPUT_PATH' quotedValue:'self outputDir fullName'); + addLast:((CMakeListAppend new) list: 'LINKLIBS' elements: (self externalLibs)); + addLast:((CMakeTargetLinkLibraries new) target: 'vm-display-null' items: (OrderedCollection with: '${LINKLIBS}')); + addLast:((CMakeSetTargetProperties new) + target: 'vm-display-null' + propertiesandvalues: (OrderedCollection with: 'PREFIX "" ' with: 'SUFFIX "" ' with: 'LINK_FLAGS ' , (self compilerFlags))). + + temp do: [:each | o nextPutAll: (each content); cr]. + self write: (o contents) toFile: 'directories.cmake'. + (enabledebugmessages) + ifTrue:[ + templates + addLast:((CMakeMessage new) message: (self class name), ' setDirectories: aMaker' ) + ]. + templates addLast: ((CMakeInclude new) file: 'directories.cmake'). + + + aMaker message: 'addVMDrivers: aMaker'. + self + addDriver: 'vm-display-null' + sources: #( + '${targetPlatform}/vm-display-null/sqUnixDisplayNull' ) + generator: aMaker + externalLibs: #(); + + addDriver: 'vm-display-X11' + sources: #( + '${targetPlatform}/vm-display-X11/sqUnixX11' + '${targetPlatform}/vm-display-X11/sqUnixMozilla' ) + generator: aMaker + externalLibs: (self externalLibs); "#( SM ICE GL X11 nsl dl); " + + addDriver: 'vm-sound-ALSA' + sources: #( + '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' ) + generator: aMaker + externalLibs: #(); + + addDriver: 'vm-sound-null' + sources: #( + '${targetPlatform}/vm-sound-null/sqUnixSoundNull' ) + generator: aMaker + externalLibs: #(). + ! Item was added: + ----- Method: Linux64x86w32BitSqueakCogV3Config>>cmakeAddDefinitionsBuild (in category 'cmake buildType redirects') ----- + cmakeAddDefinitionsBuild + "from oscogvm/build.linux32x86/squeak.cog.v3/build/mvm" + (enabledebugmessages) + ifTrue:[ templates + addLast:((CMakeMessage new) message: (self class name) , 'cmakeAddDefinitionsBuild') + ] . + templates + addLast:((CMakeAddDefinitions new) definitions: (self compilerDefinitions asOrderedCollection)). + ! Item was added: + ----- Method: Linux64x86w32BitSqueakCogV3Config>>cmakeCFlagsBuild (in category 'cmake buildType redirects') ----- + cmakeCFlagsBuild + |cflags| + self flag:'tty'. "#build should have -O2" + cflags:= String streamContents: [:stream | (self compilerFlags) asStringOn: stream delimiter: ' ' ]. + cflags:='"', cflags, '"'. + (enabledebugmessages) + ifTrue:[ templates + addLast:((CMakeMessage new) message: (self class name) , 'cmakeCFlagsBuild') + ] . + templates + addLast:((CMakeSet new) variable:'CMAKE_CXX_FLAGS' value: '${CMAKE_CXX_FLAGS} ', cflags ); + addLast:((CMakeSet new) variable:'CMAKE_C_FLAGS' value: '${CMAKE_C_FLAGS} ', cflags ); + addLast:((CMakeSet new) variable:'CMAKE_CXX_FLAGS_RELEASE' value: '${CMAKE_CXX_FLAGS_RELEASE} ', cflags ); + addLast:((CMakeSet new) variable:'CMAKE_CXX_FLAGS_DEBUG' value: '${CMAKE_CXX_FLAGS_DEBUG} ', cflags ). + + (enabledebugmessages) "take a peek at em" + ifTrue:[ templates + addLast:((CMakeMessage new) message: 'CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}'); + addLast:((CMakeMessage new) message: 'CMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}'); + addLast:((CMakeMessage new) message: 'CMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}'); + addLast:((CMakeMessage new) message: 'CMAKE_C_FLAGS=${CMAKE_C_FLAGS}'); + addLast:((CMakeMessage new) message: 'CMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}'); + addLast:((CMakeMessage new) message: 'CMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}') + ] . + + + ! Item was added: + ----- Method: Linux64x86w32BitSqueakCogV3Config>>cmakeSetSourceFilesPropertiesBuild (in category 'cmake buildType redirects') ----- + cmakeSetSourceFilesPropertiesBuild + |cflags| + cflags:=String streamContents: [:stream | (self compilerFlags) asStringOn: stream delimiter: ' ' ]. + (enabledebugmessages) + ifTrue:[ templates + addLast:((CMakeMessage new) message: (self class name) , 'cmakeSetSourceFilesPropertiesBuild') + ] . + templates + addLast:((CMakeSetSourceFilesProperties new) + files: (OrderedCollection with: '${srcVMDir}/cogit.c') + propertiesandvalues:{'COMPILE_FLAGS' . cflags}); + addLast:((CMakeSetSourceFilesProperties new) + files: (OrderedCollection with: '${targetPlatform}/vm/sqUnixHeartbeat.c') + propertiesandvalues:{'COMPILE_FLAGS' . cflags}).! Item was added: + ----- Method: Linux64x86w32BitSqueakCogV3Config>>cmakeSharedLinkerFlagsBuild (in category 'cmake buildType redirects') ----- + cmakeSharedLinkerFlagsBuild + + (enabledebugmessages) + ifTrue:[ templates + addLast:((CMakeMessage new) message: (self class name) , 'cmakeSharedLinkerFlagsBuild') + ] . + templates + addLast:((CMakeSet new) + variable:'CMAKE_SHARED_LINKER_FLAGS' + quotedValue:'${CMAKE_SHARED_LINKER_FLAGS} ', (String streamContents: [:stream | (self linkerFlags ) asStringOn: stream delimiter: ' ' ])). + + (enabledebugmessages) + ifTrue:[ templates + addLast:((CMakeMessage new) message: 'CMAKE_C_LINKER_PREFERENCE = ${CMAKE_C_LINKER_PREFERENCE}'); + addLast:((CMakeMessage new) message: 'CMAKE_C_LINKER_PREFERENCE_PROPAGATES = ${CMAKE_C_LINKER_PREFERENCE_PROPAGATES}'); + addLast:((CMakeMessage new) message: 'CMAKE_CXX_LINKER_PREFERENCE = ${CMAKE_CXX_LINKER_PREFERENCE}'); + addLast:((CMakeMessage new) message: 'CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES = ${CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES}'); + addLast:((CMakeMessage new) message: 'CMAKE_EXE_LINKER_FLAGS = ${CMAKE_EXE_LINKER_FLAGS}'); + addLast:((CMakeMessage new) message: 'CMAKE_EXE_LINKER_FLAGS_DEBUG = ${CMAKE_EXE_LINKER_FLAGS_DEBUG}'); + addLast:((CMakeMessage new) message: 'CMAKE_EXE_LINKER_FLAGS_RELEASE = ${CMAKE_EXE_LINKER_FLAGS_RELEASE}'); + addLast:((CMakeMessage new) message: 'CMAKE_MODULE_LINKER_FLAGS = ${CMAKE_MODULE_LINKER_FLAGS}'); + addLast:((CMakeMessage new) message: 'CMAKE_MODULE_LINKER_FLAGS_DEBUG = ${CMAKE_MODULE_LINKER_FLAGS_DEBUG}'); + addLast:((CMakeMessage new) message: 'CMAKE_MODULE_LINKER_FLAGS_ RELEASE= ${CMAKE_MODULE_LINKER_FLAGS_RELEASE}'); + addLast:((CMakeMessage new) message: 'CMAKE_SHARED_LINKER_FLAGS = ${CMAKE_SHARED_LINKER_FLAGS}'); + addLast:((CMakeMessage new) message: 'CMAKE_SHARED_LINKER_FLAGS_DEBUG = ${CMAKE_SHARED_LINKER_FLAGS_DEBUG}'); + addLast:((CMakeMessage new) message: 'CMAKE_SHARED_LINKER_FLAGS_RELEASE = ${CMAKE_SHARED_LINKER_FLAGS_RELEASE}'); + addLast:((CMakeMessage new) message: 'CMAKE_STATIC_LINKER_FLAGS = ${CMAKE_STATIC_LINKER_FLAGS}'); + addLast:((CMakeMessage new) message: 'CMAKE_STATIC_LINKER_FLAGS_DEBUG= ${CMAKE_STATIC_LINKER_FLAGS_DEBUG}'); + addLast:((CMakeMessage new) message: ' CMAKE_STATIC_LINKER_FLAGS_RELEASE= ${CMAKE_STATIC_LINKER_FLAGS_RELEASE}') + + ] . + ! Item was added: + ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerDefinitions (in category 'compiling') ----- + compilerDefinitions + ^#( + '-DNDEBUG' + '-DDEBUGVM=0' + '-D_GNU_SOURCE' + '-D_FILE_OFFSET_BITS=64' + '-DUSE_GLOBAL_STRUCT=0' + '-DCOGMTVM=0') + ! Item was added: + ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerFlags (in category 'compiling') ----- + compilerFlags + ^#('-Wall' + '-m32' + '-msse2' + '-g' + '-O1') + ! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerFlagsBuild (in category 'cmake buildType redirects') ----- - compilerFlagsBuild - "this is stupid. We have C_FLAGS, compilerflags, link flags, ld flags definitions." - "Some gcc versions (3.4*) create a broken VM using -O2, so try -O1 if you have problems" - ^{ - '-g3' "more debugging" - . '-O1' "low optimization level" - . '-m32' - . '-msse2' - . '-D_GNU_SOURCE' - . '-D_FILE_OFFSET_BITS=64' - . '-DNDEBUG' "disable assertions" - . '-DLSB_FIRST=1' "" - . '-DUSE_GLOBAL_STRUCT=0' - . '-DDEBUGVM=0' - . '-DCOGMTVM=0' - . '-fno-tree-pre ' - . '-fno-caller-saves' - " . '-L/usr/lib'" - } - - ! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerFlagsBuildAssert (in category 'cmake buildType redirects') ----- - compilerFlagsBuildAssert - ^self compilerFlagsBuild - ! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerFlagsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - compilerFlagsBuildAssertITimerHeartbeat - ^self compilerFlagsBuild - ! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerFlagsBuildDebug (in category 'cmake buildType redirects') ----- - compilerFlagsBuildDebug - ^self compilerFlagsBuild - ! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerFlagsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - compilerFlagsBuildDebugITimerHeartbeat - ^self compilerFlagsBuild - ! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerFlagsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - compilerFlagsBuildITimerHeartbeat - ^self compilerFlagsBuild - ! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerFlagsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - compilerFlagsBuildMultiThreaded - ^self compilerFlagsBuild - ! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerFlagsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - compilerFlagsBuildMultiThreadedAssert - ^self compilerFlagsBuild - ! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerFlagsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - compilerFlagsBuildMultiThreadedDebug - ^self compilerFlagsBuild - ! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>configHBuild (in category 'headers generation') ----- - configHBuild - ^ ' - - #define HAVE_UUID_H 1 - #define HAVE_UUIDGEN 1 - - #ifndef __sq_config_h - #define __sq_config_h - - /* explicit image width */ - - #define HAVE_INTERP_H 1 - - /* package options */ - - #define USE_X11 1 - - #undef USE_X11_GLX - /* #undef USE_QUARTZ */ - /* #undef USE_QUARTZ_CGL */ - /* #undef USE_RFB */ - - /* libraries */ - - /* #undef HAVE_LIBX11 */ - /* #undef HAVE_LIBXEXT */ - #define HAVE_LIBDL 1 - /* #undef HAVE_DYLD */ - /* #undef HAVE_LIBFFI */ - /* #undef HAVE_ICONV */ - - /* #undef USE_AUDIO_NONE */ - /* #undef USE_AUDIO_SUN */ - /* #undef USE_AUDIO_NAS */ - /* #undef USE_AUDIO_OSS */ - /* #undef USE_AUDIO_MACOSX */ - /* #undef OSS_DEVICE */ - - /* header files */ - - #define HAVE_UNISTD_H 1 - /* #undef NEED_GETHOSTNAME_P */ - - #define HAVE_DIRENT_H 1 - /* #undef HAVE_SYS_NDIR_H */ - /* #undef HAVE_SYS_DIR_H */ - /* #undef HAVE_NDIR_H */ - #define HAVE_DLFCN_H 1 - #define HAVE_ICONV_H 1 - - #define HAVE_SYS_TIME_H 1 - #define TIME_WITH_SYS_TIME 1 - - /* #undef HAVE_SYS_FILIO_H */ - - /* #undef HAVE_SYS_AUDIOIO_H */ - /* #undef HAVE_SUN_AUDIOIO_H */ - - #define HAVE_PTY_H 1 - /* #undef HAVE_UTIL_H */ - /* #undef HAVE_LIBUTIL_H */ - #define HAVE_STROPTS_H 1 - - #undef HAVE_GL_GL_H - #undef HAVE_OPENGL_GL_H - - /* #undef NEED_SUNOS_H */ - - /* system calls/library functions */ - - #define AT_EXIT atexit - - #define HAVE_TZSET 1 - - #define HAVE_OPENPTY 1 - /* #undef HAVE_UNIX98_PTYS */ - - #define HAVE_SNPRINTF 1 - /* #undef HAVE___SNPRINTF */ - - #define HAVE_MMAP 1 - - /* #undef HAVE_DYLD */ - - #define HAVE_LANGINFO_CODESET 1 - - #define HAVE_ALLOCA 1 - #define HAVE_ALLOCA_H 1 - - #define HAVE_UNSETENV 1 - - #define HAVE_NANOSLEEP 1 - - /* widths of primitive types */ - - #define SIZEOF_INT 4 - #define SIZEOF_LONG 4 - #define SIZEOF_LONG_LONG 8 - #define SIZEOF_VOID_P 4 - - /* structures */ - - #define HAVE_TM_GMTOFF 1 - #define HAVE_TIMEZONE 1 - - /* typedefs */ - - /* #undef size_t */ - /* #undef socklen_t */ - - #define squeakInt64 long long - - /* architecture */ - - #define OS_TYPE "unix" - - #define VM_HOST "i686-pc-linux-gnu" - #define VM_HOST_CPU "i686" - /* #undef VM_HOST_VENDOR */ - #define VM_HOST_OS "linux-gnu" - #define VM_BUILD_STRING "Unix built on "__DATE__ " "__TIME__" Compiler: "__VERSION__ - - /* #undef WORDS_BIGENDIAN */ - /* #undef DOUBLE_WORD_ALIGNMENT */ - - /* damage containment */ - - /* #undef DARWIN */ - - #ifdef NEED_SUNOS_H - # include "sunos.h" - #endif - - /* other configured variables */ - - #define SQ_VERSION "3.9a-7024" - #define VM_VERSION "3.9-7" - #define VM_MODULE_PREFIX "" - /* #undef VM_DLSYM_PREFIX */ - #define VM_X11DIR "" - - /* avoid dependencies on glibc2.3 */ - - #define HAVE_FEATURES_H 1 - - #if defined(HAVE_FEATURES_H) - # include "glibc.h" - #endif - - #endif /* __sq_config_h */ - - '! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>configureFlagsBuild (in category 'cmake buildType redirects') ----- - configureFlagsBuild - ^{'-without-npsqueak' . '--without-vm-display-fbdev' . '--x-libraries=/usr/lib' } ! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>configureFlagsBuildAssert (in category 'cmake buildType redirects') ----- - configureFlagsBuildAssert - ^self configureFlagsBuild! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>configureFlagsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - configureFlagsBuildAssertITimerHeartbeat - ^self configureFlagsBuild! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>configureFlagsBuildDebug (in category 'cmake buildType redirects') ----- - configureFlagsBuildDebug - ^self configureFlagsBuild! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>configureFlagsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - configureFlagsBuildDebugITimerHeartbeat - ^self configureFlagsBuild! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>configureFlagsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - configureFlagsBuildITimerHeartbeat - ^self configureFlagsBuild! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>configureFlagsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - configureFlagsBuildMultiThreaded - ^self configureFlagsBuild! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>configureFlagsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - configureFlagsBuildMultiThreadedAssert - ^self configureFlagsBuild! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>configureFlagsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - configureFlagsBuildMultiThreadedDebug - ^self configureFlagsBuild! Item was changed: + ----- Method: Linux64x86w32BitSqueakCogV3Config>>dirBuildLanguageVMMM (in category 'cmake') ----- - ----- Method: Linux64x86w32BitSqueakCogV3Config>>dirBuildLanguageVMMM (in category 'cmake directory ') ----- dirBuildLanguageVMMM ^self squeakCogV3! Item was added: + ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibraries (in category 'compiling') ----- + externalLibraries + ^#( + 'uuid' "" + 'ssl' "" + 'crypto' "" + 'm' "C math library" + 'dl' "dynamic linking library" + 'pthread' "POSIX threads library" + 'SM' "session management library for X11" + 'ICE' "ICE is the Inter Client Exchange protocol, part of X11" + 'GL' "libGL implements the GLX interface as well as the main OpenGL API entrypoints" + 'X11' + 'nsl' "network services library" + ) + + + ! Item was changed: ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuild (in category 'cmake buildType redirects') ----- externalLibsBuild + ^self externalLibraries asOrderedCollection. - self flag:'tty'. "this is dependent on plugins? what if I don't have SqueakSSLPlugin?" - ^#( - 'uuid' "" - 'ssl' "" - 'crypto' "" - 'm' "C math library" - 'dl' "dynamic linking library" - 'pthread' "POSIX threads library" - 'SM' "session management library for X11" - 'ICE' "ICE is the Inter Client Exchange protocol, part of X11" - 'GL' "libGL implements the GLX interface as well as the main OpenGL API entrypoints" - 'X11' - 'nsl' "network services library" - ). - - ! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuildAssert (in category 'cmake buildType redirects') ----- - externalLibsBuildAssert - ^ self externalLibsBuild - ! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalLibsBuildAssertITimerHeartbeat - ^ self externalLibsBuild - ! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuildDebug (in category 'cmake buildType redirects') ----- - externalLibsBuildDebug - ^ self externalLibsBuild - ! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalLibsBuildDebugITimerHeartbeat - ^ self externalLibsBuild - ! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalLibsBuildITimerHeartbeat - ^ self externalLibsBuild - ! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - externalLibsBuildMultiThreaded - ^ self externalLibsBuild - ! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - externalLibsBuildMultiThreadedAssert - ^ self externalLibsBuild - ! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - externalLibsBuildMultiThreadedDebug - ^ self externalLibsBuild - ! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>lDFlagsBuild (in category 'cmake buildType redirects') ----- - lDFlagsBuild - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm" - ^ { - '-Wl' - . '-z' - . 'now' - - } - ! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>lDFlagsBuildAssert (in category 'cmake buildType redirects') ----- - lDFlagsBuildAssert - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm" - ^self lDFlagsBuild! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>lDFlagsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - lDFlagsBuildAssertITimerHeartbeat - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm" - ^self lDFlagsBuild! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>lDFlagsBuildDebug (in category 'cmake buildType redirects') ----- - lDFlagsBuildDebug - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm" - ^self lDFlagsBuild! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>lDFlagsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - lDFlagsBuildDebugITimerHeartbeat - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm" - ^self lDFlagsBuild! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>lDFlagsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - lDFlagsBuildITimerHeartbeat - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm" - ^self lDFlagsBuild! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>lDFlagsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - lDFlagsBuildMultiThreaded - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm" - ^self lDFlagsBuild! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>lDFlagsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - lDFlagsBuildMultiThreadedAssert - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm" - ^self lDFlagsBuild! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>lDFlagsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - lDFlagsBuildMultiThreadedDebug - "Answer array of flags like the LDFLAGS=-Wl,-z,now line in the GNU system's mvm file cat Cog/build.linux32x86/squeak.cog.v3/build/mvm" - ^self lDFlagsBuild! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>linkFlagsBuildAssert (in category 'cmake buildType redirects') ----- - linkFlagsBuildAssert - ^self linkFlagsBuild! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>linkFlagsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - linkFlagsBuildAssertITimerHeartbeat - ^self linkFlagsBuild! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>linkFlagsBuildDebug (in category 'cmake buildType redirects') ----- - linkFlagsBuildDebug - ^self linkFlagsBuild! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>linkFlagsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - linkFlagsBuildDebugITimerHeartbeat - ^self linkFlagsBuild! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>linkFlagsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - linkFlagsBuildITimerHeartbeat - ^self linkFlagsBuild! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>linkFlagsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - linkFlagsBuildMultiThreaded - ^self linkFlagsBuild! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>linkFlagsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - linkFlagsBuildMultiThreadedAssert - ^self linkFlagsBuild! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>linkFlagsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - linkFlagsBuildMultiThreadedDebug - ^self linkFlagsBuild! Item was added: + ----- Method: Linux64x86w32BitSqueakCogV3Config>>linkerFlags (in category 'compiling') ----- + linkerFlags + ^#( '-Wl' + '-z' + 'now' + )! Item was changed: + ----- Method: SqueakAndroidStackEvtConfig>>availableBuildTypes (in category 'cmake') ----- - ----- Method: SqueakAndroidStackEvtConfig>>availableBuildTypes (in category 'cmake configuration') ----- availableBuildTypes ^SqueakCMakeVMMakerAbstractBuilder default noBuildTypes ! Item was changed: + ----- Method: SqueakAndroidStackEvtConfig>>buildDirName (in category 'cmake') ----- - ----- Method: SqueakAndroidStackEvtConfig>>buildDirName (in category 'squeak compatibility') ----- buildDirName ^'do not build. see class comment'! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>cmakeAddDefinitionsBuild (in category 'cmake buildType redirects') ----- + cmakeAddDefinitionsBuild + "Compiler flags for Android. Leave empty for now" + ^ {' -DDEBUG=22 '}! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>compilerFlags (in category 'source generation') ----- - compilerFlags - "Compiler flags for Android. Leave empty for now" - ^ ' -DDEBUG=22 '! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>compilerFlagsBuild (in category 'cmake buildType redirects') ----- + compilerFlagsBuild + "Compiler flags for Android. Leave empty for now" + ^ ' -DDEBUG=22 '! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>configHBuild (in category 'cmake buildType redirects') ----- - configHBuild - "does nothing. included for framework consistency/testing - - SystemNavigation default browseMethodsWhoseNamesContain: 'configHBuild' - " - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>configHBuildAssert (in category 'cmake buildType redirects') ----- - configHBuildAssert - ^ self configHBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>configHBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - configHBuildAssertITimerHeartbeat - ^ self configHBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>configHBuildDebug (in category 'cmake buildType redirects') ----- - configHBuildDebug - ^ self configHBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>configHBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - configHBuildDebugITimerHeartbeat - ^ self configHBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>configHBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - configHBuildITimerHeartbeat - ^ self configHBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>configHBuildMultiThreaded (in category 'cmake buildType redirects') ----- - configHBuildMultiThreaded - ^ self configHBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>configHBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - configHBuildMultiThreadedAssert - ^ self configHBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>configHBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - configHBuildMultiThreadedDebug - ^ self configHBuild! Item was added: + ----- Method: SqueakAndroidStackEvtConfig>>externalPluginsBuild (in category 'cmake buildType redirects') ----- + externalPluginsBuild + ^ externalPlugins ifNil: [ externalPlugins := self defaultExternalPlugins ]! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>externalPluginsBuildAssert (in category 'as yet unclassified') ----- - externalPluginsBuildAssert - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>externalPluginsBuildAssertITimerHeartbeat (in category 'as yet unclassified') ----- - externalPluginsBuildAssertITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>externalPluginsBuildDebug (in category 'as yet unclassified') ----- - externalPluginsBuildDebug - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>externalPluginsBuildDebugITimerHeartbeat (in category 'as yet unclassified') ----- - externalPluginsBuildDebugITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>externalPluginsBuildITimerHeartbeat (in category 'as yet unclassified') ----- - externalPluginsBuildITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>externalPluginsBuildMultiThreaded (in category 'as yet unclassified') ----- - externalPluginsBuildMultiThreaded - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>externalPluginsBuildMultiThreadedAssert (in category 'as yet unclassified') ----- - externalPluginsBuildMultiThreadedAssert - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>externalPluginsBuildMultiThreadedDebug (in category 'as yet unclassified') ----- - externalPluginsBuildMultiThreadedDebug - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuild: maker - ^super extraPluginSettingsBuild: maker. - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildAssert: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildAssertITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildDebug: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildDebugITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreaded: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreadedAssert: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreadedDebug: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was changed: ----- Method: SqueakAndroidStackEvtConfig>>extraVMSettingsBuild: (in category 'cmake buildType redirects') ----- extraVMSettingsBuild: aMaker + super extraVMSettingsBuild: aMaker. + (enabledebugmessages) + ifTrue:[ templates + addLast:((CMakeMessage new) message: (self class name) , 'extraVMSettingsBuild: aMaker') + ] . + self flag: 'tty'. "copied from pharo class. what is this?" + " - | versionC | - versionC := 'version.c'. aMaker puts: '$(buildDir)/',versionC, ':' ; puts: ({Character tab}, '$(platformsDir)/android/config/verstamp ', '$(buildDir)/', versionC,' gcc'); puts: {Character cr}; puts: ('LOCAL_SRC_FILES += $(buildDir)/', versionC); puts: {Character cr}. . + "! - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>extraVMSettingsBuildAssert: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildAssert: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>extraVMSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildAssertITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>extraVMSettingsBuildDebug: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildDebug: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>extraVMSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildDebugITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>extraVMSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>extraVMSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreaded: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>extraVMSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreadedAssert: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>extraVMSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreadedDebug: aMaker - ^self extraVMSettingsBuild: aMaker! Item was changed: + ----- Method: SqueakAndroidStackEvtConfig>>internalPluginsBuild (in category 'cmake buildType redirects') ----- - ----- Method: SqueakAndroidStackEvtConfig>>internalPluginsBuild (in category 'as yet unclassified') ----- internalPluginsBuild ^ internalPlugins ifNil: [ internalPlugins := self defaultInternalPlugins ]! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>internalPluginsBuildAssert (in category 'as yet unclassified') ----- - internalPluginsBuildAssert - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>internalPluginsBuildAssertITimerHeartbeat (in category 'as yet unclassified') ----- - internalPluginsBuildAssertITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>internalPluginsBuildDebug (in category 'as yet unclassified') ----- - internalPluginsBuildDebug - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>internalPluginsBuildDebugITimerHeartbeat (in category 'as yet unclassified') ----- - internalPluginsBuildDebugITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>internalPluginsBuildITimerHeartbeat (in category 'as yet unclassified') ----- - internalPluginsBuildITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>internalPluginsBuildMultiThreaded (in category 'as yet unclassified') ----- - internalPluginsBuildMultiThreaded - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>internalPluginsBuildMultiThreadedAssert (in category 'as yet unclassified') ----- - internalPluginsBuildMultiThreadedAssert - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>internalPluginsBuildMultiThreadedDebug (in category 'as yet unclassified') ----- - internalPluginsBuildMultiThreadedDebug - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>preferredIncludesBuild (in category 'source files') ----- - preferredIncludesBuild - ^ #()! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>preferredIncludesBuildAssert (in category 'source files') ----- - preferredIncludesBuildAssert - ^ self preferredIncludesBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>preferredIncludesBuildAssertITimerHeartbeat (in category 'source files') ----- - preferredIncludesBuildAssertITimerHeartbeat - ^ self preferredIncludesBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>preferredIncludesBuildDebug (in category 'source files') ----- - preferredIncludesBuildDebug - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>preferredIncludesBuildDebugITimerHeartbeat (in category 'source files') ----- - preferredIncludesBuildDebugITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>preferredIncludesBuildITimerHeartbeat (in category 'source files') ----- - preferredIncludesBuildITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>preferredIncludesBuildMultiThreaded (in category 'source files') ----- - preferredIncludesBuildMultiThreaded - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>preferredIncludesBuildMultiThreadedAssert (in category 'source files') ----- - preferredIncludesBuildMultiThreadedAssert - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>preferredIncludesBuildMultiThreadedDebug (in category 'source files') ----- - preferredIncludesBuildMultiThreadedDebug - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'as yet unclassified') ----- - setGlobalOptionsAfterDetermineSystemBuild: aMaker - "do nothing (so far) on Unix. - - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystemBuild:' - "! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsAfterDetermineSystemBuildAssert: (in category 'as yet unclassified') ----- - setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: (in category 'as yet unclassified') ----- - setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsAfterDetermineSystemBuildDebug: (in category 'as yet unclassified') ----- - setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: (in category 'as yet unclassified') ----- - setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: (in category 'as yet unclassified') ----- - setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: (in category 'as yet unclassified') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: (in category 'as yet unclassified') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: (in category 'as yet unclassified') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsBuild: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuild: aMaker - "does nothing. included for framework consistency/testing - - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsBuild' - " - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsBuildAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildAssert: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildAssertITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsBuildDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildDebug: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildDebugITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreaded: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreadedAssert: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>setGlobalOptionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreadedDebug: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>standardIncludesBuild (in category 'cmake buildType redirects') ----- - standardIncludesBuild - ^#()! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>standardIncludesBuildAssert (in category 'cmake buildType redirects') ----- - standardIncludesBuildAssert - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>standardIncludesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - standardIncludesBuildAssertITimerHeartbeat - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>standardIncludesBuildDebug (in category 'cmake buildType redirects') ----- - standardIncludesBuildDebug - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>standardIncludesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - standardIncludesBuildDebugITimerHeartbeat - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>standardIncludesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - standardIncludesBuildITimerHeartbeat - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>standardIncludesBuildMultiThreaded (in category 'cmake buildType redirects') ----- - standardIncludesBuildMultiThreaded - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>standardIncludesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - standardIncludesBuildMultiThreadedAssert - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakAndroidStackEvtConfig>>standardIncludesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - standardIncludesBuildMultiThreadedDebug - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakBSDConfig>>addVMDriversBuildAssert: (in category 'cmake buildType redirects') ----- - addVMDriversBuildAssert: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: SqueakBSDConfig>>addVMDriversBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - addVMDriversBuildAssertITimerHeartbeat: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: SqueakBSDConfig>>addVMDriversBuildDebug: (in category 'cmake buildType redirects') ----- - addVMDriversBuildDebug: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: SqueakBSDConfig>>addVMDriversBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - addVMDriversBuildDebugITimerHeartbeat: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: SqueakBSDConfig>>addVMDriversBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - addVMDriversBuildITimerHeartbeat: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: SqueakBSDConfig>>addVMDriversBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - addVMDriversBuildMultiThreaded: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: SqueakBSDConfig>>addVMDriversBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - addVMDriversBuildMultiThreadedAssert: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: SqueakBSDConfig>>addVMDriversBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - addVMDriversBuildMultiThreadedDebug: aMaker - ^self addVMDriversBuild: aMaker! Item was changed: + ----- Method: SqueakBSDConfig>>availableBuildTypes (in category 'cmake') ----- - ----- Method: SqueakBSDConfig>>availableBuildTypes (in category 'cmake configuration') ----- availableBuildTypes ^SqueakCMakeVMMakerAbstractBuilder default allBuildTypes " subclasses should use ^super availableBuildTypes copyWithoutAll: #( #assertWithHeartbeatTimer #debugWithHeartbeatTimer debugMultiThreadedFFI.....etc)) " ! Item was removed: - ----- Method: SqueakBSDConfig>>commonCompilerFlags (in category 'compiler flags') ----- - commonCompilerFlags - "avoid premature optimization. push this decision down lower if it is needed at all" - ^{'-m32'} - ! Item was removed: - ----- Method: SqueakBSDConfig>>compilerFlagsAssert (in category 'compiler flags') ----- - compilerFlagsAssert - - ^ { - '-g3'. - '-O0'. - '-msse2'. - '-D_GNU_SOURCE'. - '-DITIMER_HEARTBEAT=1'. - '-DNO_VM_PROFILE=1'. - '-DDEBUGVM=1' }! Item was removed: - ----- Method: SqueakBSDConfig>>compilerFlagsDebug (in category 'compiler flags') ----- - compilerFlagsDebug - - ^ { - '-g3'. - '-O0'. - '-msse2'. - '-D_GNU_SOURCE'. - '-DITIMER_HEARTBEAT=1'. - '-DNO_VM_PROFILE=1'. - '-DDEBUGVM=1' }! Item was removed: - ----- Method: SqueakBSDConfig>>coreSourcesBuildAssert (in category 'cmake buildType redirects') ----- - coreSourcesBuildAssert - ^self coreSourcesBuild ! Item was removed: - ----- Method: SqueakBSDConfig>>coreSourcesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - coreSourcesBuildAssertITimerHeartbeat - ^self coreSourcesBuild ! Item was removed: - ----- Method: SqueakBSDConfig>>coreSourcesBuildDebug (in category 'cmake buildType redirects') ----- - coreSourcesBuildDebug - ^self coreSourcesBuild ! Item was removed: - ----- Method: SqueakBSDConfig>>coreSourcesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - coreSourcesBuildDebugITimerHeartbeat - ^self coreSourcesBuild ! Item was removed: - ----- Method: SqueakBSDConfig>>coreSourcesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - coreSourcesBuildITimerHeartbeat - ^self coreSourcesBuild ! Item was removed: - ----- Method: SqueakBSDConfig>>coreSourcesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - coreSourcesBuildMultiThreadedAssert - ^self coreSourcesBuildMultiThreaded ! Item was removed: - ----- Method: SqueakBSDConfig>>coreSourcesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - coreSourcesBuildMultiThreadedDebug - ^self coreSourcesBuildMultiThreaded ! Item was removed: - ----- Method: SqueakBSDConfig>>externalPluginsBuildAssert (in category 'cmake buildType redirects') ----- - externalPluginsBuildAssert - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakBSDConfig>>externalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildAssertITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakBSDConfig>>externalPluginsBuildDebug (in category 'cmake buildType redirects') ----- - externalPluginsBuildDebug - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakBSDConfig>>externalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildDebugITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakBSDConfig>>externalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakBSDConfig>>externalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreaded - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakBSDConfig>>externalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreadedAssert - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakBSDConfig>>externalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreadedDebug - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakBSDConfig>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildAssert: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakBSDConfig>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildAssertITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakBSDConfig>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildDebug: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakBSDConfig>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildDebugITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakBSDConfig>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakBSDConfig>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreaded: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakBSDConfig>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreadedAssert: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakBSDConfig>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreadedDebug: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakBSDConfig>>extraVMSettingsBuild: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuild: aMaker - "SystemNavigation default browseMethodsWhoseNamesContain: 'extraVMSettingsBuild:'"! Item was removed: - ----- Method: SqueakBSDConfig>>extraVMSettingsBuildAssert: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildAssert: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakBSDConfig>>extraVMSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildAssertITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakBSDConfig>>extraVMSettingsBuildDebug: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildDebug: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakBSDConfig>>extraVMSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildDebugITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakBSDConfig>>extraVMSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakBSDConfig>>extraVMSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreaded: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakBSDConfig>>extraVMSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreadedAssert: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakBSDConfig>>extraVMSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreadedDebug: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakBSDConfig>>internalPluginsBuildAssert (in category 'cmake buildType redirects') ----- - internalPluginsBuildAssert - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakBSDConfig>>internalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildAssertITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakBSDConfig>>internalPluginsBuildDebug (in category 'cmake buildType redirects') ----- - internalPluginsBuildDebug - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakBSDConfig>>internalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildDebugITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakBSDConfig>>internalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakBSDConfig>>internalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreaded - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakBSDConfig>>internalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreadedAssert - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakBSDConfig>>internalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreadedDebug - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakBSDConfig>>postBuildActionsBuildAssert: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildAssert: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakBSDConfig>>postBuildActionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildAssertITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakBSDConfig>>postBuildActionsBuildDebug: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildDebug: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakBSDConfig>>postBuildActionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildDebugITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakBSDConfig>>postBuildActionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakBSDConfig>>postBuildActionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreaded: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakBSDConfig>>postBuildActionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreadedAssert: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakBSDConfig>>postBuildActionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreadedDebug: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakBSDConfig>>preferredIncludesBuild (in category 'cmake buildType redirects') ----- - preferredIncludesBuild - "SystemNavigation default browseMethodsWhoseNamesContain: 'preferredIncludes'" - ^ #( ) - - - ! Item was removed: - ----- Method: SqueakBSDConfig>>preferredIncludesBuildAssert (in category 'cmake buildType redirects') ----- - preferredIncludesBuildAssert - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakBSDConfig>>preferredIncludesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - preferredIncludesBuildAssertITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakBSDConfig>>preferredIncludesBuildDebug (in category 'cmake buildType redirects') ----- - preferredIncludesBuildDebug - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakBSDConfig>>preferredIncludesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - preferredIncludesBuildDebugITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakBSDConfig>>preferredIncludesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - preferredIncludesBuildITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakBSDConfig>>preferredIncludesBuildMultiThreaded (in category 'cmake buildType redirects') ----- - preferredIncludesBuildMultiThreaded - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakBSDConfig>>preferredIncludesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - preferredIncludesBuildMultiThreadedAssert - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakBSDConfig>>preferredIncludesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - preferredIncludesBuildMultiThreadedDebug - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakBSDConfig>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuild: aMaker - "do nothing (so far) on Unix. - - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystemBuild:' - "! Item was removed: - ----- Method: SqueakBSDConfig>>setGlobalOptionsAfterDetermineSystemBuildAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakBSDConfig>>setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakBSDConfig>>setGlobalOptionsAfterDetermineSystemBuildDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakBSDConfig>>setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakBSDConfig>>setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakBSDConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakBSDConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakBSDConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- 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 removed: - ----- Method: SqueakBSDConfig>>setGlobalOptionsBuildAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildAssert: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakBSDConfig>>setGlobalOptionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildAssertITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakBSDConfig>>setGlobalOptionsBuildDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildDebug: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakBSDConfig>>setGlobalOptionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildDebugITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakBSDConfig>>setGlobalOptionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakBSDConfig>>setGlobalOptionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreaded: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakBSDConfig>>setGlobalOptionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreadedAssert: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakBSDConfig>>setGlobalOptionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreadedDebug: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakBSDConfig>>standardIncludesBuild (in category 'cmake buildType redirects') ----- - standardIncludesBuild - ^#()! Item was removed: - ----- Method: SqueakBSDConfig>>standardIncludesBuildAssert (in category 'cmake buildType redirects') ----- - standardIncludesBuildAssert - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakBSDConfig>>standardIncludesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - standardIncludesBuildAssertITimerHeartbeat - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakBSDConfig>>standardIncludesBuildDebug (in category 'cmake buildType redirects') ----- - standardIncludesBuildDebug - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakBSDConfig>>standardIncludesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - standardIncludesBuildDebugITimerHeartbeat - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakBSDConfig>>standardIncludesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - standardIncludesBuildITimerHeartbeat - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakBSDConfig>>standardIncludesBuildMultiThreaded (in category 'cmake buildType redirects') ----- - standardIncludesBuildMultiThreaded - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakBSDConfig>>standardIncludesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - standardIncludesBuildMultiThreadedAssert - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakBSDConfig>>standardIncludesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - standardIncludesBuildMultiThreadedDebug - ^ self standardIncludesBuild! Item was changed: ----- Method: SqueakCMakeVMMakerAbstractBuilder class>>configureA:forBuildType: (in category 'building') ----- configureA: aSqueakCMakeConfiguration forBuildType: aSymbol "Configure a Configuration for a specific build type. SqueakLinux64x86w32CompatBuilder configureA: #Linux64x86w32BitSqueakCogV3SlackwareNoGLConfig forBuildType: #build.itimerheartbeat " default ifNil:[default:= self new]. + ^default configureA: aSqueakCMakeConfiguration forBuildType: aSymbol! - ^default configureABuildFor: aSqueakCMakeConfiguration forBuildType: aSymbol! Item was removed: - ----- Method: SqueakCMakeVMMakerAbstractBuilder class>>configureABuildFor:forBuildType: (in category 'building') ----- - configureABuildFor: aSqueakCMakeConfiguration forBuildType: aSymbol - default ifNil:[default:= self new]. - ^default configureABuildFor: aSqueakCMakeConfiguration forBuildType: aSymbol! Item was added: + ----- Method: SqueakCMakeVMMakerAbstractBuilder class>>enableMessageTracking: (in category 'queries') ----- + enableMessageTracking: aBoolean + default ifNil:[default:= self new]. + ^default enableMessageTracking: aBoolean! Item was added: + ----- Method: SqueakCMakeVMMakerAbstractBuilder class>>generateByTemplate (in category 'building') ----- + generateByTemplate + default ifNil:[default:= self new]. + ^default generateByTemplate! Item was added: + ----- Method: SqueakCMakeVMMakerAbstractBuilder>>configureA:forBuildType: (in category 'building') ----- + configureA: configSymbol forBuildType: typeSymbol + | i | + self flag:'tty'. "excludeFromBuild returning True does not exit gracefully" + "Do some sanity checks, then set the internal state of a Configuration for a particular build type. " + [ + ((Smalltalk at: configSymbol) category) = (self configurationsCategory) "verify the class is handled by this concrete builder" + ifTrue:[ + config := (Smalltalk at: configSymbol) new. "verify this config can handle this build type." + config excludeFromBuild "has a developer excluded this build manually?" + ifTrue:[^self userErrorConfigMarkedAsExcludeFromBuild: configSymbol]. + i:=config availableBuildTypes indexOf:typeSymbol + ifAbsent:[^self userErrorInvalidBuildType: typeSymbol "this config does not support this build type" + forConfiguration: configSymbol + hasTypes: config availableBuildTypes]. + (config configureForBuildType: typeSymbol) value. "config configure yourself" + ^self] + ifFalse:[^self userErrorInvalidTarget: configSymbol] + ] ifError:[^'error configureABuildFor: ''', configSymbol]. + + ^nil. + + + ! Item was removed: - ----- Method: SqueakCMakeVMMakerAbstractBuilder>>configureABuildFor:forBuildType: (in category 'building') ----- - configureABuildFor: configSymbol forBuildType: typeSymbol - | i | - self flag:'tty'. "excludeFromBuild returning True does not exit gracefully" - "Do some sanity checks, then set the internal state of a Configuration for a particular build type. " - [ - ((Smalltalk at: configSymbol) category) = (self configurationsCategory) "verify the class is handled by this concrete builder" - ifTrue:[ - config := (Smalltalk at: configSymbol) new. "verify this config can handle this build type." - config excludeFromBuild "has a developer excluded this build manually?" - ifTrue:[^self userErrorConfigMarkedAsExcludeFromBuild: configSymbol]. - i:=config availableBuildTypes indexOf:typeSymbol - ifAbsent:[^self userErrorInvalidBuildType: typeSymbol "this config does not support this build type" - forConfiguration: configSymbol - hasTypes: config availableBuildTypes]. - (config configureForBuildType: typeSymbol) value. "config configure yourself" - ^self] - ifFalse:[^self userErrorInvalidTarget: configSymbol] - ] ifError:[^'error configureABuildFor: ''', configSymbol]. - - ^nil. - - - ! Item was added: + ----- Method: SqueakCMakeVMMakerAbstractBuilder>>enableMessageTracking: (in category 'building') ----- + enableMessageTracking: aBoolean + (config isKindOf: CPlatformConfig) + ifTrue:[config enabledebugmessages: aBoolean] + ! Item was added: + ----- Method: SqueakCMakeVMMakerAbstractBuilder>>generateByTemplate (in category 'building') ----- + generateByTemplate + (config isKindOf: CPlatformConfig) + ifTrue:[config generateByTemplate] + ! Item was removed: - SqueakCocoaIOSConfig subclass: #SqueakCocoaIOSCogV3FamilyConfig - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'CMakeVMMakerSqueak-IOS'! - - !SqueakCocoaIOSCogV3FamilyConfig commentStamp: 'tty 6/15/2014 14:07' prior: 0! - This is an abstract class for all Mac Cocoa Cog VMs family. That is, for all CogVMS (StackVM, CogVM, CogMTVM, etc). - - I configure a VM according to my name's form: [Operating System] [WordSize] [Processor Language][VM MemoryManager][BuildType]Conf - - - I am not meant to be built. - - SqueakIOSBuilder - configureABuildFor: #ONE OF MY SUBCLASSES NAME HERE withBuildType: #build; - generateSources; - generate. - - HelpBrowser openOn: CMakeVMMakerSqueakEndUserHelp - HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp - - - - - - - ! Item was removed: - ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>CFBundleIconFile (in category 'bundle strings') ----- - CFBundleIconFile - - "An application icon" - ^ 'Cog.icns'! Item was removed: - ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>CFBundleVersion (in category 'bundle strings') ----- - CFBundleVersion - "An application version" - ^ '6.0-pre'! Item was removed: - ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>cogitClass (in category 'source generation') ----- - cogitClass - ^ StackToRegisterMappingCogit - ! Item was removed: - ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>commonCompilerFlags (in category 'settings') ----- - commonCompilerFlags - ^super commonCompilerFlags, #( - "CLANG >>" - '-fwrapv' "Non optimization of stackoverflow (to allow number conversions)" - '-Wno-return-type' "to avoid clang to complain about plugins that do not return properly." - '-Qunused-arguments' - "CLANG <<" - '-funroll-loops' - '-fasm-blocks' - '-fno-inline-functions' - '-mfpmath=sse' - '-march=pentium-m' - '-mtune=prescott' - '-falign-functions=16' - '-fno-gcse' - '-std=gnu99' - '-fmessage-length=0' - '-fpascal-strings' - '-DBUILD_FOR_OSX' - "'-DUSE_INLINE_MEMORY_ACCESSORS=1' " - '-DLSB_FIRST' - '-DHAVE_SYS_TIME_H' - '-DHAVE_NANOSLEEP' - '-DCOGMTVM=0' - '-DUSE_GLOBAL_STRUCT=0' - '-DBASE_HEADER_SIZE=4' - '-DENABLE_FAST_BLT')! Item was removed: - ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>compilerFlagsDebug (in category 'settings') ----- - compilerFlagsDebug - ^#('-g3' '-O0' '-DDEBUGVM=1')! Item was removed: - ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>compilerFlagsRelease (in category 'settings') ----- - compilerFlagsRelease - ^#('-g0' '-O3' '-fomit-frame-pointer' '-DNDEBUG' '-DDEBUGVM=0')! Item was removed: - ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>configureFFIPlugin: (in category 'plugin extra rules') ----- - configureFFIPlugin: maker - "extra rules for FFIPlugin" - - - "Never generate this plugin. Because it is a legacy code. - For Cog FFI, use ReentrantFFIPlugin (ReentrantIA32FFIPlugin for x86) " - - maker doNotGenerate: true.! Item was removed: - ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>configureHostWindowPlugin: (in category 'plugin extra rules') ----- - configureHostWindowPlugin: maker - super configureHostWindowPlugin: maker. - maker includeDirectories: '${platformsDir}/Cross/plugins/HostWindowPlugin'.! Item was removed: - ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>configureQuicktimePlugin: (in category 'plugin extra rules') ----- - configureQuicktimePlugin: maker - "extra rules for QuicktimePlugin" - - maker includeDirectories: '${platformsDir}/Cross/plugins/QuicktimePlugin'.! Item was removed: - ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>configureSqueakSSLPlugin: (in category 'plugin extra rules') ----- - configureSqueakSSLPlugin: maker - maker addPlatformSources: #('sqMacSSL.c').! Item was removed: - ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>configureSystemInfoPlugin: (in category 'plugin extra rules') ----- - configureSystemInfoPlugin: maker - maker includeDirectories: '${platformsDir}/Cross/plugins/SystemInfoPlugin'. - maker addPlatformSources: #('sqSystemInfo.m' ).! Item was removed: - ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>configureUnixAioPlugin: (in category 'plugin extra rules') ----- - configureUnixAioPlugin: maker - maker includeDirectories: '${crossDir}/plugins/FilePlugin'. - maker includeDirectories: '${platformsDir}/Cross/plugins/SocketPlugin'.! Item was removed: - ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>configureUnixOSProcessPlugin: (in category 'plugin extra rules') ----- - configureUnixOSProcessPlugin: maker - super configureHostWindowPlugin: maker. - maker includeDirectories: '${platformsDir}/Cross/plugins/SocketPlugin'.! Item was removed: - ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>defaultExternalPlugins (in category 'plugins') ----- - defaultExternalPlugins - ^(self versionExternalPlugins), - #( - UUIDPlugin - FloatMathPlugin - AsynchFilePlugin - Mpeg3Plugin - CroquetPlugin - JoystickTabletPlugin - B3DAcceleratorPlugin - JPEGReadWriter2Plugin - JPEGReaderPlugin - RePlugin - LocalePlugin - ObjectiveCPlugin - QuicktimePlugin - " TestOSAPlugin Broken?" - SqueakSSLPlugin - SerialPlugin - MIDIPlugin - )! Item was removed: - ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>defaultInternalPlugins (in category 'plugins') ----- - defaultInternalPlugins - ^ #( - ADPCMCodecPlugin - BMPReadWriterPlugin - BalloonEnginePlugin - BitBltSimulation - ClipboardExtendedPlugin - DSAPlugin - DeflatePlugin - DropPlugin - FFTPlugin - FilePlugin - FloatArrayPlugin - GeniePlugin - HostWindowPlugin - "JPEGReadWriter2Plugin - JPEGReaderPlugin" - KlattSynthesizerPlugin - LargeIntegersPlugin - Matrix2x3Plugin - MiscPrimitivePlugin - "RePlugin" - SecurityPlugin - SocketPlugin - SoundCodecPlugin - SoundGenerationPlugin - SoundPlugin - StarSqueakPlugin - SurfacePlugin - UnixAioPlugin - UnixOSProcessPlugin - )! Item was removed: - ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>excludeFromBuild (in category 'cmake') ----- - excludeFromBuild - "over-ride to exclude yourself from a build or not" - ^true! Item was removed: - ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>executableName (in category 'cmake') ----- - executableName - ^ self vmCogExecutableName! Item was removed: - ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>extraSources (in category 'source files') ----- - extraSources - " mac VM using some unix sources " - - ^super extraSources,' - ${platformsDir}/unix/vm/aio.c - ${platformsDir}/unix/vm/sqUnixHeartbeat.c - ${platformsDir}/unix/vm/sqUnixVMProfile.c - ${platformsDir}/unix/vm/sqUnixThreads.c '! Item was removed: - ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>interpreterClass (in category 'source generation') ----- - interpreterClass - ^ CoInterpreter - ! Item was removed: - ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>platformSources (in category 'source files') ----- - platformSources - "files added from platform/iOS/vm dir " - ^ #( - 'Common/main.m' - "'Common/aio.c'" - 'Common/Classes/Queue.m' - 'Common/Classes/sqMacV2Time.c' - 'Common/Classes/sqSqueakAppDelegate.m' - 'Common/Classes/sqSqueakFileDirectoryAPI.m' - 'Common/Classes/sqSqueakFileDirectoryInterface.m' - 'Common/Classes/sqSqueakInfoPlistInterface.m' - 'Common/Classes/sqSqueakMainApp.m' - 'Common/Classes/sqSqueakMainApplication.m' - 'Common/Classes/sqSqueakMainApplication+attributes.m' - 'Common/Classes/sqSqueakAttributesAPI.m' - 'Common/Classes/sqSqueakMainApplication+events.m' - 'Common/Classes/sqSqueakEventsAPI.m' - 'Common/Classes/sqSqueakMainApplication+imageReadWrite.m' - 'Common/Classes/sqSqueakMainApplication+sound.m' - 'Common/Classes/sqSqueakSoundAPI.m' - 'Common/Classes/sqSqueakMainApplication+vmAndImagePath.m' - 'Common/Classes/sqSqueakVmAndImagePathAPI.m' - 'Common/Classes/sqSqueakMainApplication+screen.m' - 'Common/Classes/sqSqueakScreenAPI.m' - 'Common/Classes/sqSqueakScreenAndWindow.m' - 'Common/Classes/sqSqueakCursorAPI.m' - 'Common/Classes/sqSqueakMainApplication+cursor.m' - 'OSX/SqueakOSXAppDelegate.m' - 'OSX/sqMacV2Browser.m' - 'OSX/sqMacUnixExternalPrims.m' - 'OSX/sqSqueakOSXApplication.m' - 'OSX/sqSqueakOSXFileDirectoryInterface.m' - 'OSX/sqSqueakOSXApplication+attributes.m' - 'OSX/sqSqueakOSXInfoPlistInterface.m' - 'OSX/sqSqueakOSXApplication+imageReadWrite.m' - 'OSX/sqSqueakOSXScreenAndWindow.m' - 'OSX/sqSqueakOSXCGView.m' - 'OSX/sqSqueakOSXOpenGLView.m' - 'OSX/SqViewClut.m' - 'OSX/BitMapConversionLogicFromX11.c' - 'OSX/SqViewBitmapConversion.m' - 'OSX/macintoshosxextra.c' - 'OSX/sqSqueakOSXApplication+cursor.m' - 'OSX/sqSqueakOSXApplication+events.m' - 'OSX/keyBoardStrokeDetails.m' - 'OSX/SqueakOSXApplication.m' - 'OSX/sqSqueakOSXClipboardAPI.m' - 'OSX/sqSqueakOSXApplication+clipboard.m' - 'OSX/sqSqueakOSXDropAPI.m' - 'iPhone/sqMacV2Memory.c' - 'iPhone/osExports.c' - 'Common/Classes/sqSqueakScreenAPI.m')! Item was removed: - ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>sdkVersion (in category 'accessing') ----- - sdkVersion - ^'10.6'! Item was removed: - ----- 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>>setResourceProperties: (in category 'settings') ----- - setResourceProperties: maker - maker set: 'resourceDir' toString: self resourcesDir, '/ProjectBuilder'. - - maker - set: 'resources' - to: (String streamContents: [ :stream | - self resources - do: [ :each | - stream - nextPut: $"; - nextPutAll: '${resourceDir}/'; - nextPutAll: each; - nextPut: $"] - separatedBy: [ stream space ] ]). - - maker - set: 'resourcesLocaleEnglish' - to: '"${resourceDir}/English.lproj/InfoPlist.strings" "${resourceDir}/English.lproj/MainMenu.nib"'. - - maker - cmd: 'set_source_files_properties' - params: '${resources} PROPERTIES MACOSX_PACKAGE_LOCATION Resources'. - - maker - cmd: 'set_source_files_properties' - params: '${resourcesLocaleEnglish} PROPERTIES MACOSX_PACKAGE_LOCATION Resources/English.lproj'. - - ! Item was removed: - ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>standardIncludesBuild (in category 'cmake buildType redirects') ----- - standardIncludesBuild - ^#( - '${srcDir}/vm' - '${platformsDir}/iOS/vm/OSX' - '${platformsDir}/unix/vm' - '${platformsDir}/iOS/vm/Common/Classes' - '${platformsDir}/iOS/plugins/SoundPlugin' - '${platformsDir}/iOS/vm/OSX/plugins/SoundPlugin' - '${crossDir}/plugins/SoundPlugin' - '${crossDir}/plugins/HostWindowPlugin' - '${platformsDir}/Cross/plugins/HostWindowPlugin' - '${platformsDir}/iOS/vm/iPhone/plugins/HostWindowPlugin' "Sources are here :(" - '${crossDir}/plugins/FilePlugin' - ) - ! Item was removed: - ----- Method: SqueakCocoaIOSCogV3FamilyConfig>>versionExternalPlugins (in category 'plugins') ----- - versionExternalPlugins - "Cog Version Specific Plugins. Some times you can't use same plugins in a version (for instance, CogMT uses a diferent FFI, and you can't build IA32ABIPlugin in MT for now)" - ^Array - with: #FFIPlugin - with: #IA32ABIPlugin! Item was removed: - SqueakIOSConfig subclass: #SqueakCocoaIOSConfig - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'CMakeVMMakerSqueak-IOS'! - - !SqueakCocoaIOSConfig commentStamp: 'tty 6/15/2014 14:06' prior: 0! - This is an abstract class for all Mac Cocoa configurations. It is intended to share code between different concrete implementations. - - - I configure a VM according to my name's form: [Operating System] [WordSize] [Processor Language][VM MemoryManager][BuildType]Conf - - - I am not meant to be built. - - SqueakIOSBuilder - configureABuildFor: #ONE OF MY SUBCLASSES NAME HERE withBuildType: #build; - generateSources; - generate. - - HelpBrowser openOn: CMakeVMMakerSqueakEndUserHelp - HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp - - ! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>CFBundleExecutable (in category 'bundle strings') ----- - CFBundleExecutable - ^ self executableName ! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>CFBundleGetInfoString (in category 'bundle strings') ----- - CFBundleGetInfoString - ^ self CFBundleShortVersionString - ! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>CFBundleIconFile (in category 'bundle strings') ----- - CFBundleIconFile - "An application icon" - ^ 'Squeak.icns'! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>CFBundleIdentifier (in category 'bundle strings') ----- - CFBundleIdentifier - "A Java package style name (like 'com.myCompany.MyBundle') which is used to uniquely identify bundles." - ^ 'org.squeakfoundation.Squeak'! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>CFBundleName (in category 'bundle strings') ----- - CFBundleName - "An application name" - ^ self executableName", ' (Cocoa) 32bits'"! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>CFBundleShortVersionString (in category 'bundle strings') ----- - CFBundleShortVersionString - "An application version" - ^ self executableName, ' VM ' , self CFBundleVersion! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>CFBundleVersion (in category 'bundle strings') ----- - CFBundleVersion - "An application version" - ^ '6.0'! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>NSMainNibFile (in category 'bundle strings') ----- - NSMainNibFile - ^'MainMenu'! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>SqueakDebug (in category 'bundle strings') ----- - SqueakDebug - ^self isGenerateForRelease - ifTrue: [ 0 ] - ifFalse: [ 1 ]! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>architecture (in category 'accessing') ----- - architecture - ^'i386'! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>availableBuilds (in category 'cmake') ----- - availableBuilds - ^SqueakCMakeVMMakerAbstractBuilder default noBuildConfigurations - ! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>commonCompilerFlags (in category 'accessing') ----- - commonCompilerFlags - "Common compiler flags" - ^{ - '-arch i386'. - '-mmacosx-version-min=10.5'. - '-DHAVE_UUID_GENERATE'. - '-DDEFAULT_IMAGE_NAME="', self executableName, '.image"'}! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>compilerFlagsRelease (in category 'accessing') ----- - compilerFlagsRelease - ^#( - "'-fobjc-direct-dispatch'" - '-msse3' - "'-msse4.1'" - "'-msse4.2'" - "'-mdynamic-no-pic'" - "'-fwritable-strings'" - '-Os' - '-fvisibility=default' - '-funroll-loops' - "'-fno-asm'" - '-fasm-blocks' - '-finline-functions' - '-mfpmath=sse' - '-fomit-frame-pointer' - '-march=pentium-m' - '-mtune=prescott' - '-falign-functions=16' - '-fno-gcse' - '-std=gnu99' - '-DBUILD_FOR_OSX' - "'-DUSE_INLINE_MEMORY_ACCESSORS'" - '-DLSB_FIRST' - '-DUSE_INLINE_MEMORY_ACCESSORS' - '-DHAVE_SYS_TIME_H' - '-DHAVE_NANOSLEEP' - '-DICC_DEBUG=0' - '-DICC_OPTLEVEL="speedHLO"' - '-DICC_OPT_IPO_FOR_SINGLE_FILE_COMPILATION=1' - '-DICC_OPT_PARALLEL=0' - '-DICC_OPT_PREFETCH_INSERTION=1' - '-DICC_OPT_PROVIDE_FRAME_PTR=0' - '-DICC_OPT_USE_ARCH_IA32="SSE42"')! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>configureB3DAcceleratorPlugin: (in category 'plugin extra rules') ----- - configureB3DAcceleratorPlugin: maker - "extra rules for B3DAcceleratorPlugin" - - super configureB3DAcceleratorPlugin: maker. - maker addFrameworks: self frameworks. - maker addPlatformSources: #( 'sqMacOpenGL.c' 'sqMacOpenGLInfo.c')! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>configureClipboardExtendedPlugin: (in category 'plugin extra rules') ----- - configureClipboardExtendedPlugin: maker - - maker addPlatformSources: #('sqMacExtendedClipboard.m' ) - ! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>configureHostWindowPlugin: (in category 'plugin extra rules') ----- - configureHostWindowPlugin: maker - super configureHostWindowPlugin: maker. - maker - addSources: #('sqMacHostWindow.m' ) - prefixed: '${platformsDir}/iOS/vm/OSX/plugins/HostWindowPlugin/' - ! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>configureJoystickTabletPlugin: (in category 'plugin extra rules') ----- - configureJoystickTabletPlugin: maker - "extra rules for JoystickTabletPlugin" - - super configureJoystickTabletPlugin: maker. - maker addPlatformSources: - #( - 'HID_Error_Handler.c' - 'HID_Name_Lookup.c' - 'HID_Queue_Utilities.c' - 'HID_Utilities.c' - 'sqMacJoystickAndTablet.c' - ) - ! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>configureLocalePlugin: (in category 'plugin extra rules') ----- - configureLocalePlugin: maker - maker addFrameworks: #('CoreFoundation'). - maker addPlatformSources: #( 'sqIOSLocale.c' ) . - ! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>configureMIDIPlugin: (in category 'plugin extra rules') ----- - configureMIDIPlugin: maker - "extra rules for MIDIPlugin" - - maker addPlatformSources: #( 'sqMacMIDI.m')! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>configureMacMenubarPlugin: (in category 'plugin extra rules') ----- - configureMacMenubarPlugin: maker - maker includeDirectories: '${platformsDir}/iOS/plugins/MacMenubarPlugin'. - maker - addSources: #('MacMenuOS9ToOSX.m') - prefixed: '${platformsDir}/iOS/plugins/MacMenubarPlugin/' - ! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>configureObjectiveCPlugin: (in category 'plugin extra rules') ----- - configureObjectiveCPlugin: maker - "extra rules for ObjectiveCPlugin" - - maker addDefinitions: ' -x objective-c'. - maker addFrameworks: self frameworks. - maker includeDirectories: '${platformsDir}/iOS/plugins/SqueakObjectiveC'. - maker - addSources: #('squeakProxy.m' 'squeakSUnitTester.m') - prefixed: '${platformsDir}/iOS/plugins/SqueakObjectiveC/'. - ! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>configureSoundPlugin: (in category 'plugin extra rules') ----- - configureSoundPlugin: maker - super configureSoundPlugin: maker. - - maker includeDirectories: '${platformsDir}/Cross/plugins/SoundPlugin ${platformsDir}/iOS/vm/OSX/plugins/SoundPlugin'. - maker - addSources: #('sqSqueakSoundCoreAudio.m' 'sqSqueakSoundCoreAudioAPI.m' ) - prefixed: '${platformsDir}/iOS/plugins/SoundPlugin/'. - maker - addSources: #('sqSqueakOSXSoundCoreAudio.m' ) - prefixed: '${platformsDir}/iOS/vm/OSX/plugins/SoundPlugin/'! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>configureUUIDPlugin: (in category 'plugin extra rules') ----- - configureUUIDPlugin: maker - super configureUUIDPlugin: maker. - maker addFrameworks: #(CoreFoundation). - maker addDefinitions: '-x objective-c'. - maker addPlatformSources: #('sqMacUUID.c' )! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>coreSources (in category 'source files') ----- - coreSources - ^#('interp.c')! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>crossSources (in category 'source files') ----- - crossSources - ^#( - 'sqNamedPrims.c' - 'sqVirtualMachine.c')! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>defaultExternalPlugins (in category 'plugins') ----- - defaultExternalPlugins - ^#()! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>defaultInternalPlugins (in category 'plugins') ----- - defaultInternalPlugins - ^ #( - ADPCMCodecPlugin - BMPReadWriterPlugin - BalloonEnginePlugin - BitBltSimulation - ClipboardExtendedPlugin - DSAPlugin - DeflatePlugin - DropPlugin - FFIPlugin - FFTPlugin - FilePlugin - FloatArrayPlugin - GeniePlugin - HostWindowPlugin - JPEGReadWriter2Plugin - JPEGReaderPlugin - KlattSynthesizerPlugin - LargeIntegersPlugin - MacMenubarPlugin - Matrix2x3Plugin - MiscPrimitivePlugin - RePlugin - SecurityPlugin - SocketPlugin - SoundCodecPlugin - SoundGenerationPlugin - SoundPlugin - StarSqueakPlugin - SurfacePlugin)! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>excludeFromBuild (in category 'cmake') ----- - excludeFromBuild - "over-ride to exclude yourself from a build or not" - ^true! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>extraSources (in category 'source files') ----- - extraSources - ^'${buildDir}/', self prefixHeaderFileName, ' - ${resources} ', - '${buildDir}/', self prefixHeaderFileName, ' - ${resourcesLocaleEnglish}'! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>extraVMSettingsBuild: (in category 'settings') ----- - extraVMSettingsBuild: aMaker - self architecture - ifNotNil: [ :arch | aMaker set: 'CMAKE_OSX_ARCHITECTURES' toString: arch ]. - self setResourceProperties: aMaker. - ! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>frameworksBuild (in category 'cmake buildType redirects') ----- - frameworksBuild - ^ #( - Cocoa - Foundation - AudioToolbox - CoreAudio - SystemConfiguration - ApplicationServices - QuartzCore - OpenGL - AGL - QuickTime)! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>freetypeLibClass (in category 'accessing') ----- - freetypeLibClass - ^CMOSXFreetype2! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>platformName (in category 'accessing') ----- - platformName - ^'iOS'! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>platformSources (in category 'source files') ----- - platformSources - "files added from platform/iOS/vm dir " - ^ #( - 'Common/main.m' - 'Common/aio.c' - 'Common/Classes/Queue.m' - 'Common/Classes/sqMacV2Time.c' - 'Common/Classes/sqSqueakAppDelegate.m' - 'Common/Classes/sqSqueakFileDirectoryAPI.m' - 'Common/Classes/sqSqueakFileDirectoryInterface.m' - 'Common/Classes/sqSqueakInfoPlistInterface.m' - 'Common/Classes/sqSqueakMainApp.m' - 'Common/Classes/sqSqueakMainApplication.m' - 'Common/Classes/sqSqueakMainApplication+attributes.m' - 'Common/Classes/sqSqueakAttributesAPI.m' - 'Common/Classes/sqSqueakMainApplication+events.m' - 'Common/Classes/sqSqueakEventsAPI.m' - 'Common/Classes/sqSqueakMainApplication+imageReadWrite.m' - 'Common/Classes/sqSqueakMainApplication+sound.m' - 'Common/Classes/sqSqueakSoundAPI.m' - 'Common/Classes/sqSqueakMainApplication+vmAndImagePath.m' - 'Common/Classes/sqSqueakVmAndImagePathAPI.m' - 'Common/Classes/sqSqueakMainApplication+screen.m' - 'Common/Classes/sqSqueakScreenAPI.m' - 'Common/Classes/sqSqueakScreenAndWindow.m' - 'Common/Classes/sqSqueakCursorAPI.m' - 'Common/Classes/sqSqueakMainApplication+cursor.m' - 'OSX/SqueakOSXAppDelegate.m' - 'OSX/sqMacV2Browser.m' - 'OSX/sqMacUnixExternalPrims.m' - 'OSX/sqSqueakOSXApplication.m' - 'OSX/sqSqueakOSXFileDirectoryInterface.m' - 'OSX/sqSqueakOSXApplication+attributes.m' - 'OSX/sqSqueakOSXInfoPlistInterface.m' - 'OSX/sqSqueakOSXApplication+imageReadWrite.m' - 'OSX/sqSqueakOSXScreenAndWindow.m' - 'OSX/sqSqueakOSXCGView.m' - 'OSX/sqSqueakOSXOpenGLView.m' - 'OSX/SqViewClut.m' - 'OSX/BitMapConversionLogicFromX11.c' - 'OSX/SqViewBitmapConversion.m' - 'OSX/macintoshosxextra.c' - 'OSX/sqSqueakOSXApplication+cursor.m' - 'OSX/sqSqueakOSXApplication+events.m' - 'OSX/keyBoardStrokeDetails.m' - 'OSX/SqueakOSXApplication.m' - 'OSX/sqSqueakOSXClipboardAPI.m' - 'OSX/sqSqueakOSXApplication+clipboard.m' - 'OSX/sqSqueakOSXDropAPI.m' - 'iPhone/sqMacV2Memory.c' - 'iPhone/osExports.c')! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>plistFile (in category 'bundle strings') ----- - plistFile - | plist | - - plist := self plistTemplate. - self plistKeys - do: [:key | - plist := plist - copyReplaceAll: '@' , key , '@' - with: (self perform: key) asString ]. - - ^ self fixLineEndsOf: plist! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>plistKeys (in category 'bundle strings') ----- - plistKeys - ^#( - CFBundleExecutable - CFBundleGetInfoString - CFBundleName - CFBundleShortVersionString - CFBundleVersion - CFBundleIconFile - CFBundleIdentifier - NSMainNibFile - SqueakDebug)! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>plistTemplate (in category 'bundle strings') ----- - plistTemplate - ^'<?xml version="1.0" encoding="UTF-8"?> - <!!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> - <plist version="1.0"> - <dict> - <key>CFBundleDevelopmentRegion</key> - <string>English</string> - <key>CFBundleDocumentTypes</key> - <array> - <dict> - <key>CFBundleTypeExtensions</key> - <array> - <string>image</string> - </array> - <key>CFBundleTypeIconFile</key> - <string>SqueakImage.icns</string> - <key>CFBundleTypeName</key> - <string>Squeak Image File</string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>STim</string> - </array> - <key>CFBundleTypeRole</key> - <string>Editor</string> - </dict> - <dict> - <key>CFBundleTypeExtensions</key> - <array> - <string>sources</string> - </array> - <key>CFBundleTypeIconFile</key> - <string>SqueakSources.icns</string> - <key>CFBundleTypeName</key> - <string>Squeak Sources File</string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>STso</string> - </array> - <key>CFBundleTypeRole</key> - <string>Editor</string> - </dict> - <dict> - <key>CFBundleTypeExtensions</key> - <array> - <string>changes</string> - </array> - <key>CFBundleTypeIconFile</key> - <string>SqueakChanges.icns</string> - <key>CFBundleTypeName</key> - <string>Squeak Changes File</string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>STch</string> - </array> - <key>CFBundleTypeRole</key> - <string>Editor</string> - </dict> - <dict> - <key>CFBundleTypeExtensions</key> - <array> - <string>sobj</string> - </array> - <key>CFBundleTypeIconFile</key> - <string>SqueakScript.icns</string> - <key>CFBundleTypeName</key> - <string>Squeak Script File</string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>SOBJ</string> - </array> - <key>CFBundleTypeRole</key> - <string>Editor</string> - </dict> - <dict> - <key>CFBundleTypeExtensions</key> - <array> - <string>pr</string> - </array> - <key>CFBundleTypeIconFile</key> - <string>SqueakProject.icns</string> - <key>CFBundleTypeName</key> - <string>Squeak Project File</string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>STpr</string> - </array> - <key>CFBundleTypeRole</key> - <string>Editor</string> - </dict> - <dict> - <key>CFBundleTypeName</key> - <string>JPEG</string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>JPEG</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - <dict> - <key>CFBundleTypeName</key> - <string>TEXT</string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>TEXT</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - <dict> - <key>CFBundleTypeName</key> - <string>ttro</string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>ttro</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - <dict> - <key>CFBundleTypeName</key> - <string>HTML</string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>HTML</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - <dict> - <key>CFBundleTypeName</key> - <string>RTF </string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>RTF</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - <dict> - <key>CFBundleTypeName</key> - <string>TIFF </string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>TIFF</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - <dict> - <key>CFBundleTypeName</key> - <string>PICT </string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>PICT</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - <dict> - <key>CFBundleTypeName</key> - <string>URL </string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>URL</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - <dict> - <key>CFBundleTypeName</key> - <string>ZIP </string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>ZIP</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - <dict> - <key>CFBundleTypeName</key> - <string>zip </string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>zip</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - <dict> - <key>CFBundleTypeName</key> - <string>BINA</string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>BINA</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - <dict> - <key>CFBundleTypeName</key> - <string>GIFf</string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>GIFf</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - <dict> - <key>CFBundleTypeName</key> - <string>PNGf</string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>PNGf</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - <dict> - <key>CFBundleTypeName</key> - <string>MP3 </string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>MP3</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - <dict> - <key>CFBundleTypeName</key> - <string>MP3!!</string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>MP3!!</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - <dict> - <key>CFBundleTypeName</key> - <string>MP3U</string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>MP3U</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - <dict> - <key>CFBundleTypeName</key> - <string>MPEG</string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>MPEG</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - <dict> - <key>CFBundleTypeName</key> - <string>mp3!!</string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>mp3!!</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - <dict> - <key>CFBundleTypeName</key> - <string>MPG2</string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>MPG2</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - <dict> - <key>CFBundleTypeName</key> - <string>MPG3</string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>MPG3</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - <dict> - <key>CFBundleTypeName</key> - <string>MPG </string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>MPG</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - <dict> - <key>CFBundleTypeName</key> - <string>Mp3</string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>mp3</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - <dict> - <key>CFBundleTypeName</key> - <string>M3U</string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>M3U</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - <dict> - <key>CFBundleTypeName</key> - <string>SRCS</string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>SRCS</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - <dict> - <key>CFBundleTypeName</key> - <string>Chng</string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>Chng</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - <dict> - <key>CFBundleTypeName</key> - <string>HPS5</string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>HPS5</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - </array> - <key>CFBundleExecutable</key> - <string>@CFBundleExecutable@</string> - <key>CFBundleGetInfoString</key> - <string>@CFBundleGetInfoString@</string> - <key>CFBundleIconFile</key> - <string>@CFBundleIconFile@</string> - <key>CFBundleIdentifier</key> - <string>@CFBundleIdentifier@</string> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - <key>CFBundleName</key> - <string>@CFBundleName@</string> - <key>CFBundlePackageType</key> - <string>APPL</string> - <key>CFBundleShortVersionString</key> - <string>@CFBundleShortVersionString@</string> - <key>CFBundleSignature</key> - <string>FAST</string> - <key>CFBundleVersion</key> - <string>21.0</string> - <key>LSBackgroundOnly</key> - <false/> - <key>LSMinimumSystemVersion</key> - <string>${MACOSX_DEPLOYMENT_TARGET}</string> - <key>NSMainNibFile</key> - <string>@NSMainNibFile@</string> - <key>NSPrincipalClass</key> - <string>SqueakOSXApplication</string> - <key>SqueakBrowserMouseCmdButton1</key> - <integer>3</integer> - <key>SqueakBrowserMouseCmdButton2</key> - <integer>3</integer> - <key>SqueakBrowserMouseCmdButton3</key> - <integer>2</integer> - <key>SqueakBrowserMouseControlButton1</key> - <integer>1</integer> - <key>SqueakBrowserMouseControlButton2</key> - <integer>3</integer> - <key>SqueakBrowserMouseControlButton3</key> - <integer>2</integer> - <key>SqueakBrowserMouseNoneButton1</key> - <integer>1</integer> - <key>SqueakBrowserMouseNoneButton2</key> - <integer>3</integer> - <key>SqueakBrowserMouseNoneButton3</key> - <integer>2</integer> - <key>SqueakBrowserMouseOptionButton1</key> - <integer>2</integer> - <key>SqueakBrowserMouseOptionButton2</key> - <integer>3</integer> - <key>SqueakBrowserMouseOptionButton3</key> - <integer>2</integer> - <key>SqueakDebug</key> - <integer>@SqueakDebug@</integer> - <key>SqueakExplicitWindowOpenNeeded</key> - <false/> - <key>SqueakImageName</key> - <string>Squeak.image</string> - <key>SqueakMaxHeapSize</key> - <integer>536870912</integer> - <key>SqueakMouseCmdButton1</key> - <integer>3</integer> - <key>SqueakMouseCmdButton2</key> - <integer>3</integer> - <key>SqueakMouseCmdButton3</key> - <integer>2</integer> - <key>SqueakMouseControlButton1</key> - <integer>1</integer> - <key>SqueakMouseControlButton2</key> - <integer>3</integer> - <key>SqueakMouseControlButton3</key> - <integer>2</integer> - <key>SqueakMouseNoneButton1</key> - <integer>1</integer> - <key>SqueakMouseNoneButton2</key> - <integer>3</integer> - <key>SqueakMouseNoneButton3</key> - <integer>2</integer> - <key>SqueakMouseOptionButton1</key> - <integer>2</integer> - <key>SqueakMouseOptionButton2</key> - <integer>3</integer> - <key>SqueakMouseOptionButton3</key> - <integer>2</integer> - <key>SqueakPluginsBuiltInOrLocalOnly</key> - <false/> - <key>SqueakQuitOnQuitAppleEvent</key> - <false/> - <key>SqueakResourceDirectory</key> - <string></string> - <key>SqueakTrustedDirectory</key> - <string>/foobar/tooBar/forSqueak/bogus/</string> - <key>SqueakUIFlushPrimaryDeferNMilliseconds</key> - <integer>20</integer> - <key>SqueakUnTrustedDirectory</key> - <string>~/Library/Preferences/Squeak/Internet/My Squeak/</string> - <key>SqueakUseFileMappedMMAP</key> - <false/> - <key>SqueakUIFadeForFullScreenInSeconds</key> - <real>0.5</real> - <key>UTExportedTypeDeclarations</key> - <array> - <dict> - <key>UTTypeConformsTo</key> - <array> - <string>public.data</string> - </array> - <key>UTTypeDescription</key> - <string>Squeak Image File</string> - <key>UTTypeIdentifier</key> - <string>org.squeak.image</string> - <key>UTTypeTagSpecification</key> - <dict> - <key>com.apple.ostype</key> - <string>STim</string> - <key>public.filename-extension</key> - <array> - <string>image</string> - </array> - <key>public.mime-type</key> - <string>application/squeak-image</string> - </dict> - </dict> - <dict> - <key>UTTypeConformsTo</key> - <array> - <string>public.utf8-plain-text</string> - </array> - <key>UTTypeDescription</key> - <string>Squeak Sources File</string> - <key>UTTypeIdentifier</key> - <string>org.squeak.sources</string> - <key>UTTypeTagSpecification</key> - <dict> - <key>com.apple.ostype</key> - <string>STso</string> - <key>public.filename-extension</key> - <array> - <string>sources</string> - </array> - <key>public.mime-type</key> - <string>application/squeak-sources</string> - </dict> - </dict> - <dict> - <key>UTTypeConformsTo</key> - <array> - <string>public.utf8-plain-text</string> - </array> - <key>UTTypeDescription</key> - <string>Squeak Changes File</string> - <key>UTTypeIdentifier</key> - <string>org.squeak.changes</string> - <key>UTTypeTagSpecification</key> - <dict> - <key>com.apple.ostype</key> - <string>STch</string> - <key>public.filename-extension</key> - <array> - <string>changes</string> - </array> - <key>public.mime-type</key> - <string>application/squeak-changes</string> - </dict> - </dict> - <dict> - <key>UTTypeConformsTo</key> - <array> - <string>public.data</string> - </array> - <key>UTTypeDescription</key> - <string>Squeak Script File</string> - <key>UTTypeIdentifier</key> - <string>org.squeak.script</string> - <key>UTTypeTagSpecification</key> - <dict> - <key>com.apple.ostype</key> - <string>SOBJ</string> - <key>public.filename-extension</key> - <array> - <string>sobj</string> - </array> - <key>public.mime-type</key> - <string>application/squeak-script</string> - </dict> - </dict> - <dict> - <key>UTTypeConformsTo</key> - <array> - <string>public.data</string> - </array> - <key>UTTypeDescription</key> - <string>Squeak Project File</string> - <key>UTTypeIdentifier</key> - <string>org.squeak.project</string> - <key>UTTypeTagSpecification</key> - <dict> - <key>com.apple.ostype</key> - <string>STpr</string> - <key>public.filename-extension</key> - <array> - <string>pr</string> - </array> - <key>public.mime-type</key> - <string>application/x-squeak-project</string> - </dict> - </dict> - </array> - </dict> - </plist> - '! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>pluginsDir (in category 'accessing') ----- - pluginsDir - ^'${srcDir}/vm/intplugins'! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>precompiledHeaders (in category 'settings') ----- - precompiledHeaders - ^ - '// - // Prefix header for all source files of the ''', self executableName, ''' target in the ''', self executableName, ''' project - // - - #ifdef __OBJC__ - ', - (String streamContents: [ :stream | - self precompiledImports - do: [ :each | - stream - nextPutAll: '#import '; - nextPut: $<; - nextPutAll: each; - nextPut: $> ] - separatedBy: [ - stream cr ] ]), ' - #endif - '! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>precompiledImports (in category 'settings') ----- - precompiledImports - ^#('Cocoa/Cocoa.h')! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>preferredIncludesBuild (in category 'cmake buildType redirects') ----- - preferredIncludesBuild - ^ #( - '${buildDir}/' - '${platformsDir}/iOS/vm/iPhone' - ) - ! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>prefixHeaderFileName (in category 'accessing') ----- - prefixHeaderFileName - ^self executableName, '_Prefix.pch'! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>resources (in category 'settings') ----- - resources - ^#('Squeak VM.r' - 'Cog.icns' - 'Squeak.icns' - 'SqueakChanges.icns' - 'SqueakPlugin.icns' - 'SqueakScript.icns' - 'SqueakGeneric.icns' - 'SqueakProject.icns' - 'SqueakSources.icns') - - ! Item was removed: - ----- 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 removed: - ----- Method: SqueakCocoaIOSConfig>>setExtraTargetPropertiesBuildAssert: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildAssert: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>setExtraTargetPropertiesBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildAssertITimerHeartbeat: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>setExtraTargetPropertiesBuildDebug: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildDebug: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>setExtraTargetPropertiesBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildDebugITimerHeartbeat: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>setExtraTargetPropertiesBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildITimerHeartbeat: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>setExtraTargetPropertiesBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildMultiThreaded: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>setExtraTargetPropertiesBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildMultiThreadedAssert: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>setExtraTargetPropertiesBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildMultiThreadedDebug: aMaker - ^self setExtraTargetPropertiesBuild: aMaker! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuild: aMaker - 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 removed: - ----- Method: SqueakCocoaIOSConfig>>srcDir (in category 'accessing') ----- - srcDir - ^ srcDir ifNil: [ srcDir := (self topDir directoryNamed: 'platforms/iOS/vm/src' )] - ! Item was removed: - ----- Method: SqueakCocoaIOSConfig>>standardIncludesBuild (in category 'cmake buildType redirects') ----- - standardIncludesBuild - ^ #( - '${crossDir}/plugins/SerialPlugin' - '${targetPlatform}/plugins/FilePlugin' - '${crossDir}/plugins/FilePlugin' - '${targetPlatform}/plugins/HostWindowPlugin' - '${platformsDir}/iOS/vm/iPhone/plugins/HostWindowPlugin' - '${crossDir}/plugins/HostWindowPlugin' - '${crossDir}/plugins/DropPlugin' - '${crossDir}/plugins/SocketPlugin' - '${crossDir}/plugins/SoundPlugin' - '${crossDir}/plugins/AsynchFilePlugin' - '${platformsDir}/unix/vm' - '${platformsDir}/iOS/plugins/SoundPlugin' - '${platformsDir}/iOS/vm/OSX/plugins/SoundPlugin' - '${platformsDir}/iOS/vm/Common/Classes' - '${platformsDir}/iOS/vm/OSX' - ) - ! Item was removed: - SqueakCocoaIOSCogV3FamilyConfig subclass: #SqueakCocoaIOSSqueakCogV3Config - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'CMakeVMMakerSqueak-IOS'! - - !SqueakCocoaIOSSqueakCogV3Config commentStamp: 'tty 6/15/2014 14:07' prior: 0! - This is a concrete class which generates a CogVM for Mac using the Cocoa library - - I configure a VM according to my name's form: [Operating System] [WordSize] [Processor Language][VM MemoryManager][BuildType]Conf - - - SqueakIOSBuilder - configureABuildFor: #MY NAME HERE withBuildType: #build; - generateSources; - generate. - - HelpBrowser openOn: CMakeVMMakerSqueakEndUserHelp - HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp - ! Item was removed: - ----- Method: SqueakCocoaIOSSqueakCogV3Config>>cogitClass (in category 'source generation') ----- - cogitClass - "answer a class for machine code generation or nil" - - ^ StackToRegisterMappingCogit ! Item was removed: - ----- Method: SqueakCocoaIOSSqueakCogV3Config>>commonCompilerFlags (in category 'settings') ----- - commonCompilerFlags - ^super commonCompilerFlags, #('-DCOGVM')! Item was removed: - ----- Method: SqueakCocoaIOSSqueakCogV3Config>>coreSources (in category 'source files') ----- - coreSources - ^ #( - 'cogit.c' - 'gcc3x-cointerp.c' - )! Item was removed: - ----- Method: SqueakCocoaIOSSqueakCogV3Config>>dirBuildLanguageVMMM (in category 'cmake') ----- - dirBuildLanguageVMMM - "the directory under buildPlatformDir example: newspeak.cog.spur. use squeak.cog.v3 as default" - ^self squeakCogV3! Item was removed: - ----- Method: SqueakCocoaIOSSqueakCogV3Config>>excludeFromBuild (in category 'cmake') ----- - excludeFromBuild - "over-ride to exclude yourself from a build or not" - ^true! Item was removed: - ----- Method: SqueakCocoaIOSSqueakCogV3Config>>executableName (in category 'cmake') ----- - executableName - ^ self vmCogExecutableName! Item was removed: - ----- Method: SqueakCocoaIOSSqueakCogV3Config>>interpreterClass (in category 'source generation') ----- - interpreterClass - ^ CoInterpreter! Item was removed: - ----- Method: SqueakCocoaIOSSqueakCogV3Config>>pluginsDir (in category 'accessing') ----- - pluginsDir - ^'${srcDir}/plugins'! Item was removed: - ----- Method: SqueakCocoaIOSSqueakCogV3Config>>versionExternalPlugins (in category 'plugins') ----- - versionExternalPlugins - ^Array - with: #ThreadedIA32FFIPlugin - with: #IA32ABIPlugin! Item was removed: - SqueakCocoaIOSCogV3FamilyConfig subclass: #SqueakCocoaIOSSqueakStackV3Config - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'CMakeVMMakerSqueak-IOS'! - - !SqueakCocoaIOSSqueakStackV3Config commentStamp: 'tty 6/15/2014 14:07' prior: 0! - This is a concrete class which generates a StackVM for Mac using the Cocoa library - - For more information, check the class comments of all the superclasses. - - - I configure a VM according to my name's form: [Operating System] [WordSize] [Processor Language][VM MemoryManager][BuildType]Conf - - SqueakIOSBuilder - configureABuildFor: #MY NAME HERE withBuildType: #build; - generateSources; - generate. - - HelpBrowser openOn: CMakeVMMakerSqueakEndUserHelp - HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp! Item was removed: - ----- Method: SqueakCocoaIOSSqueakStackV3Config>>coreSources (in category 'source files') ----- - coreSources - ^ #( - 'gcc3x-interp.c' - )! Item was removed: - ----- Method: SqueakCocoaIOSSqueakStackV3Config>>dirBuildLanguageVMMM (in category 'cmake') ----- - dirBuildLanguageVMMM - "the directory under buildPlatformDir example: newspeak.cog.spur. use squeak.cog.v3 as default" - ^self squeakStackV3! Item was removed: - ----- Method: SqueakCocoaIOSSqueakStackV3Config>>excludeFromBuild (in category 'cmake') ----- - excludeFromBuild - "over-ride to exclude yourself from a build or not" - ^true! Item was removed: - ----- Method: SqueakCocoaIOSSqueakStackV3Config>>executableName (in category 'cmake') ----- - executableName - ^ self vmStackExecutableName! Item was removed: - ----- Method: SqueakCocoaIOSSqueakStackV3Config>>interpreterClass (in category 'source generation') ----- - interpreterClass - ^ StackInterpreter! Item was removed: - ----- Method: SqueakCocoaIOSSqueakStackV3Config>>pluginsDir (in category 'accessing') ----- - pluginsDir - ^'${srcDir}/plugins'! Item was removed: - ----- Method: SqueakCocoaIOSSqueakStackV3Config>>versionExternalPlugins (in category 'plugins') ----- - versionExternalPlugins - ^Array - with: #ThreadedIA32FFIPlugin - with: #IA32ABIPlugin! Item was removed: - SqueakCocoaIOSSqueakStackV3Config subclass: #SqueakCocoaIOSStackV3CLANGConfig - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'CMakeVMMakerSqueak-IOS'! - - !SqueakCocoaIOSStackV3CLANGConfig commentStamp: 'tty 6/15/2014 14:07' prior: 0! - Experimental configuration for compiling using clang compiler - - For more information, check the class comments of all the superclasses. - - - I configure a VM according to my name's form: [Operating System] [WordSize] [Processor Language][VM MemoryManager][BuildType]Conf - - SqueakIOSBuilder - configureABuildFor: #MY NAME HERE withBuildType: #build; - generateSources; - generate. - - HelpBrowser openOn: CMakeVMMakerSqueakEndUserHelp - HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp - ! Item was removed: - ----- Method: SqueakCocoaIOSStackV3CLANGConfig>>coreSources (in category 'source files') ----- - coreSources - " can't use GCC stuff " - ^ #( - 'interp.c' - )! Item was removed: - ----- Method: SqueakCocoaIOSStackV3CLANGConfig>>dirBuildLanguageVMMM (in category 'cmake') ----- - dirBuildLanguageVMMM - "the directory under buildPlatformDir example: newspeak.cog.spur. use squeak.cog.v3 as default" - ^self squeakStackV3! Item was removed: - ----- Method: SqueakCocoaIOSStackV3CLANGConfig>>excludeFromBuild (in category 'cmake') ----- - excludeFromBuild - "over-ride to exclude yourself from a build or not" - ^true! Item was removed: - ----- Method: SqueakCocoaIOSStackV3CLANGConfig>>executableName (in category 'cmake') ----- - executableName - ^ self vmStackExecutableName! Item was removed: - ----- Method: SqueakCocoaIOSStackV3CLANGConfig>>setExtraTargetPropertiesBuild: (in category 'settings') ----- - setExtraTargetPropertiesBuild: aMaker - - - aMaker set: 'CMAKE_C_COMPILER' to: 'clang'. - - super setExtraTargetPropertiesBuild: aMaker! Item was changed: + ----- Method: SqueakIA32BochsConfig>>availableBuildTypes (in category 'cmake') ----- - ----- Method: SqueakIA32BochsConfig>>availableBuildTypes (in category 'cmake configuration') ----- availableBuildTypes ^SqueakCMakeVMMakerAbstractBuilder default noBuildTypes " subclasses should use ^super availableBuildTypes copyWithoutAll: #( #assertWithHeartbeatTimer #debugWithHeartbeatTimer debugMultiThreadedFFI.....etc)) " ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>externalPluginsBuildAssert (in category 'cmake buildType redirects') ----- - externalPluginsBuildAssert - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakIA32BochsConfig>>externalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildAssertITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakIA32BochsConfig>>externalPluginsBuildDebug (in category 'cmake buildType redirects') ----- - externalPluginsBuildDebug - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakIA32BochsConfig>>externalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildDebugITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakIA32BochsConfig>>externalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakIA32BochsConfig>>externalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreaded - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakIA32BochsConfig>>externalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreadedAssert - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakIA32BochsConfig>>externalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreadedDebug - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakIA32BochsConfig>>extraVMSettingsBuild: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuild: aMaker - "SystemNavigation default browseMethodsWhoseNamesContain: 'extraVMSettingsBuild:'"! Item was removed: - ----- Method: SqueakIA32BochsConfig>>extraVMSettingsBuildAssert: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildAssert: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakIA32BochsConfig>>extraVMSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildAssertITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakIA32BochsConfig>>extraVMSettingsBuildDebug: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildDebug: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakIA32BochsConfig>>extraVMSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildDebugITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakIA32BochsConfig>>extraVMSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakIA32BochsConfig>>extraVMSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreaded: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakIA32BochsConfig>>extraVMSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreadedAssert: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakIA32BochsConfig>>extraVMSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreadedDebug: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakIA32BochsConfig>>internalPluginsBuildAssert (in category 'cmake buildType redirects') ----- - internalPluginsBuildAssert - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakIA32BochsConfig>>internalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildAssertITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakIA32BochsConfig>>internalPluginsBuildDebug (in category 'cmake buildType redirects') ----- - internalPluginsBuildDebug - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakIA32BochsConfig>>internalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildDebugITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakIA32BochsConfig>>internalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakIA32BochsConfig>>internalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreaded - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakIA32BochsConfig>>internalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreadedAssert - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakIA32BochsConfig>>internalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreadedDebug - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakIA32BochsConfig>>postBuildActionsBuild: (in category 'cmake buildType redirects') ----- - postBuildActionsBuild: gen - "SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActionsBuild:'"! Item was removed: - ----- Method: SqueakIA32BochsConfig>>postBuildActionsBuildAssert: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildAssert: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakIA32BochsConfig>>postBuildActionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildAssertITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakIA32BochsConfig>>postBuildActionsBuildDebug: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildDebug: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakIA32BochsConfig>>postBuildActionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildDebugITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakIA32BochsConfig>>postBuildActionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakIA32BochsConfig>>postBuildActionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreaded: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakIA32BochsConfig>>postBuildActionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreadedAssert: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakIA32BochsConfig>>postBuildActionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreadedDebug: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakIA32BochsConfig>>preferredIncludesBuild (in category 'cmake buildType redirects') ----- - preferredIncludesBuild - "SystemNavigation default browseMethodsWhoseNamesContain: 'preferredIncludes'" - ^ #( ) - - - ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>preferredIncludesBuildAssert (in category 'cmake buildType redirects') ----- - preferredIncludesBuildAssert - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>preferredIncludesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - preferredIncludesBuildAssertITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>preferredIncludesBuildDebug (in category 'cmake buildType redirects') ----- - preferredIncludesBuildDebug - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>preferredIncludesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - preferredIncludesBuildDebugITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>preferredIncludesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - preferredIncludesBuildITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>preferredIncludesBuildMultiThreaded (in category 'cmake buildType redirects') ----- - preferredIncludesBuildMultiThreaded - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>preferredIncludesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - preferredIncludesBuildMultiThreadedAssert - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>preferredIncludesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - preferredIncludesBuildMultiThreadedDebug - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuild: aMaker - "do nothing (so far) on Unix. - - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystemBuild:' - "! Item was removed: - ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsAfterDetermineSystemBuildAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsAfterDetermineSystemBuildDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsBuild: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuild: aMaker - "does nothing. included for framework consistency/testing - - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsBuild' - " - ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsBuildAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildAssert: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildAssertITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsBuildDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildDebug: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildDebugITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreaded: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreadedAssert: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>setGlobalOptionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreadedDebug: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakIA32BochsConfig>>standardIncludesBuild (in category 'cmake buildType redirects') ----- - standardIncludesBuild - ^#()! Item was removed: - ----- Method: SqueakIA32BochsConfig>>standardIncludesBuildAssert (in category 'cmake buildType redirects') ----- - standardIncludesBuildAssert - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakIA32BochsConfig>>standardIncludesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - standardIncludesBuildAssertITimerHeartbeat - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakIA32BochsConfig>>standardIncludesBuildDebug (in category 'cmake buildType redirects') ----- - standardIncludesBuildDebug - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakIA32BochsConfig>>standardIncludesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - standardIncludesBuildDebugITimerHeartbeat - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakIA32BochsConfig>>standardIncludesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - standardIncludesBuildITimerHeartbeat - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakIA32BochsConfig>>standardIncludesBuildMultiThreaded (in category 'cmake buildType redirects') ----- - standardIncludesBuildMultiThreaded - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakIA32BochsConfig>>standardIncludesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - standardIncludesBuildMultiThreadedAssert - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakIA32BochsConfig>>standardIncludesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - standardIncludesBuildMultiThreadedDebug - ^ self standardIncludesBuild! Item was changed: + ----- Method: SqueakIOSConfig>>availableBuildTypes (in category 'cmake') ----- - ----- Method: SqueakIOSConfig>>availableBuildTypes (in category 'cmake configuration') ----- availableBuildTypes ^SqueakCMakeVMMakerAbstractBuilder default allBuildTypes " subclasses should use ^super availableBuildTypes copyWithoutAll: #( #assertWithHeartbeatTimer #debugWithHeartbeatTimer debugMultiThreadedFFI.....etc)) " ! Item was removed: - ----- Method: SqueakIOSConfig>>cMakeMacros (in category 'accessing') ----- - cMakeMacros - ^'macro(add_framework appname fwname) - find_library(FRAMEWORK_${fwname} - NAMES ${fwname} - PATHS ${CMAKE_OSX_SYSROOT}/System/Library - PATH_SUFFIXES Frameworks - NO_DEFAULT_PATH) - if( ${FRAMEWORK_${fwname}} STREQUAL FRAMEWORK_${fwname}-NOTFOUND) - message(ERROR ": Framework ${fwname} not found") - else() - include_directories(SYSTEM /System/Library/Frameworks/${fwname}.framework/Headers) - target_link_libraries(${appname} ${FRAMEWORK_${fwname}}) - endif() - endmacro(add_framework)' ! Item was removed: - ----- Method: SqueakIOSConfig>>externalPluginsBuildAssert (in category 'cmake buildType redirects') ----- - externalPluginsBuildAssert - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakIOSConfig>>externalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildAssertITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakIOSConfig>>externalPluginsBuildDebug (in category 'cmake buildType redirects') ----- - externalPluginsBuildDebug - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakIOSConfig>>externalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildDebugITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakIOSConfig>>externalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakIOSConfig>>externalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreaded - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakIOSConfig>>externalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreadedAssert - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakIOSConfig>>externalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreadedDebug - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakIOSConfig>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildAssert: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakIOSConfig>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildAssertITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakIOSConfig>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildDebug: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakIOSConfig>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildDebugITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakIOSConfig>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakIOSConfig>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreaded: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakIOSConfig>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreadedAssert: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakIOSConfig>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreadedDebug: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakIOSConfig>>extraVMSettingsBuild: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuild: aMaker - "SystemNavigation default browseMethodsWhoseNamesContain: 'extraVMSettingsBuild:'"! Item was removed: - ----- Method: SqueakIOSConfig>>extraVMSettingsBuildAssert: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildAssert: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakIOSConfig>>extraVMSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildAssertITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakIOSConfig>>extraVMSettingsBuildDebug: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildDebug: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakIOSConfig>>extraVMSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildDebugITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakIOSConfig>>extraVMSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakIOSConfig>>extraVMSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreaded: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakIOSConfig>>extraVMSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreadedAssert: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakIOSConfig>>extraVMSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreadedDebug: aMaker - ^self extraVMSettingsBuild: aMaker! Item was changed: + ----- Method: SqueakIOSConfig>>fixLibsTemplate (in category 'cmake') ----- - ----- Method: SqueakIOSConfig>>fixLibsTemplate (in category 'utils') ----- fixLibsTemplate ^ 'include(GetPrerequisites) message("Fixing library references in: ${externalModulesDir}") FILE(GLOB libs "${externalModulesDir}/*.dylib") set(all_imports "") foreach(lib ${libs}) get_filename_component(libName "${lib}" NAME) list(APPEND libNames "${libName}") set(prereq "") get_prerequisites(${lib} prereq 1 0 "${bundlePath}" "") list(APPEND all_imports ${prereq}) endforeach(lib) list(REMOVE_DUPLICATES all_imports) set(replacements "") message ( "Found imports: ${all_imports} " ) foreach(import ${all_imports}) foreach(lib ${libNames}) set(match "^.*${lib}$") if(import MATCHES ${match}) set(replacement "${pluginsRelPath}/${lib}") message("Will replace: ${import} with: ${replacement}") set(replacements ${replacements} "-change" "${import}" "${replacement}") endif(import MATCHES ${match}) endforeach(lib) endforeach(import) foreach(lib ${libs}) get_filename_component(name ${lib} NAME) set(fixedName "${pluginsRelPath}/${name}") message("Fixing up: ${name}") execute_process(COMMAND install_name_tool -id "${fixedName}" "${lib}" ) execute_process(COMMAND install_name_tool ${replacements} ${lib} ) endforeach(lib) ' ! Item was removed: - ----- Method: SqueakIOSConfig>>internalPluginsBuildAssert (in category 'cmake buildType redirects') ----- - internalPluginsBuildAssert - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakIOSConfig>>internalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildAssertITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakIOSConfig>>internalPluginsBuildDebug (in category 'cmake buildType redirects') ----- - internalPluginsBuildDebug - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakIOSConfig>>internalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildDebugITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakIOSConfig>>internalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakIOSConfig>>internalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreaded - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakIOSConfig>>internalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreadedAssert - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakIOSConfig>>internalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreadedDebug - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was changed: + ----- Method: SqueakIOSConfig>>postBuildActionsBuild: (in category 'cmake buildType redirects') ----- - ----- 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 removed: - ----- Method: SqueakIOSConfig>>postBuildActionsBuildAssert: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildAssert: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakIOSConfig>>postBuildActionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildAssertITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakIOSConfig>>postBuildActionsBuildDebug: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildDebug: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakIOSConfig>>postBuildActionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildDebugITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakIOSConfig>>postBuildActionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakIOSConfig>>postBuildActionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreaded: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakIOSConfig>>postBuildActionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreadedAssert: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakIOSConfig>>postBuildActionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreadedDebug: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakIOSConfig>>preferredIncludesBuild (in category 'source files') ----- - preferredIncludesBuild - "SystemNavigation default browseMethodsWhoseNamesContain: 'preferredIncludes'" - ^ #( ) - - - ! Item was removed: - ----- Method: SqueakIOSConfig>>preferredIncludesBuildAssert (in category 'source files') ----- - preferredIncludesBuildAssert - ^ self preferredIncludesBuild! Item was removed: - ----- Method: SqueakIOSConfig>>preferredIncludesBuildAssertITimerHeartbeat (in category 'source files') ----- - preferredIncludesBuildAssertITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakIOSConfig>>preferredIncludesBuildDebug (in category 'source files') ----- - preferredIncludesBuildDebug - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakIOSConfig>>preferredIncludesBuildDebugITimerHeartbeat (in category 'source files') ----- - preferredIncludesBuildDebugITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakIOSConfig>>preferredIncludesBuildITimerHeartbeat (in category 'source files') ----- - preferredIncludesBuildITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakIOSConfig>>preferredIncludesBuildMultiThreaded (in category 'source files') ----- - preferredIncludesBuildMultiThreaded - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakIOSConfig>>preferredIncludesBuildMultiThreadedAssert (in category 'source files') ----- - preferredIncludesBuildMultiThreadedAssert - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakIOSConfig>>preferredIncludesBuildMultiThreadedDebug (in category 'source files') ----- - preferredIncludesBuildMultiThreadedDebug - ^self preferredIncludesBuild - ! Item was removed: - ----- 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 removed: - ----- Method: SqueakIOSConfig>>setGlobalOptionsAfterDetermineSystemBuildAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakIOSConfig>>setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakIOSConfig>>setGlobalOptionsAfterDetermineSystemBuildDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakIOSConfig>>setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakIOSConfig>>setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakIOSConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakIOSConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakIOSConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakIOSConfig>>setGlobalOptionsBuild: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuild: aMaker - "does nothing. included for framework consistency/testing - - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsBuild' - " - ! Item was removed: - ----- Method: SqueakIOSConfig>>setGlobalOptionsBuildAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildAssert: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakIOSConfig>>setGlobalOptionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildAssertITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakIOSConfig>>setGlobalOptionsBuildDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildDebug: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakIOSConfig>>setGlobalOptionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildDebugITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakIOSConfig>>setGlobalOptionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakIOSConfig>>setGlobalOptionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreaded: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakIOSConfig>>setGlobalOptionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreadedAssert: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakIOSConfig>>setGlobalOptionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreadedDebug: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was changed: + ----- Method: SqueakIOSConfig>>standardIncludesBuild (in category 'cmake buildType redirects') ----- - ----- Method: SqueakIOSConfig>>standardIncludesBuild (in category 'source files') ----- standardIncludesBuild + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: (self class name), ' standardIncludesBuild' ) + ]. + templates + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/SerialPlugin' )); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${targetPlatform}/plugins/FilePlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/FilePlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${targetPlatform}/plugins/HostWindowPlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${platformsDir}/iOS/vm/iPhone/plugins/HostWindowPlugin' )); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/HostWindowPlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/DropPlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/SocketPlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/SoundPlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/AsynchFilePlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${platformsDir}/unix/vm')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${platformsDir}/iOS/plugins/SoundPlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${platformsDir}/iOS/vm/OSX/plugins/SoundPlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${platformsDir}/iOS/vm/Common/Classes')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${platformsDir}/iOS/vm/OSX')). + + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_PATH = ${CMAKE_INCLUDE_PATH}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_SYSTEM_INCLUDE_PATH = ${CMAKE_SYSTEM_INCLUDE_PATH}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES = ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES = ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = ${CMAKE_FIND_ROOT_PATH_MODE_INCLUDE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = ${CMAKE_INCLUDE_CURRENT_DIR}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE = ${CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_DIRECTORIES_BEFORE = ${CMAKE_INCLUDE_DIRECTORIES_BEFORE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE = ${CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE}' ) + ].! - ^ #( - '${crossDir}/plugins/SerialPlugin' - '${targetPlatform}/plugins/FilePlugin' - '${crossDir}/plugins/FilePlugin' - '${targetPlatform}/plugins/HostWindowPlugin' - '${platformsDir}/iOS/vm/iPhone/plugins/HostWindowPlugin' - '${crossDir}/plugins/HostWindowPlugin' - '${crossDir}/plugins/DropPlugin' - '${crossDir}/plugins/SocketPlugin' - '${crossDir}/plugins/SoundPlugin' - '${crossDir}/plugins/AsynchFilePlugin' - '${platformsDir}/unix/vm' - '${platformsDir}/iOS/plugins/SoundPlugin' - '${platformsDir}/iOS/vm/OSX/plugins/SoundPlugin' - '${platformsDir}/iOS/vm/Common/Classes' - '${platformsDir}/iOS/vm/OSX' - ) - ! Item was removed: - ----- Method: SqueakIOSConfig>>standardIncludesBuildAssert (in category 'source files') ----- - standardIncludesBuildAssert - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakIOSConfig>>standardIncludesBuildAssertITimerHeartbeat (in category 'source files') ----- - standardIncludesBuildAssertITimerHeartbeat - ^self standardIncludesBuild - ! Item was removed: - ----- Method: SqueakIOSConfig>>standardIncludesBuildDebug (in category 'source files') ----- - standardIncludesBuildDebug - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakIOSConfig>>standardIncludesBuildDebugITimerHeartbeat (in category 'source files') ----- - standardIncludesBuildDebugITimerHeartbeat - ^self standardIncludesBuild - ! Item was removed: - ----- Method: SqueakIOSConfig>>standardIncludesBuildITimerHeartbeat (in category 'source files') ----- - standardIncludesBuildITimerHeartbeat - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakIOSConfig>>standardIncludesBuildMultiThreaded (in category 'source files') ----- - standardIncludesBuildMultiThreaded - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakIOSConfig>>standardIncludesBuildMultiThreadedAssert (in category 'source files') ----- - standardIncludesBuildMultiThreadedAssert - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakIOSConfig>>standardIncludesBuildMultiThreadedDebug (in category 'source files') ----- - standardIncludesBuildMultiThreadedDebug - ^ self standardIncludesBuild! Item was removed: - SqueakIPhoneSqueakStackV3Config subclass: #SqueakIPhoneSimulatorSqueakStackV3Config - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'CMakeVMMakerSqueak-IOS'! - - !SqueakIPhoneSimulatorSqueakStackV3Config commentStamp: 'tty 6/15/2014 14:07' prior: 0! - N.B. tty. - - Honestly, I have know idea how to use this (: - - - SqueakIOSBuilder - configureABuildFor: #MY NAME HERE withBuildType: #build; - generateSources; - generate. - - HelpBrowser openOn: CMakeVMMakerSqueakEndUserHelp - HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp! Item was removed: - ----- Method: SqueakIPhoneSimulatorSqueakStackV3Config>>architecture (in category 'accessing') ----- - architecture - ^'i386'! Item was removed: - ----- Method: SqueakIPhoneSimulatorSqueakStackV3Config>>commonCompilerFlags (in category 'accessing') ----- - commonCompilerFlags - ^ super commonCompilerFlags, { - '-mios-simulator-version-min={1}' format: { self sdkVersion } }! Item was removed: - ----- Method: SqueakIPhoneSimulatorSqueakStackV3Config>>dirBuildLanguageVMMM (in category 'cmake') ----- - dirBuildLanguageVMMM - "the directory under buildPlatformDir example: newspeak.cog.spur. use squeak.cog.v3 as default" - ^self squeakStackV3! Item was removed: - ----- Method: SqueakIPhoneSimulatorSqueakStackV3Config>>excludeFromBuild (in category 'cmake') ----- - excludeFromBuild - "over-ride to exclude yourself from a build or not" - ^true! Item was removed: - ----- Method: SqueakIPhoneSimulatorSqueakStackV3Config>>executableName (in category 'cmake') ----- - executableName - ^ self vmStackExecutableName! Item was removed: - ----- Method: SqueakIPhoneSimulatorSqueakStackV3Config>>ft2PluginConfigurationFlags (in category 'plugin extra rules') ----- - ft2PluginConfigurationFlags - ^ {'--without-zlib'. - '--without-bzip2'. - '--host=i386-apple-darwin'. - '--enable-static=yes'. - '--enable-shared=no'. - 'CFLAGS=\\"-arch {1} -pipe -std=c99 -Wno-trigraphs -O2 -fpascal-strings -fwrapv -Wreturn-type -Wunused-variable -fvisibility=hidden -fmessage-length=0 -mios-simulator-version-min={3} -I{2}/usr/include/libxml2 -isysroot {2}\\"'. - 'LDFLAGS=\\"-arch {1} -mios-simulator-version-min={3} -isysroot {2}\\"' } - collect: [ :each | - each format: { - self architecture. - self sysroot. - self sdkVersion } ]! Item was removed: - ----- Method: SqueakIPhoneSimulatorSqueakStackV3Config>>sdkTarget (in category 'accessing') ----- - sdkTarget - ^'iphonesimulator', self sdkVersion! Item was removed: - ----- Method: SqueakIPhoneSimulatorSqueakStackV3Config>>setCommonProperties: (in category 'settings') ----- - setCommonProperties: maker - maker set: 'CMAKE_CROSSCOMPILING' to: 'TRUE'. - maker set: 'CMAKE_SYSTEM_NAME' to: 'Darwin'. - maker set: 'CMAKE_SYSTEM_PROCESSOR' to: 'i386'. - - maker - set: 'SDKVER' - toString: self sdkVersion. - maker - set: 'DEVROOT' - toString: ('/Applications/Xcode.app/Contents/Developer/Platforms/{1}.platform/Developer' - format: { self targetDevice }). - maker - set: 'SDKROOT' - toString: ('$\{DEVROOT\}/SDKs/{1}$\{SDKVER\}.sdk' format: { self targetDevice }). - - maker set: 'CMAKE_OSX_SYSROOT' to: self sysroot. - - maker set: 'CMAKE_FIND_ROOT_PATH' to: '"${SDKROOT}" "${DEVROOT}"'. - maker set: 'CMAKE_FIND_ROOT_PATH_MODE_PROGRAM' to: 'ONLY'. - maker set: 'CMAKE_FIND_ROOT_PATH_MODE_LIBRARY' to: 'ONLY'. - maker set: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE' to: 'ONLY'. - - maker - set: 'CMAKE_EXE_LINKER_FLAGS' - toString: '-mios-simulator-version-min=${SDKVER} --sysroot ${SDKROOT} -L${SDKROOT}/usr/lib -L${SDKROOT}/usr/lib/system'. - maker - set: 'CMAKE_C_FLAGS' - toString: '--sysroot ${SDKROOT} -L${SDKROOT}/usr/lib -L${SDKROOT}/usr/lib/system'. - maker - set: 'CMAKE_CXX_FLAGS' - toString: '--sysroot ${SDKROOT} -L${SDKROOT}/usr/lib -L${SDKROOT}/usr/lib/system'. - - maker addFrameworks: self frameworks.! Item was removed: - ----- Method: SqueakIPhoneSimulatorSqueakStackV3Config>>standardIncludesBuild (in category 'cmake buildType redirects') ----- - standardIncludesBuild - ^super standardIncludesBuild, { - '/Applications/Xcode.app/Contents/Developer/Platforms/{1}.platform/Developer/SDKs/{1}{2}.sdk/usr/include/' - format: { - self targetDevice. - self sdkVersion} } - ! Item was removed: - ----- Method: SqueakIPhoneSimulatorSqueakStackV3Config>>targetDevice (in category 'accessing') ----- - targetDevice - ^'iPhoneSimulator'! Item was removed: - SqueakCocoaIOSSqueakStackV3Config subclass: #SqueakIPhoneSqueakStackV3Config - instanceVariableNames: '' - classVariableNames: '' - poolDictionaries: '' - category: 'CMakeVMMakerSqueak-IOS'! - - !SqueakIPhoneSqueakStackV3Config commentStamp: 'tty 6/15/2014 14:07' prior: 0! - A SqueakStackIPhoneConfig - - - SqueakIOSBuilder - configureABuildFor: #MY NAME HERE withBuildType: #build; - generateSources; - generate. - - HelpBrowser openOn: CMakeVMMakerSqueakEndUserHelp - HelpBrowser openOn: CMakeVMMakerSqueakDeveloperHelp! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config class>>deviceIPad (in category 'accessing') ----- - deviceIPad - ^#(2)! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config class>>deviceIPhone (in category 'accessing') ----- - deviceIPhone - ^#(1)! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config class>>deviceUniversal (in category 'accessing') ----- - deviceUniversal - ^#(1 2)! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>CFBundleIconFile (in category 'bundle strings') ----- - CFBundleIconFile - "512 x512 icon" - ^'Cog.png'! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>CFBundleIconFile1024 (in category 'bundle strings') ----- - CFBundleIconFile1024 - "1024x1024 icon" - ^'Cog.png'! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>CFBundleIconFile57 (in category 'bundle strings') ----- - CFBundleIconFile57 - "57x57 icon" - ^'Cog.png'! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>CFBundleIconFile72 (in category 'bundle strings') ----- - CFBundleIconFile72 - "72x72 icon" - ^'Cog.png'! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>CFBundleVersion (in category 'bundle strings') ----- - CFBundleVersion - ^'1.0.0'! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>ImageIsScrollable (in category 'bundle strings') ----- - ImageIsScrollable - ^false! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>ImageIsWritable (in category 'bundle strings') ----- - ImageIsWritable - ^true! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>UIDeviceFamily (in category 'bundle strings') ----- - UIDeviceFamily - ^self targetedDeviceFamilyAsTemplateString! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>UIFileSharingEnabled (in category 'bundle strings') ----- - UIFileSharingEnabled - ^false! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>VMMemorySize (in category 'bundle strings') ----- - VMMemorySize - ^1024 * 1024 * 64 "64M"! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>WebViewAsUI (in category 'bundle strings') ----- - WebViewAsUI - ^false! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>WebViewUrl (in category 'bundle strings') ----- - WebViewUrl - ^'http://localhost:8080'! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>architecture (in category 'accessing') ----- - architecture - ^'armv7'! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>codeSignIdentity (in category 'accessing') ----- - codeSignIdentity - ^'iPhone Developer'! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>commonCompilerFlags (in category 'settings') ----- - commonCompilerFlags - "Common compiler flags" - ^{ - '-arch {1}' format: { self architecture }. - "CLANG >>" - '-fwrapv'. "Non optimization of stackoverflow (to allow number conversions)" - '-Wno-return-type'. "to avoid clang to complain about plugins that do not return properly." - '-Qunused-arguments'. - "CLANG <<" - '-isysroot {1}' format: { self sysroot }. - '-x objective-c'. - '-std=gnu99'. - '-falign-functions=16'. - '-fno-gcse'. - '-fvisibility=hidden'. - '-funroll-loops'. - '-finline-functions'. - '-mno-thumb'. - '-DSTACKVM=1'. - '-DCOGMTVM=0'. - '-DUSE_GLOBAL_STRUCT=0'. - '-DBASE_HEADER_SIZE=4'. - '-DTARGET_OS_IS_IPHONE'. - '-DHAVE_UUID_GENERATE'. - '-DHAVE_SYS_TIME_H'. - '-DLSB_FIRST'. - '-DHAVE_NANOSLEEP'. - '-DISQUEAK_IMAGE={1}' format: { self imageName }. - '-DISQUEAK_SOURCES=PharoV10'. - '-DSTACKVM'}! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>compilerFlagsDebug (in category 'settings') ----- - compilerFlagsDebug - ^#('-g3' '-O0' '-DDEBUGVM=1')! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>compilerFlagsRelease (in category 'settings') ----- - compilerFlagsRelease - ^#('-g0' '-O3' '-fomit-frame-pointer' '-DNDEBUG' '-DDEBUGVM=0')! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>configureFT2Plugin: (in category 'plugin extra rules') ----- - configureFT2Plugin: maker - "extra rules for Freetype plugin. - a custom rule to build freetype library" - | lib | - - "add freetype library into loop" - lib := self addThirdpartyLibrary: 'freetype2'. - lib configurationFlags: self ft2PluginConfigurationFlags. - - "link plugin with freetype lib" - maker includeDirectories: lib includeDir. - maker addExternalLibrary: '${thirdpartyDir}/out/lib/', lib libraryFileName. - maker addExternalDependency: 'freetype2'. - ! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>configureHostWindowPlugin: (in category 'plugin extra rules') ----- - configureHostWindowPlugin: maker - maker includeDirectories: '${platformsDir}/Cross/plugins/HostWindowPlugin'. - maker - addSources: #('sqMacHostWindow.m' ) - prefixed: '${platformsDir}/iOS/vm/iPhone/plugins/HostWindowPlugin/' - ! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>configureIOSPlugin: (in category 'plugin extra rules') ----- - configureIOSPlugin: maker - maker - addSources: #('sqTouch.m' ) - prefixed: '${platformsDir}/iOS/vm/iPhone/plugins/IOSPlugin/' - - ! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>configureSocketPlugin: (in category 'plugin extra rules') ----- - configureSocketPlugin: maker - super configureSocketPlugin: maker. - maker includeDirectories: '${SDKROOT}/usr/include'. "for tcp.h"! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>defaultExternalPlugins (in category 'settings') ----- - defaultExternalPlugins - ^#()! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>defaultInternalPlugins (in category 'settings') ----- - defaultInternalPlugins - ^ #( - ADPCMCodecPlugin - BMPReadWriterPlugin - BalloonEnginePlugin - BitBltSimulation - DSAPlugin - DeflatePlugin - "DropPlugin" - LocalePlugin - FFTPlugin - FilePlugin - FloatArrayPlugin - HostWindowPlugin - JPEGReadWriter2Plugin - JPEGReaderPlugin - LargeIntegersPlugin - Matrix2x3Plugin - MiscPrimitivePlugin - "RePlugin" - SecurityPlugin - SocketPlugin - SoundCodecPlugin - SoundGenerationPlugin - SoundPlugin - SurfacePlugin - UUIDPlugin - " ObjectiveCPlugin - IOSPlugin")! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>deploymentTargetVersion (in category 'accessing') ----- - deploymentTargetVersion - ^'4.0'! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>dirBuildLanguageVMMM (in category 'cmake') ----- - dirBuildLanguageVMMM - "the directory under buildPlatformDir example: newspeak.cog.spur. use squeak.cog.v3 as default" - ^self squeakStackV3! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>excludeFromBuild (in category 'cmake') ----- - excludeFromBuild - "over-ride to exclude yourself from a build or not" - ^true! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>executableName (in category 'cmake') ----- - executableName - ^ self vmStackExecutableName! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuild: aMaker - self architecture - ifNotNil: [ :arch | aMaker set: 'CMAKE_OSX_ARCHITECTURES' toString: arch ]. - - self setCommonProperties: aMaker. - - aMaker - setTargetProperty: 'COMPILE_FLAGS' - to: '"-include \"', (self buildDir / self prefixHeaderFileName) fullName, '\""'. - - aMaker isExternal ifTrue: [ - "copy result to results dir " - aMaker set: 'LIBRARY_OUTPUT_PATH' toString: self outputDir. - aMaker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir. - aMaker puts: 'list(APPEND linkFlags "-undefined dynamic_lookup")' ]. - - "maker addXCodeProperty: 'GCC_VERSION' value: '4.3'." - aMaker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/' , self executableName , '_Prefix.pch'. - - ! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>extraSources (in category 'source files') ----- - extraSources - " mac VM using some unix sources " - - ^'${buildDir}/', self prefixHeaderFileName, ' - ${resources} ', - '${buildDir}/', self prefixHeaderFileName, ' - ${resourcesLocaleEnglish} - ${platformsDir}/unix/vm/sqUnixHeartbeat.c - ${platformsDir}/unix/vm/sqUnixThreads.c - ${platformsDir}/unix/vm/aio.c - '! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>frameworksBuild (in category 'cmake buildType redirects') ----- - frameworksBuild - ^ #( - CoreAudio - CoreGraphics - CoreLocation - UIKit - CoreFoundation - Foundation - QuartzCore - OpenGLES - AudioToolbox - SystemConfiguration)! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>freetypeLibClass (in category 'accessing') ----- - freetypeLibClass - ^CMIOSFreetype2! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>ft2PluginConfigurationFlags (in category 'plugin extra rules') ----- - ft2PluginConfigurationFlags - ^ {'--without-zlib'. - '--without-bzip2'. - '--host=arm-apple-darwin'. - '--enable-static=yes'. - '--enable-shared=no'. - 'CFLAGS=\\"-arch {1} -std=c99 -Wno-trigraphs -O2 -fpascal-strings -fwrapv -Wreturn-type -Wunused-variable -fvisibility=hidden -fmessage-length=0 -miphoneos-version-min={3} -I{2}/usr/include/libxml2 -isysroot {2}\\"'. - 'LDFLAGS=\\"-arch {1} -miphoneos-version-min={3} -isysroot {2}\\"' } - collect: [ :each | - each format: { - self architecture. - self sysroot. - self sdkVersion } ]! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>imageName (in category 'accessing') ----- - imageName - ^'iOS'! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>imageResources (in category 'settings') ----- - imageResources - ^{ - self imageName, '.changes'. - 'PharoV10.sources' }! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>platformSources (in category 'source files') ----- - platformSources - "files added from platform/iOS/vm dir " - ^ #( - 'Common/main.m' - 'Common/Classes/Queue.m' - 'Common/Classes/sqMacV2Time.c' - 'Common/Classes/sqSqueakAppDelegate.m' - 'Common/Classes/sqSqueakFileDirectoryAPI.m' - 'Common/Classes/sqSqueakFileDirectoryInterface.m' - 'Common/Classes/sqSqueakInfoPlistInterface.m' - 'Common/Classes/sqSqueakMainApplication.m' - 'Common/Classes/sqSqueakMainApplication+attributes.m' - 'Common/Classes/sqSqueakMainApplication+events.m' - 'Common/Classes/sqSqueakMainApplication+imageReadWrite.m' - 'Common/Classes/sqSqueakMainApplication+sound.m' - 'Common/Classes/sqSqueakMainApplication+vmAndImagePath.m' - 'Common/Classes/sqSqueakMainApplication+screen.m' - 'Common/Classes/sqSqueakMainApplication+cursor.m' - "'Common/Classes/sqSqueakCursorAPI.m'" - 'Common/Classes/sqSqueakAttributesAPI.m' - 'Common/Classes/sqSqueakSoundAPI.m' - 'Common/Classes/sqSqueakVmAndImagePathAPI.m' - 'Common/Classes/sqSqueakMainApp.m' - 'Common/Classes/sqSqueakEventsAPI.m' - 'Common/Classes/sqSqueakScreenAPI.m' - 'Common/Classes/sqSqueakScreenAndWindow.m' - 'iPhone/Classes/SqueakNoOGLIPhoneAppDelegate.m' - 'iPhone/Classes/sqSqueakIPhoneApplication.m' - 'iPhone/Classes/sqSqueakIPhoneApplication+attributes.m' - 'iPhone/Classes/sqSqueakIPhoneApplication+clipboard.m' - 'iPhone/Classes/sqSqueakIPhoneApplication+imageReadWrite.m' - 'iPhone/Classes/sqSqueakIPhoneApplication+events.m' - 'iPhone/Classes/sqSqueakIPhoneApplication+Network.m' - 'iPhone/Classes/sqSqueakiPhoneApplication+sound.m' - 'iPhone/Classes/sqSqueakIPhoneFileDirectoryInterface.m' - 'iPhone/Classes/sqSqueakIPhoneInfoPlistInterface.m' - 'iPhone/Classes/sqiPhoneScreenAndWindow.m' - 'iPhone/Classes/SqueakUIView.m' - 'iPhone/Classes/SqueakUIViewCALayer.m' - 'iPhone/Classes/SqueakUIViewOpenGL.m' - 'iPhone/Classes/SqueakUIController.m' - 'iPhone/Classes/sqSqueakIPhoneClipboardAPI.m' - 'iPhone/macintoshextra.c' - 'iPhone/osExports.c' - "'iPhone/sqDummyaio.c'" "I'm using real aio.c from unix (and seems to work)" - 'iPhone/sqMacV2Memory.c' - 'iPhone/sqMacUnixExternalPrims.m' - )! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>plistKeys (in category 'bundle strings') ----- - plistKeys - ^super plistKeys, - #(CFBundleIconFile57 - CFBundleIconFile72 - CFBundleIconFile1024 - CFBundleVersion - UIDeviceFamily - UIFileSharingEnabled - VMMemorySize - ImageIsWritable - ImageIsScrollable - WebViewAsUI - WebViewUrl) - ! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>plistTemplate (in category 'bundle strings') ----- - plistTemplate - ^'<?xml version="1.0" encoding="UTF-8"?> - <!!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> - <plist version="1.0"> - <dict> - <key>CFBundleDevelopmentRegion</key> - <string>en</string> - <key>CFBundleVersion</key> - <string>@CFBundleVersion@</string> - <key>CFBundleDisplayName</key> - <string>@CFBundleExecutable@</string> - <key>CFBundleExecutable</key> - <string>@CFBundleExecutable@</string> - <key>CFBundleIconFile</key> - <string>@CFBundleIconFile@</string> - <key>CFBundleIconFiles</key> - <array> - <string>@CFBundleIconFile@</string> - <string>@CFBundleIconFile57@</string> - <string>@CFBundleIconFile72@</string> - <string>@CFBundleIconFile1024@</string> - </array> - <key>CFBundleIdentifier</key> - <string>@CFBundleIdentifier@</string> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - <key>CFBundleName</key> - <string>@CFBundleName@</string> - <key>CFBundlePackageType</key> - <string>APPL</string> - <key>CFBundleResourceSpecification</key> - <string>ResourceRules.plist</string> - <key>CFBundleSignature</key> - <string>FRAC</string> - <key>CFBundleSupportedPlatforms</key> - <array> - <string>iPhoneOS</string> - </array> - <key>LSRequiresIPhoneOS</key> - <true/> - <key>MinimumOSVersion</key> - <string>3.1.3</string> - <key>NSMainNibFile</key> - <string>MainWindow</string> - <key>UIDeviceFamily</key> - <array> - @UIDeviceFamily@ - </array> - <key>UIPrerenderedIcon</key> - <false/> - <key>UIStatusBarHidden</key> - <true/> - <key>UIFileSharingEnabled</key> - <@UIFileSharingEnabled@/> - <key>ImageIsWritable</key> - <@ImageIsWritable@/> - <key>ImageIsScrollable</key> - <@ImageIsScrollable@/> - <key>VMMemorySize</key> - <integer>@VMMemorySize@</integer> - <key>WebViewAsUI</key> - <@WebViewAsUI@/> - <key>WebViewUrl</key> - <string>@WebViewUrl@</string> - </dict> - </plist> - '! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>precompiledImports (in category 'settings') ----- - precompiledImports - ^#( - 'Foundation/Foundation.h' - 'UIKit/UIKit.h')! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>resources (in category 'settings') ----- - resources - ^{ - self CFBundleIconFile. - self CFBundleIconFile57. - self CFBundleIconFile72. - self CFBundleIconFile1024. - self imageName, '.image'}, - self imageResources - ! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>resourcesDir (in category 'accessing') ----- - resourcesDir - "Answer the value of resourcesDir" - self flag:'tty'. "I modified resourcesDir to 'assureExistence' from 'fullname'. if this causes problems, look into that" - ^ resourcesDir ifNil: [ resourcesDir := (self topDir / 'iosbuild' / 'resources') assureExistence ]! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>sdkTarget (in category 'accessing') ----- - sdkTarget - ^'iphoneos', self sdkVersion! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>sdkVersion (in category 'accessing') ----- - sdkVersion - ^'7.0'! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>setCommonProperties: (in category 'settings') ----- - setCommonProperties: maker - maker set: 'CMAKE_CROSSCOMPILING' to: 'TRUE'. - maker set: 'CMAKE_SYSTEM_NAME' to: 'Darwin'. - maker set: 'CMAKE_SYSTEM_PROCESSOR' to: 'arm'. - - maker set: 'SDKVER' toString: self sdkVersion. - maker - set: 'DEVROOT' - toString: ('/Applications/Xcode.app/Contents/Developer/Platforms/{1}.platform/Developer' - format: { self targetDevice }). - maker - set: 'SDKROOT' - toString: '${DEVROOT}/SDKs/', self targetDevice,'${SDKVER}.sdk'. - - maker set: 'CMAKE_OSX_SYSROOT' to: 'iphoneos${SDKVER}'. - - maker set: 'CMAKE_FIND_ROOT_PATH' to: '"${SDKROOT}" "${DEVROOT}"'. - maker set: 'CMAKE_FIND_ROOT_PATH_MODE_PROGRAM' to: 'ONLY'. - maker set: 'CMAKE_FIND_ROOT_PATH_MODE_LIBRARY' to: 'ONLY'. - maker set: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE' to: 'ONLY'. - - maker set: 'CMAKE_EXE_LINKER_FLAGS' toString: '--sysroot ${SDKROOT} -L${SDKROOT}/usr/lib -L${SDKROOT}/usr/lib/system'. - maker set: 'CMAKE_C_FLAGS' toString: '--sysroot ${SDKROOT} -L${SDKROOT}/usr/lib -L${SDKROOT}/usr/lib/system'. - maker set: 'CMAKE_CXX_FLAGS' toString: '--sysroot ${SDKROOT} -L${SDKROOT}/usr/lib -L${SDKROOT}/usr/lib/system'. - - maker addFrameworks: self frameworks.! Item was removed: - ----- 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>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuild: aMaker - aMaker - 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 removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>setResourceProperties: (in category 'settings') ----- - setResourceProperties: maker - maker set: 'resourceDir' toString: self resourcesDir. - - maker - set: 'resources' - to: (String streamContents: [ :stream | - self resources - do: [ :each | - stream - nextPut: $"; - nextPutAll: '${resourceDir}/'; - nextPutAll: each; - nextPut: $"] - separatedBy: [ stream space ] ]). - - maker - set: 'resourcesLocaleEnglish' - toString: '${resourceDir}/English.lproj/MainWindow.nib'. - - maker - cmd: 'set_source_files_properties' - params: '${resources} PROPERTIES MACOSX_PACKAGE_LOCATION Resources'. - - maker - cmd: 'set_source_files_properties' - params: '${resourcesLocaleEnglish} PROPERTIES MACOSX_PACKAGE_LOCATION Resources'. - ! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>standardIncludesBuild (in category 'cmake buildType redirects') ----- - standardIncludesBuild - ^#( - '${srcDir}/vm' - '${platformsDir}/iOS/vm/iPhone' - '${platformsDir}/iOS/vm/iPhone/Classes' - '${platformsDir}/iOS/vm/OSX' - '${platformsDir}/unix/vm' - '${platformsDir}/iOS/vm/Common/Classes' - '${platformsDir}/iOS/plugins/SoundPlugin' - '${platformsDir}/iOS/vm/OSX/plugins/SoundPlugin' - '${crossDir}/plugins/SoundPlugin' - '${crossDir}/plugins/HostWindowPlugin' - '${platformsDir}/Cross/plugins/HostWindowPlugin' - '${platformsDir}/iOS/vm/iPhone/plugins/HostWindowPlugin' - '${crossDir}/plugins/FilePlugin' - ) - ! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>sysroot (in category 'accessing') ----- - sysroot - ^ '/Applications/Xcode.app/Contents/Developer/Platforms/{1}.platform/Developer/SDKs/{1}{2}.sdk' - format: { - self targetDevice. - self sdkVersion }! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>targetDevice (in category 'accessing') ----- - targetDevice - ^'iPhoneOS'! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>targetedDeviceFamily (in category 'accessing') ----- - targetedDeviceFamily - ^self class deviceUniversal ! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>targetedDeviceFamilyAsString (in category 'private') ----- - targetedDeviceFamilyAsString - ^String streamContents: [ :stream | - self targetedDeviceFamily - do: [ :each | stream nextPutAll: each asString ] - separatedBy: [ stream nextPut: $, ]. - stream nextPut: Character space ]! Item was removed: - ----- Method: SqueakIPhoneSqueakStackV3Config>>targetedDeviceFamilyAsTemplateString (in category 'private') ----- - targetedDeviceFamilyAsTemplateString - ^String streamContents: [ :stream | - self targetedDeviceFamily do: [ :each | - stream - nextPutAll: '<integer>'; - nextPutAll: each asString; - nextPutAll: '</integer>' ] ]! Item was changed: + ----- Method: SqueakMacOSX32x86Config>>availableBuildTypes (in category 'cmake') ----- - ----- Method: SqueakMacOSX32x86Config>>availableBuildTypes (in category 'cmake configuration') ----- availableBuildTypes ^SqueakCMakeVMMakerAbstractBuilder default allBuildTypes " subclasses should use ^super availableBuildTypes copyWithoutAll: #( #assertWithHeartbeatTimer #debugWithHeartbeatTimer debugMultiThreadedFFI.....etc)) " ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>cMakeMacros (in category 'accessing') ----- - cMakeMacros - ^'macro(add_framework appname fwname) - find_library(FRAMEWORK_${fwname} - NAMES ${fwname} - PATHS ${CMAKE_OSX_SYSROOT}/System/Library - PATH_SUFFIXES Frameworks - NO_DEFAULT_PATH) - if( ${FRAMEWORK_${fwname}} STREQUAL FRAMEWORK_${fwname}-NOTFOUND) - message(ERROR ": Framework ${fwname} not found") - else() - include_directories(SYSTEM /System/Library/Frameworks/${fwname}.framework/Headers) - target_link_libraries(${appname} ${FRAMEWORK_${fwname}}) - endif() - endmacro(add_framework)' ! Item was changed: + ----- Method: SqueakMacOSX32x86Config>>dirBuildPlatform (in category 'cmake') ----- - ----- Method: SqueakMacOSX32x86Config>>dirBuildPlatform (in category 'cmake directory ') ----- dirBuildPlatform ^self dirMacOSX32x86! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>externalPluginsBuildAssert (in category 'cmake buildType redirects') ----- - externalPluginsBuildAssert - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>externalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildAssertITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>externalPluginsBuildDebug (in category 'cmake buildType redirects') ----- - externalPluginsBuildDebug - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>externalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildDebugITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>externalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>externalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreaded - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>externalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreadedAssert - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>externalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreadedDebug - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildAssert: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildAssertITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildDebug: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildDebugITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreaded: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreadedAssert: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreadedDebug: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was changed: ----- Method: SqueakMacOSX32x86Config>>extraVMSettingsBuild: (in category 'cmake buildType redirects') ----- extraVMSettingsBuild: aMaker "SystemNavigation default browseMethodsWhoseNamesContain: 'extraVMSettingsBuild:'" + (enabledebugmessages) + ifTrue:[ templates + addLast:((CMakeMessage new) message: (self class name) , 'extraVMSettingsBuild: aMaker') + ] . + templates + addLast:((CMakeSet new) variable: 'CMAKE_OSX_ARCHITECTURES' value: 'i386'); + addLast:((CMakeSet new) variable: 'resourceDir' quotedValue: ((self resourcesDir pathName), FileDirectory slash, 'ProjectBuilder')); + addLast:((CMakeSet new) + variable: 'resources' + value:'"${resourceDir}/Squeak VM.r" - - "Cog currently runs only in 32 bit mode" - aMaker set: 'CMAKE_OSX_ARCHITECTURES' to: 'i386'. - - aMaker set: 'resourceDir' toString: ((self resourcesDir pathName), FileDirectory slash, 'ProjectBuilder'). - aMaker set: 'resources' to: - '"${resourceDir}/Squeak VM.r" "${resourceDir}/Cog.icns" "${resourceDir}/Squeak.icns" "${resourceDir}/SqueakChanges.icns" "${resourceDir}/SqueakImage.icns" "${resourceDir}/SqueakPlugin.icns" "${resourceDir}/SqueakScript.icns" "${resourceDir}/SqueakGeneric.icns" "${resourceDir}/SqueakProject.icns" + "${resourceDir}/SqueakSources.icns"'). + + - "${resourceDir}/SqueakSources.icns"' ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>extraVMSettingsBuildAssert: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildAssert: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>extraVMSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildAssertITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>extraVMSettingsBuildDebug: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildDebug: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>extraVMSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildDebugITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>extraVMSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>extraVMSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreaded: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>extraVMSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreadedAssert: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>extraVMSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreadedDebug: aMaker - ^self extraVMSettingsBuild: aMaker! Item was changed: + ----- Method: SqueakMacOSX32x86Config>>fixLibsTemplate (in category 'cmake') ----- - ----- Method: SqueakMacOSX32x86Config>>fixLibsTemplate (in category 'utils') ----- fixLibsTemplate ^ 'include(GetPrerequisites) message("Fixing library references in: ${externalModulesDir}") FILE(GLOB libs "${externalModulesDir}/*.dylib") set(all_imports "") foreach(lib ${libs}) get_filename_component(libName "${lib}" NAME) list(APPEND libNames "${libName}") set(prereq "") get_prerequisites(${lib} prereq 1 0 "${bundlePath}" "") list(APPEND all_imports ${prereq}) endforeach(lib) list(REMOVE_DUPLICATES all_imports) set(replacements "") message ( "Found imports: ${all_imports} " ) foreach(import ${all_imports}) foreach(lib ${libNames}) set(match "^.*${lib}$") if(import MATCHES ${match}) set(replacement "${pluginsRelPath}/${lib}") message("Will replace: ${import} with: ${replacement}") set(replacements ${replacements} "-change" "${import}" "${replacement}") endif(import MATCHES ${match}) endforeach(lib) endforeach(import) foreach(lib ${libs}) get_filename_component(name ${lib} NAME) set(fixedName "${pluginsRelPath}/${name}") message("Fixing up: ${name}") execute_process(COMMAND install_name_tool -id "${fixedName}" "${lib}" ) execute_process(COMMAND install_name_tool ${replacements} ${lib} ) endforeach(lib) ' ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>internalPluginsBuildAssert (in category 'cmake buildType redirects') ----- - internalPluginsBuildAssert - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>internalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildAssertITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>internalPluginsBuildDebug (in category 'cmake buildType redirects') ----- - internalPluginsBuildDebug - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>internalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildDebugITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>internalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>internalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreaded - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>internalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreadedAssert - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>internalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreadedDebug - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>postBuildActionsBuild: (in category 'cmake buildType redirects') ----- - postBuildActionsBuild: gen - "SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActionsBuild:'"! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>postBuildActionsBuildAssert: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildAssert: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>postBuildActionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildAssertITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>postBuildActionsBuildDebug: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildDebug: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>postBuildActionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildDebugITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>postBuildActionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>postBuildActionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreaded: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>postBuildActionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreadedAssert: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>postBuildActionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreadedDebug: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>preferredIncludesBuild (in category 'source files') ----- - preferredIncludesBuild - "SystemNavigation default browseMethodsWhoseNamesContain: 'preferredIncludes'" - ^ #( ) - - - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>preferredIncludesBuildAssert (in category 'source files') ----- - preferredIncludesBuildAssert - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>preferredIncludesBuildAssertITimerHeartbeat (in category 'source files') ----- - preferredIncludesBuildAssertITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>preferredIncludesBuildDebug (in category 'source files') ----- - preferredIncludesBuildDebug - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>preferredIncludesBuildDebugITimerHeartbeat (in category 'source files') ----- - preferredIncludesBuildDebugITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>preferredIncludesBuildITimerHeartbeat (in category 'source files') ----- - preferredIncludesBuildITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>preferredIncludesBuildMultiThreaded (in category 'source files') ----- - preferredIncludesBuildMultiThreaded - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>preferredIncludesBuildMultiThreadedAssert (in category 'source files') ----- - preferredIncludesBuildMultiThreadedAssert - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>preferredIncludesBuildMultiThreadedDebug (in category 'source files') ----- - preferredIncludesBuildMultiThreadedDebug - ^self preferredIncludesBuild - ! Item was removed: - ----- 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 removed: - ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsAfterDetermineSystemBuildAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsAfterDetermineSystemBuildDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsBuild: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuild: aMaker - "does nothing. included for framework consistency/testing - - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsBuild' - " - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsBuildAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildAssert: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildAssertITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsBuildDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildDebug: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildDebugITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreaded: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreadedAssert: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>setGlobalOptionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreadedDebug: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was changed: + ----- Method: SqueakMacOSX32x86Config>>standardIncludesBuild (in category 'cmake buildType redirects') ----- - ----- Method: SqueakMacOSX32x86Config>>standardIncludesBuild (in category 'source files') ----- standardIncludesBuild + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: (self class name), ' standardIncludesBuild' ) + ]. + templates + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/SerialPlugin' )); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${targetPlatform}/plugins/FilePlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/FilePlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${targetPlatform}/plugins/HostWindowPlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${platformsDir}/iOS/vm/iPhone/plugins/HostWindowPlugin' )); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/HostWindowPlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/DropPlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/SocketPlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/SoundPlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/AsynchFilePlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${platformsDir}/unix/vm')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${platformsDir}/iOS/plugins/SoundPlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${platformsDir}/iOS/vm/OSX/plugins/SoundPlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${platformsDir}/iOS/vm/Common/Classes')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${platformsDir}/iOS/vm/OSX')). + + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_PATH = ${CMAKE_INCLUDE_PATH}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_SYSTEM_INCLUDE_PATH = ${CMAKE_SYSTEM_INCLUDE_PATH}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES = ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES = ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = ${CMAKE_FIND_ROOT_PATH_MODE_INCLUDE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = ${CMAKE_INCLUDE_CURRENT_DIR}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE = ${CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_DIRECTORIES_BEFORE = ${CMAKE_INCLUDE_DIRECTORIES_BEFORE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE = ${CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE}' ) + ]. + - ^ #( - '${crossDir}/plugins/SerialPlugin' - '${targetPlatform}/plugins/FilePlugin' - '${crossDir}/plugins/FilePlugin' - '${targetPlatform}/plugins/HostWindowPlugin' - '${platformsDir}/iOS/vm/iPhone/plugins/HostWindowPlugin' - '${crossDir}/plugins/HostWindowPlugin' - '${crossDir}/plugins/DropPlugin' - '${crossDir}/plugins/SocketPlugin' - '${crossDir}/plugins/SoundPlugin' - '${crossDir}/plugins/AsynchFilePlugin' - '${platformsDir}/unix/vm' - '${platformsDir}/iOS/plugins/SoundPlugin' - '${platformsDir}/iOS/vm/OSX/plugins/SoundPlugin' - '${platformsDir}/iOS/vm/Common/Classes' - '${platformsDir}/iOS/vm/OSX' - ) ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>standardIncludesBuildAssert (in category 'source files') ----- - standardIncludesBuildAssert - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>standardIncludesBuildAssertITimerHeartbeat (in category 'source files') ----- - standardIncludesBuildAssertITimerHeartbeat - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>standardIncludesBuildDebug (in category 'source files') ----- - standardIncludesBuildDebug - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>standardIncludesBuildDebugITimerHeartbeat (in category 'source files') ----- - standardIncludesBuildDebugITimerHeartbeat - ^self standardIncludesBuild - ! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>standardIncludesBuildITimerHeartbeat (in category 'source files') ----- - standardIncludesBuildITimerHeartbeat - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>standardIncludesBuildMultiThreaded (in category 'source files') ----- - standardIncludesBuildMultiThreaded - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>standardIncludesBuildMultiThreadedAssert (in category 'source files') ----- - standardIncludesBuildMultiThreadedAssert - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakMacOSX32x86Config>>standardIncludesBuildMultiThreadedDebug (in category 'source files') ----- - standardIncludesBuildMultiThreadedDebug - ^ self standardIncludesBuild! Item was changed: + ----- Method: SqueakMacOSXPowerPCConfig>>availableBuildTypes (in category 'cmake') ----- - ----- Method: SqueakMacOSXPowerPCConfig>>availableBuildTypes (in category 'cmake configuration') ----- availableBuildTypes ^SqueakCMakeVMMakerAbstractBuilder default allBuildTypes " subclasses should use ^super availableBuildTypes copyWithoutAll: #( #assertWithHeartbeatTimer #debugWithHeartbeatTimer debugMultiThreadedFFI.....etc)) " ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>cMakeMacros (in category 'accessing') ----- - cMakeMacros - ^'macro(add_framework appname fwname) - find_library(FRAMEWORK_${fwname} - NAMES ${fwname} - PATHS ${CMAKE_OSX_SYSROOT}/System/Library - PATH_SUFFIXES Frameworks - NO_DEFAULT_PATH) - if( ${FRAMEWORK_${fwname}} STREQUAL FRAMEWORK_${fwname}-NOTFOUND) - message(ERROR ": Framework ${fwname} not found") - else() - include_directories(SYSTEM /System/Library/Frameworks/${fwname}.framework/Headers) - target_link_libraries(${appname} ${FRAMEWORK_${fwname}}) - endif() - endmacro(add_framework)' ! Item was changed: + ----- Method: SqueakMacOSXPowerPCConfig>>dirBuildPlatform (in category 'cmake') ----- - ----- Method: SqueakMacOSXPowerPCConfig>>dirBuildPlatform (in category 'cmake directory ') ----- dirBuildPlatform ^self dirMacOSPowerPC! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>externalPluginsBuildAssert (in category 'cmake buildType redirects') ----- - externalPluginsBuildAssert - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>externalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildAssertITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>externalPluginsBuildDebug (in category 'cmake buildType redirects') ----- - externalPluginsBuildDebug - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>externalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildDebugITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>externalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>externalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreaded - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>externalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreadedAssert - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>externalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreadedDebug - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuild: aMaker - "default browseMethodsWhoseNamesContain: 'extraPluginSettingsBuild' " - self subclassResponsibility.! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildAssert: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildAssertITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildDebug: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildDebugITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreaded: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreadedAssert: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreadedDebug: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was changed: ----- Method: SqueakMacOSXPowerPCConfig>>extraVMSettingsBuild: (in category 'cmake buildType redirects') ----- extraVMSettingsBuild: aMaker "SystemNavigation default browseMethodsWhoseNamesContain: 'extraVMSettingsBuild:'" + (enabledebugmessages) + ifTrue:[ templates + addLast:((CMakeMessage new) message: (self class name) , 'extraVMSettingsBuild: aMaker') + ] . + templates + addLast:((CMakeSet new) variable: 'CMAKE_OSX_ARCHITECTURES' value: 'i386'); + addLast:((CMakeSet new) variable: 'resourceDir' quotedValue: ((self resourcesDir pathName), FileDirectory slash, 'ProjectBuilder')); + addLast:((CMakeSet new) + variable: 'resources' + value:'"${resourceDir}/Squeak VM.r" - - "Cog currently runs only in 32 bit mode" - aMaker set: 'CMAKE_OSX_ARCHITECTURES' to: 'i386'. - - aMaker set: 'resourceDir' toString: ((self resourcesDir pathName), FileDirectory slash, 'ProjectBuilder'). - aMaker set: 'resources' to: - '"${resourceDir}/Squeak VM.r" "${resourceDir}/Cog.icns" "${resourceDir}/Squeak.icns" "${resourceDir}/SqueakChanges.icns" "${resourceDir}/SqueakImage.icns" "${resourceDir}/SqueakPlugin.icns" "${resourceDir}/SqueakScript.icns" "${resourceDir}/SqueakGeneric.icns" "${resourceDir}/SqueakProject.icns" + "${resourceDir}/SqueakSources.icns"'). + + - "${resourceDir}/SqueakSources.icns"' ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>extraVMSettingsBuildAssert: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildAssert: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>extraVMSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildAssertITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>extraVMSettingsBuildDebug: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildDebug: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>extraVMSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildDebugITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>extraVMSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>extraVMSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreaded: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>extraVMSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreadedAssert: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>extraVMSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreadedDebug: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>internalPluginsBuildAssert (in category 'cmake buildType redirects') ----- - internalPluginsBuildAssert - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>internalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildAssertITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>internalPluginsBuildDebug (in category 'cmake buildType redirects') ----- - internalPluginsBuildDebug - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>internalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildDebugITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>internalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>internalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreaded - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>internalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreadedAssert - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>internalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreadedDebug - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>postBuildActionsBuild: (in category 'cmake buildType redirects') ----- - postBuildActionsBuild: gen - "SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActionsBuild:'"! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>postBuildActionsBuildAssert: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildAssert: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>postBuildActionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildAssertITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>postBuildActionsBuildDebug: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildDebug: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>postBuildActionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildDebugITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>postBuildActionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>postBuildActionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreaded: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>postBuildActionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreadedAssert: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>postBuildActionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreadedDebug: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>preferredIncludesBuild (in category 'source files') ----- - preferredIncludesBuild - "SystemNavigation default browseMethodsWhoseNamesContain: 'preferredIncludes'" - ^ #( ) - - - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>preferredIncludesBuildAssert (in category 'source files') ----- - preferredIncludesBuildAssert - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>preferredIncludesBuildAssertITimerHeartbeat (in category 'source files') ----- - preferredIncludesBuildAssertITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>preferredIncludesBuildDebug (in category 'source files') ----- - preferredIncludesBuildDebug - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>preferredIncludesBuildDebugITimerHeartbeat (in category 'source files') ----- - preferredIncludesBuildDebugITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>preferredIncludesBuildITimerHeartbeat (in category 'source files') ----- - preferredIncludesBuildITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>preferredIncludesBuildMultiThreaded (in category 'source files') ----- - preferredIncludesBuildMultiThreaded - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>preferredIncludesBuildMultiThreadedAssert (in category 'source files') ----- - preferredIncludesBuildMultiThreadedAssert - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>preferredIncludesBuildMultiThreadedDebug (in category 'source files') ----- - preferredIncludesBuildMultiThreadedDebug - ^self preferredIncludesBuild - ! Item was removed: - ----- 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 removed: - ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsAfterDetermineSystemBuildAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsAfterDetermineSystemBuildDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsBuild: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuild: aMaker - "does nothing. included for framework consistency/testing - - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsBuild' - " - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsBuildAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildAssert: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildAssertITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsBuildDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildDebug: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildDebugITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreaded: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreadedAssert: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>setGlobalOptionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreadedDebug: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was changed: + ----- Method: SqueakMacOSXPowerPCConfig>>standardIncludesBuild (in category 'cmake buildType redirects') ----- - ----- Method: SqueakMacOSXPowerPCConfig>>standardIncludesBuild (in category 'source files') ----- standardIncludesBuild + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: (self class name), ' standardIncludesBuild' ) + ]. + templates + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/SerialPlugin' )); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${targetPlatform}/plugins/FilePlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/FilePlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${targetPlatform}/plugins/HostWindowPlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${platformsDir}/iOS/vm/iPhone/plugins/HostWindowPlugin' )); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/HostWindowPlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/DropPlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/SocketPlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/SoundPlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${crossDir}/plugins/AsynchFilePlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${platformsDir}/unix/vm')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${platformsDir}/iOS/plugins/SoundPlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${platformsDir}/iOS/vm/OSX/plugins/SoundPlugin')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${platformsDir}/iOS/vm/Common/Classes')); + addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: '${platformsDir}/iOS/vm/OSX')). + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_PATH = ${CMAKE_INCLUDE_PATH}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_SYSTEM_INCLUDE_PATH = ${CMAKE_SYSTEM_INCLUDE_PATH}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES = ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES = ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = ${CMAKE_FIND_ROOT_PATH_MODE_INCLUDE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = ${CMAKE_INCLUDE_CURRENT_DIR}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE = ${CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_DIRECTORIES_BEFORE = ${CMAKE_INCLUDE_DIRECTORIES_BEFORE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE = ${CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE}' ) + ]. + - ^ #( - '${crossDir}/plugins/SerialPlugin' - '${targetPlatform}/plugins/FilePlugin' - '${crossDir}/plugins/FilePlugin' - '${targetPlatform}/plugins/HostWindowPlugin' - '${platformsDir}/iOS/vm/iPhone/plugins/HostWindowPlugin' - '${crossDir}/plugins/HostWindowPlugin' - '${crossDir}/plugins/DropPlugin' - '${crossDir}/plugins/SocketPlugin' - '${crossDir}/plugins/SoundPlugin' - '${crossDir}/plugins/AsynchFilePlugin' - '${platformsDir}/unix/vm' - '${platformsDir}/iOS/plugins/SoundPlugin' - '${platformsDir}/iOS/vm/OSX/plugins/SoundPlugin' - '${platformsDir}/iOS/vm/Common/Classes' - '${platformsDir}/iOS/vm/OSX' - ) ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>standardIncludesBuildAssert (in category 'source files') ----- - standardIncludesBuildAssert - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>standardIncludesBuildAssertITimerHeartbeat (in category 'source files') ----- - standardIncludesBuildAssertITimerHeartbeat - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>standardIncludesBuildDebug (in category 'source files') ----- - standardIncludesBuildDebug - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>standardIncludesBuildDebugITimerHeartbeat (in category 'source files') ----- - standardIncludesBuildDebugITimerHeartbeat - ^self standardIncludesBuild - ! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>standardIncludesBuildITimerHeartbeat (in category 'source files') ----- - standardIncludesBuildITimerHeartbeat - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>standardIncludesBuildMultiThreaded (in category 'source files') ----- - standardIncludesBuildMultiThreaded - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>standardIncludesBuildMultiThreadedAssert (in category 'source files') ----- - standardIncludesBuildMultiThreadedAssert - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakMacOSXPowerPCConfig>>standardIncludesBuildMultiThreadedDebug (in category 'source files') ----- - standardIncludesBuildMultiThreadedDebug - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakMacintoshConfig>>commonCompilerFlags (in category 'compiler flags') ----- - commonCompilerFlags - "Macintosh Common compiler flags" - self flag:'tty'. "cut-n-paste from representative pharo macOS configs" - ^ { - '-fmessage-length=0'. - '-Wno-trigraphs'. - '-fpascal-strings'. - '-fasm-blocks'. - '-DCOGMTVM=0'. - '-DUSE_GLOBAL_STRUCT=0'. - '-DTARGET_API_MAC_CARBON'. - '-DBUILD_FOR_OSX'. - '-DHAVE_SYS_TIME_H'. - '-mmacosx-version-min=10.5' } - ! Item was added: + ----- Method: SqueakMacintoshConfig>>compilerDefinitions (in category 'compiling') ----- + compilerDefinitions + self flag:'tty'. "cut-n-paste from representative pharo macOS configs" + ^ { + '-DCOGMTVM=0'. + '-DUSE_GLOBAL_STRUCT=0'. + '-DTARGET_API_MAC_CARBON'. + '-DBUILD_FOR_OSX'. + '-DHAVE_SYS_TIME_H'} + ! Item was added: + ----- Method: SqueakMacintoshConfig>>compilerFlags (in category 'compiling') ----- + compilerFlags + "Macintosh Common compiler flags" + self flag:'tty'. "cut-n-paste from representative pharo macOS configs" + ^ { + '-fmessage-length=0'. + '-Wno-trigraphs'. + '-fpascal-strings'. + '-fasm-blocks'. + '-mmacosx-version-min=10.5' } + ! Item was removed: - ----- Method: SqueakMacintoshConfig>>compilerFlagsDebug (in category 'compiler flags') ----- - compilerFlagsDebug - - ^ { - '-g3'. - '-O0'. - '-Wmissing-prototypes'. - '-Wmissing-braces'. - '-Wparentheses'. - '-Wunused-function'. - '-Wunused-label'. - '-Wunused-parameter'. - '-Wunused-variable'. - '-Wunused-value'. - '-Wsign-compare'. - '-DDEBUGVM=1'. - '-DEXTERNALPRIMSDEBUG=1'. - '-gdwarf-2' }! Item was removed: - ----- Method: SqueakMacintoshConfig>>compilerFlagsRelease (in category 'compiler flags') ----- - compilerFlagsRelease - " -mdynamic-no-pic " - ^ { - '-gdwarf-2'. - '-O3'. - '-funroll-loops'. - '-ftree-vectorize'. - '-msse3'. - '-DDEBUGVM=0'. - '-DNDEBUG'. - '-Wunused-value'. - '-Wuninitialized'. - '-falign-functions=16'. - '-fno-gcse'. - '-mtune=prescott'. - '-march=pentium-m'. - '-mfpmath=sse'. - '-finline-functions'. - '-Wall'. - '-DUSE_INLINE_MEMORY_ACCESSORS' }! Item was added: + ----- Method: SqueakMacintoshConfig>>customizeVMDrivers (in category 'initialize-release') ----- + customizeVMDrivers + " + SystemNavigation default browseMethodsWhoseNamesContain:'customizeVMDrivers' + + force platform level or lower customization of vm-display-X11 vm-sound-ALSA, etc. + The configurations can select what subset they want using something like this. + + |subset iwantonly| + iwantonly := #(#CMakeVMDisplayNull #CMakeVMDisplayX11 #CMakeVMSoundALSA #CMakeVMSoundNull ). + subset := vmdrivers select: [:vmd | 0 < (iwantonly occurrencesOf: (vmd class name) asSymbol)]. + vmdrivers := subset. + + self + customizeCMakeVMDisplayNull; + customizeCMakeVMDisplayX11; + customizeCMakeVMSoundALSA; + customizeCMakeVMSoundNull + + + " + self flag:'tty'. "revisit this design strategy" + self subclassResponsibility! Item was added: + ----- Method: SqueakMacintoshConfig>>setDirectories: (in category 'cmake') ----- + setDirectories: aMaker + |temp o| + "We could put these inline, but other components include the directories.cmake file. So, we continue that convention" + o := String new writeStream. + temp := OrderedCollection new. + temp + addLast: ((CMakeSet new) variable: 'topDir' quotedValue: (self topDir fullName)); + addLast: ((CMakeSet new) variable: 'buildDir' quotedValue: (self buildDir ifNil: ['${topDir}/build'] ifNotNil: [self buildDir fullName])); + addLast: ((CMakeSet new) variable: 'thirdpartyDir' quotedValue: '${buildDir}/thirdParty'); + addLast: ((CMakeSet new) variable: 'platformsDir' quotedValue: (self platformsDir)); + addLast: ((CMakeSet new) variable: 'srcDir' quotedValue: (self srcDir pathName)); + addLast: ((CMakeSet new) variable: 'srcPluginsDir' quotedValue: (pluginsDir ifNil: [ '${srcDir}/plugins' ])); + addLast: ((CMakeSet new) variable: 'srcVMDir' quotedValue: '${srcDir}/vm'); + addLast: ((CMakeSet new) variable: 'platformName' quotedValue: (self platformName)); + addLast: ((CMakeSet new) variable: 'targetPlatform' quotedValue: '${platformsDir}/${platformName}'); + addLast: ((CMakeSet new) variable: 'crossDir' quotedValue: '${platformsDir}/Cross'); + addLast: ((CMakeSet new) variable: 'platformVMDir' quotedValue: '${targetPlatform}/vm}'); + addLast: ((CMakeSet new) variable: 'outputDir' quotedValue: (self outputDir fullName)); + addLast: ((CMakeSet new) variable: 'externalModulesDir' quotedValue: (self externalModulesDir)). + temp do: [:each | o nextPutAll: (each content); cr]. + self write: (o contents) toFile: 'directories.cmake'. + (enabledebugmessages) + ifTrue:[ + templates + addLast:((CMakeMessage new) message: (self class name), ' setDirectories: aMaker' ) + ]. + templates addLast: ((CMakeInclude new) file: 'directories.cmake'). + + ! Item was added: + ----- Method: SqueakMacintoshConfig>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuild: aMaker + "Set CMake commands that are common for a this platform'" + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: (self class name), ' setGlobalOptionsAfterDetermineSystemBuild: aMaker')]. + + + + + + + ! Item was added: + ----- Method: SqueakMacintoshConfig>>setResourceProperties: (in category 'cmake buildType redirects') ----- + setResourceProperties: maker + templates + addLast:((CMakeMessage new) message: (self class name), ' setResourceProperties: maker' )! Item was added: + ----- Method: SqueakMacintoshConfig>>standardIncludesBuild (in category 'cmake buildType redirects') ----- + standardIncludesBuild + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: (self class name), ' standardIncludesBuild' ) + ]. + + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_PATH = ${CMAKE_INCLUDE_PATH}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_SYSTEM_INCLUDE_PATH = ${CMAKE_SYSTEM_INCLUDE_PATH}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES = ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES = ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = ${CMAKE_FIND_ROOT_PATH_MODE_INCLUDE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = ${CMAKE_INCLUDE_CURRENT_DIR}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE = ${CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_DIRECTORIES_BEFORE = ${CMAKE_INCLUDE_DIRECTORIES_BEFORE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE = ${CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE}' ) + ]. + ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>addVMDriversBuildAssert: (in category 'cmake buildType redirects') ----- - addVMDriversBuildAssert: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: SqueakSunOS32x86Config>>addVMDriversBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - addVMDriversBuildAssertITimerHeartbeat: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: SqueakSunOS32x86Config>>addVMDriversBuildDebug: (in category 'cmake buildType redirects') ----- - addVMDriversBuildDebug: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: SqueakSunOS32x86Config>>addVMDriversBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - addVMDriversBuildDebugITimerHeartbeat: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: SqueakSunOS32x86Config>>addVMDriversBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - addVMDriversBuildITimerHeartbeat: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: SqueakSunOS32x86Config>>addVMDriversBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - addVMDriversBuildMultiThreaded: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: SqueakSunOS32x86Config>>addVMDriversBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - addVMDriversBuildMultiThreadedAssert: aMaker - ^self addVMDriversBuild: aMaker! Item was removed: - ----- Method: SqueakSunOS32x86Config>>addVMDriversBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - addVMDriversBuildMultiThreadedDebug: aMaker - ^self addVMDriversBuild: aMaker! Item was changed: + ----- Method: SqueakSunOS32x86Config>>availableBuildTypes (in category 'cmake') ----- - ----- Method: SqueakSunOS32x86Config>>availableBuildTypes (in category 'cmake configuration') ----- availableBuildTypes ^SqueakCMakeVMMakerAbstractBuilder default allBuildTypes " subclasses should use ^super availableBuildTypes copyWithoutAll: #( #assertWithHeartbeatTimer #debugWithHeartbeatTimer debugMultiThreadedFFI.....etc)) " ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>coreSourcesBuildAssert (in category 'cmake buildType redirects') ----- - coreSourcesBuildAssert - ^self coreSourcesBuild - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>coreSourcesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - coreSourcesBuildAssertITimerHeartbeat - ^self coreSourcesBuild - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>coreSourcesBuildDebug (in category 'cmake buildType redirects') ----- - coreSourcesBuildDebug - ^self coreSourcesBuild - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>coreSourcesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - coreSourcesBuildDebugITimerHeartbeat - ^self coreSourcesBuild - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>coreSourcesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - coreSourcesBuildITimerHeartbeat - ^self coreSourcesBuild - ! Item was changed: ----- Method: SqueakSunOS32x86Config>>coreSourcesBuildMultiThreaded (in category 'cmake buildType redirects') ----- coreSourcesBuildMultiThreaded + "files to include from src/vm dir" + ^ #( + 'cogit.c' + 'cointerpmt.c' + )! - ^self coreSourcesBuild - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>coreSourcesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - coreSourcesBuildMultiThreadedAssert - ^self coreSourcesBuild - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>coreSourcesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - coreSourcesBuildMultiThreadedDebug - ^self coreSourcesBuild - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>externalPluginsBuildAssert (in category 'cmake buildType redirects') ----- - externalPluginsBuildAssert - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakSunOS32x86Config>>externalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildAssertITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakSunOS32x86Config>>externalPluginsBuildDebug (in category 'cmake buildType redirects') ----- - externalPluginsBuildDebug - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakSunOS32x86Config>>externalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildDebugITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakSunOS32x86Config>>externalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakSunOS32x86Config>>externalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreaded - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakSunOS32x86Config>>externalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreadedAssert - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakSunOS32x86Config>>externalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreadedDebug - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakSunOS32x86Config>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuild: aMaker - "default browseMethodsWhoseNamesContain: 'extraPluginSettingsBuild' " - self subclassResponsibility.! Item was removed: - ----- Method: SqueakSunOS32x86Config>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildAssert: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildAssertITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildDebug: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildDebugITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreaded: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreadedAssert: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreadedDebug: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>extraVMSettingsBuild: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuild: aMaker - "SystemNavigation default browseMethodsWhoseNamesContain: 'extraVMSettingsBuild:'"! Item was removed: - ----- Method: SqueakSunOS32x86Config>>extraVMSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildAssertITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakSunOS32x86Config>>extraVMSettingsBuildDebug: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildDebug: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakSunOS32x86Config>>extraVMSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildDebugITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakSunOS32x86Config>>extraVMSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakSunOS32x86Config>>extraVMSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreaded: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakSunOS32x86Config>>extraVMSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreadedAssert: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakSunOS32x86Config>>extraVMSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreadedDebug: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakSunOS32x86Config>>internalPluginsBuildAssert (in category 'cmake buildType redirects') ----- - internalPluginsBuildAssert - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakSunOS32x86Config>>internalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildAssertITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakSunOS32x86Config>>internalPluginsBuildDebug (in category 'cmake buildType redirects') ----- - internalPluginsBuildDebug - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakSunOS32x86Config>>internalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildDebugITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakSunOS32x86Config>>internalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakSunOS32x86Config>>internalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreaded - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakSunOS32x86Config>>internalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreadedAssert - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakSunOS32x86Config>>internalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreadedDebug - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakSunOS32x86Config>>postBuildActionsBuild: (in category 'cmake buildType redirects') ----- - postBuildActionsBuild: gen - "SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActionsBuild:'"! Item was removed: - ----- Method: SqueakSunOS32x86Config>>postBuildActionsBuildAssert: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildAssert: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakSunOS32x86Config>>postBuildActionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildAssertITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakSunOS32x86Config>>postBuildActionsBuildDebug: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildDebug: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakSunOS32x86Config>>postBuildActionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildDebugITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakSunOS32x86Config>>postBuildActionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakSunOS32x86Config>>postBuildActionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreaded: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakSunOS32x86Config>>postBuildActionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreadedAssert: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakSunOS32x86Config>>postBuildActionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreadedDebug: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakSunOS32x86Config>>preferredIncludesBuild (in category 'cmake buildType redirects') ----- - preferredIncludesBuild - "SystemNavigation default browseMethodsWhoseNamesContain: 'preferredIncludes'" - ^ #( ) - - - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>preferredIncludesBuildAssert (in category 'cmake buildType redirects') ----- - preferredIncludesBuildAssert - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>preferredIncludesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - preferredIncludesBuildAssertITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>preferredIncludesBuildDebug (in category 'cmake buildType redirects') ----- - preferredIncludesBuildDebug - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>preferredIncludesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - preferredIncludesBuildDebugITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>preferredIncludesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - preferredIncludesBuildITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>preferredIncludesBuildMultiThreaded (in category 'cmake buildType redirects') ----- - preferredIncludesBuildMultiThreaded - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>preferredIncludesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - preferredIncludesBuildMultiThreadedAssert - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>preferredIncludesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - preferredIncludesBuildMultiThreadedDebug - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuild: aMaker - "do nothing (so far) on Unix. - - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystemBuild:' - "! Item was removed: - ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsAfterDetermineSystemBuildAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsAfterDetermineSystemBuildDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- 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 removed: - ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsBuildAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildAssert: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildAssertITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsBuildDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildDebug: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildDebugITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreaded: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreadedAssert: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>setGlobalOptionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreadedDebug: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>standardIncludesBuild (in category 'cmake buildType redirects') ----- - standardIncludesBuild - ^ #()! Item was removed: - ----- Method: SqueakSunOS32x86Config>>standardIncludesBuildAssert (in category 'cmake buildType redirects') ----- - standardIncludesBuildAssert - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakSunOS32x86Config>>standardIncludesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - standardIncludesBuildAssertITimerHeartbeat - ^self standardIncludesBuild - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>standardIncludesBuildDebug (in category 'cmake buildType redirects') ----- - standardIncludesBuildDebug - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakSunOS32x86Config>>standardIncludesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - standardIncludesBuildDebugITimerHeartbeat - ^self standardIncludesBuild - ! Item was removed: - ----- Method: SqueakSunOS32x86Config>>standardIncludesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - standardIncludesBuildITimerHeartbeat - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakSunOS32x86Config>>standardIncludesBuildMultiThreaded (in category 'cmake buildType redirects') ----- - standardIncludesBuildMultiThreaded - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakSunOS32x86Config>>standardIncludesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - standardIncludesBuildMultiThreadedAssert - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakSunOS32x86Config>>standardIncludesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - standardIncludesBuildMultiThreadedDebug - ^ self standardIncludesBuild! Item was changed: CPlatformConfigForSqueak subclass: #SqueakUnixConfig + instanceVariableNames: '' - instanceVariableNames: 'configtemplates' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMakerSqueak'! !SqueakUnixConfig commentStamp: 'tty 6/17/2014 19:53' prior: 0! A SqueakUnixConfig is a top level configuration for *nix configuratons. ! Item was added: + ----- Method: SqueakUnixConfig>>cmakeIncludeModulesBuild (in category 'cmake buildType redirects') ----- + cmakeIncludeModulesBuild + "include CMake Modules. on my system they are in /usr/local/share/cmake-3.0/Modules/" + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: (self class name), ' cmakeIncludeModulesBuild: aMaker') + ]. + templates + addLast: ((CMakeInclude new) file:'Utils.cmake'); + addLast: ((CMakeInclude new) file:'Plugins.cmake'); + addLast: ((CMakeInclude new) file:'TestBigEndian'); + addLast: ((CMakeInclude new) file:'CheckIncludeFile'); + addLast: ((CMakeInclude new) file:'CheckLibraryExists'); + addLast: ((CMakeInclude new) file:'CheckTypeSize'); + addLast: ((CMakeInclude new) file:'CheckFunctionExists'); + addLast: ((CMakeInclude new) file:'CheckVariableExists'); + addLast: ((CMakeInclude new) file:'CheckStructHasMember'); + addLast: ((CMakeInclude new) file:'FindPkgConfig'). + + + ! Item was added: + ----- Method: SqueakUnixConfig>>cmakeIncludePathBuild (in category 'cmake buildType redirects') ----- + cmakeIncludePathBuild + " + cmake --help-variable CMAKE_INCLUDE_PATH + This is used when searching for include files e.g. using the FIND_PATH() command. If you have headers in non-standard locations, it may be useful to set this variable to this directory (e.g. /sw/include on Mac OS X). If you need several directories, separate them by the platform specific separators (e.g. ':' on UNIX) " + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: (self class name), ' cmakeIncludePathBuild'); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_PATH=${CMAKE_INCLUDE_PATH}') + ]. + + "override me if necessary"! Item was added: + ----- Method: SqueakUnixConfig>>cmakeLibraryPathBuild (in category 'cmake buildType redirects') ----- + cmakeLibraryPathBuild + " + cmake --help-variable CMAKE_LIBRARY_PATH + This is used when searching for libraries e.g. using the FIND_LIBRARY() command. If you have libraries in non-standard locations, it may be useful to set this variable to this directory (e.g. /sw/lib on Mac OS X). If you need several directories, separate them by the platform specific separators (e.g. '':'' on UNIX) " (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: (self class name), ' cmakeLibraryPathBuild'); + addLast: ((CMakeMessage new) message: 'CMAKE_LIBRARY_PATH=${CMAKE_LIBRARY_PATH}') + ]. + + "override me if necessary"! Item was added: + ----- Method: SqueakUnixConfig>>cmakeModulePathBuild (in category 'cmake buildType redirects') ----- + cmakeModulePathBuild + " + cmake --help-variable CMAKE_LIBRARY_PATH + This is used when searching for libraries e.g. using the FIND_LIBRARY() command. If you have libraries in non-standard locations, it may be useful to set this variable to this directory (e.g. /sw/lib on Mac OS X). If you need several directories, separate them by the platform specific separators (e.g. '':'' on UNIX) " (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: (self class name), ' cmakeModulePathBuild'); + addLast: ((CMakeMessage new) message: 'CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}') + ]. + + "override me if necessary"! Item was added: + ----- Method: SqueakUnixConfig>>cmakePrefixPathBuild (in category 'cmake buildType redirects') ----- + cmakePrefixPathBuild + " + cmake --help-variable CMAKE_PREFIX_PATH + (since CMake 2.6.0) This is used when searching for include files, binaries, or libraries using either the FIND_PACKAGE(), FIND_PATH(), FIND_PROGRAM(), or FIND_LIBRARY() commands. For each path in the CMAKE_PREFIX_PATH list, CMake will check ''PATH/include'' and ''PATH'' when FIND_PATH() is called, ''PATH/bin'' and ''PATH'' when FIND_PROGRAM() is called, and ''PATH/lib'' and ''PATH'' when FIND_LIBRARY() is called. See the documentation for FIND_PACKAGE(), FIND_LIBRARY(), FIND_PATH(), and FIND_PROGRAM() for more details." + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: (self class name), ' cmakePrefixPathBuild'); + addLast: ((CMakeMessage new) message: 'CMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}') + ]. + + "override me if necessary" + + ! Item was removed: - ----- Method: SqueakUnixConfig>>commonCompilerFlags (in category 'compiler flags') ----- - commonCompilerFlags - "avoid premature optimization. push this decision down lower if it is needed at all" - self deprecated: ' its much easier to have all the flags in your configuration class. '. - ^{} - - ! Item was changed: ----- Method: SqueakUnixConfig>>configureForBuildType: (in category 'cmake configuration') ----- configureForBuildType: aSymbol "Set my internal state appropriate for my build type". self configureNoBuildType. "reset all internal flags" buildType:= aSymbol. "error checking was handled previously" - self - preferredIncludes; - standardIncludes; - configureFlags; " configure --without-npsqueak --with-src=stacksrc --with-plugins=src/plugins --disable-cogi --without-vm-display-fbdev --x-libraries=/usr/lib --without-gl " - compilerFlags; - linkFlags; " LIBS=''-lpthread -luuid''" - internalPlugins; - externalPlugins. - ! Item was added: + ----- Method: SqueakUnixConfig>>crossSources (in category 'source files') ----- + crossSources + ^#( + 'sqHeapMap.c' + 'sqTicker.c' + 'sqExternalSemaphores.c' + 'sqNamedPrims.c' + 'sqVirtualMachine.c' + )! Item was added: + ----- Method: SqueakUnixConfig>>customizeVMDrivers (in category 'initialize-release') ----- + customizeVMDrivers + " + SystemNavigation default browseMethodsWhoseNamesContain:'customizeVMDrivers' + + force platform level or lower customization of vm-display-X11 vm-sound-ALSA, etc. + The configurations can select what subset they want using something like this. + + |subset iwantonly| + iwantonly := #(#CMakeVMDisplayNull #CMakeVMDisplayX11 #CMakeVMSoundALSA #CMakeVMSoundNull ). + subset := vmdrivers select: [:vmd | 0 < (iwantonly occurrencesOf: (vmd class name) asSymbol)]. + vmdrivers := subset. + + self + customizeCMakeVMDisplayNull; + customizeCMakeVMDisplayX11; + customizeCMakeVMSoundALSA; + customizeCMakeVMSoundNull + + + " + self flag:'tty'. "revisit this design strategy" + self subclassResponsibility! Item was added: + ----- Method: SqueakUnixConfig>>extraVMSettingsBuild: (in category 'cmake buildType redirects') ----- + extraVMSettingsBuild: aMaker + "add a generated version.c" + self flag: 'tty'. "Figure out how other's generated version info" + (enabledebugmessages) + ifTrue:[ templates + addLast:((CMakeMessage new) message: (self class name) , 'extraVMSettingsBuild: aMaker') + ] . + templates + addLast:((CMakeAddCustomCommandOutput new) + output:(OrderedCollection with: 'version.c') + commandsandargs: (OrderedCollection with: 'COMMAND ${platformsDir}/unix/config/verstamp version.c gcc' ) + comment: 'Generating version.c'). + + ! Item was removed: - ----- Method: SqueakUnixConfig>>frameworksBuildAssert (in category 'cmake buildType redirects') ----- - frameworksBuildAssert - ^ self frameworksBuild! Item was removed: - ----- Method: SqueakUnixConfig>>frameworksBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - frameworksBuildAssertITimerHeartbeat - ^ self frameworksBuild! Item was removed: - ----- Method: SqueakUnixConfig>>frameworksBuildDebug (in category 'cmake buildType redirects') ----- - frameworksBuildDebug - ^ self frameworksBuild! Item was removed: - ----- Method: SqueakUnixConfig>>frameworksBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - frameworksBuildDebugITimerHeartbeat - ^ self frameworksBuild! Item was removed: - ----- Method: SqueakUnixConfig>>frameworksBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - frameworksBuildITimerHeartbeat - ^ self frameworksBuild! Item was removed: - ----- Method: SqueakUnixConfig>>frameworksBuildMultiThreaded (in category 'cmake buildType redirects') ----- - frameworksBuildMultiThreaded - ^ self frameworksBuild! Item was removed: - ----- Method: SqueakUnixConfig>>frameworksBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - frameworksBuildMultiThreadedAssert - ^ self frameworksBuild! Item was removed: - ----- Method: SqueakUnixConfig>>frameworksBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - frameworksBuildMultiThreadedDebug - ^ self frameworksBuild! Item was added: + ----- Method: SqueakUnixConfig>>setDirectories: (in category 'cmake') ----- + setDirectories: aMaker + |temp o| + "We could put these inline, but other components include the directories.cmake file. So, we continue that convention" + o := String new writeStream. + temp := OrderedCollection new. + temp + addLast: ((CMakeSet new) variable: 'topDir' quotedValue: (self topDir fullName)); + addLast: ((CMakeSet new) variable: 'buildDir' quotedValue: (self buildDir ifNil: ['${topDir}/build'] ifNotNil: [self buildDir fullName])); + addLast: ((CMakeSet new) variable: 'thirdpartyDir' quotedValue: '${buildDir}/thirdParty'); + addLast: ((CMakeSet new) variable: 'platformsDir' quotedValue: (self platformsDir)); + addLast: ((CMakeSet new) variable: 'srcDir' quotedValue: (self srcDir pathName)); + addLast: ((CMakeSet new) variable: 'srcPluginsDir' quotedValue: (pluginsDir ifNil: [ '${srcDir}/plugins' ])); + addLast: ((CMakeSet new) variable: 'srcVMDir' quotedValue: '${srcDir}/vm'); + addLast: ((CMakeSet new) variable: 'platformName' quotedValue: (self platformName)); + addLast: ((CMakeSet new) variable: 'targetPlatform' quotedValue: '${platformsDir}/${platformName}'); + addLast: ((CMakeSet new) variable: 'crossDir' quotedValue: '${platformsDir}/Cross'); + addLast: ((CMakeSet new) variable: 'platformVMDir' quotedValue: '${targetPlatform}/vm}'); + addLast: ((CMakeSet new) variable: 'outputDir' quotedValue: (self outputDir fullName)); + addLast: ((CMakeSet new) variable: 'externalModulesDir' quotedValue: (self externalModulesDir)). + temp do: [:each | o nextPutAll: (each content); cr]. + self write: (o contents) toFile: 'directories.cmake'. + (enabledebugmessages) + ifTrue:[ + templates + addLast:((CMakeMessage new) message: (self class name), ' setDirectories: aMaker' ) + ]. + templates addLast: ((CMakeInclude new) file: 'directories.cmake'). + + ! Item was added: + ----- Method: SqueakUnixConfig>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuild: aMaker + " SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystemBuild'" + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: (self class name), ' setGlobalOptionsAfterDetermineSystemBuild: aMaker') + ]. + templates addLast:((CMakeSet new) variable:'CMAKE_C_COMPILER' value: 'gcc') + + ! Item was removed: - ----- Method: SqueakUnixConfig>>setupDirectories: (in category 'squeak compatability') ----- - setupDirectories: gen - super setupDirectories: gen. - gen set: #externalModulesDir toString: self externalModulesDir.! Item was added: + ----- Method: SqueakUnixConfig>>standardIncludesBuild (in category 'cmake buildType redirects') ----- + standardIncludesBuild + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: (self class name), ' standardIncludesBuild' ) + ]. + + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_PATH = ${CMAKE_INCLUDE_PATH}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_SYSTEM_INCLUDE_PATH = ${CMAKE_SYSTEM_INCLUDE_PATH}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES = ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES = ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = ${CMAKE_FIND_ROOT_PATH_MODE_INCLUDE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = ${CMAKE_INCLUDE_CURRENT_DIR}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE = ${CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_DIRECTORIES_BEFORE = ${CMAKE_INCLUDE_DIRECTORIES_BEFORE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE = ${CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE}' ) + ]. + ! Item was removed: - ----- Method: SqueakUnixConfig>>thirdpartyLibsBuildAssert (in category 'cmake buildType redirects') ----- - thirdpartyLibsBuildAssert - ^ self thirdpartyLibsBuild ! Item was removed: - ----- Method: SqueakUnixConfig>>thirdpartyLibsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - thirdpartyLibsBuildAssertITimerHeartbeat - ^ self thirdpartyLibsBuild ! Item was removed: - ----- Method: SqueakUnixConfig>>thirdpartyLibsBuildDebug (in category 'cmake buildType redirects') ----- - thirdpartyLibsBuildDebug - ^ self thirdpartyLibsBuild ! Item was removed: - ----- Method: SqueakUnixConfig>>thirdpartyLibsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - thirdpartyLibsBuildDebugITimerHeartbeat - ^ self thirdpartyLibsBuild ! Item was removed: - ----- Method: SqueakUnixConfig>>thirdpartyLibsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - thirdpartyLibsBuildITimerHeartbeat - ^ self thirdpartyLibsBuild ! Item was removed: - ----- Method: SqueakUnixConfig>>thirdpartyLibsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - thirdpartyLibsBuildMultiThreaded - ^ self thirdpartyLibsBuild ! Item was removed: - ----- Method: SqueakUnixConfig>>thirdpartyLibsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - thirdpartyLibsBuildMultiThreadedAssert - ^ self thirdpartyLibsBuild ! Item was removed: - ----- Method: SqueakUnixConfig>>thirdpartyLibsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - thirdpartyLibsBuildMultiThreadedDebug - ^ self thirdpartyLibsBuild ! Item was added: + ----- Method: SqueakUnixConfig>>vmDrivers (in category 'plugins') ----- + vmDrivers + "SystemNavigation default browseMethodsWhoseNamesContain: 'vmDrivers' + " + ^#( + 'vm-display-Quartz' + 'vm-display-X11' + 'vm-display-custom' + 'vm-display-fbdev' + 'vm-display-null' + 'vm-sound-ALSA' + 'vm-sound-MacOSX' + 'vm-sound-NAS' + 'vm-sound-OSS' + 'vm-sound-Sun' + 'vm-sound-custom' + 'vm-sound-null' + ) + ! Item was changed: + ----- Method: SqueakWin32x86Config>>availableBuildTypes (in category 'cmake') ----- - ----- Method: SqueakWin32x86Config>>availableBuildTypes (in category 'cmake configuration') ----- availableBuildTypes ^SqueakCMakeVMMakerAbstractBuilder default allBuildTypes " subclasses should use ^super availableBuildTypes copyWithoutAll: #( #assertWithHeartbeatTimer #debugWithHeartbeatTimer debugMultiThreadedFFI.....etc)) " ! Item was changed: + ----- Method: SqueakWin32x86Config>>coreSourcesBuild (in category 'cmake buildType redirects') ----- - ----- Method: SqueakWin32x86Config>>coreSourcesBuild (in category 'source files') ----- coreSourcesBuild "files to include from src/vm dir" ^ #( 'cogit.c' 'gcc3x-cointerp.c' )! Item was removed: - ----- Method: SqueakWin32x86Config>>coreSourcesBuildAssert (in category 'source files') ----- - coreSourcesBuildAssert - ^self coreSourcesBuild - ! Item was removed: - ----- Method: SqueakWin32x86Config>>coreSourcesBuildAssertITimerHeartbeat (in category 'source files') ----- - coreSourcesBuildAssertITimerHeartbeat - ^self coreSourcesBuild - ! Item was removed: - ----- Method: SqueakWin32x86Config>>coreSourcesBuildDebug (in category 'source files') ----- - coreSourcesBuildDebug - ^self coreSourcesBuild - ! Item was removed: - ----- Method: SqueakWin32x86Config>>coreSourcesBuildDebugITimerHeartbeat (in category 'source files') ----- - coreSourcesBuildDebugITimerHeartbeat - ^self coreSourcesBuild - ! Item was removed: - ----- Method: SqueakWin32x86Config>>coreSourcesBuildITimerHeartbeat (in category 'source files') ----- - coreSourcesBuildITimerHeartbeat - ^self coreSourcesBuild - ! Item was changed: + ----- Method: SqueakWin32x86Config>>coreSourcesBuildMultiThreaded (in category 'cmake buildType redirects') ----- - ----- Method: SqueakWin32x86Config>>coreSourcesBuildMultiThreaded (in category 'source files') ----- coreSourcesBuildMultiThreaded + "files to include from src/vm dir" + ^ #( + 'cogit.c' + 'cointerpmt.c' + )! - ^self coreSourcesBuild - ! Item was removed: - ----- Method: SqueakWin32x86Config>>coreSourcesBuildMultiThreadedAssert (in category 'source files') ----- - coreSourcesBuildMultiThreadedAssert - ^self coreSourcesBuild - ! Item was removed: - ----- Method: SqueakWin32x86Config>>coreSourcesBuildMultiThreadedDebug (in category 'source files') ----- - coreSourcesBuildMultiThreadedDebug - ^self coreSourcesBuild - ! Item was removed: - ----- Method: SqueakWin32x86Config>>externalPluginsBuildAssert (in category 'cmake buildType redirects') ----- - externalPluginsBuildAssert - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakWin32x86Config>>externalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildAssertITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakWin32x86Config>>externalPluginsBuildDebug (in category 'cmake buildType redirects') ----- - externalPluginsBuildDebug - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakWin32x86Config>>externalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildDebugITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakWin32x86Config>>externalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - externalPluginsBuildITimerHeartbeat - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakWin32x86Config>>externalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreaded - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakWin32x86Config>>externalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreadedAssert - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakWin32x86Config>>externalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - externalPluginsBuildMultiThreadedDebug - ^ self externalPluginsBuild! Item was removed: - ----- Method: SqueakWin32x86Config>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildAssert: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakWin32x86Config>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildAssertITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakWin32x86Config>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildDebug: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakWin32x86Config>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildDebugITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakWin32x86Config>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildITimerHeartbeat: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakWin32x86Config>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreaded: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakWin32x86Config>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreadedAssert: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakWin32x86Config>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - extraPluginSettingsBuildMultiThreadedDebug: aMaker - ^self extraPluginSettingsBuild: aMaker - ! Item was removed: - ----- Method: SqueakWin32x86Config>>extraVMSettingsBuildAssert: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildAssert: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakWin32x86Config>>extraVMSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildAssertITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakWin32x86Config>>extraVMSettingsBuildDebug: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildDebug: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakWin32x86Config>>extraVMSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildDebugITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakWin32x86Config>>extraVMSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildITimerHeartbeat: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakWin32x86Config>>extraVMSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreaded: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakWin32x86Config>>extraVMSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreadedAssert: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakWin32x86Config>>extraVMSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - extraVMSettingsBuildMultiThreadedDebug: aMaker - ^self extraVMSettingsBuild: aMaker! Item was removed: - ----- Method: SqueakWin32x86Config>>internalPluginsBuildAssert (in category 'cmake buildType redirects') ----- - internalPluginsBuildAssert - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakWin32x86Config>>internalPluginsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildAssertITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakWin32x86Config>>internalPluginsBuildDebug (in category 'cmake buildType redirects') ----- - internalPluginsBuildDebug - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakWin32x86Config>>internalPluginsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildDebugITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakWin32x86Config>>internalPluginsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - internalPluginsBuildITimerHeartbeat - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakWin32x86Config>>internalPluginsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreaded - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakWin32x86Config>>internalPluginsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreadedAssert - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakWin32x86Config>>internalPluginsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - internalPluginsBuildMultiThreadedDebug - " internalPlugins := self defaultInternalPlugins" - ^self internalPluginsBuild! Item was removed: - ----- Method: SqueakWin32x86Config>>postBuildActionsBuild: (in category 'cmake buildType redirects') ----- - postBuildActionsBuild: gen - "SystemNavigation default browseMethodsWhoseNamesContain: 'postBuildActionsBuild:'"! Item was removed: - ----- Method: SqueakWin32x86Config>>postBuildActionsBuildAssert: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildAssert: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakWin32x86Config>>postBuildActionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildAssertITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakWin32x86Config>>postBuildActionsBuildDebug: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildDebug: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakWin32x86Config>>postBuildActionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildDebugITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakWin32x86Config>>postBuildActionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildITimerHeartbeat: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakWin32x86Config>>postBuildActionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreaded: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakWin32x86Config>>postBuildActionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreadedAssert: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakWin32x86Config>>postBuildActionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - postBuildActionsBuildMultiThreadedDebug: aMaker - ^self postBuildActionsBuild: aMaker! Item was removed: - ----- Method: SqueakWin32x86Config>>preferredIncludesBuild (in category 'cmake buildType redirects') ----- - preferredIncludesBuild - "SystemNavigation default browseMethodsWhoseNamesContain: 'preferredIncludes'" - ^ #( ) - - - ! Item was removed: - ----- Method: SqueakWin32x86Config>>preferredIncludesBuildAssert (in category 'cmake buildType redirects') ----- - preferredIncludesBuildAssert - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakWin32x86Config>>preferredIncludesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - preferredIncludesBuildAssertITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakWin32x86Config>>preferredIncludesBuildDebug (in category 'cmake buildType redirects') ----- - preferredIncludesBuildDebug - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakWin32x86Config>>preferredIncludesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - preferredIncludesBuildDebugITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakWin32x86Config>>preferredIncludesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - preferredIncludesBuildITimerHeartbeat - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakWin32x86Config>>preferredIncludesBuildMultiThreaded (in category 'cmake buildType redirects') ----- - preferredIncludesBuildMultiThreaded - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakWin32x86Config>>preferredIncludesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - preferredIncludesBuildMultiThreadedAssert - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakWin32x86Config>>preferredIncludesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - preferredIncludesBuildMultiThreadedDebug - ^self preferredIncludesBuild - ! Item was removed: - ----- Method: SqueakWin32x86Config>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuild: aMaker - "do nothing (so far) on Unix. - - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystemBuild:' - "! Item was removed: - ----- Method: SqueakWin32x86Config>>setGlobalOptionsAfterDetermineSystemBuildAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildAssert: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakWin32x86Config>>setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildAssertITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakWin32x86Config>>setGlobalOptionsAfterDetermineSystemBuildDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildDebug: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakWin32x86Config>>setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildDebugITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakWin32x86Config>>setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildITimerHeartbeat: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakWin32x86Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreaded: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakWin32x86Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreadedAssert: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakWin32x86Config>>setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsAfterDetermineSystemBuildMultiThreadedDebug: aMaker - ^self setGlobalOptionsAfterDetermineSystemBuild: aMaker - ! Item was removed: - ----- Method: SqueakWin32x86Config>>setGlobalOptionsBuild: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuild: aMaker - "does nothing. included for framework consistency/testing - - SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsBuild' - " - ! Item was removed: - ----- Method: SqueakWin32x86Config>>setGlobalOptionsBuildAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildAssert: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakWin32x86Config>>setGlobalOptionsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildAssertITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakWin32x86Config>>setGlobalOptionsBuildDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildDebug: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakWin32x86Config>>setGlobalOptionsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildDebugITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakWin32x86Config>>setGlobalOptionsBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildITimerHeartbeat: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakWin32x86Config>>setGlobalOptionsBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreaded: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakWin32x86Config>>setGlobalOptionsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreadedAssert: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakWin32x86Config>>setGlobalOptionsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - setGlobalOptionsBuildMultiThreadedDebug: aMaker - ^self setGlobalOptionsBuild: aMaker - ! Item was removed: - ----- Method: SqueakWin32x86Config>>standardIncludesBuild (in category 'cmake buildType redirects') ----- - standardIncludesBuild - "SqueakMacintoshConfig browse - Not sure what this means on unix or windows" - ^#()! Item was removed: - ----- Method: SqueakWin32x86Config>>standardIncludesBuildAssert (in category 'cmake buildType redirects') ----- - standardIncludesBuildAssert - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakWin32x86Config>>standardIncludesBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - standardIncludesBuildAssertITimerHeartbeat - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakWin32x86Config>>standardIncludesBuildDebug (in category 'cmake buildType redirects') ----- - standardIncludesBuildDebug - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakWin32x86Config>>standardIncludesBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - standardIncludesBuildDebugITimerHeartbeat - ^self standardIncludesBuild - ! Item was removed: - ----- Method: SqueakWin32x86Config>>standardIncludesBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - standardIncludesBuildITimerHeartbeat - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakWin32x86Config>>standardIncludesBuildMultiThreaded (in category 'cmake buildType redirects') ----- - standardIncludesBuildMultiThreaded - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakWin32x86Config>>standardIncludesBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - standardIncludesBuildMultiThreadedAssert - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakWin32x86Config>>standardIncludesBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - standardIncludesBuildMultiThreadedDebug - ^ self standardIncludesBuild! Item was removed: - ----- Method: SqueakWindowsConfig>>commonCompilerFlags (in category 'compiler flags') ----- - commonCompilerFlags - "omit -ggdb2 to prevent generating debug info" - "Some flags explanation: - - STACK_ALIGN_BYTES=16 is needed in mingw and FFI (and I suppose on other modules too). - DALLOCA_LIES_SO_USE_GETSP=0 Some compilers return the stack address+4 on alloca function, - then FFI module needs to adjust that. It is NOT the case of mingw. - For more information see this thread: http://forum.world.st/There-are-something-fishy-with-FFI-plugin-td4584226.h… - " - ^ { - '-march=pentium4'. - '-mwindows'. - '-D_MT'. - '-msse2'. - '-mthreads'. - '-mwin32'. - '-mno-rtd'. - '-mms-bitfields'. - '-mno-accumulate-outgoing-args ', self winVer. - '-DWIN32'. - '-DWIN32_FILE_SUPPORT'. - '-DNO_ISNAN'. - '-DNO_SERVICE'. - '-DNO_STD_FILE_SUPPORT'. - '-DLSB_FIRST'. - '-DVM_NAME="', self executableName,'"'. - '-DX86 '. - '-DSTACK_ALIGN_BYTES=16'. - '-DALLOCA_LIES_SO_USE_GETSP=0'. - '-DENABLE_FAST_BLT ' }! Item was added: + ----- Method: SqueakWindowsConfig>>compilerDefinitions (in category 'compiling') ----- + compilerDefinitions + ^ { + '-D_MT'. + '-DWIN32'. + '-DWIN32_FILE_SUPPORT'. + '-DNO_ISNAN'. + '-DNO_SERVICE'. + '-DNO_STD_FILE_SUPPORT'. + '-DLSB_FIRST'. + '-DVM_NAME="', self executableName,'"'. + '-DX86 '. + '-DSTACK_ALIGN_BYTES=16'. + '-DALLOCA_LIES_SO_USE_GETSP=0'. + '-DENABLE_FAST_BLT ' }! Item was added: + ----- Method: SqueakWindowsConfig>>compilerFlags (in category 'compiling') ----- + compilerFlags + "omit -ggdb2 to prevent generating debug info" + "Some flags explanation: + + STACK_ALIGN_BYTES=16 is needed in mingw and FFI (and I suppose on other modules too). + DALLOCA_LIES_SO_USE_GETSP=0 Some compilers return the stack address+4 on alloca function, + then FFI module needs to adjust that. It is NOT the case of mingw. + For more information see this thread: http://forum.world.st/There-are-something-fishy-with-FFI-plugin-td4584226.h… + " + ^ { + '-march=pentium4'. + '-mwindows'. + '-msse2'. + '-mthreads'. + '-mwin32'. + '-mno-rtd'. + '-mms-bitfields'. + '-mno-accumulate-outgoing-args ', self winVer }! Item was changed: ----- Method: SqueakWindowsConfig>>configureForBuildType: (in category 'cmake configuration') ----- configureForBuildType: aSymbol "Set my internal state appropriate for my build type". self configureNoBuildType. "reset all internal flags" buildType:= aSymbol. "error checking was handled previously" - self - preferredIncludes; - standardIncludes; - " configureFlags; configure --without-npsqueak --with-src=stacksrc --with-plugins=src/plugins --disable-cogi --without-vm-display-fbdev --x-libraries=/usr/lib --without-gl " - compilerFlags; - linkFlags; " LIBS=''-lpthread -luuid''" - internalPlugins; - externalPlugins. ! Item was added: + ----- Method: SqueakWindowsConfig>>customizeVMDrivers (in category 'initialize-release') ----- + customizeVMDrivers + " + SystemNavigation default browseMethodsWhoseNamesContain:'customizeVMDrivers' + + force platform level or lower customization of vm-display-X11 vm-sound-ALSA, etc. + The configurations can select what subset they want using something like this. + + |subset iwantonly| + iwantonly := #(#CMakeVMDisplayNull #CMakeVMDisplayX11 #CMakeVMSoundALSA #CMakeVMSoundNull ). + subset := vmdrivers select: [:vmd | 0 < (iwantonly occurrencesOf: (vmd class name) asSymbol)]. + vmdrivers := subset. + + self + customizeCMakeVMDisplayNull; + customizeCMakeVMDisplayX11; + customizeCMakeVMSoundALSA; + customizeCMakeVMSoundNull + + + + " + self flag:'tty'. "revisit this design strategy" + self subclassResponsibility! Item was added: + ----- Method: SqueakWindowsConfig>>setDirectories: (in category 'cmake') ----- + setDirectories: aMaker + |temp o| + "We could put these inline, but other components include the directories.cmake file. So, we continue that convention" + o := String new writeStream. + temp := OrderedCollection new. + temp + addLast: ((CMakeSet new) variable: 'topDir' quotedValue: (self topDir fullName)); + addLast: ((CMakeSet new) variable: 'buildDir' quotedValue: (self buildDir ifNil: ['${topDir}/build'] ifNotNil: [self buildDir fullName])); + addLast: ((CMakeSet new) variable: 'thirdpartyDir' quotedValue: '${buildDir}/thirdParty'); + addLast: ((CMakeSet new) variable: 'platformsDir' quotedValue: (self platformsDir)); + addLast: ((CMakeSet new) variable: 'srcDir' quotedValue: (self srcDir pathName)); + addLast: ((CMakeSet new) variable: 'srcPluginsDir' quotedValue: (pluginsDir ifNil: [ '${srcDir}/plugins' ])); + addLast: ((CMakeSet new) variable: 'srcVMDir' quotedValue: '${srcDir}/vm'); + addLast: ((CMakeSet new) variable: 'platformName' quotedValue: (self platformName)); + addLast: ((CMakeSet new) variable: 'targetPlatform' quotedValue: '${platformsDir}/${platformName}'); + addLast: ((CMakeSet new) variable: 'crossDir' quotedValue: '${platformsDir}/Cross'); + addLast: ((CMakeSet new) variable: 'platformVMDir' quotedValue: '${targetPlatform}/vm}'); + addLast: ((CMakeSet new) variable: 'outputDir' quotedValue: (self outputDir fullName)); + addLast: ((CMakeSet new) variable: 'externalModulesDir' quotedValue: (self externalModulesDir)). + temp do: [:each | o nextPutAll: (each content); cr]. + self write: (o contents) toFile: 'directories.cmake'. + (enabledebugmessages) + ifTrue:[ + templates + addLast:((CMakeMessage new) message: (self class name), ' setDirectories: aMaker' ) + ]. + templates addLast: ((CMakeInclude new) file: 'directories.cmake'). + + ! Item was added: + ----- Method: SqueakWindowsConfig>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'cmake buildType redirects') ----- + setGlobalOptionsAfterDetermineSystemBuild: aMaker + "Set CMake commands that are common for a this platform'" + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: (self class name), ' setGlobalOptionsAfterDetermineSystemBuild: aMaker'). + ]. + + + + + ! Item was added: + ----- Method: SqueakWindowsConfig>>standardIncludesBuild (in category 'cmake buildType redirects') ----- + standardIncludesBuild + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: (self class name), ' standardIncludesBuild' ) + ]. + + + (enabledebugmessages) + ifTrue:[ + templates + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_PATH = ${CMAKE_INCLUDE_PATH}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_SYSTEM_INCLUDE_PATH = ${CMAKE_SYSTEM_INCLUDE_PATH}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES = ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES = ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = ${CMAKE_FIND_ROOT_PATH_MODE_INCLUDE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE = ${CMAKE_INCLUDE_CURRENT_DIR}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE = ${CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_DIRECTORIES_BEFORE = ${CMAKE_INCLUDE_DIRECTORIES_BEFORE}' ); + addLast: ((CMakeMessage new) message: 'CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE = ${CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE}' ) + ].!

1 0

Re: [Pharo-dev] Memory limit problems on Windows VM
by btc＠openinworld.com 17 Jul '14

17 Jul '14

1 0

[commit][3047] CogVM source as per VMMaker.oscog-eem.824
by commits＠squeakvm.org 17 Jul '14

17 Jul '14

Revision: 3047 Author: eliot Date: 2014-07-16 17:21:34 -0700 (Wed, 16 Jul 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.824 Mark the methods used by SpurMemoryManager>>globalGarbageCollect as inline: #never for profiling. Modified Paths: -------------- branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/interp.h branches/Cog/nsspursrc/vm/vmCallback.h branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/nsspurstacksrc/vm/interp.h branches/Cog/nsspurstacksrc/vm/vmCallback.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/interp.h branches/Cog/spursistasrc/vm/vmCallback.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-07-16 23:23:03 UTC (rev 3046) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-07-17 00:21:34 UTC (rev 3047) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 from - CoInterpreter VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CoInterpreter VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -914,7 +914,7 @@ static sqInt classTagForClass(sqInt classObj) NoDbgRegParms; sqInt classUnsafeAlien(void); sqInt clone(sqInt objOop); -static void compact(void); +static void compact(void) NeverInline; sqInt compactClassIndexOf(sqInt objOop); void countMarkedAndUnmarkdObjects(sqInt printFlags); static sqInt defaultEdenBytes(void); @@ -970,8 +970,8 @@ static sqInt freeListHeadsEmpty(void); static sqInt freeListsObj(void); sqInt freeObject(sqInt objOop); -static void freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact(void); -usqLong fullGC(void); +static void freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact(void) NeverInline; +usqLong fullGC(void) NeverInline; static float getHeapGrowthToSizeGCRatio(void); static sqInt goodContextSize(sqInt oop) NoDbgRegParms; static usqInt growOldSpaceByAtLeast(sqInt minAmmount) NoDbgRegParms; @@ -1058,7 +1058,7 @@ static void markAndTraceObjStackandContents(sqInt stackOrNil, sqInt markAndTraceContents) NoDbgRegParms; void markAndTrace(sqInt objOop); static sqInt markInactiveEphemerons(void); -static void markObjects(void); +static void markObjects(void) NeverInline; static void markWeaklingsAndMarkAndFireEphemerons(void); sqInt maybeSplObj(sqInt index); static sqInt moveARunOfObjectsStartingAtupTo(usqInt startAddress, usqInt limit) NoDbgRegParms; @@ -1066,7 +1066,7 @@ static sqInt newSpaceIsEmpty(void); sqInt nextInSortedFreeListLinkgiven(sqInt freeChunk, sqInt prevFree); sqInt nilObject(void); -static void nilUnmarkedWeaklingSlots(void); +static void nilUnmarkedWeaklingSlots(void) NeverInline; static sqInt noCheckPushonObjStack(sqInt objOop, sqInt objStack) NoDbgRegParms; sqInt nonIndexablePointerFormat(void); static sqInt noUnscannedEphemerons(void); @@ -2303,7 +2303,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.823"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.824"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -44218,6 +44218,7 @@ /* We'd like to use exact fit followed by best or first fit, but it doesn't work well enough in practice. So use pig compact. Fill large free objects starting from low memory with objects taken from the end of memory. */ +/* for profiling */ static void compact(void) @@ -46409,6 +46410,9 @@ usqInt rawNumSlotsAfter; sqInt sweepIndex; + + /* for profiling */ + /* begin checkFreeSpace */ assert(bitsSetInFreeSpaceMaskForAllFreeLists()); assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())); @@ -46588,6 +46592,7 @@ /* Perform a full lazy compacting GC. Answer the size of the largest free chunk. */ +/* for profiling */ usqLong fullGC(void) @@ -48769,6 +48774,7 @@ } +/* for profiling */ /* Mark all accessible objects. */ /* If the incremental collector is running mark bits may be set; stop it and clear them if necessary. @@ -49506,6 +49512,7 @@ /* Nil the unmarked slots in the weaklings on the weakling stack, finalizing those that lost references. Finally, empty the weaklingStack. */ +/* for profiling */ static void nilUnmarkedWeaklingSlots(void) @@ -64185,11 +64192,11 @@ GIV(primFailCode) = reasonCode; value = 0; l6: /* end stObject:at: */; - (!GIV(primFailCode) - ? (/* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value), - (GIV(stackPointer) = sp)) - : 0); + if (!GIV(primFailCode)) { + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp; + } return; } /* begin externalWriteBackHeadFramePointers */ @@ -64519,11 +64526,11 @@ } value; l9: /* end stObject:at:put: */; - (!GIV(primFailCode) - ? (/* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value), - (GIV(stackPointer) = sp)) - : 0); + if (!GIV(primFailCode)) { + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp; + } return; } /* begin externalWriteBackHeadFramePointers */ Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-07-16 23:23:03 UTC (rev 3046) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-07-17 00:21:34 UTC (rev 3047) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 */ Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-07-16 23:23:03 UTC (rev 3046) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-07-17 00:21:34 UTC (rev 3047) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 from - CoInterpreter VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CoInterpreter VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -917,7 +917,7 @@ static sqInt classTagForClass(sqInt classObj) NoDbgRegParms; sqInt classUnsafeAlien(void); sqInt clone(sqInt objOop); -static void compact(void); +static void compact(void) NeverInline; sqInt compactClassIndexOf(sqInt objOop); void countMarkedAndUnmarkdObjects(sqInt printFlags); static sqInt defaultEdenBytes(void); @@ -973,8 +973,8 @@ static sqInt freeListHeadsEmpty(void); static sqInt freeListsObj(void); sqInt freeObject(sqInt objOop); -static void freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact(void); -usqLong fullGC(void); +static void freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact(void) NeverInline; +usqLong fullGC(void) NeverInline; static float getHeapGrowthToSizeGCRatio(void); static sqInt goodContextSize(sqInt oop) NoDbgRegParms; static usqInt growOldSpaceByAtLeast(sqInt minAmmount) NoDbgRegParms; @@ -1061,7 +1061,7 @@ static void markAndTraceObjStackandContents(sqInt stackOrNil, sqInt markAndTraceContents) NoDbgRegParms; void markAndTrace(sqInt objOop); static sqInt markInactiveEphemerons(void); -static void markObjects(void); +static void markObjects(void) NeverInline; static void markWeaklingsAndMarkAndFireEphemerons(void); sqInt maybeSplObj(sqInt index); static sqInt moveARunOfObjectsStartingAtupTo(usqInt startAddress, usqInt limit) NoDbgRegParms; @@ -1069,7 +1069,7 @@ static sqInt newSpaceIsEmpty(void); sqInt nextInSortedFreeListLinkgiven(sqInt freeChunk, sqInt prevFree); sqInt nilObject(void); -static void nilUnmarkedWeaklingSlots(void); +static void nilUnmarkedWeaklingSlots(void) NeverInline; static sqInt noCheckPushonObjStack(sqInt objOop, sqInt objStack) NoDbgRegParms; sqInt nonIndexablePointerFormat(void); static sqInt noUnscannedEphemerons(void); @@ -2306,7 +2306,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.823"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.824"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -44227,6 +44227,7 @@ /* We'd like to use exact fit followed by best or first fit, but it doesn't work well enough in practice. So use pig compact. Fill large free objects starting from low memory with objects taken from the end of memory. */ +/* for profiling */ static void compact(void) @@ -46418,6 +46419,9 @@ usqInt rawNumSlotsAfter; sqInt sweepIndex; + + /* for profiling */ + /* begin checkFreeSpace */ assert(bitsSetInFreeSpaceMaskForAllFreeLists()); assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())); @@ -46597,6 +46601,7 @@ /* Perform a full lazy compacting GC. Answer the size of the largest free chunk. */ +/* for profiling */ usqLong fullGC(void) @@ -48778,6 +48783,7 @@ } +/* for profiling */ /* Mark all accessible objects. */ /* If the incremental collector is running mark bits may be set; stop it and clear them if necessary. @@ -49515,6 +49521,7 @@ /* Nil the unmarked slots in the weaklings on the weakling stack, finalizing those that lost references. Finally, empty the weaklingStack. */ +/* for profiling */ static void nilUnmarkedWeaklingSlots(void) @@ -64194,11 +64201,11 @@ GIV(primFailCode) = reasonCode; value = 0; l6: /* end stObject:at: */; - (!GIV(primFailCode) - ? (/* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value), - (GIV(stackPointer) = sp)) - : 0); + if (!GIV(primFailCode)) { + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp; + } return; } /* begin externalWriteBackHeadFramePointers */ @@ -64528,11 +64535,11 @@ } value; l9: /* end stObject:at:put: */; - (!GIV(primFailCode) - ? (/* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value), - (GIV(stackPointer) = sp)) - : 0); + if (!GIV(primFailCode)) { + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp; + } return; } /* begin externalWriteBackHeadFramePointers */ Modified: branches/Cog/nsspursrc/vm/interp.h =================================================================== --- branches/Cog/nsspursrc/vm/interp.h 2014-07-16 23:23:03 UTC (rev 3046) +++ branches/Cog/nsspursrc/vm/interp.h 2014-07-17 00:21:34 UTC (rev 3047) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nsspursrc/vm/vmCallback.h =================================================================== --- branches/Cog/nsspursrc/vm/vmCallback.h 2014-07-16 23:23:03 UTC (rev 3046) +++ branches/Cog/nsspursrc/vm/vmCallback.h 2014-07-17 00:21:34 UTC (rev 3047) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-07-16 23:23:03 UTC (rev 3046) +++ branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c 2014-07-17 00:21:34 UTC (rev 3047) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.820 uuid: 783c4789-0cac-41f9-9b01-d1930e0fe4d7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 from - StackInterpreter VMMaker.oscog-eem.820 uuid: 783c4789-0cac-41f9-9b01-d1930e0fe4d7 + StackInterpreter VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.820 uuid: 783c4789-0cac-41f9-9b01-d1930e0fe4d7 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -314,7 +314,7 @@ /*** Function Prototypes ***/ -#if defined(PRODUCTION) && !PRODUCTION && defined(__GNUC__) && !defined(NoDbgRegParms) +#if !PRODUCTION && defined(__GNUC__) && !defined(NoDbgRegParms) # define NoDbgRegParms __attribute__ ((regparm (0))) #endif @@ -322,6 +322,16 @@ # define NoDbgRegParms /*empty*/ #endif + + +#if defined(__GNUC__) && !defined(NeverInline) +# define NeverInline __attribute__ ((noinline)) +#endif + +#if !defined(NeverInline) +# define NeverInline /*empty*/ +#endif + sqInt interpret(void); char * cStringOrNullFor(sqInt oop); sqInt failed(void); @@ -658,7 +668,7 @@ sqInt classUnsafeAlien(void); static void clearLeakMapAndMapAccessibleObjects(void); sqInt clone(sqInt objOop); -static void compact(void); +static void compact(void) NeverInline; sqInt compactClassIndexOf(sqInt objOop); void countMarkedAndUnmarkdObjects(sqInt printFlags); static sqInt defaultEdenBytes(void); @@ -714,8 +724,8 @@ static sqInt freeListHeadsEmpty(void); static sqInt freeListsObj(void); sqInt freeObject(sqInt objOop); -static void freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact(void); -usqLong fullGC(void); +static void freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact(void) NeverInline; +usqLong fullGC(void) NeverInline; static float getHeapGrowthToSizeGCRatio(void); static sqInt goodContextSize(sqInt oop) NoDbgRegParms; static usqInt growOldSpaceByAtLeast(sqInt minAmmount) NoDbgRegParms; @@ -801,7 +811,7 @@ static void markAndTraceObjStackandContents(sqInt stackOrNil, sqInt markAndTraceContents) NoDbgRegParms; void markAndTrace(sqInt objOop); static sqInt markInactiveEphemerons(void); -static void markObjects(void); +static void markObjects(void) NeverInline; static void markWeaklingsAndMarkAndFireEphemerons(void); sqInt maybeSplObj(sqInt index); static sqInt moveARunOfObjectsStartingAtupTo(usqInt startAddress, usqInt limit) NoDbgRegParms; @@ -809,7 +819,7 @@ static sqInt newSpaceIsEmpty(void); sqInt nextInSortedFreeListLinkgiven(sqInt freeChunk, sqInt prevFree); sqInt nilObject(void); -static void nilUnmarkedWeaklingSlots(void); +static void nilUnmarkedWeaklingSlots(void) NeverInline; static sqInt noCheckPushonObjStack(sqInt objOop, sqInt objStack) NoDbgRegParms; sqInt nonIndexablePointerFormat(void); static sqInt noUnscannedEphemerons(void); @@ -2044,7 +2054,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.820"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.824"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -32699,6 +32709,7 @@ /* We'd like to use exact fit followed by best or first fit, but it doesn't work well enough in practice. So use pig compact. Fill large free objects starting from low memory with objects taken from the end of memory. */ +/* for profiling */ static void compact(void) @@ -34890,6 +34901,9 @@ usqInt rawNumSlotsAfter; sqInt sweepIndex; + + /* for profiling */ + /* begin checkFreeSpace */ assert(bitsSetInFreeSpaceMaskForAllFreeLists()); assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())); @@ -35069,6 +35083,7 @@ /* Perform a full lazy compacting GC. Answer the size of the largest free chunk. */ +/* for profiling */ usqLong fullGC(void) @@ -37268,6 +37283,7 @@ } +/* for profiling */ /* Mark all accessible objects. */ /* If the incremental collector is running mark bits may be set; stop it and clear them if necessary. @@ -38005,6 +38021,7 @@ /* Nil the unmarked slots in the weaklings on the weakling stack, finalizing those that lost references. Finally, empty the weaklingStack. */ +/* for profiling */ static void nilUnmarkedWeaklingSlots(void) @@ -55669,11 +55686,11 @@ GIV(primFailCode) = reasonCode; value = 0; l6: /* end stObject:at: */; - (!GIV(primFailCode) - ? (/* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value), - (GIV(stackPointer) = sp)) - : 0); + if (!GIV(primFailCode)) { + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp; + } return; } /* begin externalWriteBackHeadFramePointers */ @@ -56000,11 +56017,11 @@ } value; l9: /* end stObject:at:put: */; - (!GIV(primFailCode) - ? (/* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value), - (GIV(stackPointer) = sp)) - : 0); + if (!GIV(primFailCode)) { + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp; + } return; } /* begin externalWriteBackHeadFramePointers */ Modified: branches/Cog/nsspurstacksrc/vm/interp.c =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.c 2014-07-16 23:23:03 UTC (rev 3046) +++ branches/Cog/nsspurstacksrc/vm/interp.c 2014-07-17 00:21:34 UTC (rev 3047) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.820 uuid: 783c4789-0cac-41f9-9b01-d1930e0fe4d7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 from - StackInterpreter VMMaker.oscog-eem.820 uuid: 783c4789-0cac-41f9-9b01-d1930e0fe4d7 + StackInterpreter VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.820 uuid: 783c4789-0cac-41f9-9b01-d1930e0fe4d7 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -311,7 +311,7 @@ /*** Function Prototypes ***/ -#if defined(PRODUCTION) && !PRODUCTION && defined(__GNUC__) && !defined(NoDbgRegParms) +#if !PRODUCTION && defined(__GNUC__) && !defined(NoDbgRegParms) # define NoDbgRegParms __attribute__ ((regparm (0))) #endif @@ -319,6 +319,16 @@ # define NoDbgRegParms /*empty*/ #endif + + +#if defined(__GNUC__) && !defined(NeverInline) +# define NeverInline __attribute__ ((noinline)) +#endif + +#if !defined(NeverInline) +# define NeverInline /*empty*/ +#endif + sqInt interpret(void); char * cStringOrNullFor(sqInt oop); sqInt failed(void); @@ -655,7 +665,7 @@ sqInt classUnsafeAlien(void); static void clearLeakMapAndMapAccessibleObjects(void); sqInt clone(sqInt objOop); -static void compact(void); +static void compact(void) NeverInline; sqInt compactClassIndexOf(sqInt objOop); void countMarkedAndUnmarkdObjects(sqInt printFlags); static sqInt defaultEdenBytes(void); @@ -711,8 +721,8 @@ static sqInt freeListHeadsEmpty(void); static sqInt freeListsObj(void); sqInt freeObject(sqInt objOop); -static void freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact(void); -usqLong fullGC(void); +static void freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact(void) NeverInline; +usqLong fullGC(void) NeverInline; static float getHeapGrowthToSizeGCRatio(void); static sqInt goodContextSize(sqInt oop) NoDbgRegParms; static usqInt growOldSpaceByAtLeast(sqInt minAmmount) NoDbgRegParms; @@ -798,7 +808,7 @@ static void markAndTraceObjStackandContents(sqInt stackOrNil, sqInt markAndTraceContents) NoDbgRegParms; void markAndTrace(sqInt objOop); static sqInt markInactiveEphemerons(void); -static void markObjects(void); +static void markObjects(void) NeverInline; static void markWeaklingsAndMarkAndFireEphemerons(void); sqInt maybeSplObj(sqInt index); static sqInt moveARunOfObjectsStartingAtupTo(usqInt startAddress, usqInt limit) NoDbgRegParms; @@ -806,7 +816,7 @@ static sqInt newSpaceIsEmpty(void); sqInt nextInSortedFreeListLinkgiven(sqInt freeChunk, sqInt prevFree); sqInt nilObject(void); -static void nilUnmarkedWeaklingSlots(void); +static void nilUnmarkedWeaklingSlots(void) NeverInline; static sqInt noCheckPushonObjStack(sqInt objOop, sqInt objStack) NoDbgRegParms; sqInt nonIndexablePointerFormat(void); static sqInt noUnscannedEphemerons(void); @@ -2041,7 +2051,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.820"; +const char *interpreterVersion = "Newspeak Virtual Machine StackInterpreter_VMMaker.oscog-eem.824"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -32690,6 +32700,7 @@ /* We'd like to use exact fit followed by best or first fit, but it doesn't work well enough in practice. So use pig compact. Fill large free objects starting from low memory with objects taken from the end of memory. */ +/* for profiling */ static void compact(void) @@ -34881,6 +34892,9 @@ usqInt rawNumSlotsAfter; sqInt sweepIndex; + + /* for profiling */ + /* begin checkFreeSpace */ assert(bitsSetInFreeSpaceMaskForAllFreeLists()); assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())); @@ -35060,6 +35074,7 @@ /* Perform a full lazy compacting GC. Answer the size of the largest free chunk. */ +/* for profiling */ usqLong fullGC(void) @@ -37259,6 +37274,7 @@ } +/* for profiling */ /* Mark all accessible objects. */ /* If the incremental collector is running mark bits may be set; stop it and clear them if necessary. @@ -37996,6 +38012,7 @@ /* Nil the unmarked slots in the weaklings on the weakling stack, finalizing those that lost references. Finally, empty the weaklingStack. */ +/* for profiling */ static void nilUnmarkedWeaklingSlots(void) @@ -55660,11 +55677,11 @@ GIV(primFailCode) = reasonCode; value = 0; l6: /* end stObject:at: */; - (!GIV(primFailCode) - ? (/* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value), - (GIV(stackPointer) = sp)) - : 0); + if (!GIV(primFailCode)) { + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp; + } return; } /* begin externalWriteBackHeadFramePointers */ @@ -55991,11 +56008,11 @@ } value; l9: /* end stObject:at:put: */; - (!GIV(primFailCode) - ? (/* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value), - (GIV(stackPointer) = sp)) - : 0); + if (!GIV(primFailCode)) { + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp; + } return; } /* begin externalWriteBackHeadFramePointers */ Modified: branches/Cog/nsspurstacksrc/vm/interp.h =================================================================== --- branches/Cog/nsspurstacksrc/vm/interp.h 2014-07-16 23:23:03 UTC (rev 3046) +++ branches/Cog/nsspurstacksrc/vm/interp.h 2014-07-17 00:21:34 UTC (rev 3047) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.820 uuid: 783c4789-0cac-41f9-9b01-d1930e0fe4d7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nsspurstacksrc/vm/vmCallback.h =================================================================== --- branches/Cog/nsspurstacksrc/vm/vmCallback.h 2014-07-16 23:23:03 UTC (rev 3046) +++ branches/Cog/nsspurstacksrc/vm/vmCallback.h 2014-07-17 00:21:34 UTC (rev 3047) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.820 uuid: 783c4789-0cac-41f9-9b01-d1930e0fe4d7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Wed Jul 16 13:05:48 PDT 2014 + Wed Jul 16 17:19:55 PDT 2014 Modified: branches/Cog/spursistasrc/vm/cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.c 2014-07-16 23:23:03 UTC (rev 3046) +++ branches/Cog/spursistasrc/vm/cointerp.c 2014-07-17 00:21:34 UTC (rev 3047) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 from - CoInterpreter VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CoInterpreter VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -911,7 +911,7 @@ static sqInt classTagForClass(sqInt classObj) NoDbgRegParms; sqInt classUnsafeAlien(void); sqInt clone(sqInt objOop); -static void compact(void); +static void compact(void) NeverInline; sqInt compactClassIndexOf(sqInt objOop); void countMarkedAndUnmarkdObjects(sqInt printFlags); static sqInt defaultEdenBytes(void); @@ -967,8 +967,8 @@ static sqInt freeListHeadsEmpty(void); static sqInt freeListsObj(void); sqInt freeObject(sqInt objOop); -static void freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact(void); -usqLong fullGC(void); +static void freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact(void) NeverInline; +usqLong fullGC(void) NeverInline; static float getHeapGrowthToSizeGCRatio(void); static sqInt goodContextSize(sqInt oop) NoDbgRegParms; static usqInt growOldSpaceByAtLeast(sqInt minAmmount) NoDbgRegParms; @@ -1055,7 +1055,7 @@ static void markAndTraceObjStackandContents(sqInt stackOrNil, sqInt markAndTraceContents) NoDbgRegParms; void markAndTrace(sqInt objOop); static sqInt markInactiveEphemerons(void); -static void markObjects(void); +static void markObjects(void) NeverInline; static void markWeaklingsAndMarkAndFireEphemerons(void); sqInt maybeSplObj(sqInt index); static sqInt moveARunOfObjectsStartingAtupTo(usqInt startAddress, usqInt limit) NoDbgRegParms; @@ -1063,7 +1063,7 @@ static sqInt newSpaceIsEmpty(void); sqInt nextInSortedFreeListLinkgiven(sqInt freeChunk, sqInt prevFree); sqInt nilObject(void); -static void nilUnmarkedWeaklingSlots(void); +static void nilUnmarkedWeaklingSlots(void) NeverInline; static sqInt noCheckPushonObjStack(sqInt objOop, sqInt objStack) NoDbgRegParms; sqInt nonIndexablePointerFormat(void); static sqInt noUnscannedEphemerons(void); @@ -2298,7 +2298,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.823]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.824]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -39045,6 +39045,7 @@ /* We'd like to use exact fit followed by best or first fit, but it doesn't work well enough in practice. So use pig compact. Fill large free objects starting from low memory with objects taken from the end of memory. */ +/* for profiling */ static void compact(void) @@ -41236,6 +41237,9 @@ usqInt rawNumSlotsAfter; sqInt sweepIndex; + + /* for profiling */ + /* begin checkFreeSpace */ assert(bitsSetInFreeSpaceMaskForAllFreeLists()); assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())); @@ -41415,6 +41419,7 @@ /* Perform a full lazy compacting GC. Answer the size of the largest free chunk. */ +/* for profiling */ usqLong fullGC(void) @@ -43590,6 +43595,7 @@ } +/* for profiling */ /* Mark all accessible objects. */ /* If the incremental collector is running mark bits may be set; stop it and clear them if necessary. @@ -44327,6 +44333,7 @@ /* Nil the unmarked slots in the weaklings on the weakling stack, finalizing those that lost references. Finally, empty the weaklingStack. */ +/* for profiling */ static void nilUnmarkedWeaklingSlots(void) @@ -58873,11 +58880,11 @@ GIV(primFailCode) = reasonCode; value = 0; l6: /* end stObject:at: */; - (!GIV(primFailCode) - ? (/* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value), - (GIV(stackPointer) = sp)) - : 0); + if (!GIV(primFailCode)) { + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp; + } return; } /* begin externalWriteBackHeadFramePointers */ @@ -59051,7 +59058,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); return; } hdr = long64At(aContext); @@ -59297,7 +59304,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:storing:format: */ @@ -59353,7 +59360,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) { Modified: branches/Cog/spursistasrc/vm/cointerp.h =================================================================== --- branches/Cog/spursistasrc/vm/cointerp.h 2014-07-16 23:23:03 UTC (rev 3046) +++ branches/Cog/spursistasrc/vm/cointerp.h 2014-07-17 00:21:34 UTC (rev 3047) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 */ Modified: branches/Cog/spursistasrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-07-16 23:23:03 UTC (rev 3046) +++ branches/Cog/spursistasrc/vm/gcc3x-cointerp.c 2014-07-17 00:21:34 UTC (rev 3047) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 from - CoInterpreter VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CoInterpreter VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -914,7 +914,7 @@ static sqInt classTagForClass(sqInt classObj) NoDbgRegParms; sqInt classUnsafeAlien(void); sqInt clone(sqInt objOop); -static void compact(void); +static void compact(void) NeverInline; sqInt compactClassIndexOf(sqInt objOop); void countMarkedAndUnmarkdObjects(sqInt printFlags); static sqInt defaultEdenBytes(void); @@ -970,8 +970,8 @@ static sqInt freeListHeadsEmpty(void); static sqInt freeListsObj(void); sqInt freeObject(sqInt objOop); -static void freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact(void); -usqLong fullGC(void); +static void freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact(void) NeverInline; +usqLong fullGC(void) NeverInline; static float getHeapGrowthToSizeGCRatio(void); static sqInt goodContextSize(sqInt oop) NoDbgRegParms; static usqInt growOldSpaceByAtLeast(sqInt minAmmount) NoDbgRegParms; @@ -1058,7 +1058,7 @@ static void markAndTraceObjStackandContents(sqInt stackOrNil, sqInt markAndTraceContents) NoDbgRegParms; void markAndTrace(sqInt objOop); static sqInt markInactiveEphemerons(void); -static void markObjects(void); +static void markObjects(void) NeverInline; static void markWeaklingsAndMarkAndFireEphemerons(void); sqInt maybeSplObj(sqInt index); static sqInt moveARunOfObjectsStartingAtupTo(usqInt startAddress, usqInt limit) NoDbgRegParms; @@ -1066,7 +1066,7 @@ static sqInt newSpaceIsEmpty(void); sqInt nextInSortedFreeListLinkgiven(sqInt freeChunk, sqInt prevFree); sqInt nilObject(void); -static void nilUnmarkedWeaklingSlots(void); +static void nilUnmarkedWeaklingSlots(void) NeverInline; static sqInt noCheckPushonObjStack(sqInt objOop, sqInt objStack) NoDbgRegParms; sqInt nonIndexablePointerFormat(void); static sqInt noUnscannedEphemerons(void); @@ -2301,7 +2301,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.823]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.824]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -39054,6 +39054,7 @@ /* We'd like to use exact fit followed by best or first fit, but it doesn't work well enough in practice. So use pig compact. Fill large free objects starting from low memory with objects taken from the end of memory. */ +/* for profiling */ static void compact(void) @@ -41245,6 +41246,9 @@ usqInt rawNumSlotsAfter; sqInt sweepIndex; + + /* for profiling */ + /* begin checkFreeSpace */ assert(bitsSetInFreeSpaceMaskForAllFreeLists()); assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())); @@ -41424,6 +41428,7 @@ /* Perform a full lazy compacting GC. Answer the size of the largest free chunk. */ +/* for profiling */ usqLong fullGC(void) @@ -43599,6 +43604,7 @@ } +/* for profiling */ /* Mark all accessible objects. */ /* If the incremental collector is running mark bits may be set; stop it and clear them if necessary. @@ -44336,6 +44342,7 @@ /* Nil the unmarked slots in the weaklings on the weakling stack, finalizing those that lost references. Finally, empty the weaklingStack. */ +/* for profiling */ static void nilUnmarkedWeaklingSlots(void) @@ -58882,11 +58889,11 @@ GIV(primFailCode) = reasonCode; value = 0; l6: /* end stObject:at: */; - (!GIV(primFailCode) - ? (/* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value), - (GIV(stackPointer) = sp)) - : 0); + if (!GIV(primFailCode)) { + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp; + } return; } /* begin externalWriteBackHeadFramePointers */ @@ -59060,7 +59067,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); return; } hdr = long64At(aContext); @@ -59306,7 +59313,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:storing:format: */ @@ -59362,7 +59369,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) { Modified: branches/Cog/spursistasrc/vm/interp.h =================================================================== --- branches/Cog/spursistasrc/vm/interp.h 2014-07-16 23:23:03 UTC (rev 3046) +++ branches/Cog/spursistasrc/vm/interp.h 2014-07-17 00:21:34 UTC (rev 3047) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spursistasrc/vm/vmCallback.h =================================================================== --- branches/Cog/spursistasrc/vm/vmCallback.h 2014-07-16 23:23:03 UTC (rev 3046) +++ branches/Cog/spursistasrc/vm/vmCallback.h 2014-07-17 00:21:34 UTC (rev 3047) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2014-07-16 23:23:03 UTC (rev 3046) +++ branches/Cog/spursrc/vm/cointerp.c 2014-07-17 00:21:34 UTC (rev 3047) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 from - CoInterpreter VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CoInterpreter VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -906,7 +906,7 @@ static sqInt classTagForClass(sqInt classObj) NoDbgRegParms; sqInt classUnsafeAlien(void); sqInt clone(sqInt objOop); -static void compact(void); +static void compact(void) NeverInline; sqInt compactClassIndexOf(sqInt objOop); void countMarkedAndUnmarkdObjects(sqInt printFlags); static sqInt defaultEdenBytes(void); @@ -962,8 +962,8 @@ static sqInt freeListHeadsEmpty(void); static sqInt freeListsObj(void); sqInt freeObject(sqInt objOop); -static void freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact(void); -usqLong fullGC(void); +static void freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact(void) NeverInline; +usqLong fullGC(void) NeverInline; static float getHeapGrowthToSizeGCRatio(void); static sqInt goodContextSize(sqInt oop) NoDbgRegParms; static usqInt growOldSpaceByAtLeast(sqInt minAmmount) NoDbgRegParms; @@ -1050,7 +1050,7 @@ static void markAndTraceObjStackandContents(sqInt stackOrNil, sqInt markAndTraceContents) NoDbgRegParms; void markAndTrace(sqInt objOop); static sqInt markInactiveEphemerons(void); -static void markObjects(void); +static void markObjects(void) NeverInline; static void markWeaklingsAndMarkAndFireEphemerons(void); sqInt maybeSplObj(sqInt index); static sqInt moveARunOfObjectsStartingAtupTo(usqInt startAddress, usqInt limit) NoDbgRegParms; @@ -1058,7 +1058,7 @@ static sqInt newSpaceIsEmpty(void); sqInt nextInSortedFreeListLinkgiven(sqInt freeChunk, sqInt prevFree); sqInt nilObject(void); -static void nilUnmarkedWeaklingSlots(void); +static void nilUnmarkedWeaklingSlots(void) NeverInline; static sqInt noCheckPushonObjStack(sqInt objOop, sqInt objStack) NoDbgRegParms; sqInt nonIndexablePointerFormat(void); static sqInt noUnscannedEphemerons(void); @@ -2292,7 +2292,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.823]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.824]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -38818,6 +38818,7 @@ /* We'd like to use exact fit followed by best or first fit, but it doesn't work well enough in practice. So use pig compact. Fill large free objects starting from low memory with objects taken from the end of memory. */ +/* for profiling */ static void compact(void) @@ -41009,6 +41010,9 @@ usqInt rawNumSlotsAfter; sqInt sweepIndex; + + /* for profiling */ + /* begin checkFreeSpace */ assert(bitsSetInFreeSpaceMaskForAllFreeLists()); assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())); @@ -41188,6 +41192,7 @@ /* Perform a full lazy compacting GC. Answer the size of the largest free chunk. */ +/* for profiling */ usqLong fullGC(void) @@ -43363,6 +43368,7 @@ } +/* for profiling */ /* Mark all accessible objects. */ /* If the incremental collector is running mark bits may be set; stop it and clear them if necessary. @@ -44100,6 +44106,7 @@ /* Nil the unmarked slots in the weaklings on the weakling stack, finalizing those that lost references. Finally, empty the weaklingStack. */ +/* for profiling */ static void nilUnmarkedWeaklingSlots(void) @@ -58610,11 +58617,11 @@ GIV(primFailCode) = reasonCode; value = 0; l6: /* end stObject:at: */; - (!GIV(primFailCode) - ? (/* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value), - (GIV(stackPointer) = sp)) - : 0); + if (!GIV(primFailCode)) { + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp; + } return; } /* begin externalWriteBackHeadFramePointers */ @@ -58788,7 +58795,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } hdr = long64At(aContext); @@ -58944,11 +58951,11 @@ } value; l9: /* end stObject:at:put: */; - (!GIV(primFailCode) - ? (/* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value), - (GIV(stackPointer) = sp)) - : 0); + if (!GIV(primFailCode)) { + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp; + } return; } /* begin externalWriteBackHeadFramePointers */ @@ -59034,7 +59041,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:storing:format: */ @@ -59090,7 +59097,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } if ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())) { Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2014-07-16 23:23:03 UTC (rev 3046) +++ branches/Cog/spursrc/vm/cointerp.h 2014-07-17 00:21:34 UTC (rev 3047) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 */ Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-07-16 23:23:03 UTC (rev 3046) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-07-17 00:21:34 UTC (rev 3047) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 from - CoInterpreter VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CoInterpreter VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -909,7 +909,7 @@ static sqInt classTagForClass(sqInt classObj) NoDbgRegParms; sqInt classUnsafeAlien(void); sqInt clone(sqInt objOop); -static void compact(void); +static void compact(void) NeverInline; sqInt compactClassIndexOf(sqInt objOop); void countMarkedAndUnmarkdObjects(sqInt printFlags); static sqInt defaultEdenBytes(void); @@ -965,8 +965,8 @@ static sqInt freeListHeadsEmpty(void); static sqInt freeListsObj(void); sqInt freeObject(sqInt objOop); -static void freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact(void); -usqLong fullGC(void); +static void freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact(void) NeverInline; +usqLong fullGC(void) NeverInline; static float getHeapGrowthToSizeGCRatio(void); static sqInt goodContextSize(sqInt oop) NoDbgRegParms; static usqInt growOldSpaceByAtLeast(sqInt minAmmount) NoDbgRegParms; @@ -1053,7 +1053,7 @@ static void markAndTraceObjStackandContents(sqInt stackOrNil, sqInt markAndTraceContents) NoDbgRegParms; void markAndTrace(sqInt objOop); static sqInt markInactiveEphemerons(void); -static void markObjects(void); +static void markObjects(void) NeverInline; static void markWeaklingsAndMarkAndFireEphemerons(void); sqInt maybeSplObj(sqInt index); static sqInt moveARunOfObjectsStartingAtupTo(usqInt startAddress, usqInt limit) NoDbgRegParms; @@ -1061,7 +1061,7 @@ static sqInt newSpaceIsEmpty(void); sqInt nextInSortedFreeListLinkgiven(sqInt freeChunk, sqInt prevFree); sqInt nilObject(void); -static void nilUnmarkedWeaklingSlots(void); +static void nilUnmarkedWeaklingSlots(void) NeverInline; static sqInt noCheckPushonObjStack(sqInt objOop, sqInt objStack) NoDbgRegParms; sqInt nonIndexablePointerFormat(void); static sqInt noUnscannedEphemerons(void); @@ -2295,7 +2295,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.823]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.824]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -38827,6 +38827,7 @@ /* We'd like to use exact fit followed by best or first fit, but it doesn't work well enough in practice. So use pig compact. Fill large free objects starting from low memory with objects taken from the end of memory. */ +/* for profiling */ static void compact(void) @@ -41018,6 +41019,9 @@ usqInt rawNumSlotsAfter; sqInt sweepIndex; + + /* for profiling */ + /* begin checkFreeSpace */ assert(bitsSetInFreeSpaceMaskForAllFreeLists()); assert(GIV(totalFreeOldSpace) == (totalFreeListBytes())); @@ -41197,6 +41201,7 @@ /* Perform a full lazy compacting GC. Answer the size of the largest free chunk. */ +/* for profiling */ usqLong fullGC(void) @@ -43372,6 +43377,7 @@ } +/* for profiling */ /* Mark all accessible objects. */ /* If the incremental collector is running mark bits may be set; stop it and clear them if necessary. @@ -44109,6 +44115,7 @@ /* Nil the unmarked slots in the weaklings on the weakling stack, finalizing those that lost references. Finally, empty the weaklingStack. */ +/* for profiling */ static void nilUnmarkedWeaklingSlots(void) @@ -58619,11 +58626,11 @@ GIV(primFailCode) = reasonCode; value = 0; l6: /* end stObject:at: */; - (!GIV(primFailCode) - ? (/* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value), - (GIV(stackPointer) = sp)) - : 0); + if (!GIV(primFailCode)) { + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp; + } return; } /* begin externalWriteBackHeadFramePointers */ @@ -58797,7 +58804,7 @@ index = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aContext = longAt(GIV(stackPointer) + (2 * BytesPerWord)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } hdr = long64At(aContext); @@ -58953,11 +58960,11 @@ } value; l9: /* end stObject:at:put: */; - (!GIV(primFailCode) - ? (/* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value), - (GIV(stackPointer) = sp)) - : 0); + if (!GIV(primFailCode)) { + /* begin pop:thenPush: */ @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.824.mcz
by commits＠source.squeak.org 17 Jul '14

17 Jul '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.824.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.824 Author: eem Time: 16 July 2014, 5:15:47.231 pm UUID: 2f058f16-c0e9-4231-b14a-fe2dadb19735 Ancestors: VMMaker.oscog-eem.823 Mark the methods used by globalGarbageCollect as inline: #never for profiling. Fix some Slang conflicting return type translation complaints =============== Diff against VMMaker.oscog-eem.823 =============== Item was changed: ----- Method: InterpreterPrimitives>>primitiveFullGC (in category 'memory space primitives') ----- primitiveFullGC "Do a full garbage collection. In SqueakV3ObjectMemory, answer the number of bytes available (including swap space if dynamic memory management is supported). In Spur, answer the size of the largest free chunk." objectMemory hasSpurMemoryManagerAPI ifTrue: + [self pop: 1 thenPushInteger: objectMemory fullGC. + ^self]. - [^self pop: 1 thenPushInteger: objectMemory fullGC]. objectMemory fullGCLock > 0 ifTrue: [^self primitiveFailFor: PrimErrInappropriate]. objectMemory incrementalGC. "maximimize space for forwarding table" objectMemory fullGC. self pop: 1 thenPushInteger: (objectMemory bytesLeft: true)! Item was changed: ----- Method: SpurMemoryManager>>compact (in category 'compaction') ----- compact "We'd like to use exact fit followed by best or first fit, but it doesn't work well enough in practice. So use pig compact. Fill large free objects starting from low memory with objects taken from the end of memory." + <inline: #never> "for profiling" - <inline: false> statCompactPassCount := statCompactPassCount + 1. self assert: (firstFreeChunk = 0 or: [self isFreeObject: firstFreeChunk]). 1 to: 3 do: [:i| self pigCompact. self eliminateAndFreeForwardersForPigCompact]. "The free lists are zeroed in freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact. They should still be zero here" self assert: self freeListHeadsEmpty. self rebuildFreeListsForPigCompact! Item was changed: ----- Method: SpurMemoryManager>>freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact (in category 'gc - global') ----- freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact "Sweep all of old space, freeing unmarked objects, coalescing free chunks, and sorting free space. Doubly-link the free chunks in address order through the freeChunkNextIndex field using the xor trick to use only one field, see e.g. The Art of Computer Programming, Vol 1, D.E. Knuth, 3rd Ed, Sec 2.2.4 `Circular Lists', exercise. 18 http://en.wikipedia.org/wiki/XOR_linked_list. Record the lowest free object in firstFreeChunk and the highest in lastFreeChunk. Let the segmentManager mark which segments contain pinned objects via notePinned:." | prevPrevFree prevFree | + <inline: #never> "for profiling" - <inline: false> self checkFreeSpace. scavenger forgetUnmarkedRememberedObjects. self doScavenge: MarkOnTenure. segmentManager prepareForGlobalSweep."for notePinned:" "throw away the list heads, including the tree." self resetFreeListHeads. firstFreeChunk := prevPrevFree := prevFree := 0. self allOldSpaceEntitiesForCoalescingFrom: self firstObject do: [:o| self assert: (firstFreeChunk = 0 or: [self isFreeObject: firstFreeChunk]). (self isMarked: o) ifTrue: "forwarders should have been followed in markAndTrace:" [self assert: (self isForwarded: o) not. self setIsMarkedOf: o to: false. "this will unmark bridges. undo the damage in notePinned:" (self isPinned: o) ifTrue: [segmentManager notePinned: o]] ifFalse: "unmarked; two cases, an unreachable object or a free chunk." [| here | self assert: (self isRemembered: o) not. "scavenger should have cleared this above" here := self coallesceFreeChunk: o. self setObjectFree: here. self inSortedFreeListLink: prevFree to: here given: prevPrevFree. prevPrevFree := prevFree. prevFree := here]]. prevFree ~= firstFreeChunk ifTrue: [self storePointer: self freeChunkNextIndex ofFreeChunk: prevFree withValue: prevPrevFree]. lastFreeChunk := prevFree. self inSortedFreeListLink: lastFreeChunk to: 0 given: prevPrevFree. self assert: self checkTraversableSortedFreeList! Item was changed: ----- Method: SpurMemoryManager>>fullGC (in category 'gc - global') ----- fullGC "Perform a full lazy compacting GC. Answer the size of the largest free chunk." <returnTypeC: #usqLong> + <inline: #never> "for profiling" - <inline: false> needGCFlag := false. gcStartUsecs := self ioUTCMicrosecondsNow. statMarkCount := 0. coInterpreter preGCAction: GCModeFull. self globalGarbageCollect. coInterpreter postGCAction: GCModeFull. statFullGCs := statFullGCs + 1. statGCEndUsecs := self ioUTCMicrosecondsNow. statFullGCUsecs := statFullGCUsecs + (statGCEndUsecs - gcStartUsecs). ^(freeLists at: 0) ~= 0 ifTrue: [self bytesInObject: self findLargestFreeChunk] ifFalse: [0]! Item was changed: ----- Method: SpurMemoryManager>>globalGarbageCollect (in category 'gc - global') ----- globalGarbageCollect + <inline: true> "inline into fullGC" self cCode: [] inSmalltalk: [self halt: 'GC number ', statFullGCs printString]. self assert: self validObjStacks. self assert: (self isEmptyObjStack: markStack). self assert: (self isEmptyObjStack: weaklingStack). self markObjects. self expungeDuplicateAndUnmarkedClasses: true. self nilUnmarkedWeaklingSlots. self freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact. "Mid-way the leak check must be more lenient. Unmarked classes will have been expunged from the table, but unmarked instances will not yet have been reclaimed." self runLeakCheckerForFullGC: true excludeUnmarkedNewSpaceObjs: true classIndicesShouldBeValid: true. self compact. self setHeapSizeAtPreviousGC. self assert: self validObjStacks. self assert: (self isEmptyObjStack: markStack). self assert: (self isEmptyObjStack: weaklingStack). self assert: self allObjectsUnmarked. self runLeakCheckerForFullGC: true! Item was changed: ----- Method: SpurMemoryManager>>markObjects (in category 'gc - global') ----- markObjects + <inline: #never> "for profiling" - <inline: false> "Mark all accessible objects." "If the incremental collector is running mark bits may be set; stop it and clear them if necessary." self cCode: '' inSmalltalk: [coInterpreter transcript nextPutAll: 'marking...'; flush]. self runLeakCheckerForFullGC: true. self ensureAllMarkBitsAreZero. self ensureAdequateClassTableBitmap. self initializeUnscannedEphemerons. self initializeMarkStack. self initializeWeaklingStack. self markAccessibleObjects! Item was changed: ----- Method: SpurMemoryManager>>nilUnmarkedWeaklingSlots (in category 'weakness and ephemerality') ----- nilUnmarkedWeaklingSlots "Nil the unmarked slots in the weaklings on the weakling stack, finalizing those that lost references. Finally, empty the weaklingStack." + <inline: #never> "for profiling" - <inline: false> self cCode: '' inSmalltalk: [coInterpreter transcript nextPutAll: 'nilling...'; flush]. self assert: self allOldMarkedWeakObjectsOnWeaklingStack. weaklingStack = nilObj ifTrue: [^self]. self objStack: weaklingStack from: 0 do: [:weakling| | anyUnmarked | anyUnmarked := self nilUnmarkedWeaklingSlotsIn: weakling. anyUnmarked ifTrue: [coInterpreter signalFinalization: weakling]]. self emptyObjStack: weaklingStack! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveContextAt (in category 'indexing primitives') ----- primitiveContextAt "Special version of primitiveAt for accessing contexts. Written to be varargs for use from mirror primitives." | index value aContext spouseFP hdr fmt totalLength fixedFields stSize | <inline: false> <var: #spouseFP type: #'char *'> index := self stackTop. (objectMemory isIntegerObject: index) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. index := objectMemory integerValueOf: index. aContext := self stackValue: 1. "Duplicating much of stObject:at:put: here allows stObject:at:put: to omit tests for contexts." hdr := objectMemory baseHeader: aContext. (objectMemory isContextHeader: hdr) ifFalse: "might be an instance of a subclass" [value := self stObject: aContext at: index. + self successful ifTrue: + [self pop: argumentCount + 1 thenPush: value]. + ^self]. - ^self successful ifTrue: - [self pop: argumentCount + 1 thenPush: value]]. self externalWriteBackHeadFramePointers. (self isStillMarriedContext: aContext) ifFalse: [fmt := objectMemory formatOfHeader: hdr. totalLength := objectMemory lengthOf: aContext baseHeader: hdr format: fmt. fixedFields := objectMemory fixedFieldsOf: aContext format: fmt length: totalLength. stSize := self fetchStackPointerOf: aContext. (index between: 1 and: stSize) ifFalse: [^self primitiveFailFor: PrimErrBadIndex]. value := self subscript: aContext with: (index + fixedFields) format: fmt. + self pop: argumentCount + 1 thenPush: value. + ^self]. - ^self pop: argumentCount + 1 thenPush: value]. spouseFP := self frameOfMarriedContext: aContext. (index between: 1 and: (self stackPointerIndexForFrame: spouseFP)) ifFalse: [^self primitiveFailFor: PrimErrBadIndex]. value := self temporary: index - 1 in: spouseFP. self pop: argumentCount + 1 thenPush: value! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveContextAtPut (in category 'indexing primitives') ----- primitiveContextAtPut "Special version of primitiveAtPut for accessing contexts. Written to be varargs for use from mirror primitives." | index value aContext spouseFP hdr fmt totalLength fixedFields stSize | <inline: false> <var: #spouseFP type: #'char *'> value := self stackTop. index := self stackValue: 1. aContext := self stackValue: 2. (objectMemory isIntegerObject: index) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. "Duplicating much of stObject:at:put: here allows stObject:at:put: to omit tests for contexts." hdr := objectMemory baseHeader: aContext. index := objectMemory integerValueOf: index. (objectMemory isContextHeader: hdr) ifFalse: "might be an instance of a subclass" [self stObject: aContext at: index put: value. + self successful ifTrue: + [self pop: argumentCount + 1 thenPush: value]. + ^self]. - ^self successful ifTrue: - [self pop: argumentCount + 1 thenPush: value]]. self externalWriteBackHeadFramePointers. (self isStillMarriedContext: aContext) ifFalse: [fmt := objectMemory formatOfHeader: hdr. totalLength := objectMemory lengthOf: aContext baseHeader: hdr format: fmt. fixedFields := objectMemory fixedFieldsOf: aContext format: fmt length: totalLength. stSize := self fetchStackPointerOf: aContext. (index between: 1 and: stSize) ifFalse: [^self primitiveFailFor: PrimErrBadIndex]. self subscript: aContext with: (index + fixedFields) storing: value format: fmt. + self pop: argumentCount + 1 thenPush: value. + ^self]. - ^self pop: argumentCount + 1 thenPush: value]. spouseFP := self frameOfMarriedContext: aContext. (index between: 1 and: (self stackPointerIndexForFrame: spouseFP)) ifFalse: [^self primitiveFailFor: PrimErrBadIndex]. self temporary: index - 1 in: spouseFP put: value. self pop: argumentCount + 1 thenPush: value!

1 0

[commit][3046] add files to make the GdbArmPlugin unde linux; can' t actually add them to 'cross' because of permissions so this is best we can do for now
by commits＠squeakvm.org 17 Jul '14

17 Jul '14

Revision: 3046 Author: rowledge Date: 2014-07-16 16:23:03 -0700 (Wed, 16 Jul 2014) Log Message: ----------- add files to make the GdbArmPlugin unde linux; can't actually add them to 'cross' because of permissions so this is best we can do for now Added Paths: ----------- branches/Cog/platforms/unix/plugins/GdbARMPlugin/GdbARMPlugin.h branches/Cog/platforms/unix/plugins/GdbARMPlugin/HowToBuild branches/Cog/platforms/unix/plugins/GdbARMPlugin/Makefile branches/Cog/platforms/unix/plugins/GdbARMPlugin/Makefile.unix branches/Cog/platforms/unix/plugins/GdbARMPlugin/Makefile.win32 branches/Cog/platforms/unix/plugins/GdbARMPlugin/README branches/Cog/platforms/unix/plugins/GdbARMPlugin/armulmem.c branches/Cog/platforms/unix/plugins/GdbARMPlugin/sqGdbARMPlugin.c Added: branches/Cog/platforms/unix/plugins/GdbARMPlugin/GdbARMPlugin.h =================================================================== --- branches/Cog/platforms/unix/plugins/GdbARMPlugin/GdbARMPlugin.h (rev 0) +++ branches/Cog/platforms/unix/plugins/GdbARMPlugin/GdbARMPlugin.h 2014-07-16 23:23:03 UTC (rev 3046) @@ -0,0 +1,74 @@ +/* heavily based on BochsIA32Plugin.h */ +/* Bochs seems to use error code 1 for execution errors. + * So we use > 1 for various errors + */ + +/* TPR - added MemoryWriteBoundsError */ +#define NoError 0 +#define ExecutionError 1 +#define BadCPUInstance 2 +#define MemoryLoadBoundsError 3 +#define MemoryWriteBoundsError 4 +#define InstructionPrefetchError 5 +#define PanicError 6 +#define UnsupportedOperationError 7 +#define SomethingLoggedError 8 + +// TPR - The library is compiled with TFlag, therefore, we also need to set it. +#define MODET + +#if !defined(ulong) +typedef unsigned long ulong; +#endif + +extern ulong minReadAddress, minWriteAddress; +extern int gdb_log_printf(void* stream, const char * format, ...); + + +/* + * Answer a pointer to a new ARMulator CPU (an instance of typedef ARMul_State) + */ +extern void *newCPU(); +/* + * reset the cpu to register contents 0, protected 32-bit mode. + */ +extern int resetCPU(void *cpu); +/* + * Single-step *cpu (an ARMul_state instance) using memory as its memory. + * Answer 0 on success, or an integer error code if something went awry. + */ +extern int singleStepCPUInSizeMinAddrReadWrite(void *cpu, void *memory, + ulong byteSize, ulong minReadAddr, ulong minWriteAddr); +/* + * Run *cpu (an ARMul_state instance) using memory as its memory. + * Answer an integer error code when the processor hits some exception. + * Answer 0 when it is interrupted. + */ +extern int runCPUInSizeMinAddrReadWrite(void *cpu, void *memory, + ulong byteSize, ulong minReadAddr, ulong minWriteAddr); +/* + * Flush any icache entries from start to end + */ +extern void flushICacheFromTo(void *cpu, ulong strt, ulong nd); +/* + * force runCPUInSize to exit asap. Used by interrupts. + */ +extern void forceStopRunning(); +/* + * The previous entry in the interruptCheckChain so forceStopRunning can chain. + */ +extern void (*prevInterruptCheckChain)(); +/* + * Disassemble the instruction at address in memory, writing the output to the + * log. + */ +extern int disassembleForAtInSize(void *cpu, ulong laddr, + void *memory, ulong byteSize); +/* + * The saved error if the previous singleStepIn failed. + */ +extern int errorAcorn(); +/* + * The current log (if singleStep failed with SomethingLoggedError). + */ +extern char *getlog(long *len); Property changes on: branches/Cog/platforms/unix/plugins/GdbARMPlugin/GdbARMPlugin.h ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/platforms/unix/plugins/GdbARMPlugin/HowToBuild =================================================================== --- branches/Cog/platforms/unix/plugins/GdbARMPlugin/HowToBuild (rev 0) +++ branches/Cog/platforms/unix/plugins/GdbARMPlugin/HowToBuild 2014-07-16 23:23:03 UTC (rev 3046) @@ -0,0 +1,81 @@ +Building the GdbARMPlugin +------------------------------ + +Build the normal VM on your Platform. Consult Cog/{cygwinbuild|unixbuild|macbuild}/HowToBuild +for additional information. +When generating sources, update to the latest +versions of Cog and VMMaker.oscog. +You might want/need to change VMMaker +class>generateSqueakCogVM to point to the right +directories and remove FT2Plugin from the plugin- +list (even if skipped, generates a messageNotUnderstood). +You can also change VMMaker>plugins:do: removing +the return in the false block, in order to skip +when a plugin is not found, instead of aborting +the generation process. + +Building on Windows +------------------------------ +(so far tried with Windows 7 64bit unsing mingw/MSYS 32bit) + +Besides the normal build environment, you need the package gettext. +Also, downgrade your mingwrt package to 3.20 (not 3.20-2) by unpacking +the respective -dev tarball into your mingw-folder. + +When compiling the Squeak VM you need a version 3 gcc/g++. +For configuration of gdb, you need a version 4 gcc (you don't need +to switch g++). For switching between compilers in mingw, +you may use + mingw-get install/remove gcc/gcc-v3/g++/gcc-v3-g++. + +Compile gdb/bfd and gdb/opcodes with a gcc 4.*. + cd <gdb>/bfd + ./configure --enable-targets=arm-linux + make + cd <gdb>/opcodes + ./configure --enable-targets=arm-linux + make +Then switch to gcc-v3. + cd <gdb>/bfd + make clean && make + cd <gdb>/opcodes + make clean && make + +For libsim.a, the gcc version is not important. + cd sim/common + ./configure + cd ../arm + ./configure && make libsim.a + +Change Makefile.win32 to point to your gdb folder. +Then copy the plugin files to your svn-checkout, +for example changing <plugin>/Makefile and running it. +Change <cog>/cygwinbuild/plugins.ext to include GdbARMPlugin. +Change to gcc 3, then build the VM (again). + +Building on Linux +------------------------------ +(so far tried on Ubuntu 12.04 LTS 32bit) + +Download the gdb sources (http://ftp.gnu.org/gnu/gdb) and +unpack them. Change Makefile and Makefile.unix, setting +GDBBUILDFOLDER to the correct place. + +Compile libopcodes.a: + cd GDBBUILDFOLDER + ./configure --enable-targets=arm-linux +Making gdb takes quite some time. It may fail, as long as +it generates <gdb>/bfd/bfd.h and <gdb>/opcodes/libopcodes.a. + make +Compile libsim.a + cd sim/common + ./configure + cd ../arm + ./configure + make +Ensure libsim.a exists in <gdb>/sim/arm. + +Make the plugin which just copies the plugin-files +to the appropriate directories. Then change +Cog/unixbuild/bld/plugins.ext to include GdbARMPlugin. +Build the VM (again). Property changes on: branches/Cog/platforms/unix/plugins/GdbARMPlugin/HowToBuild ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/platforms/unix/plugins/GdbARMPlugin/Makefile =================================================================== --- branches/Cog/platforms/unix/plugins/GdbARMPlugin/Makefile (rev 0) +++ branches/Cog/platforms/unix/plugins/GdbARMPlugin/Makefile 2014-07-16 23:23:03 UTC (rev 3046) @@ -0,0 +1,26 @@ +# edit this to suit your system; it really ought to use relative paths +# or some other convenience +GDBBUILDFOLDER = /home/tim/Documents/Raspbian-Cog/gdb-arm/gdb-7.6 + +CC = gcc +CFLAGS = -I$(GBDBUILDFOLDER)/bfd +LDFLAGS = $(GDBBUILDFOLDER)/sim/arm/libsim.a $(GDBBUILDFOLDER)/opcodes/libopcodes.a -lbfd -lintl -liberty -Wl,-wrap,ARMul_OSHandleSWI -L$(GDBBUILDFOLDER)/bfd/ +SHAREDLIBRARYFLAGS = + +all: +# another test on linux: +# $(CC) $(CFLAGS) armulmem.c -c -I$(GDBBUILDFOLDER)/sim/arm/ -I$(GDBBUILDFOLDER)/include/ +# $(CC) $(CFLAGS) sqGdbARMPlugin.c -c -fPIC -I$(GDBBUILDFOLDER)/sim/arm/ -I$(GDBBUILDFOLDER)/include/ -I$(GDBBUILDFOLDER)/bfd/ +# $(CC) -shared $(SHAREDLIBRARYFLAGS) -o GdbARMPlugin.dll sqGdbARMPlugin.o armulmem.o $(LDFLAGS) + + mkdir -p ../cog/platforms/Cross/plugins/GdbARMPlugin + mkdir -p ../cog/platforms/win32/plugins/GdbARMPlugin + mkdir -p ../cog/platforms/unix/plugins/GdbARMPlugin + + cp sqGdbARMPlugin.c GdbARMPlugin.h armulmem.c ../cog/platforms/Cross/plugins/GdbARMPlugin/ + cp Makefile.win32 ../cog/platforms/win32/plugins/GdbARMPlugin/Makefile + cp Makefile.unix ../cog/platforms/unix/plugins/GdbARMPlugin/Makefile.inc +#unix +# cd ../cog/unixbuild/bld; make install #prefix= +#windows + cd ../cog/cygwinbuild/;make Property changes on: branches/Cog/platforms/unix/plugins/GdbARMPlugin/Makefile ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/platforms/unix/plugins/GdbARMPlugin/Makefile.unix =================================================================== --- branches/Cog/platforms/unix/plugins/GdbARMPlugin/Makefile.unix (rev 0) +++ branches/Cog/platforms/unix/plugins/GdbARMPlugin/Makefile.unix 2014-07-16 23:23:03 UTC (rev 3046) @@ -0,0 +1,12 @@ +# edit this to suit your system; it really ought to use relative paths +# or some other convenience +GDBBUILDFOLDER = /mnt/hgfs/tim/Documents/Squeak/Raspbian-Cog/gdb-arm/gdb-7.6 +XCFLAGS = -m32 -DNEED_UI_LOOP_HOOK + +XINCLUDES += -I$(GDBBUILDFOLDER)/sim/arm +XINCLUDES := -I$(GDBBUILDFOLDER)/bfd $(XINCLUDES) + +XLDFLAGS= $(GDBBUILDFOLDER)/sim/arm/libsim.a \ + $(GDBBUILDFOLDER)/opcodes/libopcodes.a \ + -lbfd -liberty \ + -Wl,-wrap,ARMul_OSHandleSWI Property changes on: branches/Cog/platforms/unix/plugins/GdbARMPlugin/Makefile.unix ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/platforms/unix/plugins/GdbARMPlugin/Makefile.win32 =================================================================== --- branches/Cog/platforms/unix/plugins/GdbARMPlugin/Makefile.win32 (rev 0) +++ branches/Cog/platforms/unix/plugins/GdbARMPlugin/Makefile.win32 2014-07-16 23:23:03 UTC (rev 3046) @@ -0,0 +1,13 @@ +GDBBUILDFOLDER = /d/Programming/cog/gdb + +LINK_WITH_GPP := yes +EXTRALIBS:= -L$(GDBBUILDFOLDER)/opcodes \ + -L$(GDBBUILDFOLDER)/sim/arm \ + -lsim -lopcodes -lbfd -lintl -liberty -Wl,-wrap,ARMul_OSHandleSWI + +include ../../Makefile.plugin + +INCLUDES:= $(INCLUDES) -I$(GDBBUILDFOLDER)/sim/arm + +# Copy libgcc_s_dw2-1.dll, libiconv-2.dll and libintl-8.dll from your MinGW/bin +# folder to the VM folder, to make it work on other Windows (7?) systems Property changes on: branches/Cog/platforms/unix/plugins/GdbARMPlugin/Makefile.win32 ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/platforms/unix/plugins/GdbARMPlugin/README =================================================================== Added: branches/Cog/platforms/unix/plugins/GdbARMPlugin/armulmem.c =================================================================== --- branches/Cog/platforms/unix/plugins/GdbARMPlugin/armulmem.c (rev 0) +++ branches/Cog/platforms/unix/plugins/GdbARMPlugin/armulmem.c 2014-07-16 23:23:03 UTC (rev 3046) @@ -0,0 +1,508 @@ +/* + This file is a compy of armvirt.c, which is part of the ARMulator distributed e.g. with gdb and skyeye. + In order to overwrite GetWord and PutWord, I (lars wasserman) had to copy the whole file and alter the Make to use it instead of the default ARM armvirt.c. + Also changed: ReLoadInstr. + TPR - changed the errors returned in PutWord & GetWord to discriminate between read & write bounds errors for better simulation + TPR - changed Get/PutWord to ensure address used is an actual word address ie bottom two bits are zeros. Without that, fetching bytes becomes... fun +*/ +#include "GdbARMPlugin.h" + +/* armvirt.c -- ARMulator virtual memory interace: ARM6 Instruction Emulator. + Copyright (C) 1994 Advanced RISC Machines Ltd. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* This file contains a complete ARMulator memory model, modelling a +"virtual memory" system. A much simpler model can be found in armfast.c, +and that model goes faster too, but has a fixed amount of memory. This +model's memory has 64K pages, allocated on demand from a 64K entry page +table. The routines PutWord and GetWord implement this. Pages are never +freed as they might be needed again. A single area of memory may be +defined to generate aborts. */ + +#include "armopts.h" +#include "armos.h" +#include "armdefs.h" +#include "ansidecl.h" + +#ifdef VALIDATE /* for running the validate suite */ +#define TUBE 48 * 1024 * 1024 /* write a char on the screen */ +#define ABORTS 1 +#endif + +/* #define ABORTS */ + +#ifdef ABORTS /* the memory system will abort */ +/* For the old test suite Abort between 32 Kbytes and 32 Mbytes + For the new test suite Abort between 8 Mbytes and 26 Mbytes */ +/* #define LOWABORT 32 * 1024 +#define HIGHABORT 32 * 1024 * 1024 */ +#define LOWABORT 8 * 1024 * 1024 +#define HIGHABORT 26 * 1024 * 1024 + +#endif + +#define NUMPAGES 64 * 1024 +#define PAGESIZE 64 * 1024 +#define PAGEBITS 16 +#define OFFSETBITS 0xffff + +int SWI_vector_installed = FALSE; + +#include <stdio.h> + +/***************************************************************************\ +* Get a Word from Memory * +\***************************************************************************/ + +static ARMword +GetWord (ARMul_State * state, ARMword address, int check) +{ + if(address < minReadAddress || address + 4 > (state->MemSize)) + { + //raise memory access error + state->EndCondition = MemoryLoadBoundsError; + state->Emulate = FALSE; + gdb_log_printf(NULL, "Illegal memory read at %#p. ", address); + return 0; + } + else + { + return *((ARMword*) (state->MemDataPtr + (address & ~3))); + } +} + +/***************************************************************************\ +* Put a Word into Memory * +\***************************************************************************/ + +static void +PutWord (ARMul_State * state, ARMword address, ARMword data, int check) +{ + if(address < minWriteAddress || address + 4 > (state->MemSize)) + { + state->Emulate = FALSE; + state->EndCondition = MemoryWriteBoundsError; + gdb_log_printf(NULL, "Illegal memory write at %#p. ", address); + } + else + { + *((ARMword*) (state->MemDataPtr + (address & ~3))) = data; + } +} + +/***************************************************************************\ +* ReLoad Instruction * +\***************************************************************************/ + +ARMword +ARMul_ReLoadInstr (ARMul_State * state, ARMword address, ARMword isize) +{ +#ifdef ABORTS + if (address >= LOWABORT && address < HIGHABORT) + { + ARMul_PREFETCHABORT (address); + return ARMul_ABORTWORD; + } + else + { + ARMul_CLEARABORT; + } +#endif + + if (address < minReadAddress + || address >= (state->MemSize) + || (address >= minWriteAddress && minWriteAddress != 0)) + { + // Custom SWI, defined in the wrapper of ARMul_OSHandleSWI + return 0xEF000000 | 0x200000; + // ^ SWI ^ SWI number + } + + if ((isize == 2) && (address & 0x2)) + { + /* We return the next two halfwords: */ + ARMword lo = GetWord (state, address, FALSE); + ARMword hi = GetWord (state, address + 4, FALSE); + + if (state->bigendSig == HIGH) + return (lo << 16) | (hi >> 16); + else + return ((hi & 0xFFFF) << 16) | (lo >> 16); + } + + return GetWord (state, address, TRUE); +} + +/***************************************************************************\ +* Initialise the memory interface * +\***************************************************************************/ + +unsigned +ARMul_MemoryInit (ARMul_State * state, unsigned long initmemsize) +{ + ARMword **pagetable; + unsigned page; + + if (initmemsize) + state->MemSize = initmemsize; + + pagetable = (ARMword **) malloc (sizeof (ARMword *) * NUMPAGES); + + if (pagetable == NULL) + return FALSE; + + for (page = 0; page < NUMPAGES; page++) + *(pagetable + page) = NULL; + + state->MemDataPtr = (unsigned char *) pagetable; + + ARMul_ConsolePrint (state, ", 4 Gb memory"); + + return TRUE; +} + +/***************************************************************************\ +* Remove the memory interface * +\***************************************************************************/ + +void +ARMul_MemoryExit (ARMul_State * state) +{ + ARMword page; + ARMword **pagetable; + ARMword *pageptr; + + pagetable = (ARMword **) state->MemDataPtr; + for (page = 0; page < NUMPAGES; page++) + { + pageptr = *(pagetable + page); + if (pageptr != NULL) + free ((char *) pageptr); + } + free ((char *) pagetable); + return; +} + +/***************************************************************************\ +* Load Instruction, Sequential Cycle * +\***************************************************************************/ + +ARMword ARMul_LoadInstrS (ARMul_State * state, ARMword address, ARMword isize) +{ + state->NumScycles++; + +#ifdef HOURGLASS + if ((state->NumScycles & HOURGLASS_RATE) == 0) + { + HOURGLASS; + } +#endif + + return ARMul_ReLoadInstr (state, address, isize); +} + +/***************************************************************************\ +* Load Instruction, Non Sequential Cycle * +\***************************************************************************/ + +ARMword ARMul_LoadInstrN (ARMul_State * state, ARMword address, ARMword isize) +{ + state->NumNcycles++; + + return ARMul_ReLoadInstr (state, address, isize); +} + +/***************************************************************************\ +* Read Word (but don't tell anyone!) * +\***************************************************************************/ + +ARMword ARMul_ReadWord (ARMul_State * state, ARMword address) +{ +#ifdef ABORTS + if (address >= LOWABORT && address < HIGHABORT) + { + ARMul_DATAABORT (address); + return ARMul_ABORTWORD; + } + else + { + ARMul_CLEARABORT; + } +#endif + + return GetWord (state, address, TRUE); +} + +/***************************************************************************\ +* Load Word, Sequential Cycle * +\***************************************************************************/ + +ARMword ARMul_LoadWordS (ARMul_State * state, ARMword address) +{ + state->NumScycles++; + + return ARMul_ReadWord (state, address); +} + +/***************************************************************************\ +* Load Word, Non Sequential Cycle * +\***************************************************************************/ + +ARMword ARMul_LoadWordN (ARMul_State * state, ARMword address) +{ + state->NumNcycles++; + + return ARMul_ReadWord (state, address); +} + +/***************************************************************************\ +* Load Halfword, (Non Sequential Cycle) * +\***************************************************************************/ + +ARMword ARMul_LoadHalfWord (ARMul_State * state, ARMword address) +{ + ARMword temp, offset; + + state->NumNcycles++; + + temp = ARMul_ReadWord (state, address); + offset = (((ARMword) state->bigendSig * 2) ^ (address & 2)) << 3; /* bit offset into the word */ + + return (temp >> offset) & 0xffff; +} + +/***************************************************************************\ +* Read Byte (but don't tell anyone!) * +\***************************************************************************/ + +ARMword ARMul_ReadByte (ARMul_State * state, ARMword address) +{ + ARMword temp, offset; + + temp = ARMul_ReadWord (state, address); + offset = (((ARMword) state->bigendSig * 3) ^ (address & 3)) << 3; /* bit offset into the word */ + + return (temp >> offset & 0xffL); +} + +/***************************************************************************\ +* Load Byte, (Non Sequential Cycle) * +\***************************************************************************/ + +ARMword ARMul_LoadByte (ARMul_State * state, ARMword address) +{ + state->NumNcycles++; + + return ARMul_ReadByte (state, address); +} + +/***************************************************************************\ +* Write Word (but don't tell anyone!) * +\***************************************************************************/ + +void +ARMul_WriteWord (ARMul_State * state, ARMword address, ARMword data) +{ +#ifdef ABORTS + if (address >= LOWABORT && address < HIGHABORT) + { + ARMul_DATAABORT (address); + return; + } + else + { + ARMul_CLEARABORT; + } +#endif + + PutWord (state, address, data, TRUE); +} + +/***************************************************************************\ +* Store Word, Sequential Cycle * +\***************************************************************************/ + +void +ARMul_StoreWordS (ARMul_State * state, ARMword address, ARMword data) +{ + state->NumScycles++; + + ARMul_WriteWord (state, address, data); +} + +/***************************************************************************\ +* Store Word, Non Sequential Cycle * +\***************************************************************************/ + +void +ARMul_StoreWordN (ARMul_State * state, ARMword address, ARMword data) +{ + state->NumNcycles++; + + ARMul_WriteWord (state, address, data); +} + +/***************************************************************************\ +* Store HalfWord, (Non Sequential Cycle) * +\***************************************************************************/ + +void +ARMul_StoreHalfWord (ARMul_State * state, ARMword address, ARMword data) +{ + ARMword temp, offset; + + state->NumNcycles++; + +#ifdef VALIDATE + if (address == TUBE) + { + if (data == 4) + state->Emulate = FALSE; + else + (void) putc ((char) data, stderr); /* Write Char */ + return; + } +#endif + + temp = ARMul_ReadWord (state, address); + offset = (((ARMword) state->bigendSig * 2) ^ (address & 2)) << 3; /* bit offset into the word */ + + PutWord (state, address, + (temp & ~(0xffffL << offset)) | ((data & 0xffffL) << offset), + TRUE); +} + +/***************************************************************************\ +* Write Byte (but don't tell anyone!) * +\***************************************************************************/ + +void +ARMul_WriteByte (ARMul_State * state, ARMword address, ARMword data) +{ + ARMword temp, offset; + + temp = ARMul_ReadWord (state, address); + offset = (((ARMword) state->bigendSig * 3) ^ (address & 3)) << 3; /* bit offset into the word */ + + PutWord (state, address, + (temp & ~(0xffL << offset)) | ((data & 0xffL) << offset), + TRUE); +} + +/***************************************************************************\ +* Store Byte, (Non Sequential Cycle) * +\***************************************************************************/ + +void +ARMul_StoreByte (ARMul_State * state, ARMword address, ARMword data) +{ + state->NumNcycles++; + +#ifdef VALIDATE + if (address == TUBE) + { + if (data == 4) + state->Emulate = FALSE; + else + (void) putc ((char) data, stderr); /* Write Char */ + return; + } +#endif + + ARMul_WriteByte (state, address, data); +} + +/***************************************************************************\ +* Swap Word, (Two Non Sequential Cycles) * +\***************************************************************************/ + +ARMword ARMul_SwapWord (ARMul_State * state, ARMword address, ARMword data) +{ + ARMword temp; + + state->NumNcycles++; + + temp = ARMul_ReadWord (state, address); + + state->NumNcycles++; + + PutWord (state, address, data, TRUE); + + return temp; +} + +/***************************************************************************\ +* Swap Byte, (Two Non Sequential Cycles) * +\***************************************************************************/ + +ARMword ARMul_SwapByte (ARMul_State * state, ARMword address, ARMword data) +{ + ARMword temp; + + temp = ARMul_LoadByte (state, address); + ARMul_StoreByte (state, address, data); + + return temp; +} + +/***************************************************************************\ +* Count I Cycles * +\***************************************************************************/ + +void +ARMul_Icycles (ARMul_State * state, unsigned number, ARMword address ATTRIBUTE_UNUSED) +{ + state->NumIcycles += number; + ARMul_CLEARABORT; +} + +/***************************************************************************\ +* Count C Cycles * +\***************************************************************************/ + +void +ARMul_Ccycles (ARMul_State * state, unsigned number, ARMword address ATTRIBUTE_UNUSED) +{ + state->NumCcycles += number; + ARMul_CLEARABORT; +} + + +/* Read a byte. Do not check for alignment or access errors. */ + +ARMword +ARMul_SafeReadByte (ARMul_State * state, ARMword address) +{ + ARMword temp, offset; + + temp = GetWord (state, address, FALSE); + offset = (((ARMword) state->bigendSig * 3) ^ (address & 3)) << 3; + + return (temp >> offset & 0xffL); +} + +void +ARMul_SafeWriteByte (ARMul_State * state, ARMword address, ARMword data) +{ + ARMword temp, offset; + + temp = GetWord (state, address, FALSE); + offset = (((ARMword) state->bigendSig * 3) ^ (address & 3)) << 3; + + PutWord (state, address, + (temp & ~(0xffL << offset)) | ((data & 0xffL) << offset), + FALSE); +} Property changes on: branches/Cog/platforms/unix/plugins/GdbARMPlugin/armulmem.c ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/platforms/unix/plugins/GdbARMPlugin/sqGdbARMPlugin.c =================================================================== --- branches/Cog/platforms/unix/plugins/GdbARMPlugin/sqGdbARMPlugin.c (rev 0) +++ branches/Cog/platforms/unix/plugins/GdbARMPlugin/sqGdbARMPlugin.c 2014-07-16 23:23:03 UTC (rev 3046) @@ -0,0 +1,215 @@ +#define COG 1 +#define FOR_COG_PLUGIN 1 + +#include "GdbARMPlugin.h" +//disassembler +#include <gdbconfig.h> /* TPR - <---- this is actually a *link* to the gdb gdb-7.6/bfd/config.h because it otherwise clashes with the Squeak one also in the assorted include paths. Must be a proper way to handle this case; it must happen elsewhere */ +#include <bfd.h> +#include <dis-asm.h> + +#include <stdarg.h> + +//emulator +#include <armdefs.h> +#include <armemu.h> + +ARMul_State* lastCPU = NULL; + +/* When compiling armulator, it generally sets NEED_UI_LOOP_HOOK, which + makes the main emulation step require this symbol to be set. */ +extern int (*deprecated_ui_loop_hook) (int) = NULL; + +// These two variables exist, in case there are library-functions which write to a stream. +// In that case, we would write functions which print to that stream instead of stderr or similar +#define LOGSIZE 4096 +static char gdb_log[LOGSIZE+1]; +static int gdblog_index = 0; + +ulong minReadAddress, minWriteAddress; + +// what is that for? + void (*prevInterruptCheckChain)() = 0; + +void +print_state(ARMul_State* state) +{ + printf("NextInstr: %i\ttheMemory: 0x%p\tNumInstrs: 0x%p\tPC: 0x%p\tmode: %i\tEndCondition: %i\tEmulate: %i\n", + state->NextInstr, state->MemDataPtr, + state->NumInstrs, state->Reg[15], + state->Mode, state->EndCondition, + state->Emulate); +} + +void* +newCPU() +{ + if(lastCPU == NULL) ARMul_EmulateInit(); + lastCPU = ARMul_NewState(); + ARMul_SelectProcessor (lastCPU, ARM_v5_Prop | ARM_v5e_Prop | ARM_XScale_Prop | ARM_v6_Prop); + return lastCPU; +} + +int +resetCPU(void* cpu) +{ + unsigned int i, j; + ARMul_State* state = (ARMul_State*) cpu; + // test whether the supplied instance is an ARMul type? + + gdblog_index = 0; + + // reset registers in all modes + for (i = 0; i < 16; i++) + { + state->Reg[i] = 0; + for (j = 0; j < 7; j++) + state->RegBank[j][i] = 0; + } + for (i = 0; i < 7; i++) + state->Spsr[i] = 0; + + ARMul_Reset(state); + return 0; +} + +int +runOnCPU(void *cpu, void *memory, + ulong byteSize, ulong minAddr, ulong minWriteMaxExecAddr, ARMword (*run)(ARMul_State*)) +{ + ARMul_State* state = (ARMul_State*) cpu; + lastCPU = state; + + // test whether the supplied instance is an ARMul type? + state->MemDataPtr = (unsigned char*) memory; + state->MemSize = byteSize; + minReadAddress = minAddr; + minWriteAddress = minWriteMaxExecAddr; + + gdblog_index = 0; + + state->EndCondition = NoError; + state->NextInstr = RESUME; + + state->Reg[15] = run(state); + + // collect the PSR from their dedicated flags to have easy access from the image. + ARMul_SetCPSR(state, ARMul_GetCPSR(state)); + + if(state->EndCondition != NoError){ + return state->EndCondition; + } + + return gdblog_index == 0 ? 0 : SomethingLoggedError; +} + +int +singleStepCPUInSizeMinAddressReadWrite(void *cpu, void *memory, + ulong byteSize, ulong minAddr, ulong minWriteMaxExecAddr) +{ + return runOnCPU(cpu, memory, byteSize, minAddr, minWriteMaxExecAddr, ARMul_DoInstr); +} + +int +runCPUInSizeMinAddressReadWrite(void *cpu, void *memory, + ulong byteSize, ulong minAddr, ulong minWriteMaxExecAddr) +{ + return runOnCPU(cpu, memory, byteSize, minAddr, minWriteMaxExecAddr, ARMul_DoProg); +} + +/* + * Currently a dummy for ARM Processor Alien. + */ +void +flushICacheFromTo(void *cpu, ulong saddr, ulong eaddr) +{ +#if 0 +# error not yet implemented +#endif +} + +int +gdb_log_printf(void* stream, const char * format, ...) +{ + va_list arg; + int n; + va_start(arg,format); + + if(stream == NULL){ + n = vsnprintf((char*) (&gdb_log) + gdblog_index, LOGSIZE-gdblog_index, format, arg); + gdblog_index = gdblog_index + n; + } else { + vfprintf(stream, format, arg); + } + return 0; +} + +int +disassembleForAtInSize(void *cpu, ulong laddr, + void *memory, ulong byteSize) +{ + gdblog_index = 0; + // ignore the cpu + // start disassembling at laddr relative to memory + // stop disassembling at memory+byteSize + + disassemble_info* dis = (disassemble_info*) calloc(1, sizeof(disassemble_info)); + // void init_disassemble_info (struct disassemble_info *dinfo, void *stream, fprintf_ftype fprintf_func) + init_disassemble_info ( dis, NULL, gdb_log_printf); + + dis->arch = bfd_arch_arm; + dis->mach = bfd_mach_arm_unknown; + + // sets some fields in the structure dis to architecture specific values + disassemble_init_for_target( dis ); + + dis->buffer_vma = 0; + dis->buffer = memory; + dis->buffer_length = byteSize; + + // first print the address + gdb_log_printf( NULL, "%08lx: ", laddr); + //other possible functions are listed in opcodes/dissassemble.c + unsigned int size = print_insn_little_arm((bfd_vma) laddr, dis); + + free(dis); + gdb_log[gdblog_index+1] = 0; + + return size; +} + +void +forceStopRunning() +{ + lastCPU->Emulate = STOP; +} + +int +errorAcorn(void) { return 0; } + +char * +getlog(long *len) +{ + *len = gdblog_index; + return gdb_log; +} + +// adding custom Software Interrupts to the ARMulator +unsigned __real_ARMul_OSHandleSWI(ARMul_State*, ARMword); + +unsigned +__wrap_ARMul_OSHandleSWI (ARMul_State * state, ARMword number) +{ + switch(number) + { + case 0x200000: + // This is the SWI number which is returned by our memory interface + // if there is an instruction fetch for an illegal address. + state->Emulate = STOP; + state->EndCondition = InstructionPrefetchError; + + // during execution, the pc points the next fetch address, which is 8 byte after the current instruction. + gdb_log_printf(NULL, "Illegal Instruction fetch address (%#p).", state->Reg[15]-8); + return TRUE; + } + return __real_ARMul_OSHandleSWI(state, number); +} Property changes on: branches/Cog/platforms/unix/plugins/GdbARMPlugin/sqGdbARMPlugin.c ___________________________________________________________________ Added: svn:executable + *

1 0

[commit][3045] add unix plugins for Pi/Scratch - Camera, Scratch, Unicode
by commits＠squeakvm.org 17 Jul '14

17 Jul '14

Revision: 3045 Author: rowledge Date: 2014-07-16 16:09:05 -0700 (Wed, 16 Jul 2014) Log Message: ----------- add unix plugins for Pi/Scratch - Camera, Scratch, Unicode Added Paths: ----------- branches/Cog/platforms/unix/plugins/CameraPlugin/ branches/Cog/platforms/unix/plugins/CameraPlugin/README.CameraPlugin branches/Cog/platforms/unix/plugins/CameraPlugin/sqCamera-linux.c branches/Cog/platforms/unix/plugins/GdbARMPlugin/ branches/Cog/platforms/unix/plugins/GdbARMPlugin/Makefile.inc branches/Cog/platforms/unix/plugins/ScratchPlugin/ branches/Cog/platforms/unix/plugins/ScratchPlugin/unixScratchOps.c branches/Cog/platforms/unix/plugins/ScratchPlugin/unixSeriaPort2Ops.c branches/Cog/platforms/unix/plugins/UnicodePlugin/ branches/Cog/platforms/unix/plugins/UnicodePlugin/Makefile.inc branches/Cog/platforms/unix/plugins/UnicodePlugin/README.UnicodePlugin branches/Cog/platforms/unix/plugins/UnicodePlugin/UnicodeOps-linux.c branches/Cog/platforms/unix/plugins/UnicodePlugin/acinclude.m4 Added: branches/Cog/platforms/unix/plugins/CameraPlugin/README.CameraPlugin =================================================================== --- branches/Cog/platforms/unix/plugins/CameraPlugin/README.CameraPlugin (rev 0) +++ branches/Cog/platforms/unix/plugins/CameraPlugin/README.CameraPlugin 2014-07-16 23:09:05 UTC (rev 3045) @@ -0,0 +1,43 @@ +CameraPlugin, 17th May 2010 11:00:00 + +- Rewrote for more general use (Squeak, Etoys, XO, etc) + +- Supports multiple simultaneously open cameras + +- Dependency on libv4l2 dropped but... + +- Code now attempts to open libv4l2 and uses it available + +- Additional pixel format conversions (if no libv4l2) + +- Redesigned so future version can do frame skipping without + incurring conversion delays on skipped frames. To support + this the Scratch API would need to change... + + CameraGetFrame(int camNum, unsigned char* buf, int pixelCount) + + to... + + CameraGetFrame(int camNum, unsigned char* buf, int pixelCount, int skipFrameCount) + +- Why is frame skipping required? To support "snapshot" type + use-cases such as the following and particularly when the + camera would be shut down between uses to preserve power: + + - taking a picture at any ad hoc moment, + - taking a picture at a specific/precise time, + - taking a picture at periodically, eg, time-lapse photgraphy + + Webcams are generally designed for streaming and drivers + typically use various degrees of buffering to improve + performance. Buffering can mean that, eg, a five second + time-lapse captured image could actually be five, ten or + more seconds old. In one such test I needed to skip 20 + frames to get the latest one! Some cameras/ drivers are + designed for this type of operation but "CameraPlugin" + is being specifically designed for maximum general use + across various hw platforms and many different types of + camera. + +- More info: http://info.scratch.mit.edu/Linux_installer/Linux_Camera_Plug-in + Added: branches/Cog/platforms/unix/plugins/CameraPlugin/sqCamera-linux.c =================================================================== --- branches/Cog/platforms/unix/plugins/CameraPlugin/sqCamera-linux.c (rev 0) +++ branches/Cog/platforms/unix/plugins/CameraPlugin/sqCamera-linux.c 2014-07-16 23:09:05 UTC (rev 3045) @@ -0,0 +1,900 @@ +/* sqCamera-linux.c -- plugin for hardware camera on Linux + * + * Author: Derek O'Connell <doc(a)doconnel.f9.co.uk> + * + * Copyright (C) 2010 by Derek O'Connel + * All rights reserved. + * + * This file is part of Unix Squeak. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Last edited: 2012-07-30 14:59:01 by piumarta on emilia + */ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <assert.h> + +#include <getopt.h> + +#include <fcntl.h> +#include <unistd.h> +#include <errno.h> +#include <sys/stat.h> +#include <sys/types.h> +#include <sys/time.h> +#include <sys/mman.h> +#include <sys/ioctl.h> +#include <dlfcn.h> + +#include <asm/types.h> /* for videodev2.h */ + +#include <linux/videodev2.h> + + +#define sqInt int +#define true 1 +#define false 0 + + +/* >>>>> USE_TEST_PATTERN >>>> +/ +/ Helps check Squeak is capturing and displaying the +/ latest frame. See CameraGetFrame() which will +/ return single colour frames in the sequence RGB. +/ +/ Remove the "x" to enable... +*/ + +#define USE_TEST_PATTERNx + +#ifdef USE_TEST_PATTERN + static int tstColourIdx = 0; +#endif + + +/* >>>>> LIBV4L2 USAGE >>>>> +/ +/ Attempting to get best-of-all-worlds so +/ explicitly loading libv4l2 if available +/ to avoid build-time dependency. +/ +*/ + +void *hLibv4l2 = NULL; + +int (*vd_open)(const char *, int, ...); +int (*vd_close)(int); +int (*vd_dup)(int); +int (*vd_ioctl)(int, unsigned long int, ...); +ssize_t (*vd_read)(int, void *, size_t); +void * (*vd_mmap)(void *, size_t, int, int, int, int64_t); +int (*vd_munmap)(void *, size_t); + + +/* >>>>>>> MULTI-CAMERA SUPPORT >>>>> */ + +#define CLEAR(x) memset (&(x), 0, sizeof (x)) + +typedef enum { + IO_METHOD_READ, + IO_METHOD_MMAP, + IO_METHOD_USERPTR, +} io_method; + +struct buffer { + void * start; + size_t length; +}; + +struct camInfo_t { + unsigned int isOpen; + unsigned int devNum; + int fileDesc; + unsigned int bmWidth, bmHeight; + + io_method ioMethod; + int pixelformat; + struct buffer *buffers; + unsigned int nBuffers; + + struct v4l2_buffer vBuf; + void *inBuffer; + unsigned long inBufferSize; + + void *sqBuffer; + unsigned long sqBufferBytes; + unsigned long sqPixels; + + unsigned long frameCount; +} camInfo[10]; + +typedef struct camInfo_t *camPtr; + +static char * videoDevName0 = "/dev/video0"; + +struct v4l2_buffer tmpVBuf; + + +/* >>>>>>>> FUNCTION PROTOTYPES >>>>>>>> */ + +/* LIBRARY CONSTRUCTOR/DESCTRUCTOR */ +void __attribute__ ((constructor)) libCon(void); +void __attribute__ ((destructor)) libDes(void); + +/* SQUEAK INTERFACE */ +sqInt CameraGetParam(int camNum, int paramNum); +sqInt CameraGetFrame(int camNum, unsigned char* buf, int pixelCount); +sqInt CameraExtent(int camNum); +char* CameraName(int camNum); +void CameraClose(int camNum); +sqInt CameraOpen(int camNum, int frameWidth, int frameHeight); + + +/* ========================================================= */ +/* ========================================================= */ +/* ========================================================= */ + +/* >>>>>>>>>>> UTILITY */ + +inline int camIsOpen(camPtr cam) { return ( cam->isOpen); } +inline int camIsClosed(camPtr cam) { return (!cam->isOpen); } + + +static void +vBufReset(struct v4l2_buffer *buf) +{ + CLEAR (*buf); + buf->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + buf->memory = V4L2_MEMORY_MMAP; +} + + +/* >>>>>>>>>>> LIB CONSTRUCTOR/DESTRUCTOR */ + +void __attribute__ ((constructor)) +libCon(void) +{ + int devNum; + camPtr cam; + + vd_open = open; + vd_close = close; + vd_dup = dup; + vd_ioctl = ioctl; + vd_read = read; + vd_mmap = mmap; + vd_munmap = munmap; + + /* Use libv4l2: use if available... */ + + hLibv4l2 = dlopen("libv4l2.so.0", RTLD_LAZY); + if (hLibv4l2) { + vd_open = dlsym(hLibv4l2, "v4l2_open"); + vd_close = dlsym(hLibv4l2, "v4l2_close"); + vd_dup = dlsym(hLibv4l2, "v4l2_dup"); + vd_ioctl = dlsym(hLibv4l2, "v4l2_ioctl"); + vd_read = dlsym(hLibv4l2, "v4l2_read"); + vd_mmap = dlsym(hLibv4l2, "v4l2_mmap"); + vd_munmap = dlsym(hLibv4l2, "v4l2_munmap"); + } + + /* Init camInfo array... */ + + for (devNum = 0; devNum < 10; ++devNum) { + cam = &camInfo[devNum]; + + CLEAR(*cam); + + cam->isOpen = false; + cam->devNum = devNum; + cam->ioMethod = IO_METHOD_MMAP; + cam->nBuffers = 2; + vBufReset(&(cam->vBuf)); + /* Pixel format auto selected for ease/speed of conversion */ + +/* + cam->fileDesc = 0; + cam->bmWidth = 0; + cam->bmHeight = 0; + cam->buffers = NULL; + cam->nBuffers = 0; + cam->vBuf = NULL; + cam->pixelformat = V4L2_PIX_FMT_YUYV; + cam->pixelformat = V4L2_PIX_FMT_RGB24; + cam->sqBuffer = 0; + cam->sqBufferBytes = 0; + cam->sqPixels = 0; + cam->frameCount = 0; +*/ + } +} + + +void __attribute__ ((destructor)) +libDes(void) +{ + int camNum; + for (camNum = 1; camNum < 11; ++camNum) + if (camIsOpen(&camInfo[camNum-1])) + CameraClose(camNum); + +/* +/ Closing libv4l2 causes a crash, so it must +/ already be closed by this point. +*/ +/* + if (hLibv4l2) dlclose(hLibv4l2); +*/ +} + + +/* >>>>>>>>>>> PIXEL FORMAT CONVERSION, SQ BUFFER TRANSFER */ + +/* YUV CONVERSION: +/ +/ from: palettes.c in VideoForLinuxPlugin +/ from: http://en.wikipedia.org/wiki/YUV422 +/ +*/ + +inline unsigned char +clipPixel(const int pixel) { + int result; + result = ((pixel < 0) ? 0 : pixel); + return (unsigned char) ((result > 255) ? 255: result); +} + + +inline void +convertPixelYUV444toARGB32( + const unsigned char y, + const unsigned char u, + const unsigned char v, + unsigned char* dest) +{ + const int C = (y - 16) * 298 + 128; + const int D = u - 128; + const int E = v - 128; + + /* ARGB */ + dest[0] = clipPixel(( C + 516 * D ) >> 8); + dest[1] = clipPixel(( C - 100 * D - 208 * E) >> 8); + dest[2] = clipPixel(( C + 409 * E) >> 8); + dest[3] = 255; +} + + +inline void +convertImageYUYVToARGB32 (camPtr cam) +{ + int i; + + const unsigned char* src = cam->inBuffer; + unsigned char* dst = cam->sqBuffer; + unsigned long int *pdst; + unsigned long int pixelCount = cam->sqPixels; + + unsigned char u, y1, v, y2; + + for (i = 0; i < pixelCount; i += 2) { + y1 = *src++; + u = *src++; + y2 = *src++; + v = *src++; + + convertPixelYUV444toARGB32(y1, u, v, dst); + pdst = (unsigned long *)dst; + dst += 4; + + if (y2 == y1) + *(unsigned long *)dst = *pdst; + else + convertPixelYUV444toARGB32(y2, u, v, dst); + + dst += 4; + } +} +/* <<<<<<<<< YUV CONVERSION <<<<<<<< */ + + +static void +convertImageRGB24toARGB32 (camPtr cam) +{ + unsigned char *src = cam->inBuffer; + unsigned long int *dst = cam->sqBuffer; + unsigned long int pixelCount = cam->sqPixels; + unsigned long int pixel; + int i; + + if (0 == dst) return; + + for ( i = 0; i < pixelCount; i++) { + pixel = 0xFF000000 | (*src++ << 16); + pixel = pixel | (*src++ << 8); + *dst++ = pixel | *src++; + } +} + + +static void +convertImageRGB444toARGB32 (camPtr cam) +{ + unsigned char *src = cam->inBuffer; + unsigned long int *dst = cam->sqBuffer; + unsigned long int pixelCount = cam->sqPixels; + unsigned long int r,g,b,pixel; + int i; + + if (0 == dst) return; + + /* Byte0: (g)ggg(b)bbb, Byte1: xxxx(r)rrr */ + + for ( i = 0; i < pixelCount; i++) { + r = *src << 4; + g = *src++ & 0xF0; + b = (*src++ & 0x0F) << 4; + pixel = 0xFF000000; + pixel |= (r << 16); + pixel |= (g << 8); + pixel |= b; + *dst++ = pixel; + } +} + + +static void +convertImageRGB565toARGB32 (camPtr cam) +{ + unsigned char *src = cam->inBuffer; + unsigned long int *dst = cam->sqBuffer; + unsigned long int pixelCount = cam->sqPixels; + unsigned long int r,g,b,pixel; + int i; + + if (0 == dst) return; + + /* Byte0: ggg(r)rrrr, Byte1: (b)bbbb(g)gg */ + + for ( i = 0; i < pixelCount; i++) { + r = (*src & 0x1F) << 3; + g = (*src++ & 0xE0) >> 5; + g |= (*src & 0x07) << 5; + b = *src++ & 0xF8; + pixel = 0xFF000000; + pixel |= (b << 16); + pixel |= (g << 8); + pixel |= r; + *dst++ = pixel; + } +} + + +void +convertImage (camPtr cam) +{ + /* func pts to be used at later date */ + + if (cam->pixelformat == V4L2_PIX_FMT_YUYV) { + convertImageYUYVToARGB32 (cam); + return; + } + + if (cam->pixelformat == V4L2_PIX_FMT_RGB565) { + convertImageRGB565toARGB32 (cam); + return; + } + + if (cam->pixelformat == V4L2_PIX_FMT_RGB444) { + convertImageRGB444toARGB32 (cam); + return; + } + + if (cam->pixelformat == V4L2_PIX_FMT_RGB24) { + convertImageRGB24toARGB32 (cam); + return; + } +} + + +/* >>>>>>>>>>> V4L ACCESS */ + +static int +xioctl (camPtr cam, int request, void * arg) +{ + int r; + do r = vd_ioctl (cam->fileDesc, request, arg); + while (-1 == r && EINTR == errno); + return (0 == r); +} + + +inline static int +queueBuffer(camPtr cam, struct v4l2_buffer *bufPtr) +{ + return xioctl (cam, VIDIOC_QBUF, bufPtr); +} + + +inline static int +dequeueBuffer(camPtr cam, struct v4l2_buffer *bufPtr) +{ + return xioctl (cam, VIDIOC_DQBUF, bufPtr); +} + + +inline static int +read_frame (camPtr cam) +{ + struct v4l2_buffer *bufPtr = &(cam->vBuf); + + cam->frameCount += 1; + + vBufReset(bufPtr); + + if (!dequeueBuffer(cam, bufPtr)) { + switch (errno) { + case EAGAIN: + case EIO: + return false; + default: + return false; + } + } +/* Not convinced this check is needed... + if (bufPtr->index < cam->nBuffers) +*/ + /* Quickly copy incoming frame and requeue immediately */ + memcpy(cam->inBuffer, cam->buffers[bufPtr->index].start, cam->inBufferSize); + queueBuffer(cam, bufPtr); + /* Conversion not triggered here, see comment on CameraGetFrame() */ + + return true; +} + + +static +int +getFrame(camPtr cam) +{ + int fd = cam->fileDesc; + unsigned int retry; + fd_set fds; + struct timeval tv; + int r; + + retry = 1; + while (retry-- > 0) { + FD_ZERO (&fds); + FD_SET (fd, &fds); + + /* Timeout. */ + tv.tv_sec = 0; + tv.tv_usec = 20000; + + errno = 0; + if (-1 == (r = select (fd + 1, &fds, NULL, NULL, &tv))) { + /* try again on EINTR */ + if ((EINTR == errno) | (EAGAIN == errno)) + continue; + return false; + } + + if (0 == r) + return false; + + if (FD_ISSET(fd, &fds)) + return read_frame (cam); + + return false; + } + + return false; +} + + +static int +stream_off (camPtr cam) +{ + enum v4l2_buf_type streamType = V4L2_BUF_TYPE_VIDEO_CAPTURE; + return xioctl (cam, VIDIOC_STREAMOFF, &streamType); +} + + +static int +stream_on (camPtr cam) +{ + enum v4l2_buf_type streamType = V4L2_BUF_TYPE_VIDEO_CAPTURE; + return xioctl (cam, VIDIOC_STREAMON, &streamType); +} + + +static int +uninit_device (camPtr cam) +{ + unsigned int i; + + if (cam->buffers) + for (i = 0; i < cam->nBuffers; ++i) + if (vd_munmap (cam->buffers[i].start, cam->buffers[i].length)) + return false; + + free (cam->buffers); + free (cam->inBuffer); + + return true; +} + + +static int +queueAllBuffers (camPtr cam) +{ + struct v4l2_buffer *bufPtr = &(cam->vBuf); + + vBufReset(bufPtr); + for (bufPtr->index = 0; bufPtr->index < cam->nBuffers; (bufPtr->index)++) + if (!queueBuffer(cam, bufPtr)) return false; + return true; +} + + +static int +init_mmap (camPtr cam) +{ + struct v4l2_buffer *bufPtr = &tmpVBuf; + struct v4l2_requestbuffers req; + + CLEAR (req); + req.count = cam->nBuffers; + req.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + req.memory = V4L2_MEMORY_MMAP; + + if (!xioctl(cam, VIDIOC_REQBUFS, &req)) return false; +/* Left in for debugging >>> + { + if (EINVAL == errno) { + return false; + } else { + return false; + } + } +<<< */ + + if (req.count < cam->nBuffers) return false; + if (cam->nBuffers < req.count) + printf("Excess Buffers: %i\n", req.count); + + if (!(cam->buffers = calloc (req.count, sizeof (struct buffer)))) + return false; + + vBufReset(bufPtr); + for (bufPtr->index = 0; bufPtr->index < req.count; bufPtr->index++) { + + if (!xioctl(cam, VIDIOC_QUERYBUF, bufPtr)) return false; + + cam->buffers[bufPtr->index].length = bufPtr->length; + cam->buffers[bufPtr->index].start = vd_mmap ( + NULL /* start anywhere */, + bufPtr->length, + PROT_READ | PROT_WRITE /* required */, + MAP_SHARED /* recommended */, + cam->fileDesc, + bufPtr->m.offset); + + if (MAP_FAILED == cam->buffers[bufPtr->index].start) return false; + } + + return true; +} + + +static int +set_format (camPtr cam, struct v4l2_format *fmt, int pixelformat, int w, int h) +{ + fmt->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + fmt->fmt.pix.width = w; + fmt->fmt.pix.height = h; + fmt->fmt.pix.pixelformat = pixelformat; + fmt->fmt.pix.field = V4L2_FIELD_NONE; + if (!xioctl (cam, VIDIOC_S_FMT, fmt)) return false; + + /* Note VIDIOC_S_FMT may change width and height. */ + if ((w != fmt->fmt.pix.width) | (h != fmt->fmt.pix.height) + | (fmt->fmt.pix.pixelformat != pixelformat)) + return false; + + cam->pixelformat = pixelformat; + + return true; +} + + +static int +init_device (camPtr cam, int w, int h) +{ + struct v4l2_capability cap; + struct v4l2_cropcap cropcap; + struct v4l2_crop crop; + struct v4l2_format fmt; + int bpp; + unsigned int min; + + if (!xioctl (cam, VIDIOC_QUERYCAP, &cap)) return false; +/* left in for debugging >>> + { + if (EINVAL == errno) { + return -1; + } else { + return -1; + } + } +<<< */ + + if (!(cap.capabilities & V4L2_CAP_VIDEO_CAPTURE)) return false; + if (!(cap.capabilities & V4L2_CAP_STREAMING)) return false; + + /* Select video input, video standard and tune here. */ + + CLEAR (cropcap); + cropcap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + + if (xioctl (cam, VIDIOC_CROPCAP, &cropcap)) { + crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; + crop.c = cropcap.defrect; /* reset to default */ + if (!xioctl (cam, VIDIOC_S_CROP, &crop)) { + if (EINVAL == errno) { + /* Cropping not supported (ignored) */ + } else { + /* Errors ignored. */ + } + } + } else { + /* Errors ignored. */ + } + + CLEAR (fmt); + /* The order of preference of formats... */ + if (!set_format(cam, &fmt, V4L2_PIX_FMT_RGB24, w, h)) + if (!set_format(cam, &fmt, V4L2_PIX_FMT_YUYV, w, h)) + if (!set_format(cam, &fmt, V4L2_PIX_FMT_RGB565, w, h)) + if (!set_format(cam, &fmt, V4L2_PIX_FMT_RGB444, w, h)) + return false; + + /* For reference: + V4L2_PIX_FMT_RGB24 : 3 bytes == 1 dst pixel + V4L2_PIX_FMT_RGB565: 2 bytes == 1 dst pixel + V4L2_PIX_FMT_RGB444: 2 bytes == 1 dst pixel + V4L2_PIX_FMT_YUYV : 4 bytes == 2 dst pixels + */ + + switch (fmt.fmt.pix.pixelformat) { + case V4L2_PIX_FMT_RGB24: /* printf("V4L2_PIX_FMT_RGB24\n"); */ + bpp = 3; + break; + case V4L2_PIX_FMT_RGB565: /* printf("V4L2_PIX_FMT_RGB565\n"); */ + bpp = 2; + break; + case V4L2_PIX_FMT_RGB444: /* printf("V4L2_PIX_FMT_RGB444\n"); */ + bpp = 2; + break; + case V4L2_PIX_FMT_YUYV: /* printf("V4L2_PIX_FMT_YUYV\n"); */ + bpp = 4; + break; + } + + /* Buggy driver paranoia >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> */ + min = fmt.fmt.pix.width * bpp; + if (fmt.fmt.pix.bytesperline < min) fmt.fmt.pix.bytesperline = min; + min = fmt.fmt.pix.bytesperline * fmt.fmt.pix.height; + if (fmt.fmt.pix.sizeimage < min) fmt.fmt.pix.sizeimage = min; + /* <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< */ + + if (!(cam->inBuffer = calloc (min, 1))) return false; + cam->inBufferSize = min; + + if (!init_mmap(cam)) return false; + + if (!queueAllBuffers(cam)) return false; + + /* cache returned dims */ + cam->bmWidth = fmt.fmt.pix.width; + cam->bmHeight = fmt.fmt.pix.height; + cam->sqPixels = cam->bmWidth * cam->bmHeight; + cam->sqBufferBytes = cam->sqPixels * 4; /* Bytes to tx to Squeak (always RGB32) */ + + return true; +} + + +static int +close_device (camPtr cam) +{ + vd_close (cam->fileDesc); + cam->fileDesc = 0; + return true; +} + + +static int +open_device (camPtr cam) +{ + char deviceName[12]; + struct stat st; + + strcpy(deviceName, videoDevName0); + deviceName[10] = cam->devNum + '0'; + + if (stat (deviceName, &st)) return false; + if (!S_ISCHR (st.st_mode)) return false; + + return (-1 != (cam->fileDesc = vd_open (deviceName, O_RDWR /* required */ | O_NONBLOCK, 0))); +} + + +int +initCamera(camPtr cam, int w, int h) +{ + if (!open_device(cam)) return false; + + if (!init_device(cam, w, h)) { + close_device(cam); + return false; + } + + if (!stream_on(cam)) { + uninit_device(cam); + close_device(cam); + return false; + } + + return true; +} + + +/* >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> */ +/* >>>>>>>>>>>>>>>>> SCRATCH I/F >>>>>>>>>>>>>>>>> */ +/* >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> */ + +sqInt +CameraGetParam(int camNum, int paramNum) +{ + camPtr cam = &camInfo[camNum-1]; + return false; +} + + +/* +/ Spec from Scratch protocol... +/ +/ "Copy a camera frame into the given Bitmap. The Bitmap should be for a Form +/ of depth 32 that is the same width and height as the current camera frame. +/ Fail if the camera is not open or if the bitmap is not the right size. If +/ successful, answer the number of frames received from the camera since the +/ last call. If this is zero, then there has been no change." +/ +/ This version: +/ - designed to fail silently +/ - coded so that a future version can skip frames and do so *without* incurring +/ delays due to conversion. +*/ +sqInt +CameraGetFrame(int camNum, unsigned char* buf, int pixelCount) +{ +#ifdef USE_TEST_PATTERN + unsigned long f,i; + unsigned long *d; +#endif + + camPtr cam = &camInfo[camNum-1]; + + if (camIsClosed(cam)) return 0; + if (pixelCount != cam->sqPixels) return 0; + + cam->sqBuffer = (void *)buf; + +#ifdef USE_TEST_PATTERN +printf("%i\n", tstColourIdx); + switch (tstColourIdx) { + case 0: + f = 0xFFFF0000; + break; + case 1: + f = 0xFF00FF00; + break; + case 2: + f = 0xFF0000FF; + break; + } + d = (unsigned long *)buf; + for (i = 0; i < pixelCount; i++) + *d++ = f; + tstColourIdx = (tstColourIdx == 2 ? 0: tstColourIdx + 1); + return 1; +#endif + +/* OPTION 1: ALL FRAMES, SKIP IMAGE-SIDE, INCUR CONVERSION COST... */ + + if (getFrame(cam)) { + convertImage (cam); + return 1; + } + return 0; + + +/* OPTION 2: ONLY LATEST FRAME, AVOIDS CONVERSION OF SKIPPED FRAMES... */ + + /* getFrame() buffers & eventually fails leaving the latest/last frame */ +/* + while (getFrame(cam)); + convertImage (cam); + return 1; +*/ + +} + + +sqInt +CameraExtent(int camNum) +{ + camPtr cam = &camInfo[camNum-1]; + if (camIsClosed(cam)) return false; + return (cam->bmWidth << 16) + cam->bmHeight; +} + + +char* +CameraName(int camNum) +{ + camPtr cam = &camInfo[camNum-1]; + if (camIsClosed(cam)) return "camera not open"; + return "default camera"; +} + + +void +CameraClose(int camNum) +{ + camPtr cam = &camInfo[camNum-1]; + if (camIsClosed(cam)) return; + stream_off(cam); + uninit_device(cam); + close_device(cam); + cam->isOpen = false; +} + + +sqInt +CameraOpen(int camNum, int frameWidth, int frameHeight) +{ + camPtr cam = &camInfo[camNum-1]; + + if (camIsOpen(cam)) return false; + if (!initCamera(cam, frameWidth, frameHeight)) return false; + cam->isOpen = true; + + while (!getFrame(cam)); + +#ifdef USE_TEST_PATTERN + tstColourIdx = 0; +#endif + return true; +} + Added: branches/Cog/platforms/unix/plugins/GdbARMPlugin/Makefile.inc =================================================================== --- branches/Cog/platforms/unix/plugins/GdbARMPlugin/Makefile.inc (rev 0) +++ branches/Cog/platforms/unix/plugins/GdbARMPlugin/Makefile.inc 2014-07-16 23:09:05 UTC (rev 3045) @@ -0,0 +1,13 @@ +# edit this to suit your system; it really ought to use relative paths +# or some other convenience +GDBBUILDFOLDER = /mnt/hgfs/tim/Documents/Squeak/Rasbian-VM/gdb-7.6 +XCFLAGS = -m32 -DNEED_UI_LOOP_HOOK + +XINCLUDES += -I$(GDBBUILDFOLDER)/include +XINCLUDES += -I$(GDBBUILDFOLDER)/sim/arm +XINCLUDES := -I$(GDBBUILDFOLDER)/bfd $(XINCLUDES) + +XLDFLAGS= $(GDBBUILDFOLDER)/sim/arm/libsim.a \ + $(GDBBUILDFOLDER)/opcodes/libopcodes.a \ + -lbfd -liberty \ + -Wl,-wrap,ARMul_OSHandleSWI Property changes on: branches/Cog/platforms/unix/plugins/GdbARMPlugin/Makefile.inc ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/platforms/unix/plugins/ScratchPlugin/unixScratchOps.c =================================================================== --- branches/Cog/platforms/unix/plugins/ScratchPlugin/unixScratchOps.c (rev 0) +++ branches/Cog/platforms/unix/plugins/ScratchPlugin/unixScratchOps.c 2014-07-16 23:09:05 UTC (rev 3045) @@ -0,0 +1,98 @@ +/* unixScratchOps.c -- Scratch operations for unix based OSes. + * + * + * Copyright (C) 2011 Massachusetts Institute of Technology + * All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + */ + +#include "ScratchPlugin.h" +#include <stdlib.h> +#include <string.h> +#include <stdio.h> + +void OpenURL(char *url) { + // Open a browser on the given URL. +#ifdef I_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS + char cmd[1000] = "xdg-open "; + strcat( cmd, url); + system(cmd); +#else + // Implement a secure way here. + // IMHO it would be best to call a script that the user or + // package maintainer can customize. But in any case, + // DO NOT call system() with an unchecked URL. --bf +#endif +} + +void SetScratchWindowTitle(char *title) { + // Set the text in the window title bar. Not yet implemented. +} + +void GetFolderPathForID(int folderID, char *path, int maxPath) { + // Get the full path for a special folder: + // 1 - user's home folder + // 2 - user's desktop folder + // 3 - user's document folder + // 4 - user's photos or pictures folder (does Linux have a convention for this?) + // 5 - user's music folder (does Linux have a convention for this?) + // path is filled in with a zero-terminated string of max length maxPath + + char *s = NULL; + + path[0] = 0; // a zero-length path indicates failure + + // get the user's HOME directory + s = getenv("HOME"); + if ((s == NULL) || (strlen(s) == 0)) return; + + strncat(path, s, maxPath); // home folder + + if (folderID == 1) return; + if (folderID == 2) strncat(path, "/Desktop", maxPath); + if (folderID == 4) strncat(path, "/Pictures", maxPath); + if (folderID == 5) strncat(path, "/Music", maxPath); + + if (folderID == 3) { + s = getenv("SUGAR_ACTIVITY_ROOT"); + if (s != NULL) { + // On XO, return the writeable activity "data" directory + strncat(path, s, maxPath); + strncat(path, "/data", maxPath); + } else { + strncat(path, "/Documents", maxPath); + } + } +} + +int WinShortToLongPath(char *shortPath, char* longPath, int maxPath) { + return -1; // fail on non-Windows platforms +} + +int IsFileOrFolderHidden(char *fullPath) { + // Always return false on Linux + return 0; +} + +void SetUnicodePasteBuffer(short int *utf16, int count) { + // Store the given Unicode UTF16 string in the paste buffer. + // No longer needed; use clipboard methods in UnicodePlugin. +} Property changes on: branches/Cog/platforms/unix/plugins/ScratchPlugin/unixScratchOps.c ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/platforms/unix/plugins/ScratchPlugin/unixSeriaPort2Ops.c =================================================================== --- branches/Cog/platforms/unix/plugins/ScratchPlugin/unixSeriaPort2Ops.c (rev 0) +++ branches/Cog/platforms/unix/plugins/ScratchPlugin/unixSeriaPort2Ops.c 2014-07-16 23:09:05 UTC (rev 3045) @@ -0,0 +1,356 @@ +/* unixSerialPort2Ops.c -- Scratch operations for unix based OSes. Support + * for SerialPort2 primitives under Unix, including OSX and Linux. + * + * + * Copyright (C) 2011 Massachusetts Institute of Technology + * All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + */ + +#include "ScratchPlugin.h" + +#include <dirent.h> +#include <errno.h> +#include <fcntl.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/ioctl.h> +#include <termios.h> +#include <unistd.h> + +// support for systems with a single hardware flow control bit +// on such systems setting hardware handshaking for input sets it for output as well +#ifndef CRTS_IFLOW +# define CRTS_IFLOW CRTSCTS +#endif +#ifndef CCTS_OFLOW +# define CCTS_OFLOW CRTSCTS +#endif + + +// globals +#define PORT_COUNT 32 +static int gFileDescr[PORT_COUNT] = { // file descriptors for open serial ports + -1, -1, -1, -1, -1, -1, -1, -1, // the portNum kept by Squeak is an index + -1, -1, -1, -1, -1, -1, -1, -1, // into this array. -1 marks unused entries. + -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1}; +static struct termios gOrigTermios[PORT_COUNT]; // original termios settings for open ports + +#define PRIM_FAILED -1 + +// helper function declarations +int FileDescrForEntry(int portNum); +int OpenPortNamed(const char *bsdPath, int baudRate, int entryIndex); +int isPrefix(char *prefix, char *s); +int isSerialPortDev(char *s); + +int SerialPortCount(void) { + DIR *dirPtr; + struct dirent *entryPtr; + int cnt = 0; + + if ((dirPtr = opendir("/dev")) == NULL) return 0; + + while ((entryPtr = readdir(dirPtr)) != NULL) { + if (isSerialPortDev(entryPtr->d_name)) cnt++; + } + + closedir(dirPtr); + return cnt; +} + +// Find the name of the given port number. Fill in bsdPath if successful. +// Otherwise, make bsdPath be the empty string. +void SerialPortName(int portIndex, char *bsdPath, int maxPathSize) { + DIR *dirPtr; + struct dirent *entryPtr; + int cnt = 0; + + *bsdPath = '\0'; // result is the empty string if port not found + + if (portIndex < 1) return; + if ((dirPtr = opendir("/dev")) == NULL) return; + + while ((entryPtr = readdir(dirPtr)) != NULL) { + if (isSerialPortDev(entryPtr->d_name)) cnt++; + if (cnt == portIndex) { + strncat(bsdPath, "/dev/", maxPathSize); + strncat(bsdPath, entryPtr->d_name, maxPathSize); + closedir(dirPtr); + return; + } + } + + closedir(dirPtr); +} + +int SerialPortOpenPortNamed(char *portName, int baudRate) { + int entryIndex; + + // scan for first free entry + for (entryIndex = 0; entryIndex < PORT_COUNT; entryIndex++) { + if (gFileDescr[entryIndex] == -1) break; + } + if (entryIndex >= PORT_COUNT) return PRIM_FAILED; // no free entry + + if (!OpenPortNamed(portName, baudRate, entryIndex)) return PRIM_FAILED; + return entryIndex; +} + +void SerialPortClose(int portNum) { + int fDescr; + + if ((fDescr = FileDescrForEntry(portNum)) < 0) return; // already closed + + // restore the serial port settings to their original state + tcsetattr(fDescr, TCSANOW, &gOrigTermios[portNum]); + close(fDescr); + gFileDescr[portNum] = -1; +} + +int SerialPortIsOpen(int portNum) { + return FileDescrForEntry(portNum) != -1; +} + +int SerialPortRead(int portNum, char *bufPtr, int bufSize) { + int fDescr, count = 0; + + if ((fDescr = FileDescrForEntry(portNum)) < 0) return 0; + + count = read(fDescr, bufPtr, bufSize); + if (count < 0) return 0; // read error + return count; +} + +int SerialPortWrite(int portNum, char *bufPtr, int bufSize) { + int fDescr, count = 0; + + if ((fDescr = FileDescrForEntry(portNum)) < 0) return 0; + + count = write(fDescr, bufPtr, bufSize); + if (count < 0) return 0; // write error + return count; +} + +// Port options for SetOption/GetOption: +// 1. baud rate +// 2. data bits +// 3. stop bits +// 4. parity type +// 5. input flow control type +// 6. output flow control type +// 20-25: handshake line bits (DTR, RTS, CTS, DSR, CD, RD) + +int SerialPortSetOption(int portNum, int optionNum, int newValue) { + int fDescr, handshake; + struct termios options; + + if ((fDescr = FileDescrForEntry(portNum)) < 0) return PRIM_FAILED; + if (tcgetattr(fDescr, &options) == -1) return PRIM_FAILED; + + switch (optionNum) { + case 1: // baud rate + if (cfsetspeed(&options, newValue) == -1) return PRIM_FAILED; + break; + case 2: // # of data bits + switch(newValue) { + case 5: + options.c_cflag = (options.c_cflag & ~CSIZE) | CS5; + break; + case 6: + options.c_cflag = (options.c_cflag & ~CSIZE) | CS6; + break; + case 7: + options.c_cflag = (options.c_cflag & ~CSIZE) | CS7; + break; + case 8: + options.c_cflag = (options.c_cflag & ~CSIZE) | CS8; + break; + } + break; + case 3: // 1 or 2 stop bits + if (newValue > 1) options.c_cflag |= CSTOPB; // two stop bits + else options.c_cflag &= ~CSTOPB; // one stop bit + break; + case 4: // parity + options.c_cflag &= ~(PARENB | PARODD); // no parity + if (newValue == 1) options.c_cflag |= (PARENB | PARODD); // odd parity + if (newValue == 2) options.c_cflag |= PARENB; // even parity + break; + case 5: // input flow control + options.c_iflag &= ~IXOFF; // disable xoff input flow control + options.c_cflag &= ~CRTS_IFLOW; // disable RTS (hardware) input flow control + if (newValue == 1) options.c_iflag |= IXOFF; // enable xoff input flow control + if (newValue == 2) { + options.c_cflag |= CRTS_IFLOW; // enable RTS (hardware) input flow control + if (CRTS_IFLOW == CCTS_OFLOW) { // on systems with a single hardware flow control bit: + options.c_iflag &= ~(IXON | IXOFF); // disable xon/xoff flow control + } + } + break; + case 6: // output flow control + options.c_iflag &= ~IXON; // disable xon output flow control + options.c_cflag &= ~CCTS_OFLOW; // disable CTS (hardware) output flow control + if (newValue == 1) options.c_iflag |= IXON; // enable xon output flow control + if (newValue == 2) { + options.c_cflag |= CCTS_OFLOW; // enable CTS (hardware) output flow control + if (CRTS_IFLOW == CCTS_OFLOW) { // on systems with a single hardware flow control bit: + options.c_iflag &= ~(IXON | IXOFF); // disable xon/xoff flow control + } + } + break; + + case 20: // set DTR line state + if (ioctl(fDescr, TIOCMGET, &handshake) == -1) return PRIM_FAILED; + handshake = newValue ? (handshake | TIOCM_DTR) : (handshake & ~TIOCM_DTR); + if (ioctl(fDescr, TIOCMSET, &handshake) == -1) return PRIM_FAILED; + break; + case 21: // set RTS line state + if (ioctl(fDescr, TIOCMGET, &handshake) == -1) return PRIM_FAILED; + handshake = newValue ? (handshake | TIOCM_RTS) : (handshake & ~TIOCM_RTS); + if (ioctl(fDescr, TIOCMSET, &handshake) == -1) return PRIM_FAILED; + break; + } + if (tcsetattr(fDescr, TCSANOW, &options) == -1) return PRIM_FAILED; + return 0; +} + +int SerialPortGetOption(int portNum, int optionNum) { + int fDescr, handshake = -1; + struct termios options; + + if ((fDescr = FileDescrForEntry(portNum)) < 0) return PRIM_FAILED; + if (tcgetattr(fDescr, &options) == -1) return PRIM_FAILED; + if (ioctl(fDescr, TIOCMGET, &handshake) == -1) return PRIM_FAILED; + + switch (optionNum) { + case 1: return (int) cfgetispeed(&options); + case 2: + if ((options.c_cflag & CSIZE) == CS5) return 5; + if ((options.c_cflag & CSIZE) == CS6) return 6; + if ((options.c_cflag & CSIZE) == CS7) return 7; + if ((options.c_cflag & CSIZE) == CS8) return 8; + return PRIM_FAILED; + case 3: return (options.c_cflag & CSTOPB) ? 2 : 1; + case 4: + if (!(options.c_cflag & PARENB)) return 0; + return (options.c_cflag & PARODD) ? 1 : 2; + case 5: + if (options.c_iflag & IXOFF) return 1; + if (options.c_cflag & CRTS_IFLOW) return 2; + return 0; + case 6: + if (options.c_iflag & IXON) return 1; + if (options.c_cflag & CCTS_OFLOW) return 2; + return 0; + + case 20: return (handshake & TIOCM_DTR) > 0; + case 21: return (handshake & TIOCM_RTS) > 0; + case 22: return (handshake & TIOCM_CTS) > 0; + case 23: return (handshake & TIOCM_DSR) > 0; + case 24: return (handshake & TIOCM_CD) > 0; + case 25: return (handshake & TIOCM_RI) > 0; + } + return PRIM_FAILED; +} + +// ***** helper functions ***** + +// Return the file descriptor for the given entry or -1 if either the +// given port number (index) is out of range or the port is not open. +int FileDescrForEntry(int portNum) { + if ((portNum < 0) || (portNum >= PORT_COUNT)) return PRIM_FAILED; + return gFileDescr[portNum]; +} + +// Given the path to a serial device, open the device and configure it for +// using given entryIndex. Answer 1 if the operation succeeds, 0 if it fails. +int OpenPortNamed(const char *bsdPath, int baudRate, int entryIndex) { + int fDescr = -1; + struct termios options; + + // open the serial port read/write with no controlling terminal; don't block + fDescr = open(bsdPath, O_RDWR | O_NOCTTY | O_NONBLOCK); + if (fDescr == -1) { + printf("Error opening serial port %s - %s(%d).\n", bsdPath, strerror(errno), errno); + goto error; + } + + // request exclusive access to the port + if (ioctl(fDescr, TIOCEXCL) == -1) { + printf("Error setting TIOCEXCL on %s - %s(%d).\n", bsdPath, strerror(errno), errno); + goto error; + } + + // save port settings so we can restore them later + if (tcgetattr(fDescr, &gOrigTermios[entryIndex]) == -1) { + printf("Error getting attributes %s - %s(%d).\n", bsdPath, strerror(errno), errno); + goto error; + } + + // port settings are made by modifying a copy of the termios struct + // and then calling tcsetattr() to make those changes take effect. + options = gOrigTermios[entryIndex]; + + // set the baud rate + if (cfsetspeed(&options, baudRate) == -1) { + printf("Error setting speed %d %s - %s(%d).\n", baudRate, bsdPath, strerror(errno), errno); + goto error; + } + + // set raw input (non-canonical) mode, with writes not blocking. + cfmakeraw(&options); + options.c_cc[VMIN] = 0; + options.c_cc[VTIME] = 0; + + // install the new port settings + if (tcsetattr(fDescr, TCSANOW, &options) == -1) { + printf("Error setting attributes %s - %s(%d).\n", bsdPath, strerror(errno), errno); + goto error; + } + gFileDescr[entryIndex] = fDescr; + return 1; // success! + +error: + if (fDescr != -1) close(fDescr); + return 0; +} + +int isSerialPortDev(char *s) { + return isPrefix("ttyusb", s); +} + +int isPrefix(char *prefix, char *s) { + int prefixC, c; + while (1) { + prefixC = *prefix++; + c = *s++; + if (prefixC == 0) return 1; // match! + if (c == 0) return 0; // s is shorter than prefix + if (c != prefixC) { + if (('a' <= c) && (c <= 'z')) c -= 32; + if (('a' <= prefixC) && (prefixC <= 'z')) prefixC -= 32; + if (c != prefixC) return 0; // non-match + } + } +} Property changes on: branches/Cog/platforms/unix/plugins/ScratchPlugin/unixSeriaPort2Ops.c ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/platforms/unix/plugins/UnicodePlugin/Makefile.inc =================================================================== --- branches/Cog/platforms/unix/plugins/UnicodePlugin/Makefile.inc (rev 0) +++ branches/Cog/platforms/unix/plugins/UnicodePlugin/Makefile.inc 2014-07-16 23:09:05 UTC (rev 3045) @@ -0,0 +1,2 @@ +XCPPFLAGS= -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/arm-linux-gnueabihf/glib-2.0/include +XLDFLAGS= -lpangocairo-1.0 -lcairo -lpango-1.0 -lgobject-2.0 -lglib-2.0 Added: branches/Cog/platforms/unix/plugins/UnicodePlugin/README.UnicodePlugin =================================================================== --- branches/Cog/platforms/unix/plugins/UnicodePlugin/README.UnicodePlugin (rev 0) +++ branches/Cog/platforms/unix/plugins/UnicodePlugin/README.UnicodePlugin 2014-07-16 23:09:05 UTC (rev 3045) @@ -0,0 +1 @@ +In order to build the Unicode plugin on Linux, you'll need a collection of Pango, Cairo, and glib header and library files. These can often be found in the GTK+ development package in the package repository for your version of Linux. Property changes on: branches/Cog/platforms/unix/plugins/UnicodePlugin/README.UnicodePlugin ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/platforms/unix/plugins/UnicodePlugin/UnicodeOps-linux.c =================================================================== --- branches/Cog/platforms/unix/plugins/UnicodePlugin/UnicodeOps-linux.c (rev 0) +++ branches/Cog/platforms/unix/plugins/UnicodePlugin/UnicodeOps-linux.c 2014-07-16 23:09:05 UTC (rev 3045) @@ -0,0 +1,280 @@ +/* UnicodeOps-linux.c + * + * + * Copyright (C) 2011 Massachusetts Institute of Technology + * All rights reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + */ + + +#include <pango/pangocairo.h> +#include <glib/gprintf.h> +#include <string.h> + +/* entry points */ + +int unicodeClipboardGet(unsigned short *utf16, int utf16Length); +void unicodeClipboardPut(unsigned short *utf16, int utf16Length); +int unicodeClipboardSize(void); +void unicodeDrawString(char *utf8, int utf8Length, int *wPtr, int *hPtr, unsigned int *bitmapPtr); +int unicodeGetFontList(char *str, int strLength); +int unicodeGetXRanges(char *utf8, int utf8Length, int *resultPtr, int resultLength); +void unicodeMeasureString(char *utf8, int utf8Length, int *wPtr, int *hPtr); +void unicodeSetColors(int fgRed, int fgGreen, int fgBlue, int bgRed, int bgGreen, int bgBlue, int mapBGToTransparent); +void unicodeSetFont(char *fontName, int fontSize, int boldFlag, int italicFlag, int antiAliasFlag); + +/* globals */ + +PangoLayout *cachedLayout = NULL; // used for measuring +PangoFontDescription *fontDescr = NULL; +cairo_font_options_t* fontOptions = NULL; + +int g_bgRed = 255, g_bgGreen = 255, g_bgBlue = 255; +int g_fgRed = 0, g_fgGreen = 0, g_fgBlue = 0; +int g_bgRGB = 0; // Squeak format +int g_bgTransparent = 0; + +/* helper procedures */ + +void computeLayout(PangoLayout *layout, char *utf8, int utf8Length, int *wPtr, int *hPtr, int *xOffsetPtr, int *yOffsetPtr, int *layoutDetailsPtr) { + PangoRectangle inkRect, logicalRect; + int left, top, right, bottom, baseline; + PangoLayoutIter *iter; + + if (fontDescr == NULL) unicodeSetFont("Verdana", 18, 0, 0, 1); + pango_cairo_context_set_font_options(pango_layout_get_context(layout), fontOptions); + pango_layout_set_font_description(layout, fontDescr); + pango_layout_set_text(layout, utf8, utf8Length); + pango_layout_get_pixel_extents(layout, &inkRect, &logicalRect); + + left = (inkRect.x < logicalRect.x) ? inkRect.x : logicalRect.x; + top = (inkRect.y < logicalRect.y) ? inkRect.y : logicalRect.y; + right = inkRect.x + inkRect.width; + if ((logicalRect.x + logicalRect.width) > right) right = logicalRect.x + logicalRect.width; + bottom = inkRect.y + inkRect.height; + if ((logicalRect.y + logicalRect.height) > bottom) bottom = logicalRect.y + logicalRect.height; + + iter = pango_layout_get_iter(layout); + baseline = PANGO_PIXELS(pango_layout_iter_get_baseline(iter)); + pango_layout_iter_free(iter); + + if (left < 0) { + inkRect.x = inkRect.x - left; + logicalRect.x = logicalRect.x - left; + } + if (top < 0) { + inkRect.y = inkRect.y - top; + logicalRect.y = logicalRect.y - top; + baseline = baseline - top; + } + + if (layoutDetailsPtr != NULL) { + layoutDetailsPtr[0] = inkRect.x; + layoutDetailsPtr[1] = inkRect.y; + layoutDetailsPtr[2] = inkRect.width; + layoutDetailsPtr[3] = inkRect.height; + + layoutDetailsPtr[4] = logicalRect.x; + layoutDetailsPtr[5] = logicalRect.y; + layoutDetailsPtr[6] = logicalRect.width; + layoutDetailsPtr[7] = logicalRect.height; + + layoutDetailsPtr[8] = baseline; + } + + *wPtr = right - left; + *hPtr = bottom - top; + *xOffsetPtr = left < 0 ? -left : 0; + *yOffsetPtr = top < 0 ? -top : 0; +} + +int unicodeLength(char *utf8, int utf8Length) { + int count, i, ch; + + count = i = 0; + while (i < utf8Length) { + count++; + ch = utf8[i]; + if ((ch & 0xE0) == 0xC0) i += 2; + else if ((ch & 0xF0) == 0xE0) i += 3; + else if ((ch & 0xF8) == 0xF0) i += 4; + else i += 1; + } + return count; +} + +/* entry points */ + +// Clipboard operations are not yet implemented +int unicodeClipboardGet(unsigned short *utf16, int utf16Length) { return 0; } +void unicodeClipboardPut(unsigned short *utf16, int utf16Length) { } +int unicodeClipboardSize(void) { return 0; } + +int unicodeGetFontList(char *str, int strLength) { + PangoFontMap *fontMap; + PangoFontFamily **fontFomilies; + int count, i; + + str[0] = '\0'; + + if (cachedLayout == NULL) { + cairo_surface_t *surface = cairo_image_surface_create(CAIRO_FORMAT_A8, 1, 1); + cairo_t *cr = cairo_create(surface); + cachedLayout = pango_cairo_create_layout(cr); + } + + fontMap = pango_context_get_font_map(pango_layout_get_context(cachedLayout)); + pango_font_map_list_families(fontMap, &fontFomilies, &count); + + for (i = 0; i < count; i++) { + strncat(str, pango_font_family_get_name(fontFomilies[i]), strLength); + strncat(str, "\n", strLength); + } + g_free(fontFomilies); + return strlen(str); +} + +void unicodeDrawString(char *utf8, int utf8Length, int *wPtr, int *hPtr, unsigned int *bitmapPtr) { + int w = *wPtr; + int h = *hPtr; + int pixelCount = w * h; + int offsetX, offsetY; + unsigned int *pixelPtr, *lastPtr; + + cairo_surface_t *surface = cairo_image_surface_create_for_data((unsigned char *) bitmapPtr, CAIRO_FORMAT_RGB24, w, h, (4 * w)); + cairo_t *cr = cairo_create(surface); + PangoLayout *layout = pango_cairo_create_layout(cr); + + computeLayout(layout, utf8, utf8Length, wPtr, hPtr, &offsetX, &offsetY, NULL); + + // fill with background color if not transparent + if (g_bgRGB != 0) { + cairo_set_source_rgb(cr, g_bgRed / 255.0, g_bgGreen / 255.0, g_bgBlue / 255.0); + cairo_paint(cr); + } + + cairo_translate(cr, offsetX, offsetY); + cairo_set_source_rgb(cr, g_fgRed / 255.0, g_fgGreen / 255.0, g_fgBlue / 255.0); + pango_cairo_show_layout(cr, layout); + + // map bg color pixels to transparent if so desired + if (g_bgTransparent) { + pixelPtr = bitmapPtr; + lastPtr = pixelPtr + pixelCount; + while (pixelPtr < lastPtr) { + if (*pixelPtr == g_bgRGB) *pixelPtr = 0; + pixelPtr++; + } + } + + g_object_unref(layout); + cairo_destroy(cr); + cairo_surface_destroy(surface); +} + +int unicodeGetXRanges(char *utf8, int utf8Length, int *resultPtr, int resultLength) { + int w, h, offsetX, offsetY; + int count, ch, i, j; + PangoRectangle rect; + + count = unicodeLength(utf8, utf8Length); + if (resultLength < (2 * count)) return -1; + + if (cachedLayout == NULL) { + cairo_surface_t *surface = cairo_image_surface_create(CAIRO_FORMAT_A8, 1, 1); + cairo_t *cr = cairo_create(surface); + cachedLayout = pango_cairo_create_layout(cr); + } + + computeLayout(cachedLayout, utf8, utf8Length, &w, &h, &offsetX, &offsetY, NULL); + + i = j = 0; + while ((i < utf8Length) && (j < (resultLength - 1))) { + pango_layout_index_to_pos(cachedLayout, i, &rect); + ch = utf8[i]; + if ((ch & 0xE0) == 0xC0) i += 2; + else if ((ch & 0xF0) == 0xE0) i += 3; + else if ((ch & 0xF8) == 0xF0) i += 4; + else i += 1; + resultPtr[j] = PANGO_PIXELS(rect.x); + resultPtr[j + 1] = PANGO_PIXELS(rect.x + rect.width); + j += 2; + } + + return count; +} + +void unicodeMeasureString(char *utf8, int utf8Length, int *wPtr, int *hPtr) { + int offsetX, offsetY; + + if (cachedLayout == NULL) { + cairo_surface_t *surface = cairo_image_surface_create(CAIRO_FORMAT_A8, 1, 1); + cairo_t *cr = cairo_create(surface); + cachedLayout = pango_cairo_create_layout(cr); + } + + computeLayout(cachedLayout, utf8, utf8Length, wPtr, hPtr, &offsetX, &offsetY, NULL); +} + +void unicodeSetColors(int fgRed, int fgGreen, int fgBlue, int bgRed, int bgGreen, int bgBlue, int mapBGToTransparent) { + g_fgRed = fgRed & 255; + g_fgGreen = fgGreen & 255; + g_fgBlue = fgBlue & 255; + g_bgRed = bgRed & 255; + g_bgGreen = bgGreen & 255; + g_bgBlue = bgBlue & 255; + g_bgRGB = (g_bgRed << 16) | (g_bgGreen << 8) | g_bgBlue; // Squeak pixel format + g_bgTransparent = mapBGToTransparent; +} + +void unicodeSetFont(char *fontName, int fontSize, int boldFlag, int italicFlag, int antiAliasFlag) { + char description[200]; + g_sprintf(description, "%s, %s %s %dpx", + fontName, + (boldFlag ? "bold" : ""), + (italicFlag ? "italic" : ""), + fontSize); + + if (fontDescr != NULL) pango_font_description_free(fontDescr); + fontDescr = pango_font_description_from_string(description); + + if (fontOptions == NULL) { + fontOptions = cairo_font_options_create(); + // Note: On Mac OS, the default hint style and metrics looked the best. Also, using + // the default allows the user to control the look via the OS settings. + /* + styles: + CAIRO_HINT_STYLE_DEFAULT Use the default hint style for for font backend and target device + CAIRO_HINT_STYLE_NONE Do not hint outlines + CAIRO_HINT_STYLE_SLIGHT Hint outlines slightly to improve contrast while retaining good fidelity to the original shapes. + CAIRO_HINT_STYLE_MEDIUM Hint outlines with medium strength giving a compromise between fidelity to the original shapes and contrast + CAIRO_HINT_STYLE_FULL Hint outlines to maximize contrast + metrics: + CAIRO_HINT_METRICS_DEFAULT Hint metrics in the default manner for the font backend and target device + CAIRO_HINT_METRICS_OFF Do not hint font metrics @@ Diff output truncated at 50000 characters. @@

1 0

[commit][3044] add ARM build tree skeleton
by commits＠squeakvm.org 17 Jul '14

17 Jul '14

Revision: 3044 Author: rowledge Date: 2014-07-16 15:58:01 -0700 (Wed, 16 Jul 2014) Log Message: ----------- add ARM build tree skeleton Added Paths: ----------- branches/Cog/build.linux32ARMv6/ branches/Cog/build.linux32ARMv6/HowToBuild branches/Cog/build.linux32ARMv6/makeall branches/Cog/build.linux32ARMv6/makeproduct branches/Cog/build.linux32ARMv6/mkNamedPrims.sh branches/Cog/build.linux32ARMv6/squeak.stack.v3/ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build/ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build/mvm branches/Cog/build.linux32ARMv6/squeak.stack.v3/build/plugins.ext branches/Cog/build.linux32ARMv6/squeak.stack.v3/build/plugins.int branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/mvm branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/plugins.ext branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/plugins.int branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/mvm branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/plugins.ext branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/plugins.int branches/Cog/build.linux32ARMv6/squeak.stack.v3/makeallclean branches/Cog/build.linux32ARMv6/squeak.stack.v3/makealldirty Added: branches/Cog/build.linux32ARMv6/HowToBuild =================================================================== --- branches/Cog/build.linux32ARMv6/HowToBuild (rev 0) +++ branches/Cog/build.linux32ARMv6/HowToBuild 2014-07-16 22:58:01 UTC (rev 3044) @@ -0,0 +1,218 @@ +How To Build On Linux +--------------------- + + +Contents: + - Overview + - Checking out sources to build out-of-the-box + - Building out of the box + - Building the Bochs Support Libraries + - Compiling in 32-bit mode on a 64-bit linux + - How to configure and build a VM on Unix + - Testing an external plugin has completely linked + - Optimization level and gcc version (please read!) + + +Overview +-------- +The "Cog" VM comes in a bewildering variety of forms. The first distinction +is between Squeak/Croquet VMs that run Squeak, Pharo, Cuis, Croquet images +and their ilk, and between Newspeak VMs that run Newspeak. + +Another distinction is between Stack, Cog and Sista VMs. Stack VMs are those +with context-to-stack mapping that optimise message sending by keeping method +activations on a stack instead of in contexts. These are pure interpreters but +significantly faster than the standard context-based Interpreter VM. Cog VMs +add a JIT to the mix, compiling methods used more than once to maxchine code on +the fly. Sista VMs, as yet unrealised and in development, add support for +adaptive optimization that does speculative inlining at the bytecode-to-bytecode +level. These are targeted for release in 2015. + +Another distinction is between "v3" VMs and Spur VMs. "v3" is the original +object representation for Squeak as described in the back-to-the-future paper. +Spur, as described on the www.mirandabanda.org blog, is a faster object +representation which uses generation scavenging, lazy forwarding for fast +become, and a single object header format common to 32 and 64 bit versions. + +Another distinction is between normal single-threaded VMs that schedule "green" +Smalltalk processes above a single-threaded VM, and "multi-threaded" VMs that +share the VM between any number of native threads such that only one native +thread owns the VM at any one time, switching between threads on FFI calls and +callbacks or on Smalltalk process switches when Smalltalk processes are owned +by threads. This multi-threaded support is as yet experimental. + +A distinction on linux is between VMs with an itimer hearbeat or a threaded +heartbeat. VMs with an itimer hearbeat use setitimer to deliver a SIGALRM +signal at regular intervals to interrupt the VM to check for events. These +signals can be troublesome, interrupting foreign code that cannot cope with +such signals. VMs with a threaded heartbeat use a high-priority thread that +loops, blocking on nanosleep and then interrupting the VM, performing the same +function as the itimer heartbeat but without using signals. These VMs are to +be preferred but suport for multiple thread priorities in user-level processes +has only been available on linux in kernels later than 2.6.12. + +The final distinction is between production, assert and debug VMs. Production +VMs are fully optimized, although they may include debugging symbols, and as +their name implies are for use in production. Assert and debug VMs include +many assert checks that are disabled in the production VMs. These asserts are +very helpful in debugging VM problems but significantly impact performance. +The difference between assert and debug VMs is that assert VMs are compiled +with moderate optimization, which improves the performance of the asserts, +whereas debug VMs are compiled with no optimization at all, providing maximum +debuggability with minimum performance. + +This directory tree provides build directories for some of this matrix. For +example, squeak.cog.v3 contains build directories for Smalltalk Cog VMs using +the old object representation, newspeak.stack.spur contains build directories +for Newspeak Stack VMs using the Spur object representation. Build as desired. + + +Checking out sources to build out-of-the-box +-------------------------------------------- +Check-out at least the relevant platform sources, vm and plugin sources, and +the relevant build directories + svn co http://www.squeakvm.org/svn/squeak/branches/Cog/platforms + svn co http://www.squeakvm.org/svn/squeak/branches/Cog/build.linux32x86 + svn co http://www.squeakvm.org/svn/squeak/branches/Cog/src etc + (see section "VM source directories" in the root README) + + +Building out of the box +----------------------- +Install the tools (gcc, X11-devel, etc (e.g. libpng, libX11 & libxt source)). +Then cd to the build directory of your choice, e.g. + build.linux32x86/squeak.cog.spur/build +Then either remove any BochsIA32Plugin line from plugins.ext or build the +Bochs support libraries (see Building the Bochs Support Libraries below). +Then execute + ./mvm +answering "y" to perform a clean build or "n" to rebuild without recionfiguring. +The subdirectories confrm to the production/assert/debug x itimer vs threaded +heartbeat x single vs multi-threaded parts of the matrix described above. For +example, build.linux32x86/squeak.cog.v3 includes + + build + build.itimerheartbeat + build.multithreaded + + build.assert + build.assert.itimerheartbeat + build.multithreaded.assert + + build.debug + build.multithreaded.debug + build.debug.itimerheartbeat + +subdirectories. It includes two convenience scripts that will make all +configurations: + makeallclean + makealldirty + +Each build directory contains three files + mvm + plugins.int + plugins.ext +The mvm script runs ../platforms/unix/config/configure with the relevant +options, runs make, and then make install to create a VM directory tree in +../products, ../products/assert or ../products/debug as appropriate. +plugins.int and plugins.ext determine the set of plugins to be taken from +the supplied plugins directory (which defaults to ../src/plugins), and which +are to be linked into the VM (plugins.int) or compiled as external shared +objects to be dynamically linked at run-time (plugins.ext). + +Finally, at the build.linux32x86 level the makeall script will run all the +makeallclean scripts it can find. + + +Building the Bochs Support Libraries +------------------------------------ +If you want to get the Cog VM simulator working you'll need to build the +BochsIA32Plugin and to build that you'll need to first build bochs. First +check-out the processor simulator source tree containing Bochs: + svn co http://www.squeakvm.org/svn/squeak/branches/Cog/processors +Then build libraries linuxbochs/{cpu/libcpu.a,disasm/libdisasm.a,fpu/libfpu.a} + $ cd ../processors/IA32/linuxbochs + $ ./conf.COG + $ ../bochs/makeem + + +Compiling in 32-bit mode on a 64-bit linux +------------------------------- +If you're building the VM on a 64-bit OS, you'll need a compiler which can +compile and link to 32-bit binaries. On most Linuxes the gcc-multilib package +provides the 32-bit compiler and the ia32-libs provides the 32-bit libraries. +You'll also have to add the -m32 switch to all gcc & g++ invocations. The +easiest way to do this is to add CC="gcc -m32" & CXX="g++ -m32" to the configure +script: + ../../platforms/unix/config/configure CC="gcc -m32" CXX="g++ -m32" --without-npsqueak CFLAGS="-g -O2 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=0" LIBS=-lpthread +To run a 32-bit VM on a 64-bit OS, you'll also need the 32-bit libraries +provided by the ia32-libs package. + +According to Paul DeBruicker the following packages need to be installed to +compile in 32-bt mode on 64-bit ubuntu. YMMV. + +build-essential +lib32asound2-dev +libgl1-mesa-dev +libglu1-mesa-dev +ia32-libs +gcc-multilib +g++multilib + +In addition phil(a)highoctane.be installed libc6dev-i386. + +This in itself may not be enough, but persistence will pay off. See for example +http://permalink.gmane.org/gmane.comp.lang.smalltalk.pharo.devel/75198. + + +How to configure and build a VM on Unix +------------------------------- +The mvm scripts are themselves wrappers around an adaptation of Ian Piumarta's +Squeak build system above autoconf to the Cog sources. One can choose the vm +source files, plugin source files, and optimization level to compile a VM of +your choice. To find the full set of options via + + ../platforms/unix/config/configure --help + +You can see the use of configure in the various mvm scripts in each build +directory. + +e.g. + ../../platforms/unix/config/configure --without-npsqueak CFLAGS="-g -O2 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=0" LIBS=-lpthread + make install prefix=WhereYouWantTheVmToGo + + N.B. If you're on a 64-bit linux read 3e below!! + N.B. On Ubuntu *do not* supply "LIBS=-lpthread -luuid", i.e. use + ../../platforms/unix/config/configure --without-npsqueak CFLAGS="-g -O2 -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DITIMER_HEARTBEAT=1 -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=0" + + +N.B. The plugin set is defined by plugins.ext and plugins.int in the build dir. + + + +Testing an external plugin has completely linked +------------------------------- +You may find that an external plugin compiles and links but does not load. +This is usually because it contans undefined symbols. To find undefined +symbols, remake the plugin, capturing the link step and then supply + -Wl,--warn-unresolved-symbols -Wl,--no-allow-shlib-undefined +when manually repeating the link command + + +Optimization level and gcc version +---------------------------------- +There are issues with gcc version > 4.2.1. Any of the following flags may break the build at -O2: +-ftree-pre +-fpartial-inlining +-fcaller-saves + +So turn them off. e.g. + ../../platforms/unix/config/configure --without-npsqueak CFLAGS="-g -O2 -msse2 -fno-caller-saves -fno-partial-inlining -fno-tree-pre -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DNO_VM_PROFILE=1 -DCOGMTVM=0 -DDEBUGVM=0" LIBS="-lpthread -luuid" +See http://smallissimo.blogspot.fr/2013/02/compiling-squeak-cog-virtual-machine… + +There appear to be issues with 3.4.x gcc version on RedHat. In particular +compiling the Newspeak VM with either of + gcc version 3.4.6 20060404 (Red Hat 3.4.6-3) + gcc version 3.4.6 20060404 (Red Hat 3.4.6-10) +using -O2 results in a VM that segfaults early in startup. For these compilers +it is probably wise to use -O1, even though -O3 seems to work. Added: branches/Cog/build.linux32ARMv6/makeall =================================================================== --- branches/Cog/build.linux32ARMv6/makeall (rev 0) +++ branches/Cog/build.linux32ARMv6/makeall 2014-07-16 22:58:01 UTC (rev 3044) @@ -0,0 +1,9 @@ +#!/bin/bash +trap 'exit 2' HUP INT PIPE TERM +for d in newspeak.cog.* newspeak.stack.* squeak.*; do + if test -d "$d"; then + (cd $d;./makeallclean "$@") + else + echo no $d directory found + fi +done Property changes on: branches/Cog/build.linux32ARMv6/makeall ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32ARMv6/makeproduct =================================================================== --- branches/Cog/build.linux32ARMv6/makeproduct (rev 0) +++ branches/Cog/build.linux32ARMv6/makeproduct 2014-07-16 22:58:01 UTC (rev 3044) @@ -0,0 +1,9 @@ +#!/bin/bash +trap 'exit 2' HUP INT PIPE TERM +for d in newspeak.cog.spur newspeak.cog.spur squeak.cog.spur squeak.cog.v3; do + if test -d "$d"; then + (cd $d;./makeallclean "$@") + else + echo no $d directory found + fi +done Property changes on: branches/Cog/build.linux32ARMv6/makeproduct ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32ARMv6/mkNamedPrims.sh =================================================================== --- branches/Cog/build.linux32ARMv6/mkNamedPrims.sh (rev 0) +++ branches/Cog/build.linux32ARMv6/mkNamedPrims.sh 2014-07-16 22:58:01 UTC (rev 3044) @@ -0,0 +1,24 @@ +#!/bin/sh +# Generate a sqNamedPrims.h file from plugins.int. The plugins.int used should +# be the one and only argument. +if [ $# != 1 -o ! -f "$1" ]; then + echo usage $0 plugins.int ">sqNamedPrims.h" 1>&2 + exit 1 +fi +echo "/* Automatically generated on "`date`" */" +echo "extern sqExport vm_exports[];"; +echo "extern sqExport os_exports[];"; +for p in `grep -v '^#' "$1" | sed 's/INTERNAL_PLUGINS = //' | tr -d '\\\\\\012'` +do + echo "extern sqExport "$p"_exports[];" +done +echo +echo "sqExport *pluginExports[] = {" +echo " vm_exports," +echo " os_exports," +for p in `grep -v '^#' "$1" | sed 's/INTERNAL_PLUGINS = //' | tr -d '\\\\\\012'` +do + echo " "$p"_exports," +done +echo " NULL" +echo "};" Property changes on: branches/Cog/build.linux32ARMv6/mkNamedPrims.sh ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32ARMv6/squeak.stack.v3/build/mvm =================================================================== --- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build/mvm (rev 0) +++ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build/mvm 2014-07-16 22:58:01 UTC (rev 3044) @@ -0,0 +1,32 @@ +#!/bin/bash +# Stack VM with VM profiler and threaded heartbeat +INSTALLDIR=stklinuxhtARM +# Some gcc versions create a broken VM using -O2 +case `gcc -v 2>&1 | grep version | sed 's/gcc version *//'` in +3.4.*) OPT="-g -O1 -DNDEBUG -DDEBUGVM=0 -DNO_VM_PROFILE=1";; +*) OPT="-g -O3 -DNDEBUG -DDEBUGVM=0 -DNO_VM_PROFILE=1";; +esac + +if [ $# -ge 1 ]; then + INSTALLDIR="$1"; shift +fi + +echo -n "clean? " +read a +case $a in +n|no|N|NO) echo "ok but this isn't safe!!";; +*) rm config.h; test -f Makefile && make reallyclean +esac +test -f config.h || ../../../platforms/unix/config/configure \ + --with-src=stacksrc --with-plugins=src/plugins --disable-cogit \ + --without-vm-display-fbdev --without-npsqueak \ + CC="gcc " \ + CXX="g++ " \ + CFLAGS="$OPT -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DI_REALLY_DONT_CARE_HOW_UNSAFE_THIS_IS" \ + LIBS="-lpthread -luuid" \ + LDFLAGS=-Wl,-z,now +rm -f vm/sqUnixMain.o # nuke version info +rm -rf ../../../products/$INSTALLDIR +# prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` +# but older linux readlinks lack the -f flag and Raspbian lacks `readlinks` +make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Property changes on: branches/Cog/build.linux32ARMv6/squeak.stack.v3/build/mvm ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32ARMv6/squeak.stack.v3/build/plugins.ext =================================================================== --- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build/plugins.ext (rev 0) +++ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build/plugins.ext 2014-07-16 22:58:01 UTC (rev 3044) @@ -0,0 +1,7 @@ +# Copied, perhaps edited, from ../../src/examplePlugins.ext +EXTERNAL_PLUGINS = \ +LocalePlugin \ +UnixOSProcessPlugin \ +UUIDPlugin \ +UnicodePlugin \ +XDisplayControlPlugin Added: branches/Cog/build.linux32ARMv6/squeak.stack.v3/build/plugins.int =================================================================== --- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build/plugins.int (rev 0) +++ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build/plugins.int 2014-07-16 22:58:01 UTC (rev 3044) @@ -0,0 +1,35 @@ +# Copied, perhaps edited, from ../../src/examplePlugins.int +INTERNAL_PLUGINS = \ +ADPCMCodecPlugin \ +AioPlugin \ +AsynchFilePlugin \ +B2DPlugin \ +BitBltPlugin \ +BMPReadWriterPlugin \ +ZipPlugin \ +DropPlugin \ +DSAPrims \ +FFTPlugin \ +FileCopyPlugin \ +FilePlugin \ +FloatArrayPlugin \ +FloatMathPlugin \ +JoystickTabletPlugin \ +JPEGReaderPlugin \ +JPEGReadWriter2Plugin \ +Klatt \ +LargeIntegers \ +Matrix2x3Plugin \ +MIDIPlugin \ +MiscPrimitivePlugin \ +Mpeg3Plugin \ +RePlugin \ +SecurityPlugin \ +SerialPlugin \ +SocketPlugin \ +SoundCodecPrims \ +SoundGenerationPlugin \ +SoundPlugin \ +StarSqueakPlugin \ +SurfacePlugin \ +VMProfileLinuxSupportPlugin Added: branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/mvm =================================================================== --- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/mvm (rev 0) +++ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/mvm 2014-07-16 22:58:01 UTC (rev 3044) @@ -0,0 +1,28 @@ +#!/bin/bash +# assert Stack VM with VM profiler and threaded heartbeat +INSTALLDIR=assert/stklinuxht +OPT="-g3 -O1 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -DDEBUGVM=0" + +if [ $# -ge 1 ]; then + INSTALLDIR="$1"; shift +fi + +echo -n "clean? " +read a +case $a in +n|no|N|NO) echo "ok but this isn't safe!!";; +*) rm config.h; test -f Makefile && make reallyclean +esac +test -f config.h || ../../../platforms/unix/config/configure \ + --with-src=stacksrc --with-plugins=src/plugins --disable-cogit \ + --without-vm-display-fbdev --without-npsqueak \ + CC="gcc -m32" \ + CXX="g++ -m32" \ + CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \ + LIBS="-lpthread -luuid" \ + LDFLAGS=-Wl,-z,now +rm -f vm/sqUnixMain.o # nuke version info +rm -rf ../../../products/$INSTALLDIR +# prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` +# but older linux readlinks lack the -f flag +make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Property changes on: branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/mvm ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/plugins.ext =================================================================== --- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/plugins.ext (rev 0) +++ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/plugins.ext 2014-07-16 22:58:01 UTC (rev 3044) @@ -0,0 +1,9 @@ +# Copied, perhaps edited, from ../../src/examplePlugins.ext +EXTERNAL_PLUGINS = \ +B3DAcceleratorPlugin \ +SqueakFFIPrims \ +SqueakSSL \ +LocalePlugin \ +UnixOSProcessPlugin \ +UUIDPlugin \ +XDisplayControlPlugin Added: branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/plugins.int =================================================================== --- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/plugins.int (rev 0) +++ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.assert/plugins.int 2014-07-16 22:58:01 UTC (rev 3044) @@ -0,0 +1,37 @@ +# Copied, perhaps edited, from ../../src/examplePlugins.int +INTERNAL_PLUGINS = \ +ADPCMCodecPlugin \ +AioPlugin \ +AsynchFilePlugin \ +B2DPlugin \ +BitBltPlugin \ +BMPReadWriterPlugin \ +CroquetPlugin \ +ZipPlugin \ +DropPlugin \ +DSAPrims \ +FFTPlugin \ +FileCopyPlugin \ +FilePlugin \ +FloatArrayPlugin \ +FloatMathPlugin \ +IA32ABI \ +JoystickTabletPlugin \ +JPEGReaderPlugin \ +JPEGReadWriter2Plugin \ +Klatt \ +LargeIntegers \ +Matrix2x3Plugin \ +MIDIPlugin \ +MiscPrimitivePlugin \ +Mpeg3Plugin \ +RePlugin \ +SecurityPlugin \ +SerialPlugin \ +SocketPlugin \ +SoundCodecPrims \ +SoundGenerationPlugin \ +SoundPlugin \ +StarSqueakPlugin \ +SurfacePlugin \ +VMProfileLinuxSupportPlugin Added: branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/mvm =================================================================== --- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/mvm (rev 0) +++ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/mvm 2014-07-16 22:58:01 UTC (rev 3044) @@ -0,0 +1,28 @@ +#!/bin/bash +# debug Stack VM with VM profiler and threaded heartbeat +INSTALLDIR=debug/stklinuxht +OPT="-g3 -O0 -DDEBUGVM=1" + +if [ $# -ge 1 ]; then + INSTALLDIR="$1"; shift +fi + +echo -n "clean? " +read a +case $a in +n|no|N|NO) echo "ok but this isn't safe!!";; +*) rm config.h; test -f Makefile && make reallyclean +esac +test -f config.h || ../../../platforms/unix/config/configure \ + --with-src=stacksrc --with-plugins=src/plugins --disable-cogit \ + --without-vm-display-fbdev --without-npsqueak \ + CC="gcc -m32" \ + CXX="g++ -m32" \ + CFLAGS="$OPT -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" \ + LIBS="-lpthread -luuid" \ + LDFLAGS=-Wl,-z,now +rm -f vm/sqUnixMain.o # nuke version info +rm -rf ../../../products/$INSTALLDIR +# prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` +# but older linux readlinks lack the -f flag +make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Property changes on: branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/mvm ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/plugins.ext =================================================================== --- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/plugins.ext (rev 0) +++ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/plugins.ext 2014-07-16 22:58:01 UTC (rev 3044) @@ -0,0 +1,9 @@ +# Copied, perhaps edited, from ../../src/examplePlugins.ext +EXTERNAL_PLUGINS = \ +B3DAcceleratorPlugin \ +SqueakFFIPrims \ +SqueakSSL \ +LocalePlugin \ +UnixOSProcessPlugin \ +UUIDPlugin \ +XDisplayControlPlugin Added: branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/plugins.int =================================================================== --- branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/plugins.int (rev 0) +++ branches/Cog/build.linux32ARMv6/squeak.stack.v3/build.debug/plugins.int 2014-07-16 22:58:01 UTC (rev 3044) @@ -0,0 +1,37 @@ +# Copied, perhaps edited, from ../../src/examplePlugins.int +INTERNAL_PLUGINS = \ +ADPCMCodecPlugin \ +AioPlugin \ +AsynchFilePlugin \ +B2DPlugin \ +BitBltPlugin \ +BMPReadWriterPlugin \ +CroquetPlugin \ +ZipPlugin \ +DropPlugin \ +DSAPrims \ +FFTPlugin \ +FileCopyPlugin \ +FilePlugin \ +FloatArrayPlugin \ +FloatMathPlugin \ +IA32ABI \ +JoystickTabletPlugin \ +JPEGReaderPlugin \ +JPEGReadWriter2Plugin \ +Klatt \ +LargeIntegers \ +Matrix2x3Plugin \ +MIDIPlugin \ +MiscPrimitivePlugin \ +Mpeg3Plugin \ +RePlugin \ +SecurityPlugin \ +SerialPlugin \ +SocketPlugin \ +SoundCodecPrims \ +SoundGenerationPlugin \ +SoundPlugin \ +StarSqueakPlugin \ +SurfacePlugin \ +VMProfileLinuxSupportPlugin Added: branches/Cog/build.linux32ARMv6/squeak.stack.v3/makeallclean =================================================================== --- branches/Cog/build.linux32ARMv6/squeak.stack.v3/makeallclean (rev 0) +++ branches/Cog/build.linux32ARMv6/squeak.stack.v3/makeallclean 2014-07-16 22:58:01 UTC (rev 3044) @@ -0,0 +1,6 @@ +#!/bin/sh +trap 'exit 2' HUP INT PIPE TERM +for d in `dirname $0`/build*; do + (cd $d + echo y | ./mvm "$@") +done Property changes on: branches/Cog/build.linux32ARMv6/squeak.stack.v3/makeallclean ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32ARMv6/squeak.stack.v3/makealldirty =================================================================== --- branches/Cog/build.linux32ARMv6/squeak.stack.v3/makealldirty (rev 0) +++ branches/Cog/build.linux32ARMv6/squeak.stack.v3/makealldirty 2014-07-16 22:58:01 UTC (rev 3044) @@ -0,0 +1,6 @@ +#!/bin/sh +trap 'exit 2' HUP INT PIPE TERM +for d in `dirname $0`/build*; do + (cd $d + echo n | ./mvm "$@") +done Property changes on: branches/Cog/build.linux32ARMv6/squeak.stack.v3/makealldirty ___________________________________________________________________ Added: svn:executable + *

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
16
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 July 2014