Revision: 39192
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39192
Author: nazgul
Date: 2011-08-08 17:51:04 +0000 (Mon, 08 Aug 2011)
Log Message:
-----------
Merging r39146 through r39191 from trunk into soc-2011-salad
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39146
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39191
Modified Paths:
--------------
branches/soc-2011-salad/SConstruct
branches/soc-2011-salad/build_files/buildbot/slave_compile.py
branches/soc-2011-salad/build_files/buildbot/slave_pack.py
branches/soc-2011-salad/build_files/cmake/macros.cmake
branches/soc-2011-salad/build_files/scons/config/darwin-config.py
branches/soc-2011-salad/build_files/scons/tools/btools.py
branches/soc-2011-salad/intern/ghost/CMakeLists.txt
branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManagerCocoa.h
branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
branches/soc-2011-salad/intern/ghost/intern/GHOST_NDOFManagerX11.h
branches/soc-2011-salad/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2011-salad/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/soc-2011-salad/intern/ghost/intern/GHOST_SystemSDL.cpp
branches/soc-2011-salad/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2011-salad/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2011-salad/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2011-salad/release/scripts/modules/bpyml.py
branches/soc-2011-salad/release/scripts/modules/bpyml_ui.py
branches/soc-2011-salad/release/scripts/modules/rna_info.py
branches/soc-2011-salad/release/scripts/startup/bl_operators/image.py
branches/soc-2011-salad/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/soc-2011-salad/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2011-salad/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2011-salad/release/scripts/templates/operator_modal.py
branches/soc-2011-salad/release/scripts/templates/operator_modal_draw.py
branches/soc-2011-salad/release/scripts/templates/operator_modal_view3d.py
branches/soc-2011-salad/source/blender/editors/include/ED_object.h
branches/soc-2011-salad/source/blender/editors/interface/interface_layout.c
branches/soc-2011-salad/source/blender/editors/interface/interface_templates.c
branches/soc-2011-salad/source/blender/editors/object/object_relations.c
branches/soc-2011-salad/source/blender/editors/transform/CMakeLists.txt
branches/soc-2011-salad/source/blender/editors/transform/transform.c
branches/soc-2011-salad/source/blender/editors/transform/transform.h
branches/soc-2011-salad/source/blender/editors/transform/transform_generics.c
branches/soc-2011-salad/source/blender/editors/transform/transform_ops.c
branches/soc-2011-salad/source/blender/makesrna/RNA_access.h
branches/soc-2011-salad/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-salad/source/blender/windowmanager/CMakeLists.txt
branches/soc-2011-salad/source/blender/windowmanager/WM_types.h
branches/soc-2011-salad/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-salad/source/tests/CMakeLists.txt
branches/soc-2011-salad/source/tests/bl_run_operators.py
Removed Paths:
-------------
branches/soc-2011-salad/source/blender/editors/transform/transform_ndofinput.c
Property Changed:
----------------
branches/soc-2011-salad/
Property changes on: branches/soc-2011-salad
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36828-39099
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-39147
/branches/soc-2011-tomato:36831-39069
/trunk/blender:36834-39145
+ /branches/soc-2010-jwilkins:28499-37009
/branches/soc-2010-nicolasbishop:28448-30783,30792-30793,30797-30798,30815
/branches/soc-2011-carrot:36828-39099
/branches/soc-2011-cucumber:36829-36994
/branches/soc-2011-onion:36833-38309
/branches/soc-2011-pepper:36830-39147
/branches/soc-2011-tomato:36831-39069
/trunk/blender:36834-39191
Modified: branches/soc-2011-salad/SConstruct
===================================================================
--- branches/soc-2011-salad/SConstruct 2011-08-08 17:35:22 UTC (rev 39191)
+++ branches/soc-2011-salad/SConstruct 2011-08-08 17:51:04 UTC (rev 39192)
@@ -253,14 +253,22 @@
if k not in B.arguments:
env[k] = v
-# detect presence of 3D_CONNEXION_CLIENT_LIBRARY for OSX
+# Extended OSX_SDK and 3D_CONNEXION_CLIENT_LIBRARY detection for OSX
if env['OURPLATFORM']=='darwin':
- envi = Environment()
- conf = Configure(envi)
- if not conf.CheckCHeader('ConnexionClientAPI.h'): # CheckCXXHeader if it
is c++ !
+ print B.bc.OKGREEN + "Detected Xcode version: -- " + B.bc.ENDC +
env['XCODE_CUR_VER'][:9] + " --"
+ print "Available " + env['MACOSX_SDK_CHECK']
+ if not 'Mac OS X 10.5' in env['MACOSX_SDK_CHECK']:
+ print B.bc.OKGREEN + "MacOSX10.5.sdk not available:" + B.bc.ENDC + "
using MacOSX10.6.sdk"
+ else:
+ print B.bc.OKGREEN + "Found recommended sdk :" + B.bc.ENDC + " using
MacOSX10.5.sdk"
+
+ # for now, Mac builders must download and install the driver framework
from 3Dconnexion
+ # necessary header file lives here when installed:
+ #
/Library/Frameworks/3DconnexionClient.framework/Versions/Current/Headers/ConnexionClientAPI.h
+ if env['WITH_BF_3DMOUSE'] == 1 and not
os.path.exists('/Library/Frameworks/3DconnexionClient.framework'):
print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling
WITH_BF_3DMOUSE" # avoid build errors !
env['WITH_BF_3DMOUSE'] = 0
- envi = conf.Finish()
+ env['FOUND_NDOF_DRIVERS'] = 0
if env['WITH_BF_OPENMP'] == 1:
Modified: branches/soc-2011-salad/build_files/buildbot/slave_compile.py
===================================================================
--- branches/soc-2011-salad/build_files/buildbot/slave_compile.py
2011-08-08 17:35:22 UTC (rev 39191)
+++ branches/soc-2011-salad/build_files/buildbot/slave_compile.py
2011-08-08 17:51:04 UTC (rev 39192)
@@ -134,7 +134,7 @@
scons_options.append('BF_FFMPEG_LIB=' + (' '.join(ffmpeg_lib)))
scons_options.append('BF_FFMPEG_DLL=' + (' '.join(ffmpeg_dll)))
- scons_options.append('BF_BITNESS='+bitness)
+ scons_options.append('BF_BITNESS=' + bitness)
retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
sys.exit(retcode)
Modified: branches/soc-2011-salad/build_files/buildbot/slave_pack.py
===================================================================
--- branches/soc-2011-salad/build_files/buildbot/slave_pack.py 2011-08-08
17:35:22 UTC (rev 39191)
+++ branches/soc-2011-salad/build_files/buildbot/slave_pack.py 2011-08-08
17:51:04 UTC (rev 39192)
@@ -98,7 +98,7 @@
scons_options.append('BF_FFMPEG_LIB=' + (' '.join(ffmpeg_lib)))
scons_options.append('BF_FFMPEG_DLL=' + (' '.join(ffmpeg_dll)))
- scons_options.append('BF_BITNESS='+bitness)
+ scons_options.append('BF_BITNESS=' + bitness)
retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
sys.exit(retcode)
Modified: branches/soc-2011-salad/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-salad/build_files/cmake/macros.cmake 2011-08-08
17:35:22 UTC (rev 39191)
+++ branches/soc-2011-salad/build_files/cmake/macros.cmake 2011-08-08
17:51:04 UTC (rev 39192)
@@ -62,6 +62,10 @@
foreach(_INC ${ARGV})
get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
list(APPEND _ALL_INCS ${_ABS_INC})
+ # for checking for invalid includes, disable for regular use
+ ##if(NOT EXISTS "${_ABS_INC}/")
+ ## message(FATAL_ERROR "Include not found: ${_ABS_INC}/")
+ ##endif()
endforeach()
include_directories(${_ALL_INCS})
unset(_INC)
@@ -75,6 +79,9 @@
foreach(_INC ${ARGV})
get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
list(APPEND _ALL_INCS ${_ABS_INC})
+ ##if(NOT EXISTS "${_ABS_INC}/")
+ ## message(FATAL_ERROR "Include not found: ${_ABS_INC}/")
+ ##endif()
endforeach()
include_directories(SYSTEM ${_ALL_INCS})
unset(_INC)
Modified: branches/soc-2011-salad/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/config/darwin-config.py
2011-08-08 17:35:22 UTC (rev 39191)
+++ branches/soc-2011-salad/build_files/scons/config/darwin-config.py
2011-08-08 17:51:04 UTC (rev 39192)
@@ -21,17 +21,23 @@
MAC_PROC=commands.getoutput(cmd)
cmd = 'uname -r'
cmd_res=commands.getoutput(cmd)
-MAC_CUR_VER='10.5' # by default (test below fails on my 10.5 PowerPC)
-if cmd_res[:2]=='7':
+
+if cmd_res[:1]=='7':
MAC_CUR_VER='10.3'
-elif cmd_res[:2]=='8':
+elif cmd_res[:1]=='8':
MAC_CUR_VER='10.4'
-elif cmd_res[:2]=='9':
+elif cmd_res[:1]=='9':
MAC_CUR_VER='10.5'
elif cmd_res[:2]=='10':
MAC_CUR_VER='10.6'
elif cmd_res[:2]=='11':
MAC_CUR_VER='10.7'
+cmd = 'xcodebuild -version'
+cmd_xcode=commands.getoutput(cmd)
+XCODE_CUR_VER=cmd_xcode
+cmd = 'xcodebuild -showsdks'
+cmd_sdk=commands.getoutput(cmd)
+MACOSX_SDK_CHECK=cmd_sdk
if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64':
USE_QTKIT=True # Carbon quicktime is not available for 64bit
@@ -60,21 +66,23 @@
LCGDIR = '#../lib/darwin-8.x.i386'
CC = 'gcc-4.0'
CXX = 'g++-4.0'
-elif MAC_CUR_VER >= '10.6':
- # OSX 10.6 and 10.7 developer tools do not come with sdk < 10.6 anymore
!
- MAC_MIN_VERS = '10.6'
- MACOSX_DEPLOYMENT_TARGET = '10.6'
- MACOSX_SDK='/Developer/SDKs/MacOSX10.6.sdk'
- LCGDIR = '#../lib/darwin-9.x.universal'
- CC = 'llvm-gcc-4.2'
- CXX = 'llvm-g++-4.2'
else :
- MAC_MIN_VERS = '10.5'
- MACOSX_DEPLOYMENT_TARGET = '10.5'
- MACOSX_SDK='/Developer/SDKs/MacOSX10.5.sdk'
- LCGDIR = '#../lib/darwin-9.x.universal'
- CC = 'gcc-4.2'
- CXX = 'g++-4.2'
+ if 'Mac OS X 10.5' in MACOSX_SDK_CHECK:
+ # OSX 10.5/6 with Xcode 3.x
+ MAC_MIN_VERS = '10.5'
+ MACOSX_DEPLOYMENT_TARGET = '10.5'
+ MACOSX_SDK='/Developer/SDKs/MacOSX10.5.sdk'
+ LCGDIR = '#../lib/darwin-9.x.universal'
+ CC = 'gcc-4.2'
+ CXX = 'g++-4.2'
+ else:
+ # OSX 10.6/7 with Xcode 4.x
+ MAC_MIN_VERS = '10.6'
+ MACOSX_DEPLOYMENT_TARGET = '10.6'
+ MACOSX_SDK='/Developer/SDKs/MacOSX10.6.sdk'
+ LCGDIR = '#../lib/darwin-9.x.universal'
+ CC = 'gcc-4.2'
+ CXX = 'g++-4.2'
LIBDIR = '${LCGDIR}'
@@ -199,8 +207,8 @@
BF_GETTEXT_LIB = 'intl'
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
-WITH_BF_GAMEENGINE=True
-WITH_BF_PLAYER = False
+WITH_BF_GAMEENGINE = True
+WITH_BF_PLAYER = True
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
@@ -251,7 +259,7 @@
BF_OPENGL_LINKFLAGS = ['-framework', 'OpenGL']
#OpenCollada flags
-WITH_BF_COLLADA = False
+WITH_BF_COLLADA = True
BF_COLLADA = '#source/blender/collada'
BF_COLLADA_INC = '${BF_COLLADA}'
BF_COLLADA_LIB = 'bf_collada'
@@ -280,7 +288,7 @@
WITH_BF_ONSURFACEBRUSH = True
# SpaceNavigator and related 3D mice
-WITH_BF_3DMOUSE = False
+WITH_BF_3DMOUSE = True
#############################################################################
################### various compile settings and flags ##################
@@ -299,31 +307,31 @@
CCFLAGS = ['-pipe','-funsigned-char']+ARCH_FLAGS
CXXFLAGS = ['-pipe','-funsigned-char']+ARCH_FLAGS
-if WITH_GHOST_COCOA==True:
+if WITH_GHOST_COCOA:
PLATFORM_LINKFLAGS =
['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Cocoa','-framework','Carbon','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL']+ARCH_FLAGS
else:
PLATFORM_LINKFLAGS =
['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Carbon','-framework','AGL','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL']+ARCH_FLAGS
-if WITH_BF_QUICKTIME == True:
- if USE_QTKIT == True:
+if WITH_BF_QUICKTIME:
+ if USE_QTKIT:
PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QTKit']
else:
PLATFORM_LINKFLAGS =
PLATFORM_LINKFLAGS+['-framework','QuickTime']
-if WITH_BF_3DMOUSE:
+if FOUND_NDOF_DRIVERS:
PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS +
['-weak_framework','3DconnexionClient']
#note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding
the SystemStubs.a lib from 10.4
LLIBS = ['stdc++', 'SystemStubs']
-# some flags shuffling for different Os versions
+# some flags shuffling for different OS versions
if MAC_MIN_VERS == '10.3':
CFLAGS = ['-fuse-cxa-atexit']+CFLAGS
CXXFLAGS = ['-fuse-cxa-atexit']+CXXFLAGS
PLATFORM_LINKFLAGS = ['-fuse-cxa-atexit']+PLATFORM_LINKFLAGS
LLIBS.append('crt3.o')
-if USE_SDK==True:
+if USE_SDK:
SDK_FLAGS=['-isysroot',
MACOSX_SDK,'-mmacosx-version-min='+MAC_MIN_VERS,'-arch',MACOSX_ARCHITECTURE]
PLATFORM_LINKFLAGS =
['-mmacosx-version-min='+MAC_MIN_VERS,'-Wl','-isysroot',MACOSX_SDK,'-arch',MACOSX_ARCHITECTURE]+PLATFORM_LINKFLAGS
CCFLAGS=SDK_FLAGS+CCFLAGS
Modified: branches/soc-2011-salad/build_files/scons/tools/btools.py
===================================================================
--- branches/soc-2011-salad/build_files/scons/tools/btools.py 2011-08-08
17:35:22 UTC (rev 39191)
+++ branches/soc-2011-salad/build_files/scons/tools/btools.py 2011-08-08
17:51:04 UTC (rev 39192)
@@ -137,7 +137,7 @@
'BF_NO_ELBEEM',
'WITH_BF_CXX_GUARDEDALLOC',
'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC',
'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB',
'BF_JEMALLOC_LIB_STATIC',
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
