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

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

Name: CMakeVMMaker-EstebanLorenzano.200
Author: EstebanLorenzano
Time: 19 April 2013, 2:16:36.761 pm
UUID: 48975b0a-a164-4b3b-9452-8564a63c24fa
Ancestors: CMakeVMMaker-EstebanLorenzano.199

- JPEGReadWriter2Plugin, JPEGReaderPlugin and RePlugin moved from internal to external (in OSX and Linux)
- typo in thirdParty directory
- fixes in iPhone config

=============== Diff against CMakeVMMaker-EstebanLorenzano.199 ===============

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: #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: CogFamilyCocoaIOSConfig>>defaultExternalPlugins (in category 'plugins') -----
  defaultExternalPlugins 
  	^(self versionExternalPlugins),
  		#(
  		UUIDPlugin
  		FloatMathPlugin
  		AsynchFilePlugin
  		SerialPlugin
  		Mpeg3Plugin
  		CroquetPlugin
  		JoystickTabletPlugin
  		MIDIPlugin
  		B3DAcceleratorPlugin
+ 		JPEGReadWriter2Plugin 
+ 		JPEGReaderPlugin
+ 		RePlugin
  		LocalePlugin
  		ObjectiveCPlugin
  		QuicktimePlugin
  		TestOSAPlugin
  		SqueakSSLPlugin
  		"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" 
- 		JPEGReadWriter2Plugin 
- 		JPEGReaderPlugin 
  		KlattSynthesizerPlugin 
  		LargeIntegersPlugin 
  		"MacMenubarPlugin" "This plugin is not yet ported"
  		Matrix2x3Plugin 
  		MiscPrimitivePlugin 
+ 		"RePlugin" 
- 		RePlugin 
  		SecurityPlugin 
  		SocketPlugin 
  		SoundCodecPlugin 
  		SoundGenerationPlugin 
  		SoundPlugin
  		StarSqueakPlugin 
  		SurfacePlugin 
  		UnixAioPlugin
  		UnixOSProcessPlugin
  		)!

Item was changed:
  ----- Method: CogUnixConfig>>defaultExternalPlugins (in category 'plugins') -----
  defaultExternalPlugins
  	^ #(
  		B3DAcceleratorPlugin
  		ThreadedIA32FFIPlugin "SqueakFFIPrims"
  		"UUIDPlugin"
  		"UnixOSProcessPlugin ?? "	
+ 		JPEGReaderPlugin 
+ 		JPEGReadWriter2Plugin 			
+ 		RePlugin
  		InternetConfigPlugin
  	)!

Item was changed:
  ----- Method: CogUnixConfig>>defaultInternalPlugins (in category 'plugins') -----
  defaultInternalPlugins
  " took from unixbuild/bld/plugins.int"
  	^ #(
  		ADPCMCodecPlugin 
  		AsynchFilePlugin 
  		BalloonEnginePlugin "B2DPlugin" 
  		BitBltSimulation "BitBltPlugin"
  		BMPReadWriterPlugin 
  		CroquetPlugin 
  		DeflatePlugin  "ZipPlugin"
  		DropPlugin 
  		DSAPlugin "DSAPrims" 
  		FFTPlugin 
  		FileCopyPlugin 
  		FilePlugin 
  		FloatArrayPlugin 
  		FloatMathPlugin 
  		IA32ABIPlugin "IA32ABI"
  		JoystickTabletPlugin 
- 		JPEGReaderPlugin 
- 		JPEGReadWriter2Plugin 
  		KlattSynthesizerPlugin "Klatt"
  		LargeIntegersPlugin "LargeIntegers"
  		Matrix2x3Plugin 
  		MIDIPlugin 
  		MiscPrimitivePlugin 
+ 		Mpeg3Plugin  	
- 		Mpeg3Plugin 
- 		RePlugin 	
  		SecurityPlugin 
  		SerialPlugin 
  		SocketPlugin 
  		SoundCodecPlugin "SoundCodecPrims"
  		SoundGenerationPlugin 
  		SoundPlugin 
  		StarSqueakPlugin 
  		SurfacePlugin	
  		LocalePlugin
  		)!

