[Vm-dev] VM Maker: CMakeVMMakerSqueak-tty.61.mcz

[commits at source.squeak.org]

Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker:
http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.61.mcz

==================== Summary ====================

Name: CMakeVMMakerSqueak-tty.61
Author: tty
Time: 16 June 2014, 9:03:03.664 pm
UUID: 5e4fd6d7-f360-4eb2-98de-e7c712cc843d
Ancestors: CMakeVMMakerSqueak-tty.60

setupDirectoriesBuild: aMaker is a compatibility method override. 

Decided against configuring for different buildTypes for now. 

Will revisit later if necessary

=============== Diff against CMakeVMMakerSqueak-tty.60 ===============

Item was changed:
+ ----- Method: Linux64Config>>setupDirectories: (in category 'cmake config build type ') -----
+ setupDirectories: aMaker 
+ 	"SystemNavigation default browseMethodsWhoseNamesContain: 'setupDirectories:'
+ 	
+ 	we subclass this in our concrete builder and route it to 
+ 	
+ 	^self setupDirectories: aMaker buildType: (self buildType asSymbol)
- ----- Method: Linux64Config>>setupDirectories: (in category 'squeak compatibility') -----
- setupDirectories: gen
- 	| dirsInclude |
  
+ 	"
+ 	self required
- 	" write the directories in separate include file"
- 	dirsInclude := gen captureOutputDuring: [
- 		gen
- 			set: #topDir toString: (self topDir fullName); 
- 			set: #buildDir toString: (self buildDir ifNil: ['${topDir}/build'] ifNotNil: [self buildDir fullName] );
- 			set: #thirdpartyDir toString: '${buildDir}/thirdParty';
- 			set: #platformsDir toString: self platformsDir;
- 			set: #srcDir toString: self srcDir pathName;
- 			set: #srcPluginsDir toString: (pluginsDir ifNil: [ '${srcDir}/plugins' ]);
- 			set: #srcVMDir toString: '${srcDir}/vm';
- 			set: #platformName toString: self platformName;
- 			set: #targetPlatform to: '${platformsDir}/${platformName}';
- 			set: #crossDir toString: '${platformsDir}/Cross';
- 			set: #platformVMDir toString: '${targetPlatform}/vm';
- 			set: #outputDir toString: self outputDir fullName.
- 	].
- 
- 	self write: dirsInclude toFile: 'directories.cmake'.
  	
- 	gen include: 'directories.cmake'.
  !

Item was changed:
  ----- Method: Linux64x86w32BitConfig>>configureBuild (in category 'cmake') -----
  configureBuild
  	"configure this Configuration for a buildType #build"
  	self 
- "		setGlobalOptionsBuild: aMaker"
- "		setGlobalOptionsAfterDetermineSystemBuild: aMaker"
- "		setupDirectoriesBuild: aMaker;"
  		preferredIncludesBuild;
  		standardIncludesBuild;
  		compilerFlagsBuild;
- "		extraVMSettingsBuild: aMaker"
  		internalPluginsBuild;
  		externalPluginsBuild;
  		thirdpartyLibsBuild.
+ !
- "		postBuildActionsBuild: aMaker"
- "		configHBuild"!

Item was changed:
  ----- Method: Linux64x86w32BitConfig>>setupDirectories: (in category 'squeak compatibility') -----
+ setupDirectories: aMaker
- setupDirectories: gen
  	| dirsInclude |
  
  	" write the directories in separate include file"
