[Vm-dev] VM Maker: CMakeVMMakerSqueak-tty.82.mcz
commits at source.squeak.org
commits at source.squeak.org
Thu Jul 3 18:18:41 UTC 2014
Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker:
http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.82.mcz
==================== Summary ====================
Name: CMakeVMMakerSqueak-tty.82
Author: tty
Time: 3 July 2014, 2:18:36.148 pm
UUID: 270ad62e-f37b-4897-97be-7cf21a3d5f60
Ancestors: CMakeVMMakerSqueak-tty.81
fix extraPluginSettings(Build): aMaker on Linux32x86SqueakCogV3Config
Added standard buildType redirect infrastructure for extraPluginSettings.
Wrote test to make sure it is implemented on all executable configs.
Took a deep breath and, using a crow-bar, broke my frustration-induced death grip on the keyboard.
Next up.
build a squeak.stack.v3 from scratch and document creation steps.
=============== Diff against CMakeVMMakerSqueak-tty.81 ===============
Item was changed:
----- Method: CMakePluginGeneratorForSqueak>>generate (in category 'squeak compatibility') -----
generate
| name |
output := String new writeStream.
name := plugin moduleName.
#( vmGen config setGlobalOptions: self.
self
printHeader;
project: name;
"include directories generated for build"
include: '../directories.cmake'.
self set: 'CMAKE_CONFIGURATION_TYPES' to: 'Release'.
).
self message: (internal ifTrue: [ 'Adding internal plugin: '] ifFalse: ['Adding external plugin: ']) , name.
self
set: #pluginName toString: name;
set: #pluginSrc toString: '${srcPluginsDir}/', name;
set: #pluginCross toString: '${crossDir}/plugins/', name;
set: #pluginPlatform toString: '${targetPlatform}/plugins/', name.
"clear LINKLIBS variable"
self set: #LINKLIBS to: ''.
internal
ifTrue: [ self puts: 'add_definitions(-DSQUEAK_BUILTIN_PLUGIN)'].
self addSources: { name , '.c' } prefixed: '${pluginSrc}/'.
" default include directories for plugin "
self includeDirectories: '${pluginSrc} ${pluginCross} ${targetPlatform}/plugins/${pluginName}'.
"Not needed because there are already there (inherited from main configuration)"
"self addDefinitions: vmGen config compilerFlags."
" perform config's configureXYZ: message to apply per-plugin custom rules, if any "
vmGen config configurePlugin: plugin with: self.
extraRules ifNotNil: [ extraRules value: self ].
" generate a static lib for internal plugin, or shared for external"
internal ifTrue: [
self cmd: 'add_library' params: name , ' STATIC ${sources}'.
] ifFalse: [
self cmd: 'add_library' params: name , ' SHARED ${sources}'.
" self cmd: 'set_property' params: 'TARGET ' , name , ' PROPERTY LINK_FLAGS -bundle'"
].
vmGen config extraPluginSettings: self.
self isExternal ifTrue: [
self cmd: 'target_link_libraries'
params: self moduleName , ' ${LINKLIBS}'.
].
" see senders of #linkFlags "
self
cmd: 'set_property'
params: 'TARGET ', name, ' PROPERTY LINK_FLAGS "${linkFlags}"'.
"set dependencies"
self puts: 'IF (',self moduleName , '_dependencies)'.
self cmd: 'add_dependencies'
params: name , ' ${', self moduleName , '_dependencies}'.
self puts: 'ENDIF (',self moduleName , '_dependencies)'.
self saveFile.!
Item was changed:
+ ----- Method: CMakePluginGeneratorForSqueak>>isInternal (in category 'accessing') -----
- ----- Method: CMakePluginGeneratorForSqueak>>isInternal (in category 'as yet unclassified') -----
isInternal
^ internal!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>isInternal: (in category 'accessing') -----
+ isInternal: aBoolean
+ internal:= aBoolean!
Item was changed:
+ ----- Method: CMakePluginGeneratorForSqueak>>vmGenerator (in category 'accessing') -----
- ----- Method: CMakePluginGeneratorForSqueak>>vmGenerator (in category 'squeak compatibility') -----
vmGenerator
"Make it accessible from plugin generator side"
^ vmGen!
Item was added:
+ ----- Method: CMakePluginGeneratorForSqueak>>vmGenerator: (in category 'accessing') -----
+ vmGenerator: aCMakeVMGeneratorForSqueak
+ "needed for tests"
+ vmGen := aCMakeVMGeneratorForSqueak!
Item was added:
+ ----- Method: CMakeVMMakerSqueakRedirectMethodsTest>>testExternalLibs (in category 'as yet unclassified') -----
+ testExternalLibs
+ #(#SqueakMacintoshConfig #SqueakUnixConfig #SqueakWindowsConfig )
+ do:[:each |
+ (Smalltalk at:each)
+ allSubclassesDo:[:configuration | | o buildTypes|
+ o:= configuration new.
+ (o excludeFromBuild not) & (configuration isAbstractBaseClass not)
+ ifTrue:[
+ buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone).
+ buildTypes do:[:buildType |
+ o configureForBuildType: buildType.
+ self assert:(o externalLibs isKindOf: Collection).
+ ]]]].
+
+
+
+
+
+
+
+ !
Item was changed:
----- Method: CMakeVMMakerSqueakRedirectMethodsTest>>testLinkFlags (in category 'as yet unclassified') -----
testLinkFlags
#(#SqueakMacintoshConfig #SqueakUnixConfig #SqueakWindowsConfig )
do:[:each |
(Smalltalk at:each)
allSubclassesDo:[:configuration | | o buildTypes|
o:= configuration new.
(o excludeFromBuild not) & (configuration isAbstractBaseClass not)
ifTrue:[
buildTypes:=o availableBuildTypes copyWithoutAll:#(#buildNone).
buildTypes do:[:buildType |
o configureForBuildType: buildType.
+ self assert:(o linkFlags isString)]]]].!
- self assert:(o linkFlags isArray)]]]].!
Item was added:
+ ----- Method: CMakeVMMakerSqueakRedirectMethodsWithArgTest>>testExtraPluginSettings (in category 'as yet unclassified') -----
+ testExtraPluginSettings
+ self flag:'tty'. "Is the self shouldnt sufficient?"
+ #(#SqueakMacintoshConfig #SqueakUnixConfig #SqueakWindowsConfig )
+ do:[:each |
+ (Smalltalk at:each)
+ allSubclassesDo:[:configuration | | o buildTypes vmGenerator pluginGenerator|
+ 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).
+ pluginGenerator := CMakePluginGeneratorForSqueak new.
+ pluginGenerator vmGenerator: vmGenerator.
+ pluginGenerator isInternal: false.
+ pluginGenerator output:(String new writeStream).
+ self shouldnt: [o extraPluginSettings: pluginGenerator] raise: Error]]]].
+ !
Item was changed:
----- Method: CPlatformConfigForSqueak>>addDriver:sources:generator:externalLibs: (in category 'squeak compatability') -----
addDriver: name sources: aSources generator: cmakeGen externalLibs: extLibs
| cfg srcs |
srcs := aSources inject: '' into: [:res :each | res , ' "', each, '"' ].
cfg := cmakeGen
captureOutputDuring: [
cmakeGen printHeader;
project: name;
include: '../directories.cmake';
message: 'Adding module: ', name;
addDefinitions: self compilerFlags;
addDefinitions: '-fPIC -DPIC';
set: #sources to: srcs;
cmd: 'add_library' params: name, ' SHARED ${sources}';
includeDirectories: '${crossDir}/plugins/FilePlugin';
includeDirectories: '${targetPlatform}/plugins/B3DAcceleratorPlugin';
includeDirectories: '${crossDir}/plugins/B3DAcceleratorPlugin';
set: 'LIBRARY_OUTPUT_PATH' toString: self outputDir fullName;
addExternalLibraries: extLibs;
cmd: 'target_link_libraries' params: name , ' ${LINKLIBS}';
cmd: 'set_target_properties' params: name , ' PROPERTIES PREFIX "" SUFFIX ""
LINK_FLAGS -m32'
].
(self buildDir / name) assureExistence.
self write: cfg toFile: name , '/', cmakeGen outputFileName.
cmakeGen addSubdirectory: name.
!
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>externalLibs (in category 'cmake buildType redirects') -----
+ externalLibs
+ "Route this message send to the message appropriate for my buildType "
+ |d |
+ d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy.
+ d
+ at: #build put: [self externalLibsBuild];
+ at: #buildAssert put: [self externalLibsBuildAssert];
+ at: #buildAssertITimerHeartbeat put: [self externalLibsBuildAssertITimerHeartbeat];
+ at:#buildDebug put: [self externalLibsBuildDebug];
+ at: #buildDebugITimerHeartbeat put: [self externalLibsBuildDebugITimerHeartbeat ];
+ at: #buildITimerHeartbeat put: [self externalLibsBuildITimerHeartbeat];
+ at: #buildMultiThreaded put: [self externalLibsBuildMultiThreaded];
+ at: #buildMultiThreadedAssert put: [self externalLibsBuildMultiThreadedAssert];
+ at: #buildMultiThreadedDebug put: [self externalLibsBuildMultiThreadedDebug ];
+ at: #buildNone put:[self externalLibsNoBuildType].
+ ^(d at: buildType) value!
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>externalLibsBuild (in category 'cmake buildType redirects') -----
+ externalLibsBuild
+ ""
+ self subclassResponsibility!
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>externalLibsBuildAssert (in category 'cmake buildType redirects') -----
+ externalLibsBuildAssert
+ ""
+ self subclassResponsibility!
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>externalLibsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') -----
+ externalLibsBuildAssertITimerHeartbeat
+ ""
+ self subclassResponsibility!
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>externalLibsBuildDebug (in category 'cmake buildType redirects') -----
+ externalLibsBuildDebug
+ ""
+ self subclassResponsibility!
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>externalLibsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') -----
+ externalLibsBuildDebugITimerHeartbeat
+ ""
+ self subclassResponsibility!
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>externalLibsBuildITimerHeartbeat (in category 'cmake buildType redirects') -----
+ externalLibsBuildITimerHeartbeat
+ ""
+ self subclassResponsibility!
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>externalLibsBuildMultiThreaded (in category 'cmake buildType redirects') -----
+ externalLibsBuildMultiThreaded
+ ""
+ self subclassResponsibility!
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>externalLibsBuildMultiThreadedAssert (in category 'cmake buildType redirects') -----
+ externalLibsBuildMultiThreadedAssert
+ ""
+ self subclassResponsibility!
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>externalLibsBuildMultiThreadedDebug (in category 'cmake buildType redirects') -----
+ externalLibsBuildMultiThreadedDebug
+ ""
+ self subclassResponsibility!
Item was added:
+ ----- Method: CPlatformConfigForSqueak>>externalLibsNoBuildType (in category 'cmake buildType redirects') -----
+ externalLibsNoBuildType
+ "SHOULD NOT GET HERE"
+ self shouldNotImplement.
+ !
Item was changed:
+ ----- Method: CPlatformConfigForSqueak>>extraPluginSettings: (in category 'cmake buildType redirects') -----
+ extraPluginSettings: aMaker
+ "Route this message send to the message appropriate for my buildType "
+ |d |
+ d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy.
+ d
+ at: #build put: [self extraPluginSettingsBuild: aMaker];
+ at: #buildAssert put: [self extraPluginSettingsBuildAssert: aMaker];
+ at: #buildAssertITimerHeartbeat put: [self extraPluginSettingsBuildAssertITimerHeartbeat: aMaker];
+ at:#buildDebug put: [self extraPluginSettingsBuildDebug: aMaker];
+ at: #buildDebugITimerHeartbeat put: [self extraPluginSettingsBuildDebugITimerHeartbeat: aMaker ];
+ at: #buildITimerHeartbeat put: [self extraPluginSettingsBuildITimerHeartbeat: aMaker];
+ at: #buildMultiThreaded put: [self extraPluginSettingsBuildMultiThreaded: aMaker];
+ at: #buildMultiThreadedAssert put: [self extraPluginSettingsBuildMultiThreadedAssert: aMaker];
+ at: #buildMultiThreadedDebug put: [self extraPluginSettingsBuildMultiThreadedDebug: aMaker ];
+ at: #buildNone put:[self extraPluginSettingsNoBuildType: aMaker].
+ ^(d at: buildType) value!
- ----- Method: CPlatformConfigForSqueak>>extraPluginSettings: (in category 'plugins') -----
- extraPluginSettings: maker
- super extraPluginSettings: maker.
- " This is a very active method depending on Platform
-
- CPlatformConfig browse.
-
- "!
Item was changed:
----- Method: CPlatformConfigForSqueak>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssert: aMaker
+ "^self extraPluginSettingsBuild: aMaker'"
- extraPluginSettingsBuildAssert: maker
- "convenience method to customize plugin settings for this buildType.
- Most configurations do nothing.
- SystemNavigation default browseMethodsWhoseNamesContain: 'extraPluginSettings'
- "
self subclassResponsibility
!
Item was changed:
----- Method: CPlatformConfigForSqueak>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssertITimerHeartbeat: aMaker
+ "^self extraPluginSettingsBuild: aMaker'"
- extraPluginSettingsBuildAssertITimerHeartbeat: maker
- "convenience method to customize plugin settings for this buildType.
- Most configurations do nothing.
- SystemNavigation default browseMethodsWhoseNamesContain: 'extraPluginSettings'
- "
self subclassResponsibility
!
Item was changed:
----- Method: CPlatformConfigForSqueak>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebug: aMaker
+ "^self extraPluginSettingsBuild: aMaker'"
- extraPluginSettingsBuildDebug: maker
- "convenience method to customize plugin settings for this buildType.
- Most configurations do nothing.
- SystemNavigation default browseMethodsWhoseNamesContain: 'extraPluginSettings'
- "
self subclassResponsibility
!
Item was changed:
----- Method: CPlatformConfigForSqueak>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebugITimerHeartbeat: aMaker
+ "^self extraPluginSettingsBuild: aMaker'"
- extraPluginSettingsBuildDebugITimerHeartbeat: maker
- "convenience method to customize plugin settings for this buildType.
- Most configurations do nothing.
- SystemNavigation default browseMethodsWhoseNamesContain: 'extraPluginSettings'
- "
self subclassResponsibility
-
!
Item was changed:
----- Method: CPlatformConfigForSqueak>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildITimerHeartbeat: aMaker
+ "^self extraPluginSettingsBuild: aMaker'"
- extraPluginSettingsBuildITimerHeartbeat: maker
- "convenience method to customize plugin settings for this buildType.
- Most configurations do nothing.
- SystemNavigation default browseMethodsWhoseNamesContain: 'extraPluginSettings'
- "
self subclassResponsibility
!
Item was changed:
----- Method: CPlatformConfigForSqueak>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreaded: aMaker
+ "^self extraPluginSettingsBuild: aMaker'"
- extraPluginSettingsBuildMultiThreaded: maker
- "convenience method to customize plugin settings for this buildType.
- Most configurations do nothing.
- SystemNavigation default browseMethodsWhoseNamesContain: 'extraPluginSettings'
- "
self subclassResponsibility
-
!
Item was changed:
----- Method: CPlatformConfigForSqueak>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedAssert: aMaker
+ "^self extraPluginSettingsBuild: aMaker'"
- extraPluginSettingsBuildMultiThreadedAssert: maker
- "convenience method to customize plugin settings for this buildType.
- Most configurations do nothing.
- SystemNavigation default browseMethodsWhoseNamesContain: 'extraPluginSettings'
- "
self subclassResponsibility
!
Item was changed:
----- Method: CPlatformConfigForSqueak>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedDebug: aMaker
+ "^self extraPluginSettingsBuild: aMaker'"
- extraPluginSettingsBuildMultiThreadedDebug: maker
- "convenience method to customize plugin settings for this buildType.
- Most configurations do nothing.
- SystemNavigation default browseMethodsWhoseNamesContain: 'extraPluginSettings'
- "
self subclassResponsibility
-
!
Item was changed:
----- Method: CPlatformConfigForSqueak>>extraPluginSettingsNoBuildType: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsNoBuildType: aMaker
- extraPluginSettingsNoBuildType: maker
"SHOULD NOT GET HERE"
self shouldNotImplement.
!
Item was removed:
- ----- Method: Linux32ARMv6StackV3CrossRaspbianConfig>>extraPluginSettings: (in category 'plugin extra rules') -----
- extraPluginSettings: maker
-
- maker isExternal ifTrue: [
- "copy lib to results dir "
- maker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}'
- ].
-
- maker set: #linkFlags toString: '${linkFlags}'
- !
Item was added:
+ ----- 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: Linux32ARMv6StackV3RaspbianConfig>>extraPluginSettings: (in category 'plugin extra rules') -----
- extraPluginSettings: maker
-
- maker isExternal ifTrue: [
- "copy lib to results dir "
- maker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}'
- ].
-
- maker set: #linkFlags toString: '${linkFlags}'
- !
Item was added:
+ ----- 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 changed:
----- 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);
- externalLibs: (self linkFlags);
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: Linux32x86Config>>extraPluginSettings: (in category 'plugin extra rules') -----
- extraPluginSettings: maker
- super extraPluginSettings: maker.
- maker set: #linkFlags toString: '${linkFlags} -m32'!
Item was added:
+ ----- Method: Linux32x86Config>>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: Linux32x86Config>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux32x86Config>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssertITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux32x86Config>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux32x86Config>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebugITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux32x86Config>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux32x86Config>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreaded: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux32x86Config>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux32x86Config>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- 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 added:
+ ----- Method: Linux32x86SqueakCogV3Config>>externalLibsBuildAssert (in category 'cmake buildType redirects') -----
+ externalLibsBuildAssert
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux32x86SqueakCogV3Config>>externalLibsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') -----
+ externalLibsBuildAssertITimerHeartbeat
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux32x86SqueakCogV3Config>>externalLibsBuildDebug (in category 'cmake buildType redirects') -----
+ externalLibsBuildDebug
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux32x86SqueakCogV3Config>>externalLibsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') -----
+ externalLibsBuildDebugITimerHeartbeat
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux32x86SqueakCogV3Config>>externalLibsBuildITimerHeartbeat (in category 'cmake buildType redirects') -----
+ externalLibsBuildITimerHeartbeat
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux32x86SqueakCogV3Config>>externalLibsBuildMultiThreaded (in category 'cmake buildType redirects') -----
+ externalLibsBuildMultiThreaded
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux32x86SqueakCogV3Config>>externalLibsBuildMultiThreadedAssert (in category 'cmake buildType redirects') -----
+ externalLibsBuildMultiThreadedAssert
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux32x86SqueakCogV3Config>>externalLibsBuildMultiThreadedDebug (in category 'cmake buildType redirects') -----
+ externalLibsBuildMultiThreadedDebug
+ ^ self externalLibsBuild
+ !
Item was changed:
----- 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);
- externalLibs: (self linkFlags);
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>>addVMDrivers: (in category 'cmake buildType redirects') -----
- addVMDrivers: maker
- "
- libICE
- ICE is the Inter Client Exchange protocol, part of X11
-
- libSM
- session management library for X11
-
- "
- self
- addDriver: 'vm-display-null'
- sources: #(
- '${targetPlatform}/vm-display-null/sqUnixDisplayNull' )
- generator: maker
- externalLibs: #();
-
-
- addDriver: 'vm-display-X11'
- sources: #(
- '${targetPlatform}/vm-display-X11/sqUnixX11'
- '${targetPlatform}/vm-display-X11/sqUnixMozilla' )
- generator: maker
-
- "-lSM -lICE -ldl -lGL -lpthread -lm -lnsl -lX11'"
- externalLibs: #( SM ICE GL X11 nsl dl);
-
-
- addDriver: 'vm-sound-ALSA'
- sources: #(
- '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' )
- generator: maker
- externalLibs: #();
-
- addDriver: 'vm-sound-null'
- sources: #(
- '${targetPlatform}/vm-sound-null/sqUnixSoundNull' )
- generator: maker
- externalLibs: #().
-
- "
- vm-display-null
- vm-display-X11
- vm-sound-ALSA
- vm-sound-null"!
Item was changed:
----- Method: Linux64x86w32BitConfig>>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); "#( SM ICE GL X11 nsl dl); "
- externalLibs: #( SM ICE GL X11 nsl dl); "(self linkFlags);"
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: Linux64x86w32BitConfig>>defaultExternalPlugins (in category 'plugins') -----
defaultExternalPlugins
+ ^ #(
+ B3DAcceleratorPlugin
+ ThreadedIA32FFIPlugin "SqueakFFIPrims"
+ "UUIDPlugin"
+ "UnixOSProcessPlugin ?? "
+ JPEGReaderPlugin
+ JPEGReadWriter2Plugin
+ RePlugin
+ InternetConfigPlugin
+ )
- " 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)
+ "debug"!
-
- "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 changed:
----- Method: Linux64x86w32BitConfig>>defaultInternalPlugins (in category 'plugins') -----
defaultInternalPlugins
+ " took from unixbuild/bld/plugins.int"
- " 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 "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
+ )!
- 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: Linux64x86w32BitConfig>>extraPluginSettings: (in category 'plugin extra rules') -----
+ extraPluginSettings: maker
+ super extraPluginSettings: maker.
+ maker set: #linkFlags toString: '${linkFlags} -m32'!
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuild: maker
+ self flag:'tty'. "this dumps the libs into the executable's directory. This breaks the distribution convention squeak has had for a while. However, we probably should handle that in a packaging/redistribution step and not worry about it now"
+ maker isExternal ifTrue: [
+ "copy lib to outputDir "
+ maker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}'
+ ].
+ maker set: #linkFlags toString: '${linkFlags} -m32'!
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssertITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebugITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreaded: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: Linux64x86w32BitConfig>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was changed:
----- Method: Linux64x86w32BitConfig>>preferredIncludesBuild (in category 'source files') -----
preferredIncludesBuild
^ #( '${targetPlatform}/plugins/B3DAcceleratorPlugin')
"SystemNavigation default browseMethodsWhoseNamesContain: 'preferredIncludes'"
!
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 message: 'setExtraTargetPropertiesBuild: aMaker'.
-
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 addExternalLibraries:
- #(
- 'uuid' ""
- 'ssl' ""
- 'crypto' ""
- 'm'
- 'dl'
- 'pthread'
- ).
-
aMaker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName.
self addVMDrivers: aMaker.!
Item was changed:
----- Method: Linux64x86w32BitConfig>>setGlobalOptionsBuild: (in category 'cmake buildType redirects') -----
setGlobalOptionsBuild: aMaker
aMaker message: 'setGlobalOptionsBuild: aMaker'.
+ " aMaker linkDirectories: '/usr/lib'."
- aMaker linkDirectories: '/usr/lib'.
" SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptions:' "!
Item was changed:
----- Method: Linux64x86w32BitSqueakCogV3Config>>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 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'"
- . '-L/usr/lib'
}
!
Item was changed:
----- Method: Linux64x86w32BitSqueakCogV3Config>>defaultExternalPlugins (in category 'plugins') -----
defaultExternalPlugins
""
+ ^ #(
+
+ ThreadedFFIPlugin "SqueakFFIPrims"
+ "UUIDPlugin"
+ "UnixOSProcessPlugin ?? "
+ JPEGReaderPlugin
+ JPEGReadWriter2Plugin
+ RePlugin
+ )!
- ^ #()!
Item was removed:
- ----- Method: Linux64x86w32BitSqueakCogV3Config>>defaultInternalPlugins (in category 'plugins') -----
- defaultInternalPlugins
- ^super defaultInternalPlugins copyWithoutAll:#(#FloatMathPlugin)!
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>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 added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuildAssert (in category 'cmake buildType redirects') -----
+ externalLibsBuildAssert
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') -----
+ externalLibsBuildAssertITimerHeartbeat
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuildDebug (in category 'cmake buildType redirects') -----
+ externalLibsBuildDebug
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') -----
+ externalLibsBuildDebugITimerHeartbeat
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuildITimerHeartbeat (in category 'cmake buildType redirects') -----
+ externalLibsBuildITimerHeartbeat
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuildMultiThreaded (in category 'cmake buildType redirects') -----
+ externalLibsBuildMultiThreaded
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuildMultiThreadedAssert (in category 'cmake buildType redirects') -----
+ externalLibsBuildMultiThreadedAssert
+ ^ self externalLibsBuild
+ !
Item was added:
+ ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibsBuildMultiThreadedDebug (in category 'cmake buildType redirects') -----
+ externalLibsBuildMultiThreadedDebug
+ ^ self externalLibsBuild
+ !
Item was changed:
----- Method: Linux64x86w32BitSqueakCogV3Config>>linkFlagsBuild (in category 'cmake buildType redirects') -----
linkFlagsBuild
"Answer array of libraries to link to"
^ { '-L/usr/lib'
. '-L/usr/lib/X11'
. '-luuid'
. 'lSM'
. '-lICE'
. '-ldl'
. '-lGL'
. '-lpthread'
. '-lm'
. '-lnsl'
. '-lX11'
+ }
- } addAll: (self lDFlagsBuild)
!
Item was added:
+ ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuild: maker
+ ^super extraPluginSettingsBuild: maker.
+ !
Item was added:
+ ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssertITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebugITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreaded: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakAndroidStackEvtConfig>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was changed:
----- 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);
- externalLibs: (self linkFlags);
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>>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: SqueakBSDConfig>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakBSDConfig>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssertITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakBSDConfig>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakBSDConfig>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebugITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakBSDConfig>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakBSDConfig>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreaded: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakBSDConfig>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakBSDConfig>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was removed:
- ----- Method: SqueakCocoaIOSConfig>>extraPluginSettings: (in category 'plugin extra rules') -----
- extraPluginSettings: maker
- maker set: 'CMAKE_OSX_ARCHITECTURES' to: 'i386'.
-
- maker
- setTargetProperty: 'COMPILE_FLAGS'
- to: '"-include \"', (self buildDir / self prefixHeaderFileName) fullName, '\""'.
-
- maker isExternal ifTrue: [
- "copy result to results dir "
-
- maker set: 'LIBRARY_OUTPUT_PATH' toString: self outputDir fullName.
- maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName.
- maker puts: 'list(APPEND linkFlags "-undefined dynamic_lookup")' ].
-
- "maker addXCodeProperty: 'GCC_VERSION' value: '4.3'."
- maker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/' , self executableName , '_Prefix.pch'.
-
- !
Item was added:
+ ----- Method: SqueakIOSConfig>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuild: aMaker
+ aMaker set: 'CMAKE_OSX_ARCHITECTURES' to: 'i386'.
+
+ 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 fullName.
+ aMaker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName.
+ 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 added:
+ ----- Method: SqueakIOSConfig>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakIOSConfig>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssertITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakIOSConfig>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakIOSConfig>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebugITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakIOSConfig>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakIOSConfig>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreaded: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakIOSConfig>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakIOSConfig>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was removed:
- ----- Method: SqueakIPhoneSqueakStackV3Config>>extraPluginSettings: (in category 'plugin extra rules') -----
- extraPluginSettings: maker
- self architecture
- ifNotNil: [ :arch | maker set: 'CMAKE_OSX_ARCHITECTURES' toString: arch ].
-
- self setCommonProperties: maker.
-
- maker
- setTargetProperty: 'COMPILE_FLAGS'
- to: '"-include \"', (self buildDir / self prefixHeaderFileName) fullName, '\""'.
-
- maker isExternal ifTrue: [
- "copy result to results dir "
- maker set: 'LIBRARY_OUTPUT_PATH' toString: self outputDir.
- maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir.
- maker puts: 'list(APPEND linkFlags "-undefined dynamic_lookup")' ].
-
- "maker addXCodeProperty: 'GCC_VERSION' value: '4.3'."
- maker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/' , self executableName , '_Prefix.pch'.
-
- !
Item was added:
+ ----- 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 added:
+ ----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuild: aMaker
+ "Cog currently runs only in 32 bit mode"
+ self flag: 'tty'. "cut-n-paste from pharo code. I have no idea if this is appropriate for this platform"
+ aMaker set: 'CMAKE_OSX_ARCHITECTURES' to: 'i386'!
Item was added:
+ ----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssertITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebugITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreaded: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSX32x86Config>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuild: aMaker
+ "default browseMethodsWhoseNamesContain: 'extraPluginSettingsBuild' "
+ self subclassResponsibility.!
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssertITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebugITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreaded: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakMacOSXPowerPCConfig>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was changed:
----- 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);
- externalLibs: (self linkFlags);
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>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuild: aMaker
+ "default browseMethodsWhoseNamesContain: 'extraPluginSettingsBuild' "
+ self subclassResponsibility.!
Item was added:
+ ----- Method: SqueakSunOS32x86Config>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakSunOS32x86Config>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssertITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakSunOS32x86Config>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakSunOS32x86Config>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebugITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakSunOS32x86Config>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakSunOS32x86Config>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreaded: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakSunOS32x86Config>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakSunOS32x86Config>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was removed:
- ----- Method: SqueakUnixConfig>>extraPluginSettings: (in category 'plugin extra rules') -----
- extraPluginSettings: maker
-
- maker isExternal ifTrue: [
- "copy lib to results dir "
- maker set: 'LIBRARY_OUTPUT_PATH' to: '${outputDir}'
- ].
- !
Item was added:
+ ----- Method: SqueakWin32x86Config>>extraPluginSettingsBuild: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuild: aMaker
+
+ self flag:'tty'. "cut-n-paste from pharo code in CogWindowsConfig. caveat emptor"
+ self subclassResponsibility.
+ "
+ aMaker isExternal ifTrue: [
+ aMaker set: 'LIBRARY_OUTPUT_PATH' toString: '${outputDir}'.
+
+ aMaker cmd: 'set_target_properties' params: aMaker moduleName , ' PROPERTIES PREFIX "" '
+ ]"!
Item was added:
+ ----- Method: SqueakWin32x86Config>>extraPluginSettingsBuildAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakWin32x86Config>>extraPluginSettingsBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildAssertITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakWin32x86Config>>extraPluginSettingsBuildDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakWin32x86Config>>extraPluginSettingsBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildDebugITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakWin32x86Config>>extraPluginSettingsBuildITimerHeartbeat: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildITimerHeartbeat: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakWin32x86Config>>extraPluginSettingsBuildMultiThreaded: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreaded: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakWin32x86Config>>extraPluginSettingsBuildMultiThreadedAssert: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedAssert: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
Item was added:
+ ----- Method: SqueakWin32x86Config>>extraPluginSettingsBuildMultiThreadedDebug: (in category 'cmake buildType redirects') -----
+ extraPluginSettingsBuildMultiThreadedDebug: aMaker
+ ^self extraPluginSettingsBuild: aMaker
+ !
More information about the Vm-dev
mailing list