From 87cacd3893a7e07b38b4b9b4de553898987148b8 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 1 Dec 2016 15:05:53 +0100 Subject: Buildbot: Disable glibc211 slaves --- build_files/buildbot/master.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index 6b7191cd57b..387e53593b3 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -297,8 +297,8 @@ def generic_builder(id, libdir='', branch='', rsync=False): # Builders add_builder(c, 'mac_x86_64_10_6_cmake', 'darwin-9.x.universal', generic_builder, hour=5) -add_builder(c, 'linux_glibc211_i686_cmake', '', generic_builder, hour=1) -add_builder(c, 'linux_glibc211_x86_64_cmake', '', generic_builder, hour=2) +# add_builder(c, 'linux_glibc211_i686_cmake', '', generic_builder, hour=1) +# add_builder(c, 'linux_glibc211_x86_64_cmake', '', generic_builder, hour=2) add_builder(c, 'linux_glibc219_i686_cmake', '', generic_builder, hour=3) add_builder(c, 'linux_glibc219_x86_64_cmake', '', generic_builder, hour=4) add_builder(c, 'win32_cmake_vc2013', 'windows_vc12', generic_builder, hour=3) -- cgit v1.2.3 From 0e459ad1a3663bcd93c787865a0ef21880c3061e Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 3 Feb 2017 16:09:53 +0100 Subject: Buildbot: Re-enable cuda support for OSX --- build_files/buildbot/slave_compile.py | 2 -- 1 file changed, 2 deletions(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 76d538ad578..860dd1174cf 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -72,10 +72,8 @@ if 'cmake' in builder: # Set up OSX architecture if builder.endswith('x86_64_10_6_cmake'): cmake_extra_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64') - cmake_extra_options.append('-DCUDA_NVCC_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 elif builder.startswith('win'): -- cgit v1.2.3 From e32710d2d749b7060befb2d31fd70f127f90dc48 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 24 Mar 2017 10:27:41 +0100 Subject: Buildbot: Use proper NVCC path In fact, we could probably remove this option all together. --- build_files/buildbot/slave_compile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 860dd1174cf..1d42f04f151 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -111,7 +111,7 @@ if 'cmake' in builder: cuda_chroot_name = 'buildbot_' + deb_name + '_x86_64' targets = ['player', 'blender', 'cuda'] - cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-8.0/bin/nvcc') + cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda/bin/nvcc') cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file)) -- cgit v1.2.3 From ac43e5cc87a75b99a86d9caf174b9af07421c18b Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 29 Mar 2017 10:16:41 +0200 Subject: Buildbot: Remove global hardcoded NVCC path This was initially needed for heterogeneous setup of two toolkits which we no longer need. --- build_files/buildbot/slave_compile.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 1d42f04f151..c8d69c38644 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -91,7 +91,6 @@ if 'cmake' in builder: elif builder.startswith('win32'): bits = 32 cmake_options.extend(['-G', 'Visual Studio 12 2013']) - cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE:FILEPATH=C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v8.0/bin/nvcc.exe') elif builder.startswith('linux'): tokens = builder.split("_") @@ -111,8 +110,6 @@ if 'cmake' in builder: cuda_chroot_name = 'buildbot_' + deb_name + '_x86_64' targets = ['player', 'blender', 'cuda'] - cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda/bin/nvcc') - cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file)) # Prepare CMake options needed to configure cuda binaries compilation. -- cgit v1.2.3 From 15ff75d06b3d9ffe255c391c875cea6cc99d6009 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 29 Mar 2017 10:21:17 +0200 Subject: Buildbot: Use older NVCC on 32bit linux Newer toolkit has some weird issue with cross0-compiling 32bit kernels from 64bit environment. --- build_files/buildbot/slave_compile.py | 1 + 1 file changed, 1 insertion(+) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index c8d69c38644..3c59f168356 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -109,6 +109,7 @@ if 'cmake' in builder: chroot_name = 'buildbot_' + deb_name + '_i686' cuda_chroot_name = 'buildbot_' + deb_name + '_x86_64' targets = ['player', 'blender', 'cuda'] + cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-8.0.44/bin/nvcc') cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file)) -- cgit v1.2.3 From b3f9ae01255fc5801055682148ef274027f45006 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 29 Mar 2017 10:46:53 +0200 Subject: Buildbot: Revert previous change, older toolkit has same exact behavior --- build_files/buildbot/slave_compile.py | 1 - 1 file changed, 1 deletion(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 3c59f168356..c8d69c38644 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -109,7 +109,6 @@ if 'cmake' in builder: chroot_name = 'buildbot_' + deb_name + '_i686' cuda_chroot_name = 'buildbot_' + deb_name + '_x86_64' targets = ['player', 'blender', 'cuda'] - cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-8.0.44/bin/nvcc') cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file)) -- cgit v1.2.3 From d27ef3913a823e571427c8fab23e5ad356cefab3 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 3 Apr 2017 14:49:07 +0200 Subject: Buildbot: Some special tricks for Blender 2.8 slave --- build_files/buildbot/master_unpack.py | 3 +++ build_files/buildbot/slave_pack.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/master_unpack.py b/build_files/buildbot/master_unpack.py index ec44705931c..67b628f668a 100644 --- a/build_files/buildbot/master_unpack.py +++ b/build_files/buildbot/master_unpack.py @@ -67,6 +67,9 @@ def get_platform(filename): def get_branch(filename): + if filename.startswith("blender-2.8"): + return "blender2.8" + tokens = filename.split("-") branch = "" diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index 490f0456045..33bf3745182 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -111,7 +111,8 @@ if builder.find('cmake') != -1: if builder.endswith('vc2015'): platform += "-vc14" builderified_name = 'blender-{}-{}-{}'.format(blender_full_version, git_hash, platform) - if branch != '': + # NOTE: Blender 2.8 is already respected by blender_full_version. + if branch != '' and branch != 'blender2.8': builderified_name = branch + "-" + builderified_name os.rename(result_file, "{}.zip".format(builderified_name)) -- cgit v1.2.3 From cc93a66e71a9de09cb41d4433be86e0f056d2b6f Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 3 Apr 2017 15:04:16 +0200 Subject: Buildbot: SPecial branch trickery for linux slaves --- build_files/buildbot/slave_pack.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index 33bf3745182..6929be85003 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -178,7 +178,8 @@ if builder.find('cmake') != -1: blender_hash, blender_glibc, blender_arch) - if branch != '': + # NOTE: Blender 2.8 is already respected by blender_full_version. + if branch != '' and branch != 'blender2.8': package_name = branch + "-" + package_name upload_filename = package_name + ".tar.bz2" -- cgit v1.2.3 From e741804ce34f2099f733f55b8ac5c3db711de169 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 3 Apr 2017 15:36:52 +0200 Subject: Buildbot: Update bundled vetrsion of server configuration --- build_files/buildbot/master.cfg | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index 387e53593b3..d126d0e1c0e 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -4,10 +4,10 @@ # # List of the branches being built automatically overnight -NIGHT_SCHEDULE_BRANCHES = [None] +NIGHT_SCHEDULE_BRANCHES = [None, "blender2.8"] # List of the branches available for force build -FORCE_SCHEDULE_BRANCHES = ["master", "gooseberry", "experimental-build"] +FORCE_SCHEDULE_BRANCHES = ["master", "blender2.8", "experimental-build"] """ Stock Twisted directory lister doesn't provide any information about last file @@ -127,7 +127,14 @@ def schedule_force_build(name): project=forcesched.FixedParameter(name="project", default="", hide=True)), # For now, hide other codebases. forcesched.CodebaseParameter(hide=True, codebase="blender-translations"), - forcesched.CodebaseParameter(hide=True, codebase="blender-addons"), + forcesched.CodebaseParameter( + codebase="blender-addons", + branch=forcesched.ChoiceStringParameter( + name="branch", choices=["master", "blender2.8"], default="master"), + repository=forcesched.FixedParameter(name="repository", default="", hide=True), + project=forcesched.FixedParameter(name="project", default="", hide=True), + revision=forcesched.FixedParameter(name="revision", default="", hide=True), + ), forcesched.CodebaseParameter(hide=True, codebase="blender-addons-contrib"), forcesched.CodebaseParameter(hide=True, codebase="blender-dev-tools"), forcesched.CodebaseParameter(hide=True, codebase="lib svn")], @@ -139,12 +146,16 @@ def schedule_build(name, hour, minute=0): scheduler_name = "nightly " + name if current_branch: scheduler_name += ' ' + current_branch + # Use special addons submodule branch when building blender2.8 branch. + addons_branch = "master" + if current_branch == "blender2.8": + addons_branch = "blender2.8" c['schedulers'].append(timed.Nightly(name=scheduler_name, codebases={ "blender": {"repository": ""}, "blender-translations": {"repository": "", "branch": "master"}, "blender-addons": {"repository": "", "branch": "master"}, - "blender-addons-contrib": {"repository": "", "branch": "master"}, + "blender-addons-contrib": {"repository": "", "branch": addons_branch}, "blender-dev-tools": {"repository": "", "branch": "master"}, "lib svn": {"repository": "", "branch": "trunk"}}, branch=current_branch, @@ -225,8 +236,7 @@ def git_step(branch=''): def git_submodules_update(): - command = ['git', 'submodule', 'foreach', '--recursive', - 'git', 'pull', 'origin', 'master'] + command = ['git', 'submodule', 'update', '--remote'] return ShellCommand(name='Submodules Update', command=command, description='updating', -- cgit v1.2.3 From 728f75c6a72417b3860f8e9116d57b6dc0488156 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 3 Apr 2017 15:51:31 +0200 Subject: Buildbot: Some more twqeaks to master config --- build_files/buildbot/master.cfg | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index d126d0e1c0e..de503a62ec1 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -245,7 +245,10 @@ def git_submodules_update(): def lib_svn_step(dir): - return SVN(name='lib svn', + name = "lib svn" + if dir == "darwin": + name = "C++11 lib svn" + return SVN(name=name, baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + dir, codebase='lib svn', mode='update', @@ -274,6 +277,9 @@ def generic_builder(id, libdir='', branch='', rsync=False): f = BuildFactory() if libdir != '': f.addStep(lib_svn_step(libdir)) + # Special trick to make sure we always have all the libs. + if libdir.startswith("darwin"): + f.addStep(lib_svn_step("darwin")) for submodule in ('blender-translations', 'blender-addons', -- cgit v1.2.3 From 4f7eb3ad12134d162db74386556ba9e4b6208722 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 4 Apr 2017 12:15:35 +0200 Subject: Buildbot: Update master config --- build_files/buildbot/master.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index de503a62ec1..ba023817279 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -154,8 +154,8 @@ def schedule_build(name, hour, minute=0): codebases={ "blender": {"repository": ""}, "blender-translations": {"repository": "", "branch": "master"}, - "blender-addons": {"repository": "", "branch": "master"}, - "blender-addons-contrib": {"repository": "", "branch": addons_branch}, + "blender-addons": {"repository": "", "branch": addons_branch}, + "blender-addons-contrib": {"repository": "", "branch": "master"}, "blender-dev-tools": {"repository": "", "branch": "master"}, "lib svn": {"repository": "", "branch": "trunk"}}, branch=current_branch, -- cgit v1.2.3 From ffac92e38539a74424fe8cfd6fac9d79144c4872 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 4 Apr 2017 12:52:37 +0200 Subject: Buildbot: Update master config --- build_files/buildbot/master.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index ba023817279..c650cb8c302 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -302,7 +302,7 @@ def generic_builder(id, libdir='', branch='', rsync=False): f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, - maxsize=150 * 1024 * 1024, + maxsize=180 * 1024 * 1024, workdir='install')) f.addStep(MasterShellCommand(name='unpack', command=['python2.7', unpack_script, filename], -- cgit v1.2.3 From 97300a3bebb719927fad46c79c5ea0955e3546e4 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 6 Apr 2017 11:21:07 +0200 Subject: Buildbot: Force build environment to use latest GCC --- build_files/buildbot/config/blender_linux.cmake | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake index ed5417c1c6e..320edab65e8 100644 --- a/build_files/buildbot/config/blender_linux.cmake +++ b/build_files/buildbot/config/blender_linux.cmake @@ -21,6 +21,10 @@ else() message(FATAL_ERROR "Unknown build environment") endif() +# Use backported version of the compiler instead of a system default one +set(CMAKE_C_COMPILER "/usr/bin/gcc-6" CACHE STRING "" FORCE) +set(CMAKE_CXX_COMPILER "/usr/bin/g++-6" CACHE STRING "" FORCE) + # Default to only build Blender, not the player set(WITH_BLENDER ON CACHE BOOL "" FORCE) set(WITH_PLAYER OFF CACHE BOOL "" FORCE) -- cgit v1.2.3 From ae76a90593fb03187789e29676f589adfd5294ea Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Thu, 6 Apr 2017 11:39:06 +0200 Subject: Buildbot: Correct previous release Seems CMake is not happy about changing compiler from script. --- build_files/buildbot/config/blender_linux.cmake | 4 ---- build_files/buildbot/slave_compile.py | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake index 320edab65e8..ed5417c1c6e 100644 --- a/build_files/buildbot/config/blender_linux.cmake +++ b/build_files/buildbot/config/blender_linux.cmake @@ -21,10 +21,6 @@ else() message(FATAL_ERROR "Unknown build environment") endif() -# Use backported version of the compiler instead of a system default one -set(CMAKE_C_COMPILER "/usr/bin/gcc-6" CACHE STRING "" FORCE) -set(CMAKE_CXX_COMPILER "/usr/bin/g++-6" CACHE STRING "" FORCE) - # Default to only build Blender, not the player set(WITH_BLENDER ON CACHE BOOL "" FORCE) set(WITH_PLAYER OFF CACHE BOOL "" FORCE) diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index c8d69c38644..4fb05c9f977 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -109,6 +109,8 @@ if 'cmake' in builder: chroot_name = 'buildbot_' + deb_name + '_i686' cuda_chroot_name = 'buildbot_' + deb_name + '_x86_64' targets = ['player', 'blender', 'cuda'] + cmake_extra_options.extend(["-DCMAKE_C_COMPILER=/usr/bin/gcc-6", + "-DCMAKE_CXX_COMPILER=/usr/bin/g++-6"]) cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file)) -- cgit v1.2.3 From 07708b85b4e903ea1be82d82396285c2518e1b3a Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 7 Apr 2017 17:00:43 +0200 Subject: Buildbot: Link statically against freetype --- build_files/buildbot/config/blender_linux.cmake | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake index ed5417c1c6e..45b327f8aeb 100644 --- a/build_files/buildbot/config/blender_linux.cmake +++ b/build_files/buildbot/config/blender_linux.cmake @@ -94,6 +94,10 @@ set(OPENCOLORIO_OPENCOLORIO_LIBRARY "${OPENCOLORIO_ROOT_DIR}/lib/libOpenColorIO. set(OPENCOLORIO_TINYXML_LIBRARY "${OPENCOLORIO_ROOT_DIR}/lib/libtinyxml.a" CACHE STRING "" FORCE) set(OPENCOLORIO_YAML-CPP_LIBRARY "${OPENCOLORIO_ROOT_DIR}/lib/libyaml-cpp.a" CACHE STRING "" FORCE) +# Freetype +set(FREETYPE_INCLUDE_DIRS "/usr/include/freetype2" CACHE STRING "" FORCE) +set(FREETYPE_LIBRARY "/usr/lib${MULTILIB}/libfreetype.a" CACHE STRING "" FORCE) + # OpenImageIO if(GLIBC EQUAL "2.19") set(OPENIMAGEIO_LIBRARY -- cgit v1.2.3 From eae691f89e3cb584047196b15c6e75eaea287dcc Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 7 Apr 2017 17:01:07 +0200 Subject: Buildbot: List freetype for OIIO libraries OIIO in release environment is compiled with Freetype support. This fixes compilation error of static unit tests. --- build_files/buildbot/config/blender_linux.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake index 45b327f8aeb..56f18967300 100644 --- a/build_files/buildbot/config/blender_linux.cmake +++ b/build_files/buildbot/config/blender_linux.cmake @@ -106,6 +106,7 @@ if(GLIBC EQUAL "2.19") /usr/lib${MULTILIB}/libwebp.a /usr/lib${MULTILIB}/liblzma.a /usr/lib${MULTILIB}/libjbig.a + ${FREETYPE_LIBRARY} CACHE STRING "" FORCE ) endif() -- cgit v1.2.3 From b354c15805199a1bf841d3100edd8071583fbeba Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 14 Apr 2017 10:01:28 +0200 Subject: Buildbot: Attempt to fix CUDA compilation on OSX Stupid toolkit is really fragile about CLang version. --- build_files/buildbot/slave_compile.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 4fb05c9f977..9b14bba87fe 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -74,6 +74,9 @@ if 'cmake' in builder: cmake_extra_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64') cmake_extra_options.append('-DWITH_CODEC_QUICKTIME=OFF') cmake_extra_options.append('-DCMAKE_OSX_DEPLOYMENT_TARGET=10.6') + cmake_extra_options.append('CUDA_HOST_COMPILER=/usr/local/cuda-hack/clang') + cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/nvcc') + elif builder.startswith('win'): -- cgit v1.2.3 From 7cfabcef5c8f29246bfbedac663b6ed0baa8a64f Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 14 Apr 2017 10:03:30 +0200 Subject: Buildbot: Fix typos --- build_files/buildbot/slave_compile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 9b14bba87fe..0e264a752d5 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -74,7 +74,7 @@ if 'cmake' in builder: cmake_extra_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64') cmake_extra_options.append('-DWITH_CODEC_QUICKTIME=OFF') cmake_extra_options.append('-DCMAKE_OSX_DEPLOYMENT_TARGET=10.6') - cmake_extra_options.append('CUDA_HOST_COMPILER=/usr/local/cuda-hack/clang') + cmake_extra_options.append('-DCUDA_HOST_COMPILER=/usr/local/cuda-hack/clang') cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/nvcc') @@ -180,7 +180,7 @@ if 'cmake' in builder: os.remove('CMakeCache.txt') retcode = subprocess.call(target_chroot_prefix + ['cmake', blender_dir] + target_cmake_options) if retcode != 0: - print('Condifuration FAILED!') + print('Configuration FAILED!') sys.exit(retcode) if 'win32' in builder or 'win64' in builder: -- cgit v1.2.3 From 9f044cb422c1fc9ad79278092445f612342abb59 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Sat, 27 May 2017 15:34:55 -0400 Subject: Remove MinGW support The Issue ======= For a long time now MinGW has been unsupported and unmaintained and at this point, it looks like something that we should just leave behind and move on. Why Remove ========== One of the big motivations for MinGW back in the day is that it was free compared to MSVC which was licensed based. However, now that this is no longer true we have basically stopped updating the need CMake files. Along with the CMake files, there are several patches to the extern libs needed to make this work. For example, see: https://developer.blender.org/diffusion/B/browse/master/extern/carve/patches/mingw_w64.patch If we wanted to keep MinGW then we would need to make more custom patches to the external libs and this is not something our platform maintainers are willing to do. For example, here is the patches needed to build python: https://github.com/Alexpux/MINGW-packages/tree/master/mingw-w64-python3 Fixes T51301 Differential Revision: https://developer.blender.org/D2648 --- build_files/buildbot/master_unpack.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/master_unpack.py b/build_files/buildbot/master_unpack.py index 67b628f668a..157e244e210 100644 --- a/build_files/buildbot/master_unpack.py +++ b/build_files/buildbot/master_unpack.py @@ -49,7 +49,7 @@ def get_platform(filename): tokens = filename.split("-") platforms = ('osx', 'mac', 'bsd', 'win', 'linux', 'source', - 'irix', 'solaris', 'mingw') + 'irix', 'solaris') platform_tokens = [] found = False -- cgit v1.2.3 From 22466a5bdff73afb6ad3afd408e265517e4f3733 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Wed, 21 Jun 2017 14:05:23 +0200 Subject: Fix typo in builtbot config --- build_files/buildbot/config/blender_linux_player.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/config/blender_linux_player.cmake b/build_files/buildbot/config/blender_linux_player.cmake index 2fb31192002..69ab984e386 100644 --- a/build_files/buildbot/config/blender_linux_player.cmake +++ b/build_files/buildbot/config/blender_linux_player.cmake @@ -1,4 +1,4 @@ -# This is applied as an ovveride on top of blender_linux.config +# This is applied as an override on top of blender_linux.config # Disables all the areas which are not needed for the player. set(WITH_COMPOSITOR OFF CACHE BOOL "" FORCE) set(WITH_CYCLES OFF CACHE BOOL "" FORCE) -- cgit v1.2.3 From d0aa62091272a6d42c91005b0fe12e7ce28d6529 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 17 Jul 2017 09:32:19 +0200 Subject: Buildbot: Switch to GCC-7 for Linux build slaves This is GCC version was used for Testbuild1 and Testbuild2. --- build_files/buildbot/slave_compile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 0e264a752d5..d99e66f7871 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -112,8 +112,8 @@ if 'cmake' in builder: chroot_name = 'buildbot_' + deb_name + '_i686' cuda_chroot_name = 'buildbot_' + deb_name + '_x86_64' targets = ['player', 'blender', 'cuda'] - cmake_extra_options.extend(["-DCMAKE_C_COMPILER=/usr/bin/gcc-6", - "-DCMAKE_CXX_COMPILER=/usr/bin/g++-6"]) + cmake_extra_options.extend(["-DCMAKE_C_COMPILER=/usr/bin/gcc-7", + "-DCMAKE_CXX_COMPILER=/usr/bin/g++-7"]) cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file)) -- cgit v1.2.3 From b11b5b273e8d38e96372b01c5171986591d7d2bd Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 28 Aug 2017 09:12:53 +0200 Subject: Buildbot: Tweak nightly schedule of builds Basically, schedule linux 64 earlier on, so builds are ready for nightly benchmarks. --- build_files/buildbot/master.cfg | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index c650cb8c302..dad7f1e01d2 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -312,15 +312,13 @@ def generic_builder(id, libdir='', branch='', rsync=False): # Builders -add_builder(c, 'mac_x86_64_10_6_cmake', 'darwin-9.x.universal', generic_builder, hour=5) -# add_builder(c, 'linux_glibc211_i686_cmake', '', generic_builder, hour=1) -# add_builder(c, 'linux_glibc211_x86_64_cmake', '', generic_builder, hour=2) -add_builder(c, 'linux_glibc219_i686_cmake', '', generic_builder, hour=3) -add_builder(c, 'linux_glibc219_x86_64_cmake', '', generic_builder, hour=4) -add_builder(c, 'win32_cmake_vc2013', 'windows_vc12', generic_builder, hour=3) -add_builder(c, 'win64_cmake_vc2013', 'win64_vc12', generic_builder, hour=4) -add_builder(c, 'win32_cmake_vc2015', 'windows_vc14', generic_builder, hour=5) -add_builder(c, 'win64_cmake_vc2015', 'win64_vc14', generic_builder, hour=6) +add_builder(c, 'mac_x86_64_10_6_cmake', 'darwin-9.x.universal', generic_builder, hour=1) +add_builder(c, 'linux_glibc219_i686_cmake', '', generic_builder, hour=2) +add_builder(c, 'linux_glibc219_x86_64_cmake', '', generic_builder, hour=1) +add_builder(c, 'win32_cmake_vc2013', 'windows_vc12', generic_builder, hour=1) +add_builder(c, 'win64_cmake_vc2013', 'win64_vc12', generic_builder, hour=2) +add_builder(c, 'win32_cmake_vc2015', 'windows_vc14', generic_builder, hour=3) +add_builder(c, 'win64_cmake_vc2015', 'win64_vc14', generic_builder, hour=4) # STATUS TARGETS # -- cgit v1.2.3 From 704f6a51845e03132c4618f1b440b12f8c2ce117 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 5 Sep 2017 16:17:48 +0200 Subject: Buildbot: Fix paths to sndfile and flac Need this in 2.79 branch as well, since build rules are based on this files. --- build_files/buildbot/config/blender_linux.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/config/blender_linux.cmake b/build_files/buildbot/config/blender_linux.cmake index 56f18967300..95265754d74 100644 --- a/build_files/buildbot/config/blender_linux.cmake +++ b/build_files/buildbot/config/blender_linux.cmake @@ -70,7 +70,7 @@ set(FFMPEG_LIBRARIES ) # SndFile libraries -set(SNDFILE_LIBRARY "/usr/lib/libsndfile.a;/usr/lib/libFLAC.a" CACHE STRING "" FORCE) +set(SNDFILE_LIBRARY "/usr/lib${MULTILIB}/libsndfile.a;/usr/lib${MULTILIB}/libFLAC.a" CACHE STRING "" FORCE) # OpenAL libraries set(OPENAL_ROOT_DIR "/opt/lib/openal" CACHE STRING "" FORCE) -- cgit v1.2.3 From efd5e3c25401b43cbd7f909418835bb570db1ab3 Mon Sep 17 00:00:00 2001 From: Aaron Carlisle Date: Fri, 22 Sep 2017 16:11:24 -0400 Subject: Remove quicktime support It has been deprecated since at least macOS 10.9 and fully removed in 10.12. I am unsure if we should remove it only in 2.8. But you cannot build blender with it supported when using a modern xcode version anyway so I would tend towards just removing it also for 2.79 if that ever happens. Reviewers: mont29, dfelinto, juicyfruit, brecht Reviewed By: mont29, brecht Subscribers: Blendify, brecht Maniphest Tasks: T52807 Differential Revision: https://developer.blender.org/D2333 --- build_files/buildbot/slave_compile.py | 1 - 1 file changed, 1 deletion(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index d99e66f7871..84f924b2dd9 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -72,7 +72,6 @@ if 'cmake' in builder: # Set up OSX architecture if builder.endswith('x86_64_10_6_cmake'): cmake_extra_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64') - cmake_extra_options.append('-DWITH_CODEC_QUICKTIME=OFF') cmake_extra_options.append('-DCMAKE_OSX_DEPLOYMENT_TARGET=10.6') cmake_extra_options.append('-DCUDA_HOST_COMPILER=/usr/local/cuda-hack/clang') cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/nvcc') -- cgit v1.2.3 From c10ac1bb5c9d0e3bffa97cb5499680c6f1b682b7 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 28 Sep 2017 20:52:22 +0200 Subject: macOS: officially upgrade to 10.9 libraries from lib/darwin. This removes a bunch of code that is no longer needed, and running "make update" will now automatically download the new libraries. Differential Revision: https://developer.blender.org/D2861 --- build_files/buildbot/master.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index dad7f1e01d2..d5be6e1bf9e 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -312,7 +312,7 @@ def generic_builder(id, libdir='', branch='', rsync=False): # Builders -add_builder(c, 'mac_x86_64_10_6_cmake', 'darwin-9.x.universal', generic_builder, hour=1) +add_builder(c, 'mac_x86_64_10_6_cmake', 'darwin', generic_builder, hour=1) add_builder(c, 'linux_glibc219_i686_cmake', '', generic_builder, hour=2) add_builder(c, 'linux_glibc219_x86_64_cmake', '', generic_builder, hour=1) add_builder(c, 'win32_cmake_vc2013', 'windows_vc12', generic_builder, hour=1) -- cgit v1.2.3 From 97eefc1fd9069794cbfbba23de01fc1813f738d7 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 28 Sep 2017 23:21:27 +0200 Subject: Code cleanup: remove unnecessary buildbot code after macOS library upgrade. --- build_files/buildbot/master.cfg | 5 ----- 1 file changed, 5 deletions(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index d5be6e1bf9e..c721d5a4ba9 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -246,8 +246,6 @@ def git_submodules_update(): def lib_svn_step(dir): name = "lib svn" - if dir == "darwin": - name = "C++11 lib svn" return SVN(name=name, baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + dir, codebase='lib svn', @@ -277,9 +275,6 @@ def generic_builder(id, libdir='', branch='', rsync=False): f = BuildFactory() if libdir != '': f.addStep(lib_svn_step(libdir)) - # Special trick to make sure we always have all the libs. - if libdir.startswith("darwin"): - f.addStep(lib_svn_step("darwin")) for submodule in ('blender-translations', 'blender-addons', -- cgit v1.2.3 From ca3f7021de995dc088896324c781e2f17e9b125f Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Sun, 1 Oct 2017 09:59:50 +0200 Subject: Buildbot: Tweaks to current macOS config Also disable CUDA binaries for now, those would need some extra work. --- build_files/buildbot/slave_compile.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 84f924b2dd9..88da5ca956c 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -70,13 +70,12 @@ if 'cmake' in builder: if builder.startswith('mac'): # Set up OSX architecture - if builder.endswith('x86_64_10_6_cmake'): + if builder.endswith('x86_64_10_9_cmake'): cmake_extra_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64') - cmake_extra_options.append('-DCMAKE_OSX_DEPLOYMENT_TARGET=10.6') + cmake_extra_options.append('-DCMAKE_OSX_DEPLOYMENT_TARGET=10.9') cmake_extra_options.append('-DCUDA_HOST_COMPILER=/usr/local/cuda-hack/clang') cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/nvcc') - - + build_cubins = False elif builder.startswith('win'): if builder.endswith('_vc2015'): -- cgit v1.2.3 From 29ed5f301d41a061c71ae5cf9b5d932e64e09f03 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Sun, 1 Oct 2017 10:01:45 +0200 Subject: Buildbot: Extra tweaks to packing rules --- build_files/buildbot/slave_pack.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py index 6929be85003..41841d809eb 100644 --- a/build_files/buildbot/slave_pack.py +++ b/build_files/buildbot/slave_pack.py @@ -101,13 +101,9 @@ if builder.find('cmake') != -1: platform = builder.split('_')[0] if platform == 'mac': # Special exception for OSX - platform = 'OSX-10.6-' - if builder.endswith('x86_64_10_6_cmake'): + platform = 'OSX-10.9-' + if builder.endswith('x86_64_10_9_cmake'): platform += 'x86_64' - elif builder.endswith('i386_10_6_cmake'): - platform += 'i386' - elif builder.endswith('ppc_10_6_cmake'): - platform += 'ppc' if builder.endswith('vc2015'): platform += "-vc14" builderified_name = 'blender-{}-{}-{}'.format(blender_full_version, git_hash, platform) -- cgit v1.2.3 From 9139532dc8655f23b59da3ee399cc01d1fa2b7b2 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Sun, 1 Oct 2017 10:34:04 +0200 Subject: Buildbot: Use latest master config from buildbot --- build_files/buildbot/master.cfg | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg index c721d5a4ba9..e3101430e50 100644 --- a/build_files/buildbot/master.cfg +++ b/build_files/buildbot/master.cfg @@ -245,8 +245,7 @@ def git_submodules_update(): def lib_svn_step(dir): - name = "lib svn" - return SVN(name=name, + return SVN(name='lib svn', baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + dir, codebase='lib svn', mode='update', @@ -307,7 +306,7 @@ def generic_builder(id, libdir='', branch='', rsync=False): # Builders -add_builder(c, 'mac_x86_64_10_6_cmake', 'darwin', generic_builder, hour=1) +add_builder(c, 'mac_x86_64_10_9_cmake', 'darwin', generic_builder, hour=1) add_builder(c, 'linux_glibc219_i686_cmake', '', generic_builder, hour=2) add_builder(c, 'linux_glibc219_x86_64_cmake', '', generic_builder, hour=1) add_builder(c, 'win32_cmake_vc2013', 'windows_vc12', generic_builder, hour=1) -- cgit v1.2.3 From 9f8bb5813bbbd2fc8a6a174b8ff4d86529bef94a Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 2 Oct 2017 20:24:42 +0500 Subject: Buildbot: Re-enable cuda binaries, those should work --- build_files/buildbot/slave_compile.py | 1 - 1 file changed, 1 deletion(-) (limited to 'build_files/buildbot') diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py index 88da5ca956c..1318cd26294 100644 --- a/build_files/buildbot/slave_compile.py +++ b/build_files/buildbot/slave_compile.py @@ -75,7 +75,6 @@ if 'cmake' in builder: cmake_extra_options.append('-DCMAKE_OSX_DEPLOYMENT_TARGET=10.9') cmake_extra_options.append('-DCUDA_HOST_COMPILER=/usr/local/cuda-hack/clang') cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/nvcc') - build_cubins = False elif builder.startswith('win'): if builder.endswith('_vc2015'): -- cgit v1.2.3