[Vm-dev] VM Maker: CMakeVMMaker-EstebanLorenzano.166.mcz

[commits at source.squeak.org]

Esteban Lorenzano uploaded a new version of CMakeVMMaker to project VM Maker:
http://source.squeak.org/VMMaker/CMakeVMMaker-EstebanLorenzano.166.mcz

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

Name: CMakeVMMaker-EstebanLorenzano.166
Author: EstebanLorenzano
Time: 21 June 2012, 8:45:23.036 am
UUID: 236832b5-e802-e349-a30a-f9b571b4dc87
Ancestors: CMakeVMMaker-IgorStasenko.165

- fix paths include in windows targets.


=============== Diff against CMakeVMMaker-IgorStasenko.165 ===============

Item was changed:
  ----- Method: CPlatformConfig>>setupDirectories: (in category 'directories') -----
  setupDirectories: gen
  	| dirsInclude |
  
  	" 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;
  			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.
  	].
  
  	self write: dirsInclude toFile: 'directories.cmake'.
  	
  	gen include: 'directories.cmake'.
  !

Item was changed:
  ----- Method: CogFamilyWindowsConfig>>setupDirectories: (in category 'as yet unclassified') -----
  setupDirectories: gen
  	"we have to override that, because we need to convert windoze paths to msys ones"
  	
  	| dirsInclude |
  	
  
  	" write the directories in separate include file"
  	dirsInclude := gen captureOutputDuring: [
  		gen
  			set: #topDir toString: (self msysPathFor: self topDir fullName); 
  			set: #buildDir toString: (self buildDir ifNil: ['${topDir}/build'] ifNotNil:[ self msysPathFor: self buildDir fullName ]);
+ 			set: #thirdpartyDir toString: '${buildDir}/thirdparty';
  			set: #platformsDir toString: (self msysPathFor: self platformsDir);
  			set: #srcDir toString: (self msysPathFor: self srcDir);
  			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 msysPathFor: self outputDir).
  	].
  
+ 	self write: dirsInclude toFile: 'directories.cmake'.
+ 	
+ 	gen include: 'directories.cmake'.
+ 	!
- 	self write: dirsInclude toFile: 'directories.cmake'!