+ 	dirsInclude := aMaker captureOutputDuring: [
+ 		aMaker
- 	dirsInclude := gen captureOutputDuring: [
- 		gen
  			set: #topDir toString: (self topDir fullName); 
  			set: #buildDir toString: (self buildDir ifNil: ['${topDir}/build'] ifNotNil: [self buildDir fullName] );
  			set: #thirdpartyDir toString: '${buildDir}/thirdParty';
  			set: #platformsDir toString: self platformsDir;
  			set: #srcDir toString: self srcDir pathName;
  			set: #srcPluginsDir toString: (pluginsDir ifNil: [ '${srcDir}/plugins' ]);
  			set: #srcVMDir toString: '${srcDir}/vm';
  			set: #platformName toString: self platformName;
  			set: #targetPlatform to: '${platformsDir}/${platformName}';
  			set: #crossDir toString: '${platformsDir}/Cross';
  			set: #platformVMDir toString: '${targetPlatform}/vm';
  			set: #outputDir toString: self outputDir fullName.
  	].
  
  	self write: dirsInclude toFile: 'directories.cmake'.
  	
+ 	aMaker include: 'directories.cmake'.
- 	gen include: 'directories.cmake'.
  !

Item was changed:
  ----- Method: Linux64x86w32BitSqueakCogV3SlackwareNoGLConfig>>setupDirectories: (in category 'squeak compatibility') -----
  setupDirectories: gen
  	super setupDirectories: gen.
  	gen set: #externalModulesDir toString: self externalModulesDir.!

Item was added:
+ ----- Method: SqueakAndroidStackEvtConfig>>configureBuild (in category 'cmake configuration') -----
+ configureBuild
+ 	"configure this Configuration for a buildType #build"
+ 	self 
+ 		preferredIncludesBuild;
+ 		standardIncludesBuild;
+ 		compilerFlagsBuild;
+ 		internalPluginsBuild;
+ 		externalPluginsBuild;
+ 		thirdpartyLibsBuild
+ 		
+ 
+ 
+ 		
+ 		
+ 		!

Item was added:
+ ----- Method: SqueakBSDConfig>>configureBuild (in category 'cmake configuration') -----
+ configureBuild
+ 	"configure this Configuration for a buildType #build"
+ 	self 
+ 		preferredIncludesBuild;
+ 		standardIncludesBuild;
+ 		compilerFlagsBuild;
+ 		internalPluginsBuild;
+ 		externalPluginsBuild;
+ 		thirdpartyLibsBuild
+ 		
+ 
+ 
+ 		
+ 		
+ 		!

Item was added:
+ ----- Method: SqueakIA32BochsConfig>>configureBuild (in category 'cmake configuration') -----
+ configureBuild
+ 	"configure this Configuration for a buildType #build"
+ 	self 
+ 		preferredIncludesBuild;
+ 		standardIncludesBuild;
+ 		compilerFlagsBuild;
+ 		internalPluginsBuild;
+ 		externalPluginsBuild;
+ 		thirdpartyLibsBuild
+ 
+ 
+ 		
+ 		
+ 		!

Item was added:
+ ----- Method: SqueakMacOSConfig>>configureBuild (in category 'cmake configuration') -----
+ configureBuild
+ 	"configure this Configuration for a buildType #build"
+ 	self 
+ 		preferredIncludesBuild;
+ 		standardIncludesBuild;
+ 		compilerFlagsBuild;
+ 		internalPluginsBuild;
+ 		externalPluginsBuild;
+ 		thirdpartyLibsBuild
+ 		
+ 
+ 
+ 		
+ 		
+ 		!

Item was added:
+ ----- Method: SqueakSunOS32x86Config>>configureBuild (in category 'cmake configuration') -----
+ configureBuild
+ 	"configure this Configuration for a buildType #build"
+ 	self 
+ 		preferredIncludesBuild;
+ 		standardIncludesBuild;
+ 		compilerFlagsBuild;
+ 		internalPluginsBuild;
+ 		externalPluginsBuild;
+ 		thirdpartyLibsBuild
+ 
+ 
+ 		
+ 		
+ 		!

Item was added:
+ ----- Method: SqueakWin32x86Config>>configureBuild (in category 'cmake configuration') -----
+ configureBuild
+ 	"configure this Configuration for a buildType #build"
+ 	self 
+ 		preferredIncludesBuild;
+ 		standardIncludesBuild;
+ 		compilerFlagsBuild;
+ 		internalPluginsBuild;
+ 		externalPluginsBuild;
+ 		thirdpartyLibsBuild
+ 		
+ 
+ 
+ 		
+ 		
+ 		!

Item was changed:
  ----- Method: TCPlatformConfigForSqueak>>configureBuild (in category 'cmake configuration') -----
  configureBuild
  	"configure this Configuration for a buildType #build"
  	self 
- "		setGlobalOptionsBuild: aMaker"
- "		setGlobalOptionsAfterDetermineSystemBuild: aMaker"
- "		setupDirectoriesBuild: aMaker;"
  		preferredIncludesBuild;
  		standardIncludesBuild;
  		compilerFlagsBuild;
- "		extraVMSettingsBuild: aMaker"
  		internalPluginsBuild;
  		externalPluginsBuild;
  		thirdpartyLibsBuild
- "		postBuildActionsBuild:"
- "		configHBuild."
  		
  
  
  		
  		
  		!

Item was removed:
- ----- Method: TCPlatformConfigForSqueak>>setupDirectoriesBuild: (in category 'cmake config build type ') -----
- setupDirectoriesBuild: aMaker 
- 	"convencience method to customize for this build. default is self setupDirectories: aMaker"
- 	self setupDirectories: aMaker
- !

Item was removed:
- ----- Method: TCPlatformConfigForSqueak>>setupDirectoriesBuildAssert: (in category 'cmake config build type ') -----
- setupDirectoriesBuildAssert: aMaker 
- 	"convencience method to customize for this build. default is self setupDirectories: aMaker"
- 	self setupDirectories: aMaker
- 
- !

Item was removed:
- ----- Method: TCPlatformConfigForSqueak>>setupDirectoriesBuildAssertITimerHeartbeat: (in category 'cmake config build type ') -----
- setupDirectoriesBuildAssertITimerHeartbeat: aMaker 
- 	"convencience method to customize for this build. default is self setupDirectories: aMaker"
- 	self setupDirectories: aMaker
- 
- 
- 
- !

Item was removed:
- ----- Method: TCPlatformConfigForSqueak>>setupDirectoriesBuildDebug: (in category 'cmake config build type ') -----
- setupDirectoriesBuildDebug: aMaker 
- 	"convencience method to customize for this build. default is self setupDirectories: aMaker"
- 	self setupDirectories: aMaker
- 
- 
- 
- !

Item was removed:
- ----- Method: TCPlatformConfigForSqueak>>setupDirectoriesBuildDebugITimerHeartbeat: (in category 'cmake config build type ') -----
- setupDirectoriesBuildDebugITimerHeartbeat: aMaker 
- 	"convencience method to customize for this build. default is self setupDirectories: aMaker"
- 	self setupDirectories: aMaker
- 
- !

Item was removed:
- ----- Method: TCPlatformConfigForSqueak>>setupDirectoriesBuildITimerHeartbeat: (in category 'cmake config build type ') -----
- setupDirectoriesBuildITimerHeartbeat: aMaker 
- 	"convencience method to customize for this build. default is self setupDirectories: aMaker"
- 	self setupDirectories: aMaker!

Item was removed:
- ----- Method: TCPlatformConfigForSqueak>>setupDirectoriesBuildMultiThreaded: (in category 'cmake config build type ') -----
- setupDirectoriesBuildMultiThreaded: aMaker 
- 	"convencience method to customize for this build. default is self setupDirectories: aMaker"
- 	self setupDirectories: aMaker!

Item was removed:
- ----- Method: TCPlatformConfigForSqueak>>setupDirectoriesBuildMultiThreadedAssert: (in category 'cmake config build type ') -----
- setupDirectoriesBuildMultiThreadedAssert: aMaker 
- 	"convencience method to customize for this build. default is self setupDirectories: aMaker"
- 	self setupDirectories: aMaker!

Item was removed:
- ----- Method: TCPlatformConfigForSqueak>>setupDirectoriesBuildMultiThreadedDebug: (in category 'cmake config build type ') -----
- setupDirectoriesBuildMultiThreadedDebug: aMaker 
- 	"convencience method to customize for this build. default is self setupDirectories: aMaker"
- 	self setupDirectories: aMaker!

Item was removed:
- ----- Method: TCPlatformConfigForSqueak>>setupDirectoriesBuildNone: (in category 'cmake config build type ') -----
- setupDirectoriesBuildNone: aMaker 
- 	"WE SHOULD NEVER GET HERE"
- 	self halt.
- !