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

commits at source.squeak.org commits at source.squeak.org
Tue Jan 10 15:36:44 UTC 2012


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

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

Name: CMakeVMMaker-EstebanLorenzano.145
Author: EstebanLorenzano
Time: 10 January 2012, 12:36:24 pm
UUID: 4df5ffc1-ad63-412b-a8cb-b5f1a8216228
Ancestors: CMakeVMMaker-EstebanLorenzano.143, CMakeVMMaker-golubovsky.144

-merged

=============== Diff against CMakeVMMaker-EstebanLorenzano.143 ===============

Item was changed:
  ----- Method: CocoaIOSConfig>>configureHostWindowPlugin: (in category 'plugin extra rules') -----
  configureHostWindowPlugin: maker
  	super configureHostWindowPlugin: maker.
  	maker 
+ 		addSources: #('sqMacHostWindow.m' ) 
- 		addSources: #('sqMacHostWindow.c' ) 
  		prefixed: '${platformsDir}/iOS/vm/iPhone/plugins/HostWindowPlugin/'
  !

Item was changed:
  ----- Method: StackCocoaIOSARMConfig>>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>BuildMachineOSBuild</key>
- 	<string>10J869</string>
  	<key>CFBundleDevelopmentRegion</key>
  	<string>en</string>
  	<key>CFBundleDisplayName</key>
  	<string>@CFBundleExecutable@</string>
  	<key>CFBundleExecutable</key>
  	<string>@CFBundleExecutable@</string>
  	<key>CFBundleIconFile</key>
  	<string>@CFBundleIconFile@</string>
  	<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>DTCompiler</key>
- 	<string>4.2</string>
- 	<key>DTPlatformBuild</key>
- 	<string>8H7</string>
- 	<key>DTPlatformName</key>
- 	<string>iphoneos</string>
- 	<key>DTPlatformVersion</key>
- 	<string>4.3</string>
- 	<key>DTSDKBuild</key>
- 	<string>8H7</string>
- 	<key>DTSDKName</key>
- 	<string>iphoneos4.3</string>
- 	<key>DTXcode</key>
- 	<string>0402</string>
- 	<key>DTXcodeBuild</key>
- 	<string>4A2002a</string>
  	<key>LSRequiresIPhoneOS</key>
  	<true/>
  	<key>MinimumOSVersion</key>
  	<string>3.1.3</string>
  	<key>NSMainNibFile</key>
  	<string>MainWindow</string>
  	<key>UIDeviceFamily</key>
  	<array>
  		<integer>1</integer>
  	</array>
  	<key>UIPrerenderedIcon</key>
+ 	<false/>
- 	<true/>
  	<key>UIStatusBarHidden</key>
  	<true/>
  </dict>
  </plist>
  '!

Item was changed:
  ----- Method: StackCocoaIOSARMConfig>>setResourceProperties: (in category 'settings') -----
  setResourceProperties: maker
  	maker set: 'resourceDir' toString: self resourcesDir, '/ProjectBuilder'.
  
  	maker 
  		set: 'resources' 
  		to: (String streamContents: [ :stream | 
  			self  resources
  				do: [ :each | 
  					stream 
  						nextPut: $";
  						nextPutAll: '${resourceDir}/';
  						nextPutAll: each;
  						nextPut: $"]
  				separatedBy: [ stream space ] ]).
  		
  	maker 
  		set: 'resourcesLocaleEnglish' 
  		toString: '${resourceDir}/iPhone-English.lproj/MainWindow.nib'.
  
  	maker 
  		cmd: 'set_source_files_properties' 
+ 		params: '${resources} PROPERTIES MACOSX_PACKAGE_LOCATION Resources'.
- 		params: '${resources} PROPERTIES MACOSX_PACKAGE_LOCATION .'.
  
  	maker 
  		cmd: 'set_source_files_properties' 
+ 		params: '${resourcesLocaleEnglish} PROPERTIES MACOSX_PACKAGE_LOCATION Resources'.
- 		params: '${resourcesLocaleEnglish} PROPERTIES MACOSX_PACKAGE_LOCATION .'.
  
  !

Item was added:
+ ----- Method: StackEvtAndroidConfig>>configureLocalePlugin: (in category 'plugin extra rules') -----
+ configureLocalePlugin: maker
+ 	"extra rules for LocalePlugin"
+ 
+ 	super configureLocalePlugin: maker.  
+ 	
+ 	maker addPlatformSources: #( 'sqAndroidLocale.c')!

Item was changed:
  ----- Method: StackEvtAndroidConfig>>defaultInternalPlugins (in category 'plugins') -----
  defaultInternalPlugins
  " took from unixbuild/bld/plugins.int"
  	^ #(
  		AndroidPlugin
  		BitBltSimulation "BitBltPlugin"
  		BalloonEnginePlugin "B2DPlugin" 
  		BMPReadWriterPlugin 
  		CroquetPlugin 
  		DSAPlugin "DSAPrims" 
  		FFTPlugin 
  		FileCopyPlugin 
  		FilePlugin 
  		FloatArrayPlugin 
  		FloatMathPlugin 
  		JoystickTabletPlugin 
  		JPEGReaderPlugin 
  		LargeIntegersPlugin "LargeIntegers"
  		Matrix2x3Plugin 
+ 		LocalePlugin
  		RePlugin 	
  		SecurityPlugin 
  		JPEGReadWriter2Plugin 
  		SocketPlugin 
  		MiscPrimitivePlugin 
  		DeflatePlugin  "ZipPlugin"
  		)!



More information about the Vm-dev mailing list