[Vm-dev] VM Maker: CMakeVMMaker-GuillermoPolito.206.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.206.mcz

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

Name: CMakeVMMaker-GuillermoPolito.206
Author: GuillermoPolito
Time: 17 June 2013, 4:20:01.296 pm
UUID: ea40c04e-a52a-4637-b881-f52dc86be81d
Ancestors: CMakeVMMaker-IgorStasenko.205

changing references from FileDirectory to FileSystem

=============== Diff against CMakeVMMaker-IgorStasenko.205 ===============

Item was changed:
- SystemOrganization addCategory: #'CMakeVMMaker-Android'!
  SystemOrganization addCategory: #CMakeVMMaker!
+ SystemOrganization addCategory: #'CMakeVMMaker-Android'!
- SystemOrganization addCategory: #'CMakeVMMaker-Unix'!
- SystemOrganization addCategory: #'CMakeVMMaker-Windows'!
- SystemOrganization addCategory: #'CMakeVMMaker-MacOS'!
- SystemOrganization addCategory: #'CMakeVMMaker-IOS'!
  SystemOrganization addCategory: #'CMakeVMMaker-FreeBSD'!
+ SystemOrganization addCategory: #'CMakeVMMaker-IOS'!
  SystemOrganization addCategory: #'CMakeVMMaker-Libs'!
+ SystemOrganization addCategory: #'CMakeVMMaker-MacOS'!
+ SystemOrganization addCategory: #'CMakeVMMaker-Unix'!
+ SystemOrganization addCategory: #'CMakeVMMaker-Windows'!
- SystemOrganization addCategory: #'CMakeVMMaker-Chipmunk'!

Item was changed:
  ----- Method: CMakeGenScripts class>>generateCocoaVM (in category 'sources generation') -----
  generateCocoaVM
  	| platformDirectoryName |
+ 	"B3DAcceleratorPlugin"
+ 	"Not using it right now"
+ 	platformDirectoryName := (FileSystem workingDirectory parent directoryNamed: 'platforms') fullName.
+ 	VMMaker default
+ 		platformRootDirectoryName: platformDirectoryName;
+ 		sourceDirectoryName: platformDirectoryName , '/iOS/vm/src';
+ 		internal:
+ 				#(#ADPCMCodecPlugin #B3DEnginePlugin #BalloonEnginePlugin #BitBltSimulation #BMPReadWriterPlugin #ClipboardExtendedPlugin #DeflatePlugin #DSAPlugin #FFIPlugin #FFTPlugin #FilePlugin #FloatArrayPlugin #GeniePlugin #HostWindowPlugin #JPEGReaderPlugin #JPEGReadWriter2Plugin #KlattSynthesizerPlugin #LargeIntegersPlugin #Matrix2x3Plugin #MacMenubarPlugin #MiscPrimitivePlugin #NewsqueakIA32ABIPlugin #ObjectiveCPlugin #RePlugin #SecurityPlugin #SocketPlugin #SoundCodecPlugin #SoundGenerationPlugin #SoundPlugin #StarSqueakPlugin #SurfacePlugin #UUIDPlugin #DropPlugin)
+ 			external: #(#UnixOSProcessPlugin);
- 
- "B3DAcceleratorPlugin" "Not using it right now"
- 
- 	platformDirectoryName := (FileDirectory default 
- 		containingDirectory 
- 			directoryNamed: 'platforms') 
- 				fullName.
- 	VMMaker default 
- 		platformRootDirectoryName:  platformDirectoryName; 
- 		sourceDirectoryName: platformDirectoryName, '/iOS/vm/src';
- 		internal: #(
- 			ADPCMCodecPlugin 
- 			B3DEnginePlugin 
- 			BalloonEnginePlugin
- 			BitBltSimulation 
- 			BMPReadWriterPlugin 
- 			ClipboardExtendedPlugin 
- 			DeflatePlugin 
- 			DSAPlugin 
- 			FFIPlugin 
- 			FFTPlugin 
- 			FilePlugin 
- 			FloatArrayPlugin 
- 			GeniePlugin 
- 			HostWindowPlugin 
- 			JPEGReaderPlugin 
- 			JPEGReadWriter2Plugin 
- 			KlattSynthesizerPlugin 
- 			LargeIntegersPlugin 
- 			Matrix2x3Plugin 
- 			MacMenubarPlugin 
- 			MiscPrimitivePlugin
- 			NewsqueakIA32ABIPlugin 
- 			ObjectiveCPlugin
- 			RePlugin 
- 			SecurityPlugin 
- 			SocketPlugin 
- 			SoundCodecPlugin 
- 			SoundGenerationPlugin 
- 			SoundPlugin 
- 			StarSqueakPlugin 
- 			SurfacePlugin 
- 			UUIDPlugin 
- 			DropPlugin)	
- 		external: #(
- 			UnixOSProcessPlugin);
  		generateMainVM;
