From 634508ca3f3197785100b49070486d02f36df1ee Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 16 Sep 2016 17:49:56 +0200 Subject: Buildbot: Disable QuickTime for the time being Buildbot machine was updated to the new SDK which seems to have QTKit removed. For until we've installed older SDK or ported our code to a new AVFramework disabling QuickTime. --- build_files/buildbot/slave_compile.py | 1 + 1 file changed, 1 insertion(+) (limited to 'build_files') diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index d763ddfb3e0..b7feae1ed8c 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -74,6 +74,7 @@ if 'cmake' in builder: cmake_extra_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64') cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/bin/nvcc') cmake_extra_options.append('-DCUDA_NVCC8_EXECUTABLE=/usr/local/cuda8-hack/bin/nvcc') + cmake_extra_options.append('-DWITH_CODEC_QUICKTIME=OFF') elif builder.startswith('win'): if builder.endswith('_vc2015'): -- cgit v1.2.3 From 838e0a09c7bc4b7c46d9f7b7b7ebcea3a8249378 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 19 Sep 2016 16:11:19 +0200 Subject: Buildbot: Attempt to use proper Clang for CUDA binaries --- build_files/buildbot/slave_compile.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'build_files') diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index b7feae1ed8c..d62dded7067 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -75,6 +75,8 @@ if 'cmake' in builder: cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/bin/nvcc') cmake_extra_options.append('-DCUDA_NVCC8_EXECUTABLE=/usr/local/cuda8-hack/bin/nvcc') cmake_extra_options.append('-DWITH_CODEC_QUICKTIME=OFF') + cmake_extra_options.append('-DCUDA_HOST_COMPILER=/usr/local/cuda-hack/bin/clang') + elif builder.startswith('win'): if builder.endswith('_vc2015'): -- cgit v1.2.3 From 12680d36f539a6006308a2b27282f0cb3acc5836 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 19 Sep 2016 16:24:55 +0200 Subject: Buildbot: Temporary disable CUBIN compilation --- build_files/buildbot/slave_compile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build_files') diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index d62dded7067..119c9b8eed9 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -75,7 +75,7 @@ if 'cmake' in builder: cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/bin/nvcc') cmake_extra_options.append('-DCUDA_NVCC8_EXECUTABLE=/usr/local/cuda8-hack/bin/nvcc') cmake_extra_options.append('-DWITH_CODEC_QUICKTIME=OFF') - cmake_extra_options.append('-DCUDA_HOST_COMPILER=/usr/local/cuda-hack/bin/clang') + build_cubins = False elif builder.startswith('win'): -- cgit v1.2.3 From 7d63ea4a1c0eceb2eee04a7829419180cf9cbdc5 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 19 Sep 2016 16:45:08 +0200 Subject: Buildbot: Another attempt to have OSX builder fixed --- build_files/buildbot/slave_compile.py | 1 + 1 file changed, 1 insertion(+) (limited to 'build_files') diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 119c9b8eed9..b156e4be327 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -75,6 +75,7 @@ if 'cmake' in builder: cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/bin/nvcc') cmake_extra_options.append('-DCUDA_NVCC8_EXECUTABLE=/usr/local/cuda8-hack/bin/nvcc') cmake_extra_options.append('-DWITH_CODEC_QUICKTIME=OFF') + cmake_extra_options.append('-DCMAKE_OSX_DEPLOYMENT_TARGET=10.6') build_cubins = False -- cgit v1.2.3 From f915ee8e76aded1cfd790f04743e7b04ee48b8b6 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 22 Sep 2016 11:01:37 +0200 Subject: CMake: Fix copy-paste error --- build_files/cmake/config/blender_release.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build_files') diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake index 8d87a921217..050db91e75e 100644 --- a/build_files/cmake/config/blender_release.cmake +++ b/build_files/cmake/config/blender_release.cmake @@ -1,7 +1,7 @@ # Turn everything ON thats expected for an official release builds. # # Example usage: -# cmake -C../blender/build_files/cmake/config/blender_full.cmake ../blender +# cmake -C../blender/build_files/cmake/config/blender_release.cmake ../blender # set(WITH_ALEMBIC ON CACHE BOOL "" FORCE) -- cgit v1.2.3 From 9937f2887742e22b0bca33d6f8cdeaa4333e8fb1 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 22 Sep 2016 15:00:23 +0200 Subject: Buildinfo: Improve behavior with detached HEAD Try real hard to detect which branch we've detached from. --- build_files/cmake/buildinfo.cmake | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'build_files') diff --git a/build_files/cmake/buildinfo.cmake b/build_files/cmake/buildinfo.cmake index af0ccd250e8..1f0a283ba0e 100644 --- a/build_files/cmake/buildinfo.cmake +++ b/build_files/cmake/buildinfo.cmake @@ -27,13 +27,12 @@ if(EXISTS ${SOURCE_DIR}/.git) OUTPUT_VARIABLE MY_WC_HASH OUTPUT_STRIP_TRAILING_WHITESPACE) - execute_process(COMMAND git branch --list master --contains ${MY_WC_HASH} + execute_process(COMMAND git branch --list master blender-v* --contains ${MY_WC_HASH} WORKING_DIRECTORY ${SOURCE_DIR} OUTPUT_VARIABLE _git_contains_check OUTPUT_STRIP_TRAILING_WHITESPACE) - STRING(REGEX REPLACE "^[ \t]+" "" _git_contains_check "${_git_contains_check}") - if(_git_contains_check STREQUAL "master") + if(NOT _git_contains_check STREQUAL "") set(MY_WC_BRANCH "master") else() execute_process(COMMAND git show-ref --tags -d @@ -48,6 +47,22 @@ if(EXISTS ${SOURCE_DIR}/.git) if(_git_tag_hashes MATCHES "${_git_head_hash}") set(MY_WC_BRANCH "master") + else() + execute_process(COMMAND git branch --contains ${MY_WC_HASH} + WORKING_DIRECTORY ${SOURCE_DIR} + OUTPUT_VARIABLE _git_contains_branches + OUTPUT_STRIP_TRAILING_WHITESPACE) + string(REGEX REPLACE "^\\*[ \t]+" "" _git_contains_branches "${_git_contains_branches}") + string(REGEX REPLACE "[\r\n]+" ";" _git_contains_branches "${_git_contains_branches}") + string(REGEX REPLACE ";[ \t]+" ";" _git_contains_branches "${_git_contains_branches}") + foreach(_branch ${_git_contains_branches}) + if (NOT "${_branch}" MATCHES "\\(HEAD.*") + set(MY_WC_BRANCH "${_branch}") + break() + endif() + endforeach() + unset(_branch) + unset(_git_contains_branches) endif() unset(_git_tag_hashes) -- cgit v1.2.3