[Vm-dev] VM Maker: CMakeVMMaker-GuillermoPolito.209.mcz

[commits at source.squeak.org]

Guillermo Polito uploaded a new version of CMakeVMMaker to project VM Maker:
http://source.squeak.org/VMMaker/CMakeVMMaker-GuillermoPolito.209.mcz

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

Name: CMakeVMMaker-GuillermoPolito.209
Author: GuillermoPolito
Time: 27 June 2013, 1:29:44.067 am
UUID: 7a50eff6-f801-4fdb-90b7-a57c60e1f538
Ancestors: CMakeVMMaker-GuillermoPolito.208

fixes for Unix configs

=============== Diff against CMakeVMMaker-GuillermoPolito.208 ===============

Item was changed:
  ----- Method: CPlatformConfig>>srcDir (in category 'accessing') -----
  srcDir
  	"Answer the value of srcDir"
  
+ 	^ srcDir ifNil: [ srcDir := (self topDir / self srcDirName) ensureDirectory fullName ]!
- 	^ srcDir ifNil: [ srcDir := (self topDir / self srcDirName) assureExistence fullName ]!

Item was changed:
  ----- Method: CPlatformConfig>>write:toFile: (in category 'directories') -----
  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 := bldDir asFileReference ].
  	bldDir ensureDirectory.
+ 	(bldDir / aFileName)
+ 		ensureFile
+ 		writeStream
+ 		nextPutAll: (self fixLineEndsOf: aContents)!
- 	FileStream
- 		forceNewFileNamed: (bldDir / aFileName) fullName
- 		do: [ :stream | stream nextPutAll: (self fixLineEndsOf: aContents) ]!

Item was changed:
  ----- Method: CogFamilyUnixConfig>>addDriver:sources:generator:externalLibs: (in category 'utils') -----
  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;
- 			set: 'LIBRARY_OUTPUT_PATH' toString: self outputDir;
  			addExternalLibraries: extLibs;
  			cmd: 'target_link_libraries' params: name , ' ${LINKLIBS}';
  			cmd: 'set_target_properties' params: name , ' PROPERTIES PREFIX "" SUFFIX "" 
  			LINK_FLAGS -m32' 
  	].
  	
+ 	(self buildDir / name) ensureDirectory.
+ 	self write: cfg toFile: name , '/', cmakeGen outputFileName.
- 		
- 	self write: cfg toFile: ((self buildDir / name) assureExistence / cmakeGen outputFileName) fullName.
  	cmakeGen addSubdirectory:  name.
  	!

Item was changed:
  ----- Method: CogFamilyUnixConfig>>outputDir (in category 'directories') -----
  outputDir
  
  	"the directory where built binaries will be stored"
+ 	^ outputDir ifNil: [ outputDir := (self buildDir parent / self outputDirName) ]	!
- 	^ outputDir ifNil: [ outputDir := (self buildDir containingDirectory fullName , '/', self outputDirName) ]
- 	!

Item was changed:
  ----- Method: CogFamilyUnixConfig>>setExtraTargetProperties: (in category 'utils') -----
  setExtraTargetProperties: maker
  
  
  	maker addExternalLibraries: 
  		#(
  			'm'  "math lib"
  			'dl'  "dynamic loader"
  			'pthread' "posix threads" 
  		).
  		
+ 	maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName.
- 	maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir.
  	self addVMDrivers: maker.!

Item was changed:
  ----- Method: CogFamilyWindowsConfig>>outputDir (in category 'directories') -----
  outputDir
  
  	"the directory where built binaries will be stored"
  
+ 	^ outputDir ifNil: [ outputDir := self msysPathFor: (self buildDir parent / self outputDirName) ]!
- 	^ outputDir ifNil: [ outputDir := self msysPathFor: (self buildDir containingDirectory fullName , '/', self outputDirName) ]
- 	!

Item was changed:
  ----- Method: StackEvtAndroidConfig>>outputDir (in category 'directories') -----
  outputDir
  
  	"the directory where built binaries will be stored - for now it is copied from CogFamilyUnixConfig"
+ 	^ outputDir ifNil: [ outputDir := (self buildDir parent / self outputDirName) ]
- 	^ outputDir ifNil: [ outputDir := (self buildDir containingDirectory fullName , '/', self outputDirName) ]
  	!