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

commits at source.squeak.org commits at source.squeak.org
Mon Apr 2 18:56:30 UTC 2012


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

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

Name: CMakeVMMaker-EstebanLorenzano.153
Author: EstebanLorenzano
Time: 2 April 2012, 8:55:54 pm
UUID: 3c1d9785-eda0-4294-88eb-457831255a10
Ancestors: CMakeVMMaker-EstebanLorenzano.152

locale plugin integrated

=============== Diff against CMakeVMMaker-EstebanLorenzano.152 ===============

Item was changed:
  ----- Method: CocoaIOSConfig>>configureLocalePlugin: (in category 'plugin extra rules') -----
+ configureLocalePlugin: maker
+ 	maker addFrameworks: #('CoreFoundation').
+ 	maker addPlatformSources: #( 'sqIOSLocale.c' )	.
+ !
- configureLocalePlugin: maker 
- 	"extra rules for LocalePlugin"
- 
- 	super configureLocalePlugin: maker.  
- 	maker addPlatformSources: #( 'sqMacLocaleCarbon.c' )!

Item was changed:
  ----- Method: CocoaIOSConfig>>setExtraTargetProperties: (in category 'settings') -----
  setExtraTargetProperties: maker
  	| plist precompiledHeaders |
  
  	" generated and add Info.plist file "
+ 	plist := self plistFile.	
- 	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'.
  			
  	precompiledHeaders := (self executableName, '_Prefix.pch').
  	(maker buildDir forceNewFileNamed: precompiledHeaders) 
  		nextPutAll: self precompiledHeaders;
  		close.
- 		
- 	maker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/', precompiledHeaders.
  
+ 	maker addXCodeProperty: 'GCC_PREFIX_HEADER' value: '${buildDir}/', precompiledHeaders.	
+ 
  	"maker 
  		addXCodeProperty: 'GCC_ENABLE_SSE3_EXTENSIONS' value: 'YES';  
  		addXCodeProperty: 'GCC_ENABLE_SSE41_EXTENSIONS' value: 'YES';
  		addXCodeProperty: 'GCC_ENABLE_SSE42_EXTENSIONS' value: 'YES';
  		addXCodeProperty: 'GCC_GENERATE_DEBUGGING_SYMBOLS' value: 'NO';  
  		addXCodeProperty: 'GCC_INLINES_ARE_PRIVATE_EXTERN' value: 'YES';
  		addXCodeProperty: 'GCC_UNROLL_LOOPS' value: 'YES'.	"
  	
  	"Extras"
  	maker 
  		addXCodeProperty: 'ICC_DEBUG' value: 'NO';
  		addXCodeProperty: 'ICC_OPTLEVEL' value: 'speedHLO';
  		addXCodeProperty: 'ICC_OPT_IPO_FOR_SINGLE_FILE_COMPILATION' value: 'YES';
  		addXCodeProperty: 'ICC_OPT_PARALLEL' value: 'NO';
  		addXCodeProperty: 'ICC_OPT_PREFETCH_INSERTION' value: 'YES';
  		addXCodeProperty: 'ICC_OPT_PROVIDE_FRAME_PTR' value: 'NO';
  		addXCodeProperty: 'ICC_OPT_USE_ARCH_IA32' value: 'SSE41';
  		addXCodeProperty: 'PER_ARCH_CFLAGS_i386' value: '-finline-functions -mfpmath=sse -march=pentium-m -mtune=prescott -falign-functions=16  -fno-gcse -fno-cse-follow-jumps  -DLSB_FIRST -DUSE_INLINE_MEMORY_ACCESSORS';
  		addXCodeProperty: 'PER_ARCH_CFLAGS_ppc' value: '-fast -mtune=7450 -mcpu=7450 -D_BSD_SOCKLEN_T_=int'!

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>>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 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.3'."
  
  	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.!