+ 		generateExternalPlugins.	"Gnuifier"
+ 	(Gnuifier on: (platformDirectoryName , '/iOS/vm/src/vm') asFileReference pathName) gnuify!
- 		generateExternalPlugins.
- 
- 	"Gnuifier"
- 	(Gnuifier on:((FileDirectory on: platformDirectoryName, '/iOS/vm/src/vm') pathName)) gnuify.	
- !

Item was changed:
  ----- Method: CMakeGenScripts class>>generateCogMacOS (in category 'as yet unclassified') -----
  generateCogMacOS
  	" generate sources for Stack Interpreter of Mac OS"
+ 
  	| top |
+ 	top := FileSystem workingDirectory parent.
- 	top := FileDirectory default containingDirectory.				
- 	
  	VMMaker
  		generate: CoInterpreter
  		to: (top / 'src') fullName
+ 		platformDir: (top / 'platforms') fullName
+ 		excluding:
+ 			#(#BrokenPlugin #IA32ABIPluginSimulator #SlangTestPlugin #TestOSAPlugin #FFIPlugin #ReentrantARMFFIPlugin #ReentrantFFIPlugin #ReentrantPPCBEFFIPlugin).
+ 	CogMacOSConfig generate!
- 		platformDir: ( top / 'platforms') fullName
- 		excluding:#(BrokenPlugin IA32ABIPluginSimulator SlangTestPlugin TestOSAPlugin
- 					FFIPlugin ReentrantARMFFIPlugin ReentrantFFIPlugin ReentrantPPCBEFFIPlugin).
- 						
- 	CogMacOSConfig generate.
- 
- 	!

Item was changed:
  ----- Method: CMakeGenScripts class>>generateCogSources (in category 'sources generation') -----
  generateCogSources
  	" self generateCogSources "
  
  	" generate sources for CoInterpreter"
  
  	| top |
- 	
  	CogRTLOpcodes initialize.
  	CogIA32Compiler initialize.
+ 	top := FileSystem workingDirectory parent.
- 	
- 	top := FileDirectory default containingDirectory.				
- 	
  	VMMaker
  		generate: CoInterpreter
  		and: StackToRegisterMappingCogit
  		to: (top / 'src') fullName
+ 		platformDir: (top / 'platforms') fullName
+ 		excluding:
+ 			#(#BrokenPlugin #IA32ABIPluginSimulator #SlangTestPlugin #TestOSAPlugin #FFIPlugin #ReentrantARMFFIPlugin #ReentrantFFIPlugin #ReentrantPPCBEFFIPlugin #NewsqueakIA32ABIPlugin #NewsqueakIA32ABIPluginAttic)!
- 		platformDir: ( top / 'platforms') fullName
- 		excluding:#(BrokenPlugin IA32ABIPluginSimulator SlangTestPlugin TestOSAPlugin
- 					FFIPlugin ReentrantARMFFIPlugin ReentrantFFIPlugin ReentrantPPCBEFFIPlugin NewsqueakIA32ABIPlugin
- 					 NewsqueakIA32ABIPluginAttic).
- !

Item was changed:
  ----- Method: CMakeGenScripts class>>generateCogSourcesEmm40 (in category 'sources generation') -----
  generateCogSourcesEmm40
  	" self generateCogSourcesEmm40 "
  
- 
  	" generate sources for CoInterpreter"
  
  	| top |
- 	
  	CogRTLOpcodes initialize.
  	CogIA32Compiler initialize.
+ 	top := FileSystem workingDirectory parent.
- 	
- 	top := FileDirectory default containingDirectory.				
- 	
  	VMMaker
  		generate: CoInterpreter
  		and: StackToRegisterMappingCogit
  		to: (top / 'src') fullName
