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

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

Name: CMakeVMMaker-EstebanLorenzano.152
Author: EstebanLorenzano
Time: 22 February 2012, 6:39:33 pm
UUID: 48e3f0fc-df97-4d90-9c08-ca8af20edda8
Ancestors: CMakeVMMaker-EstebanLorenzano.151

device target now can be universal too

=============== Diff against CMakeVMMaker-EstebanLorenzano.151 ===============

Item was changed:
  ----- Method: StackIPhoneConfig class>>deviceIPad (in category 'accessing') -----
  deviceIPad 
+ 	^#(2)!
- 	^'2'!

Item was changed:
  ----- Method: StackIPhoneConfig class>>deviceIPhone (in category 'accessing') -----
  deviceIPhone 
+ 	^#(1)!
- 	^'1'!

Item was added:
+ ----- Method: StackIPhoneConfig class>>deviceUniversal (in category 'accessing') -----
+ deviceUniversal 
+ 	^#(1 2)!

Item was changed:
  ----- Method: StackIPhoneConfig>>UIDeviceFamily (in category 'bundle strings') -----
  UIDeviceFamily
+ 	^self targetedDeviceFamilyAsTemplateString!
- 	^self targetedDeviceFamily!

Item was removed:
- ----- Method: StackIPhoneConfig>>compilerFlagsDebug (in category 'settings') -----
- compilerFlagsDebug
- 	^super compilerFlagsDebug "#('-g3' '-O0' '-fno-cse-follow-jumps' '-DDEBUGVM=1')"!

Item was removed:
- ----- Method: StackIPhoneConfig>>compilerFlagsRelease (in category 'settings') -----
- compilerFlagsRelease 
- 	^super compilerFlagsRelease "#('-g0' '-O3' '-finline-functions'  '-fomit-frame-pointer' '-DNDEBUG' '-DDEBUGVM=0')"!

Item was changed:
  ----- Method: StackIPhoneConfig>>configureIOSPlugin: (in category 'plugin extra rules') -----
  configureIOSPlugin: maker
  	maker 
  		addSources: #('sqTouch.m' ) 
+ 		prefixed: '${platformsDir}/iOS/vm/iPhone/plugins/IOSPlugin/'
- 		prefixed: '${platformsDir}/iOS/vm/iPhone/plugins/TouchPlugin/'
  !

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>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>LSRequiresIPhoneOS</key>
  	<true/>
  	<key>MinimumOSVersion</key>
  	<string>3.1.3</string>
  	<key>NSMainNibFile</key>
  	<string>MainWindow</string>
  	<key>UIDeviceFamily</key>
  	<array>
+ 		@UIDeviceFamily@
- 		<integer>@UIDeviceFamily@</integer>
  	</array>
  	<key>UIPrerenderedIcon</key>
  	<false/>
  	<key>UIStatusBarHidden</key>
  	<true/>
  </dict>
  </plist>
  '!

Item was changed:
  ----- Method: StackIPhoneConfig>>setExtraTargetProperties: (in category 'settings') -----
  setExtraTargetProperties: maker
  	"super setExtraTargetProperties: maker."
  
  	| precompiledHeaders plist |
  	
  	precompiledHeaders := (self executableName, '_Prefix.pch').
  	(maker buildDir forceNewFileNamed: precompiledHeaders) 
  		nextPutAll: self precompiledHeaders;
  		close.
  	
  	maker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/', precompiledHeaders.
  	
  	self setCommonProperties: maker.
  
  	" 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_target_properties' 
  		params: self executableName, ' PROPERTIES COMPILE_FLAGS "-include \"', (self buildDir / self prefixHeaderFileName) fullName, '\""'. 
  
  	maker set: 'CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY' toString: self codeSignIdentity.
+ 	maker set: 'CMAKE_XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY' toString: self targetedDeviceFamilyAsString.
- 	maker set: 'CMAKE_XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY' toString: self targetedDeviceFamily.
  	maker set: 'CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET' to: self deploymentTargetVersion.
  	
  	maker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir.!

Item was changed:
  ----- Method: StackIPhoneConfig>>targetedDeviceFamily (in category 'accessing') -----
  targetedDeviceFamily 
+ 	^self class deviceUniversal !
- 	^self class deviceIPad!

Item was added:
+ ----- Method: StackIPhoneConfig>>targetedDeviceFamilyAsString (in category 'private') -----
+ targetedDeviceFamilyAsString 
+ 	^String streamContents: [ :stream | 
+ 		self targetedDeviceFamily 
+ 			do: [ :each | stream nextPutAll: each asString ]
+ 			separatedBy: [ stream nextPut: $, ].
+ 		stream nextPut: Character space ]!

Item was added:
+ ----- Method: StackIPhoneConfig>>targetedDeviceFamilyAsTemplateString (in category 'private') -----
+ targetedDeviceFamilyAsTemplateString 
+ 	^String streamContents: [ :stream | 
+ 		self targetedDeviceFamily do: [ :each | 
+ 			stream 
+ 				nextPutAll: '<integer>';
+ 				nextPutAll: each asString;
+ 				nextPutAll: '</integer>' ] ]!