[Vm-dev] VM Maker: CMakeVMMaker-EstebanLorenzano.169.mcz
commits at source.squeak.org
commits at source.squeak.org
Tue Jul 3 08:46:04 UTC 2012
Esteban Lorenzano uploaded a new version of CMakeVMMaker to project VM Maker:
http://source.squeak.org/VMMaker/CMakeVMMaker-EstebanLorenzano.169.mcz
==================== Summary ====================
Name: CMakeVMMaker-EstebanLorenzano.169
Author: EstebanLorenzano
Time: 3 July 2012, 10:45:46.998 am
UUID: 84ebb92a-a421-492f-b9bc-ef1a3c7d11f9
Ancestors: CMakeVMMaker-IgorStasenko.168
- added sources for core graphics and opengl (cocoa)
- added UIFileSharingEnabled property (iOS)
=============== Diff against CMakeVMMaker-IgorStasenko.168 ===============
Item was changed:
----- Method: CocoaIOSConfig>>compilerFlagsRelease (in category 'accessing') -----
compilerFlagsRelease
^#(
"'-fobjc-direct-dispatch'"
'-msse3'
"'-msse4.1'"
"'-msse4.2'"
"'-mdynamic-no-pic'"
"'-fwritable-strings'"
'-Os'
'-fvisibility=hidden'
'-funroll-loops'
"'-fno-asm'"
'-fasm-blocks'
'-finline-functions'
'-mfpmath=sse'
'-fomit-frame-pointer'
'-march=pentium-m'
'-mtune=prescott'
'-falign-functions=16'
'-fno-gcse'
'-fno-cse-follow-jumps'
'-std=gnu99'
'-DBUILD_FOR_OSX'
+ "'-DUSE_INLINE_MEMORY_ACCESSORS'"
- '-DUSE_INLINE_MEMORY_ACCESSORS'
'-DLSB_FIRST'
'-DUSE_INLINE_MEMORY_ACCESSORS'
'-DHAVE_SYS_TIME_H'
'-DHAVE_NANOSLEEP'
'-DICC_DEBUG=0'
'-DICC_OPTLEVEL="speedHLO"'
'-DICC_OPT_IPO_FOR_SINGLE_FILE_COMPILATION=1'
'-DICC_OPT_PARALLEL=0'
'-DICC_OPT_PREFETCH_INSERTION=1'
'-DICC_OPT_PROVIDE_FRAME_PTR=0'
'-DICC_OPT_USE_ARCH_IA32="SSE42"')!
Item was changed:
----- Method: CocoaIOSConfig>>platformSources (in category 'source files') -----
platformSources
"files added from platform/iOS/vm dir "
^ #(
'Common/main.m'
'Common/aio.c'
'Common/Classes/Queue.m'
'Common/Classes/sqMacV2Time.c'
'Common/Classes/sqSqueakAppDelegate.m'
'Common/Classes/sqSqueakFileDirectoryAPI.m'
'Common/Classes/sqSqueakFileDirectoryInterface.m'
'Common/Classes/sqSqueakInfoPlistInterface.m'
'Common/Classes/sqSqueakMainApp.m'
'Common/Classes/sqSqueakMainApplication.m'
'Common/Classes/sqSqueakMainApplication+attributes.m'
'Common/Classes/sqSqueakAttributesAPI.m'
'Common/Classes/sqSqueakMainApplication+events.m'
'Common/Classes/sqSqueakEventsAPI.m'
'Common/Classes/sqSqueakMainApplication+imageReadWrite.m'
'Common/Classes/sqSqueakMainApplication+sound.m'
'Common/Classes/sqSqueakSoundAPI.m'
'Common/Classes/sqSqueakMainApplication+vmAndImagePath.m'
'Common/Classes/sqSqueakVmAndImagePathAPI.m'
'Common/Classes/sqSqueakMainApplication+screen.m'
'Common/Classes/sqSqueakScreenAPI.m'
'Common/Classes/sqSqueakScreenAndWindow.m'
'Common/Classes/sqSqueakCursorAPI.m'
'Common/Classes/sqSqueakMainApplication+cursor.m'
'OSX/SqueakOSXAppDelegate.m'
'OSX/sqMacV2Browser.m'
'OSX/sqMacUnixExternalPrims.m'
'OSX/sqSqueakOSXApplication.m'
'OSX/sqSqueakOSXFileDirectoryInterface.m'
'OSX/sqSqueakOSXApplication+attributes.m'
'OSX/sqSqueakOSXInfoPlistInterface.m'
'OSX/sqSqueakOSXApplication+imageReadWrite.m'
'OSX/sqSqueakOSXScreenAndWindow.m'
+ 'OSX/sqSqueakOSXCGView.m'
+ 'OSX/sqSqueakOSXOpenGLView.m'
- 'OSX/sqSqueakOSXNSView.m'
'OSX/SqViewClut.m'
'OSX/BitMapConversionLogicFromX11.c'
'OSX/SqViewBitmapConversion.m'
'OSX/macintoshosxextra.c'
'OSX/sqSqueakOSXApplication+cursor.m'
'OSX/sqSqueakOSXApplication+events.m'
'OSX/keyBoardStrokeDetails.m'
'OSX/SqueakOSXApplication.m'
'OSX/sqSqueakOSXClipboardAPI.m'
'OSX/sqSqueakOSXApplication+clipboard.m'
'OSX/sqSqueakOSXDropAPI.m'
'iPhone/sqMacV2Memory.c'
'iPhone/osExports.c')!
Item was changed:
----- Method: CocoaIOSConfig>>setExtraTargetProperties: (in category 'settings') -----
setExtraTargetProperties: maker
| plist precompiledHeaders |
" 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'.
precompiledHeaders := (self executableName, '_Prefix.pch').
(maker buildDir forceNewFileNamed: precompiledHeaders)
nextPutAll: self precompiledHeaders;
close.
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';
- 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: CogCocoaIOSConfig>>commonCompilerFlags (in category 'settings') -----
commonCompilerFlags
+ ^super commonCompilerFlags, #('-DCOGVM' '-fwrapv')!
- ^super commonCompilerFlags, #('-DCOGVM')!
Item was changed:
----- Method: CogFamilyCocoaIOSConfig>>commonCompilerFlags (in category 'settings') -----
commonCompilerFlags
^super commonCompilerFlags,
#(
'-funroll-loops'
'-fasm-blocks'
'-finline-functions'
'-mfpmath=sse'
'-march=pentium-m'
'-mtune=prescott'
'-falign-functions=16'
'-fno-gcse'
'-fno-cse-follow-jumps'
'-std=gnu99'
'-DBUILD_FOR_OSX'
+ "'-DUSE_INLINE_MEMORY_ACCESSORS=1' "
- '-DUSE_INLINE_MEMORY_ACCESSORS=1'
'-DLSB_FIRST'
'-DHAVE_SYS_TIME_H'
'-DHAVE_NANOSLEEP'
'-DCOGMTVM=0'
'-DUSE_GLOBAL_STRUCT=0'
'-DBASE_HEADER_SIZE=4')!
Item was changed:
----- Method: CogFamilyCocoaIOSConfig>>platformSources (in category 'source files') -----
platformSources
"files added from platform/iOS/vm dir "
^ #(
'Common/main.m'
"'Common/aio.c'"
'Common/Classes/Queue.m'
'Common/Classes/sqMacV2Time.c'
'Common/Classes/sqSqueakAppDelegate.m'
'Common/Classes/sqSqueakFileDirectoryAPI.m'
'Common/Classes/sqSqueakFileDirectoryInterface.m'
'Common/Classes/sqSqueakInfoPlistInterface.m'
'Common/Classes/sqSqueakMainApp.m'
'Common/Classes/sqSqueakMainApplication.m'
'Common/Classes/sqSqueakMainApplication+attributes.m'
'Common/Classes/sqSqueakAttributesAPI.m'
'Common/Classes/sqSqueakMainApplication+events.m'
'Common/Classes/sqSqueakEventsAPI.m'
'Common/Classes/sqSqueakMainApplication+imageReadWrite.m'
'Common/Classes/sqSqueakMainApplication+sound.m'
'Common/Classes/sqSqueakSoundAPI.m'
'Common/Classes/sqSqueakMainApplication+vmAndImagePath.m'
'Common/Classes/sqSqueakVmAndImagePathAPI.m'
'Common/Classes/sqSqueakMainApplication+screen.m'
'Common/Classes/sqSqueakScreenAPI.m'
'Common/Classes/sqSqueakScreenAndWindow.m'
'Common/Classes/sqSqueakCursorAPI.m'
'Common/Classes/sqSqueakMainApplication+cursor.m'
'OSX/SqueakOSXAppDelegate.m'
'OSX/sqMacV2Browser.m'
'OSX/sqMacUnixExternalPrims.m'
'OSX/sqSqueakOSXApplication.m'
'OSX/sqSqueakOSXFileDirectoryInterface.m'
'OSX/sqSqueakOSXApplication+attributes.m'
'OSX/sqSqueakOSXInfoPlistInterface.m'
'OSX/sqSqueakOSXApplication+imageReadWrite.m'
'OSX/sqSqueakOSXScreenAndWindow.m'
+ 'OSX/sqSqueakOSXCGView.m'
+ 'OSX/sqSqueakOSXOpenGLView.m'
- 'OSX/sqSqueakOSXNSView.m'
'OSX/SqViewClut.m'
'OSX/BitMapConversionLogicFromX11.c'
'OSX/SqViewBitmapConversion.m'
'OSX/macintoshosxextra.c'
'OSX/sqSqueakOSXApplication+cursor.m'
'OSX/sqSqueakOSXApplication+events.m'
'OSX/keyBoardStrokeDetails.m'
'OSX/SqueakOSXApplication.m'
'OSX/sqSqueakOSXClipboardAPI.m'
'OSX/sqSqueakOSXApplication+clipboard.m'
'OSX/sqSqueakOSXDropAPI.m'
'iPhone/sqMacV2Memory.c'
'iPhone/osExports.c'
'Common/Classes/sqSqueakScreenAPI.m')!
Item was changed:
+ ----- Method: CogFamilyCocoaIOSConfig>>setGlobalOptions: (in category 'settings') -----
- ----- Method: CogFamilyCocoaIOSConfig>>setGlobalOptions: (in category 'as yet unclassified') -----
setGlobalOptions: maker
"set any CMake global options, before declaring a project in cmake file"
maker set: 'CMAKE_C_COMPILER' to: '/usr/bin/gcc-4.2'.
maker set: 'CMAKE_CXX_COMPILER' to: '/usr/bin/g++-4.2'.
maker set: 'CMAKE_OSX_ARCHITECTURES' to: 'i386'.
maker set: 'CMAKE_OSX_SYSROOT' to: '/'.
" maker set: 'CMAKE_OSX_SYSROOT' to: '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk'"!
Item was added:
+ ----- Method: StackIPhoneConfig>>UIFileSharingEnabled (in category 'bundle strings') -----
+ UIFileSharingEnabled
+ ^false!
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'.
'-x objective-c'.
'-std=gnu99'.
'-falign-functions=16'.
'-fno-gcse'.
'-fno-cse-follow-jumps'.
'-fvisibility=hidden'.
'-funroll-loops'.
'-finline-functions'.
'-mno-thumb'.
'-fwrapv'.
'-DSTACKVM=1'.
'-DCOGMTVM=0'.
'-DUSE_GLOBAL_STRUCT=0'.
'-DBASE_HEADER_SIZE=4'.
'-DTARGET_OS_IS_IPHONE'.
'-DHAVE_UUID_GENERATE'.
+ "'-DUSE_INLINE_MEMORY_ACCESSORS'. "
- '-DUSE_INLINE_MEMORY_ACCESSORS'.
'-DHAVE_SYS_TIME_H'.
'-DLSB_FIRST'.
'-DHAVE_NANOSLEEP'.
'-DISQUEAK_IMAGE=', self imageName.
'-DISQUEAK_SOURCES=PharoV10'}!
Item was changed:
----- Method: StackIPhoneConfig>>plistKeys (in category 'bundle strings') -----
plistKeys
+ ^super plistKeys, #(UIDeviceFamily UIFileSharingEnabled)!
- ^super plistKeys
- copyWith: #UIDeviceFamily!
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@
</array>
<key>UIPrerenderedIcon</key>
<false/>
<key>UIStatusBarHidden</key>
<true/>
+ <key>UIFileSharingEnabled</key>
+ <@UIFileSharingEnabled@/>
</dict>
</plist>
'!
More information about the Vm-dev
mailing list