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

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

Name: CMakeVMMaker-EstebanLorenzano.139
Author: EstebanLorenzano
Time: 17 October 2011, 10:09:20 am
UUID: 472888bd-c8bf-4707-bfb3-d9728e343dca
Ancestors: CMakeVMMaker-EstebanLorenzano.138

-added logic for English.lproj

=============== Diff against CMakeVMMaker-EstebanLorenzano.138 ===============

Item was changed:
  ----- Method: CocoaIOSConfig>>extraSources (in category 'source files') -----
  extraSources
  	^'${buildDir}/', self prefixHeaderFileName, '
+  ${resources} ', 
+ 	'${buildDir}/', self prefixHeaderFileName, '
+  ${resourcesLocaleEnglish}'!
-  ${resources}'!

Item was changed:
  ----- Method: CocoaIOSConfig>>extraVMSettings: (in category 'settings') -----
  extraVMSettings: maker
  	maker set: 'CMAKE_OSX_ARCHITECTURES' to: 'i386'.
  
  	maker set: 'resourceDir' toString: self resourcesDir, '/ProjectBuilder'.
  	maker set: 'resources' to: 
  		'"${resourceDir}/Squeak VM.r"
  		"${resourceDir}/Squeak.icns"
  		"${resourceDir}/Cog.icns"
  		"${resourceDir}/SqueakChanges.icns"
  		"${resourceDir}/SqueakImage.icns"
  		"${resourceDir}/SqueakPlugin.icns"
  		"${resourceDir}/SqueakScript.icns"
  		"${resourceDir}/SqueakGeneric.icns"
  		"${resourceDir}/SqueakProject.icns"
+ 		"${resourceDir}/SqueakSources.icns"'.
+ 		
+ 	maker set: 'resourcesLocaleEnglish' to: 
+ 	     '"${resourceDir}/English.lproj/InfoPlist.strings"
+ 		"${resourceDir}/English.lproj/MainMenu.nib"'
- 		"${resourceDir}/SqueakSources.icns"
- 		"${resourceDir}/MainMenu.nib"'
  !

Item was changed:
  ----- Method: CocoaIOSConfig>>plistFile (in category 'bundle strings') -----
  plistFile
  
  	| plist |
  	
  	plist := self plistTemplate.
  	
  	#(
  	CFBundleExecutable
  	CFBundleGetInfoString
  	CFBundleName
  	CFBundleShortVersionString
  	CFBundleVersion
  	CFBundleIconFile
  	CFBundleIdentifier
  	NSMainNibFile
  	SqueakDebug) do: [:key |
  		plist := plist copyReplaceAll: '@' , key , '@' with: (self perform: key) asString
  	].
  
  	^ self fixLineEndsOf: plist!

Item was changed:
  ----- Method: CocoaIOSConfig>>plistTemplate (in category 'bundle strings') -----
(excessive size, no diff calculated)

Item was changed:
  ----- Method: CogFamilyCocoaIOSConfig>>defaultExternalPlugins (in category 'plugins') -----
  defaultExternalPlugins 
  	^(self versionExternalPlugins),
  		#(
  		UUIDPlugin
  		FloatMathPlugin
  		AsynchFilePlugin
  		SerialPlugin
  		Mpeg3Plugin
  		CroquetPlugin
  		JoystickTabletPlugin
  		MIDIPlugin
  		B3DAcceleratorPlugin
  		LocalePlugin
  		ObjectiveCPlugin
  		QuicktimePlugin
  		TestOSAPlugin
+ 		UnixOSProcessPlugin
  	)!

Item was changed:
  ----- Method: CogFamilyCocoaIOSConfig>>defaultInternalPlugins (in category 'plugins') -----
  defaultInternalPlugins
  	^ #(
  		ADPCMCodecPlugin
  		BMPReadWriterPlugin 
  		BalloonEnginePlugin 
  		BitBltSimulation 
  		ClipboardExtendedPlugin
  		DSAPlugin 
  		DeflatePlugin 
  		DropPlugin 
  		FFTPlugin 
  		FilePlugin 
  		FloatArrayPlugin 
  		GeniePlugin 
  		HostWindowPlugin 
  		JPEGReadWriter2Plugin 
  		JPEGReaderPlugin 
  		KlattSynthesizerPlugin 
  		LargeIntegersPlugin 
  		"MacMenubarPlugin" "This plugin is not yet ported"
  		Matrix2x3Plugin 
  		MiscPrimitivePlugin 
  		RePlugin 
  		SecurityPlugin 
  		SocketPlugin 
  		SoundCodecPlugin 
  		SoundGenerationPlugin 
  		SoundPlugin
  		StarSqueakPlugin 
  		SurfacePlugin 
+ 		"UnixOSProcessPlugin"
- 		UnixOSProcessPlugin
  		)!

Item was changed:
  ----- Method: CogFamilyCocoaIOSConfig>>setExtraTargetProperties: (in category 'settings') -----
  setExtraTargetProperties: maker
  	| plist |
  
  	maker addFrameworks: self frameworks.
  
  	" generated and add Info.plist file "
  	plist := self plistFile.
  
  	(maker buildDir forceNewFileNamed: 'Info.plist') 
  		nextPutAll: plist; 
  		close.
  
  	maker 
  		addProperty: 'MACOSX_BUNDLE_INFO_PLIST' 
  		value: '${buildDir}/Info.plist'.  
  
  	maker 
  		cmd: 'set_source_files_properties' 
  		params: '${resources} PROPERTIES MACOSX_PACKAGE_LOCATION Resources'.
+ 
+ 	maker 
+ 		cmd: 'set_source_files_properties' 
+ 		params: '${resourcesLocaleEnglish} PROPERTIES MACOSX_PACKAGE_LOCATION Resources/English.lproj'.
+ 
+ 
+ 	maker 
+ 		cmd: 'set_source_files_properties' 
+ 		params: '${ENGLISH_RESOURCES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources/English.lproj'.
  			
  	(maker buildDir forceNewFileNamed: self prefixHeaderFileName) 
  		nextPutAll: self precompiledHeaders;
  		close.
  	maker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/', self prefixHeaderFileName.
  
  	maker 
  		addXCodeProperty: 'PER_ARCH_CFLAGS_i386' value: '-DLSB_FIRST -mfpmath=sse -finline-functions  -fno-cse-follow-jumps -fno-gcse -mtune=prescott -march=pentium-m -falign-functions=16'.
  		
  	maker 
  		addXCodeProperty: 'GCC_VERSION' value: '4.2'.
  
  	maker 
  		cmd: 'set_target_properties' 
  		params: self executableName, ' PROPERTIES COMPILE_FLAGS "-include \"', (self buildDir / self prefixHeaderFileName) fullName, '\""'. 
  	
  	maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir.
  	maker set: 'RUNTIME_OUTPUT_DIRECTORY' toString: self outputDir.!