+ 		platformDir: (top / 'platforms') fullName
+ 		excluding:
+ 			#(#BrokenPlugin #IA32ABIPluginSimulator #SlangTestPlugin #TestOSAPlugin #FFIPlugin #ReentrantARMFFIPlugin #ReentrantFFIPlugin #ReentrantPPCBEFFIPlugin #NewsqueakIA32ABIPlugin #NewsqueakIA32ABIPluginAttic)!
- 		platformDir: ( top / 'platforms') fullName
- 		excluding:#(BrokenPlugin IA32ABIPluginSimulator SlangTestPlugin TestOSAPlugin
- 					FFIPlugin ReentrantARMFFIPlugin ReentrantFFIPlugin 					ReentrantPPCBEFFIPlugin NewsqueakIA32ABIPlugin
- 					 NewsqueakIA32ABIPluginAttic).
- !

Item was changed:
  ----- Method: CMakeGenScripts class>>generateStackSources (in category 'sources generation') -----
  generateStackSources
  	" generate sources for Stack Interpreter of Mac OS"
+ 
  	| top |
+ 	top := FileSystem workingDirectory parent.
- 	top := FileDirectory default containingDirectory.
- 	
  	VMMaker
  		generate: StackInterpreter
  		to: (top / 'src') fullName
+ 		platformDir: (top / 'platforms') fullName
+ 		excluding:
+ 			#(#BrokenPlugin #IA32ABIPluginSimulator #SlangTestPlugin #TestOSAPlugin #FFIPlugin #ReentrantARMFFIPlugin #ReentrantFFIPlugin #ReentrantPPCBEFFIPlugin)!
- 		platformDir: ( top / 'platforms') fullName
- 		excluding: #(BrokenPlugin IA32ABIPluginSimulator SlangTestPlugin TestOSAPlugin
- 			FFIPlugin ReentrantARMFFIPlugin ReentrantFFIPlugin ReentrantPPCBEFFIPlugin).
- 			
- 	
- 
- 	!

Item was changed:
  ----- Method: CMakeVMGenerator>>topDir (in category 'accessing') -----
  topDir
  	| dir |
+ 	dir := self config topDir ifNil: [ FileSystem workingDirectory parent ].
+ 	dir isString
+ 		ifTrue: [ ^dir asFileReference ].
- 	dir := self config topDir ifNil: [ FileDirectory default containingDirectory ].
- 	dir isString ifTrue: [^ FileDirectory on: ( FileDirectory fullPathForURI: dir) ].
  	^ dir!

Item was changed:
  ----- Method: CPlatformConfig>>dirFrom: (in category 'utils') -----
  dirFrom: aStringOrDir
+ 	^ aStringOrDir isString
+ 		ifTrue: [ aStringOrDir asFileReference ]
+ 		ifFalse: [ aStringOrDir ]!
- 	
- 	^ aStringOrDir isString ifTrue: [
- 		FileDirectory on: ( FileDirectory fullPathForURI: aStringOrDir)] 
- 	ifFalse: [ aStringOrDir ]!

Item was changed:
  ----- Method: CPlatformConfig>>topDir (in category 'directories') -----
  topDir
+ 	^ topDir ifNil: [ topDir := FileSystem workingDirectory parent ]!
- 	
- 	^ topDir ifNil: [ topDir := FileDirectory default containingDirectory ].
- !

Item was changed:
  ----- Method: CPlatformConfig>>topDir: (in category 'directories') -----
  topDir: pathString
+ 	topDir := pathString asFileReference.
+ 	topDir assureExistence!
- 
- 	topDir :=
- 		FileDirectory on: (FileDirectory fullPathForURI: pathString).
- 	topDir assureExistence.!

Item was changed:
  ----- Method: CPlatformConfig>>validateSourcesPresent (in category 'source generation') -----
  validateSourcesPresent
  	| sources |
+ 	sources := Smalltalk openSources: SmalltalkImage current sourcesName forImage: SmalltalkImage current imageName.
- 	sources := FileDirectory openSources: SmalltalkImage current sourcesName forImage: SmalltalkImage current imageName.
  	
  	((sources == nil or: [sources atEnd])
  			and: [ SmalltalkImage current checkSourcesFileAvailability])
  		ifTrue: [
  		self error: 'VM source code cannot be generated without .sources file'.
  	]		!

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 isString ifTrue: [ bldDir := FileDirectory on: (FileDirectory fullPathForURI: bldDir) ].
  	bldDir assureExistence.
+ 	bldDir forceNewFileNamed: aFileName do: [ :stream | stream nextPutAll: (self fixLineEndsOf: aContents) ]!
- 	
- 	bldDir forceNewFileNamed: aFileName 
- 		do: [:stream | stream nextPutAll: (self fixLineEndsOf: aContents) ].!