diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-27 03:49:13 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-01-27 03:49:13 +0400 |
commit | 556912792ad3c37c294256a558c96b39f264e7b5 (patch) | |
tree | 9b6ee8cf1ad92ee89c04f27a89be11599c5b40c0 /build_files | |
parent | 9251d628db0abe599d927d79170025d8545c8ace (diff) | |
parent | c84383301c5a2582e95259a7e4468a23a3566401 (diff) |
Merged changes in the trunk up to revision 54110.
Conflicts resolved:
source/blender/blenfont/SConscript
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_scene.c
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/buildbot/master.cfg | 12 | ||||
-rw-r--r-- | build_files/buildbot/slave_rsync.py | 2 | ||||
-rw-r--r-- | build_files/cmake/cmake_static_check_clang_array.py | 2 | ||||
-rw-r--r-- | build_files/cmake/cmake_static_check_cppcheck.py | 2 | ||||
-rw-r--r-- | build_files/cmake/cmake_static_check_smatch.py | 3 | ||||
-rw-r--r-- | build_files/cmake/cmake_static_check_sparse.py | 2 | ||||
-rw-r--r-- | build_files/cmake/cmake_static_check_splint.py | 2 | ||||
-rwxr-xr-x | build_files/cmake/project_info.py | 3 | ||||
-rw-r--r-- | build_files/cmake/project_source_info.py | 6 | ||||
-rw-r--r-- | build_files/scons/config/Modules/FindPython.py | 10 | ||||
-rw-r--r-- | build_files/scons/config/linux-config.py | 5 | ||||
-rw-r--r-- | build_files/scons/tools/btools.py | 3 |
12 files changed, 30 insertions, 22 deletions
diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index 9d0839bd0d7..3cfea2a3abd 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -28,8 +28,8 @@ c['slavePortnum'] = 9989 from buildbot.changes.svnpoller import SVNPoller c['change_source'] = SVNPoller( - 'https://svn.blender.org/svnroot/bf-blender/trunk/', - pollinterval=1200) + 'https://svn.blender.org/svnroot/bf-blender/trunk/', + pollinterval=1200) # BUILDERS # @@ -74,9 +74,11 @@ def svn_step(branch=''): else: return SVN(baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/blender', mode='update', defaultBranch='trunk', workdir='blender') + def lib_svn_step(dir): return SVN(name='lib svn', baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + dir, mode='update', defaultBranch='trunk', workdir='lib/' + dir) + def rsync_step(id, branch, rsync_script): return ShellCommand(name='rsync', command=['python', rsync_script, id, branch], description='uploading', descriptionDone='uploaded', workdir='install') @@ -155,9 +157,9 @@ for i in range(0, schedule_cycle): print(names) c['schedulers'].append(timed.Nightly(name='nightly' + str(i), - builderNames=names, - hour=3+i, - minute=0)) + builderNames=names, + hour=3 + i, + minute=0)) # STATUS TARGETS # diff --git a/build_files/buildbot/slave_rsync.py b/build_files/buildbot/slave_rsync.py index aea1b65e333..6936232a495 100644 --- a/build_files/buildbot/slave_rsync.py +++ b/build_files/buildbot/slave_rsync.py @@ -41,5 +41,3 @@ print(command) ret = os.system(command) sys.exit(ret) - - diff --git a/build_files/cmake/cmake_static_check_clang_array.py b/build_files/cmake/cmake_static_check_clang_array.py index 7f45cc6aadc..448454c2177 100644 --- a/build_files/cmake/cmake_static_check_clang_array.py +++ b/build_files/cmake/cmake_static_check_clang_array.py @@ -50,7 +50,7 @@ def main(): check_commands = [] for c, inc_dirs, defs in source_info: cmd = ([CHECKER_BIN] + - CHECKER_ARGS + + CHECKER_ARGS + [c] + [("-I%s" % i) for i in inc_dirs] + [("-D%s" % d) for d in defs] diff --git a/build_files/cmake/cmake_static_check_cppcheck.py b/build_files/cmake/cmake_static_check_cppcheck.py index d79145f8586..2f7ffa5c240 100644 --- a/build_files/cmake/cmake_static_check_cppcheck.py +++ b/build_files/cmake/cmake_static_check_cppcheck.py @@ -56,7 +56,7 @@ def main(): check_commands = [] for c, inc_dirs, defs in source_info: cmd = ([CHECKER_BIN] + - CHECKER_ARGS + + CHECKER_ARGS + [c] + [("-I%s" % i) for i in inc_dirs] + [("-D%s" % d) for d in defs] diff --git a/build_files/cmake/cmake_static_check_smatch.py b/build_files/cmake/cmake_static_check_smatch.py index 7535f1cc55a..2cf07b093fb 100644 --- a/build_files/cmake/cmake_static_check_smatch.py +++ b/build_files/cmake/cmake_static_check_smatch.py @@ -41,6 +41,7 @@ import os USE_QUIET = (os.environ.get("QUIET", None) is not None) + def main(): source_info = project_source_info.build_info(use_cxx=False, ignore_prefix_list=CHECKER_IGNORE_PREFIX) @@ -48,7 +49,7 @@ def main(): for c, inc_dirs, defs in source_info: cmd = ([CHECKER_BIN] + - CHECKER_ARGS + + CHECKER_ARGS + [c] + [("-I%s" % i) for i in inc_dirs] + [("-D%s" % d) for d in defs] diff --git a/build_files/cmake/cmake_static_check_sparse.py b/build_files/cmake/cmake_static_check_sparse.py index 06bef1a1327..8a3fb477239 100644 --- a/build_files/cmake/cmake_static_check_sparse.py +++ b/build_files/cmake/cmake_static_check_sparse.py @@ -47,7 +47,7 @@ def main(): for c, inc_dirs, defs in source_info: cmd = ([CHECKER_BIN] + - CHECKER_ARGS + + CHECKER_ARGS + [c] + [("-I%s" % i) for i in inc_dirs] + [("-D%s" % d) for d in defs] diff --git a/build_files/cmake/cmake_static_check_splint.py b/build_files/cmake/cmake_static_check_splint.py index 5b1207543f5..6ad03f2bdca 100644 --- a/build_files/cmake/cmake_static_check_splint.py +++ b/build_files/cmake/cmake_static_check_splint.py @@ -79,7 +79,7 @@ def main(): check_commands = [] for c, inc_dirs, defs in source_info: cmd = ([CHECKER_BIN] + - CHECKER_ARGS + + CHECKER_ARGS + [c] + [("-I%s" % i) for i in inc_dirs] + [("-D%s" % d) for d in defs] diff --git a/build_files/cmake/project_info.py b/build_files/cmake/project_info.py index e73b94a7051..73648be3f15 100755 --- a/build_files/cmake/project_info.py +++ b/build_files/cmake/project_info.py @@ -141,7 +141,7 @@ def cmake_advanced_info(): if sys.platform == "win32": cmd = 'cmake "%s" -G"Eclipse CDT4 - MinGW Makefiles"' % CMAKE_DIR else: - if make_exe_basename.startswith("make"): + if make_exe_basename.startswith(("make", "gmake")): cmd = 'cmake "%s" -G"Eclipse CDT4 - Unix Makefiles"' % CMAKE_DIR elif make_exe_basename.startswith("ninja"): cmd = 'cmake "%s" -G"Eclipse CDT4 - Ninja"' % CMAKE_DIR @@ -150,7 +150,6 @@ def cmake_advanced_info(): os.system(cmd) return join(CMAKE_DIR, ".cproject") - includes = [] defines = [] diff --git a/build_files/cmake/project_source_info.py b/build_files/cmake/project_source_info.py index 69d09b05ac7..90e240c35ef 100644 --- a/build_files/cmake/project_source_info.py +++ b/build_files/cmake/project_source_info.py @@ -86,15 +86,15 @@ def makefile_log(): make_exe = cmake_cache_var("CMAKE_MAKE_PROGRAM") make_exe_basename = os.path.basename(make_exe) - if make_exe_basename.startswith("make"): + if make_exe_basename.startswith(("make", "gmake")): print("running 'make' with --dry-run ...") process = subprocess.Popen([make_exe, "--always-make", "--dry-run", "--keep-going", "VERBOSE=1"], - stdout=subprocess.PIPE, + stdout=subprocess.PIPE, ) elif make_exe_basename.startswith("ninja"): print("running 'ninja' with -t commands ...") process = subprocess.Popen([make_exe, "-t", "commands"], - stdout=subprocess.PIPE, + stdout=subprocess.PIPE, ) while process.poll(): diff --git a/build_files/scons/config/Modules/FindPython.py b/build_files/scons/config/Modules/FindPython.py index c93a10351d5..01215753cf7 100644 --- a/build_files/scons/config/Modules/FindPython.py +++ b/build_files/scons/config/Modules/FindPython.py @@ -15,6 +15,13 @@ def FindPython(): abi_flags = cur_flags break + # Find config.h. In some distros, such as ubuntu 12.10 they are not in standard include dir. + incconf64 = os.path.join(include, "x86_64-linux-gnu", "python" + version + cur_flags, "pyconfig.h") + if os.path.exists(incconf64): + incconf = os.path.join(include, "x86_64-linux-gnu", "python" + version + cur_flags) + else: + incconf = '' + # Determine whether python is in /usr/lib or /usr/lib64 lib32 = os.path.join(python, "lib", "python" + version, "sysconfig.py") lib64 = os.path.join(python, "lib64", "python" + version, "sysconfig.py") @@ -29,4 +36,5 @@ def FindPython(): return {'PYTHON': python, "VERSION": version, 'LIBPATH': libpath, - 'ABI_FLAGS': abi_flags} + 'ABI_FLAGS': abi_flags, + 'CONFIG': incconf} diff --git a/build_files/scons/config/linux-config.py b/build_files/scons/config/linux-config.py index 05d846d7433..22e82662ae7 100644 --- a/build_files/scons/config/linux-config.py +++ b/build_files/scons/config/linux-config.py @@ -5,9 +5,10 @@ py = FindPython() BF_PYTHON_ABI_FLAGS = py['ABI_FLAGS'] BF_PYTHON = py['PYTHON'] BF_PYTHON_LIBPATH = py['LIBPATH'] +BF_PYTHON_CONFIG = py['CONFIG'] BF_PYTHON_VERSION = py['VERSION'] WITH_BF_STATICPYTHON = False -BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}' +BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS} ' + BF_PYTHON_CONFIG BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}' BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}${BF_PYTHON_ABI_FLAGS}' # BF_PYTHON+'/lib/python'+BF_PYTHON_VERSION+'/config/libpython'+BF_PYTHON_VERSION+'.a' BF_PYTHON_LINKFLAGS = ['-Xlinker', '-export-dynamic'] @@ -193,7 +194,7 @@ BF_OCIO_LIB = 'OpenColorIO yaml-cpp tinyxml' BF_OCIO_LIB_STATIC = '${BF_OCIO_LIBPATH}/libOpenColorIO.a ${BF_OCIO_LIBPATH}/libtinyxml.a ${BF_OCIO_LIBPATH}/libyaml-cpp.a' BF_OCIO_LIBPATH = '${BF_OCIO}/lib' -WITH_BF_BOOST = False +WITH_BF_BOOST = True WITH_BF_STATICBOOST = False BF_BOOST = '/usr' BF_BOOST_INC = '${BF_BOOST}/include' diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 82d7350bfce..9a31ba650f5 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -108,7 +108,7 @@ def validate_arguments(args, bc): 'WITH_BF_STATICFFMPEG', 'BF_FFMPEG_LIB_STATIC', 'WITH_BF_OGG', 'BF_OGG', 'BF_OGG_LIB', 'WITH_BF_FRAMESERVER', - 'WITH_BF_COMPOSITOR', 'WITH_BF_COMPOSITOR_LEGACY', + 'WITH_BF_COMPOSITOR', 'WITH_BF_JPEG', 'BF_JPEG', 'BF_JPEG_INC', 'BF_JPEG_LIB', 'BF_JPEG_LIBPATH', 'WITH_BF_STATICJPEG', 'BF_JPEG_LIB_STATIC', 'WITH_BF_OPENJPEG', 'BF_OPENJPEG', 'BF_OPENJPEG_INC', 'BF_OPENJPEG_LIB', 'BF_OPENJPEG_LIBPATH', 'WITH_BF_REDCODE', 'BF_REDCODE', 'BF_REDCODE_INC', 'BF_REDCODE_LIB', 'BF_REDCODE_LIBPATH', @@ -602,7 +602,6 @@ def read_opts(env, cfg, args): ('BF_BOOST_LIB_STATIC', 'Boost static library', ''), (BoolVariable('WITH_GHOST_XDND', 'Build with drag-n-drop support on Linux platforms using XDND protocol', True)), - (BoolVariable('WITH_BF_COMPOSITOR_LEGACY', 'Enable the legacy compositor', False)), (BoolVariable('WITH_BF_CYCLES_OSL', 'Build with OSL sypport in Cycles', False)), (BoolVariable('WITH_BF_STATICOSL', 'Staticly link to OSL', False)), |