Item was changed:
  ----- Method: StackIPhoneConfig>>commonCompilerFlags (in category 'settings') -----
  commonCompilerFlags
  	"Common compiler flags"
  	^{
  	"'-miphoneos-version-min=4.3'. "
+ 	'-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS', self sdkVersion, '.sdk'.
- 	'-isysroot /Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS', self sdkVersion, '.sdk'.
  	'-x objective-c'.
  	'-std=gnu99'.
  	'-falign-functions=16'.
  	'-fno-gcse'.
  	'-fno-cse-follow-jumps'.
  	'-fvisibility=hidden'.
  	'-funroll-loops'.
  	'-finline-functions'.
  	'-mno-thumb'.
  	'-DSTACKVM=1'.
  	'-DCOGMTVM=0'. 
  	'-DUSE_GLOBAL_STRUCT=0'. 
  	'-DBASE_HEADER_SIZE=4'.
  	'-DTARGET_OS_IS_IPHONE'.
  	'-DHAVE_UUID_GENERATE'.
  	'-DUSE_INLINE_MEMORY_ACCESSORS'. 
  	'-DHAVE_SYS_TIME_H'.
  	'-DLSB_FIRST'.
  	'-DHAVE_NANOSLEEP'.
  	"'-DXXXUSE_INLINE_MEMORY_ACCESSORS'."
  	'-DISQUEAK_IMAGE=', self imageName.
  	'-DISQUEAK_SOURCES=PharoV10'}!

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

Item was changed:
  ----- Method: StackIPhoneConfig>>defaultInternalPlugins (in category 'settings') -----
  defaultInternalPlugins
  	^ #(
  		ADPCMCodecPlugin
  		BMPReadWriterPlugin 
  		BalloonEnginePlugin 
  		BitBltSimulation 
  		DSAPlugin 
  		DeflatePlugin 
+ 		"DropPlugin"
+ 		LocalePlugin 
- 		"DropPlugin" 
  		FFTPlugin 
  		FilePlugin 
  		FloatArrayPlugin 
  		HostWindowPlugin 
  		JPEGReadWriter2Plugin 
  		JPEGReaderPlugin 
  		LargeIntegersPlugin 
  		Matrix2x3Plugin 
  		MiscPrimitivePlugin 
  		"RePlugin" 
  		SecurityPlugin 
+ 		"SocketPlugin"
- 		"SocketPlugin" 
  		SoundCodecPlugin 
  		SoundGenerationPlugin 
  		SoundPlugin
  		SurfacePlugin
  		UUIDPlugin
  		ObjectiveCPlugin 
  		#IOSPlugin)!

Item was changed:
  ----- Method: StackIPhoneConfig>>frameworks (in category 'accessing') -----
  frameworks
  	^ #(
  	CoreAudio
  	CoreGraphics
  	CoreLocation
  	UIKit
  	Foundation
  	QuartzCore
  	OpenGLES
  	AudioToolbox
  	SystemConfiguration)!

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

Item was changed:
  ----- Method: StackIPhoneConfig>>setCommonProperties: (in category 'settings') -----
  setCommonProperties: maker 
  	maker set: 'CMAKE_CROSSCOMPILING' to: 'TRUE'.
  	maker set: 'CMAKE_SYSTEM_NAME' to: 'Darwin'.
  	maker set: 'CMAKE_SYSTEM_PROCESSOR' to: 'arm'.
  
  	maker set: 'SDKVER' toString: self sdkVersion.
+ 	maker set: 'DEVROOT' toString: '/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer'.
- 	maker set: 'DEVROOT' toString: '/Developer/Platforms/iPhoneOS.platform/Developer'.
  	maker set: 'SDKROOT' toString: '${DEVROOT}/SDKs/iPhoneOS${SDKVER}.sdk'.
  
  	maker set: 'CMAKE_OSX_SYSROOT' to: 'iphoneos${SDKVER}'.
  		
  	maker set: 'CMAKE_C_COMPILER' to: '${DEVROOT}/usr/bin/llvm-gcc'.
  	maker set: 'CMAKE_CXX_COMPILER' to: '${DEVROOT}/usr/bin/llvm-g++'.
- 	"maker set: 'CMAKE_C_COMPILER' to: 'gcc-4.2'.
- 	maker set: 'CMAKE_CXX_COMPILER' to: 'g++-4.2'."
  		
  	maker set: 'CMAKE_FIND_ROOT_PATH' to: '"${SDKROOT}" "${DEVROOT}"'.
  	maker set: 'CMAKE_FIND_ROOT_PATH_MODE_PROGRAM' to: 'ONLY'.
  	maker set: 'CMAKE_FIND_ROOT_PATH_MODE_LIBRARY' to: 'ONLY'.
  	maker set: 'CMAKE_FIND_ROOT_PATH_MODE_INCLUDE' to: 'ONLY'.
  	
  	maker set: 'CMAKE_EXE_LINKER_FLAGS' toString: '-L${SDKROOT}/usr/lib -L${SDKROOT}/usr/lib/system'.
  
  	maker addFrameworks: self frameworks.!



More information about the Vm-dev mailing list