Item was added:
+ ----- Method: StackIPhoneConfig>>CFBundleVersion (in category 'bundle strings') -----
+ CFBundleVersion
+ 	^'1.0.0'!

Item was changed:
  ----- Method: StackIPhoneConfig>>plistKeys (in category 'bundle strings') -----
  plistKeys 
  	^super plistKeys, 
  	#(CFBundleIconFile57 
  	CFBundleIconFile72 
  	CFBundleIconFile1024
+ 	CFBundleVersion
  	UIDeviceFamily 
  	UIFileSharingEnabled
  	VMMemorySize
  	ImageIsWritable
  	ImageIsScrollable
  	WebViewAsUI
  	WebViewUrl)
  !

Item was changed:
  ----- Method: StackIPhoneConfig>>plistTemplate (in category 'bundle strings') -----
  plistTemplate 
- 	self flag: #todo. "CFBundleDisplayName is using @CFBundleExecutable@ that's probably wrong"
  	^'<?xml version="1.0" encoding="UTF-8"?>
  <!!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
  <plist version="1.0">
  <dict>
  	<key>CFBundleDevelopmentRegion</key>
  	<string>en</string>
+ 	<key>CFBundleVersion</key>
+ 	<string>@CFBundleVersion@</string>
  	<key>CFBundleDisplayName</key>
  	<string>@CFBundleExecutable@</string>
  	<key>CFBundleExecutable</key>
  	<string>@CFBundleExecutable@</string>
  	<key>CFBundleIconFile</key>
  	<string>@CFBundleIconFile@</string>
  	<key>CFBundleIconFiles</key>
  	<array>
  		<string>@CFBundleIconFile@</string>
  		<string>@CFBundleIconFile57@</string>
  		<string>@CFBundleIconFile72@</string>
  		<string>@CFBundleIconFile1024@</string>
  	</array>	
  	<key>CFBundleIdentifier</key>
  	<string>@CFBundleIdentifier@</string>
  	<key>CFBundleInfoDictionaryVersion</key>
  	<string>6.0</string>
  	<key>CFBundleName</key>
  	<string>@CFBundleName@</string>
  	<key>CFBundlePackageType</key>
  	<string>APPL</string>
  	<key>CFBundleResourceSpecification</key>
  	<string>ResourceRules.plist</string>
  	<key>CFBundleSignature</key>
  	<string>FRAC</string>
  	<key>CFBundleSupportedPlatforms</key>
  	<array>
  		<string>iPhoneOS</string>
  	</array>
- 	<key>CFBundleVersion</key>
- 	<string>1.1.7</string>
  	<key>LSRequiresIPhoneOS</key>
  	<true/>
  	<key>MinimumOSVersion</key>
  	<string>3.1.3</string>
  	<key>NSMainNibFile</key>
  	<string>MainWindow</string>
  	<key>UIDeviceFamily</key>
  	<array>
  		@UIDeviceFamily@
  	</array>
  	<key>UIPrerenderedIcon</key>
  	<false/>
  	<key>UIStatusBarHidden</key>
  	<true/>
  	<key>UIFileSharingEnabled</key>
  	<@UIFileSharingEnabled@/>
  	<key>ImageIsWritable</key>
  	<@ImageIsWritable@/>
  	<key>ImageIsScrollable</key>
  	<@ImageIsScrollable@/>
  	<key>VMMemorySize</key>
  	<integer>@VMMemorySize@</integer>
  	<key>WebViewAsUI</key>
  	<@WebViewAsUI@/>
  	<key>WebViewUrl</key>
  	<string>@WebViewUrl@</string>
  </dict>
  </plist>
  '!

Item was changed:
  ----- Method: StackIPhoneConfig>>sdkVersion (in category 'accessing') -----
  sdkVersion 
+ 	^'6.1'!
- 	^'6.0'!