Buildbot: Cleanup unused code

- Remove deprecated/unused builders
- Remove unused SCons OSX slave configuration
- Remove SCons slave logic, it is not giving error about unknown building
  system used for the slave.

diff --git a/build_files/buildbot/config/user-config-mac-i386.py b/build_files/buildbot/config/user-config-mac-i386.py
deleted file mode 100644 (file)
index c1beefc..0000000
--- a/build_files/buildbot/config/user-config-mac-i386.py
+++ /dev/null
@@ -1,9 +0,0 @@
-
-MACOSX_ARCHITECTURE = 'i386' # valid archs: ppc, i386, ppc64, x86_64
-
-WITH_BF_CYCLES_CUDA_BINARIES = True
-
-WITH_BF_CYCLES_OSL = False # OSL never worked on OSX 32bit !
-
-WITH_BF_COLLADA = False # we drop 32bit, newest collada is only x86_64 !
-

diff --git a/build_files/buildbot/config/user-config-mac-x86_64.py b/build_files/buildbot/config/user-config-mac-x86_64.py
deleted file mode 100644 (file)
index f310eeb..0000000
--- a/build_files/buildbot/config/user-config-mac-x86_64.py
+++ /dev/null
@@ -1,6 +0,0 @@
-#CC = "../lib/darwin-9.x.universal/clang-omp-3.5/bin/clang"
-#CXX = "../lib/darwin-9.x.universal/clang-omp-3.5/bin/clang++"
-
-MACOSX_ARCHITECTURE = 'x86_64' # valid archs: ppc, i386, ppc64, x86_64
-
-WITH_BF_CYCLES_CUDA_BINARIES = True

diff --git a/build_files/buildbot/master.cfg b/build_files/buildbot/master.cfg
index 250f39e63ec0eaef6bebcf2c53e68fc3d15e7530..1f82f24a8e2fac34ece19168d31ce098cf66482f 100644 (file)
--- a/build_files/buildbot/master.cfg
+++ b/build_files/buildbot/master.cfg
@@ -294,28 +294,14 @@ def generic_builder(id, libdir='', branch='', rsync=False):
                                  descriptionDone='unpacked'))
     return f
 
                                  descriptionDone='unpacked'))
     return f
 

-# builders
+# Builders

 
 

-#add_builder(c, 'mac_x86_64_10_6_scons', 'darwin-9.x.universal', generic_builder, hour=5)
-#add_builder(c, 'mac_i386_10_6_scons', 'darwin-9.x.universal', generic_builder, hour=11)

 add_builder(c, 'mac_x86_64_10_6_cmake', 'darwin-9.x.universal', generic_builder, hour=5)
 add_builder(c, 'mac_i386_10_6_cmake', 'darwin-9.x.universal', generic_builder, hour=11)
 add_builder(c, 'mac_x86_64_10_6_cmake', 'darwin-9.x.universal', generic_builder, hour=5)
 add_builder(c, 'mac_i386_10_6_cmake', 'darwin-9.x.universal', generic_builder, hour=11)

-#add_builder(c, 'linux_glibc211_i386_scons', '', generic_builder, hour=1)
-#add_builder(c, 'linux_glibc211_x86_64_scons', '', generic_builder, hour=2)

 add_builder(c, 'linux_glibc211_i386_cmake', '', generic_builder, hour=1)
 add_builder(c, 'linux_glibc211_x86_64_cmake', '', generic_builder, hour=2)
 add_builder(c, 'linux_glibc211_i386_cmake', '', generic_builder, hour=1)
 add_builder(c, 'linux_glibc211_x86_64_cmake', '', generic_builder, hour=2)

-#add_builder(c, 'win32_scons_vc2013', 'windows_vc12', generic_builder, hour=1)
-#add_builder(c, 'win64_scons_vc2013', 'win64_vc12', generic_builder, hour=2)

 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_vc2013', 'windows_vc12', generic_builder, hour=3)
 add_builder(c, 'win64_cmake_vc2013', 'win64_vc12', generic_builder, hour=4)

-#add_builder(c, 'mingw_win32_scons', 'mingw32', generic_builder, hour=4)
-#add_builder(c, 'mingw_win64_scons', 'mingw64', generic_builder, hour=3)
-#add_builder(c, 'freebsd_i386_cmake', '', generic_builder, hour=1)
-#add_builder(c, 'freebsd_x86_64_cmake', '', generic_builder, hour=2)
-
-# Multiview branch
-add_builder(c, 'multiview_win64_scons', 'win64', generic_builder, 'multiview', hour=4)
-add_builder(c, 'multiview_win32_scons', 'windows', generic_builder, 'multiview', hour=5)

 
 # STATUS TARGETS
 #
 
 # STATUS TARGETS
 #

diff --git a/build_files/buildbot/slave_compile.py b/build_files/buildbot/slave_compile.py
index cad0608d44f070e22ebbc7b43076aa2f225b8c18..93fad72373b7688e0bcd2569a68db0115914d4e6 100644 (file)
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -157,34 +157,5 @@ if 'cmake' in builder:
         if retcode != 0:
             sys.exit(retcode)
 else:
         if retcode != 0:
             sys.exit(retcode)
 else:

-    python_bin = 'python'
-
-    # scons
-    os.chdir(blender_dir)
-    scons_cmd = [python_bin, 'scons/scons.py']
-    scons_options = ['BF_FANCY=False']
-
-    # We're using the same rules as release builder, so tweak
-    # build and install dirs
-    build_dir = os.path.join('..', 'build', builder)
-    install_dir = os.path.join('..', 'install', builder)
-
-    # Clean install directory so we'll be sure there's no
-    # residual libs and files remained from the previous install.
-    if os.path.isdir(install_dir):
-        shutil.rmtree(install_dir)
-
-    buildbot_dir = os.path.dirname(os.path.realpath(__file__))
-    config_dir = os.path.join(buildbot_dir, 'config')
-
-    if builder.find('mac') != -1:
-        if builder.find('x86_64') != -1:
-            config = 'user-config-mac-x86_64.py'
-        else:
-            config = 'user-config-mac-i386.py'
-
-        scons_options.append('BF_CONFIG=' + os.path.join(config_dir, config))
-
-    retcode = subprocess.call([python_bin, 'scons/scons.py'] + scons_options)
-
-    sys.exit(retcode)
+    print("Unknown building system")
+    sys.exit(1)

diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py
index 5355c7090a9664337c59758c384a544841628dd5..c0785ad0bc55da4a96b87f6bbac2a7d5b3edea76 100644 (file)
--- a/build_files/buildbot/slave_pack.py
+++ b/build_files/buildbot/slave_pack.py
@@ -81,27 +81,7 @@ def create_tar_bz2(src, dest, package_name):
     package.close()
 
 
     package.close()
 
 

-# scons does own packaging
-if builder.find('scons') != -1:
-    python_bin = 'python'
-
-    os.chdir('../blender.git')
-    scons_options = ['BF_QUICK=slnt', 'BUILDBOT_BRANCH=' + branch, 'buildslave', 'BF_FANCY=False']
-
-    buildbot_dir = os.path.dirname(os.path.realpath(__file__))
-    config_dir = os.path.join(buildbot_dir, 'config')
-
-    if builder.find('mac') != -1:
-        if builder.find('x86_64') != -1:
-            config = 'user-config-mac-x86_64.py'
-        else:
-            config = 'user-config-mac-i386.py'
-
-        scons_options.append('BF_CONFIG=' + os.path.join(config_dir, config))
-
-    retcode = subprocess.call([python_bin, 'scons/scons.py'] + scons_options)
-    sys.exit(retcode)
-else:
+if builder.find('cmake') != -1:

     # CMake
     if 'win' in builder or 'mac' in builder:
         os.chdir(build_dir)
     # CMake
     if 'win' in builder or 'mac' in builder:
         os.chdir(build_dir)


@@ -203,6 +183,9 @@ else:
         print("Creating .tar.bz2 archive")
         upload_filepath = install_dir + '.tar.bz2'
         create_tar_bz2(install_dir, upload_filepath, package_name)
         print("Creating .tar.bz2 archive")
         upload_filepath = install_dir + '.tar.bz2'
         create_tar_bz2(install_dir, upload_filepath, package_name)

+else:
+    print("Unknown building system")
+    sys.exit(1)

 
 
 if upload_filepath is None:
 
 
 if upload_filepath is None:

diff --git a/build_files/buildbot/slave_test.py b/build_files/buildbot/slave_test.py
index 07fe27ce9675b2b7f4047fe03cbab3dde02aa36e..a95928139120b00f66525a32cbf893666f01a296 100644 (file)
--- a/build_files/buildbot/slave_test.py
+++ b/build_files/buildbot/slave_test.py
@@ -54,5 +54,5 @@ if "cmake" in builder:
     retcode = subprocess.call(chroot_prefix + ['ctest', '--output-on-failure'])
     sys.exit(retcode)
 else:
     retcode = subprocess.call(chroot_prefix + ['ctest', '--output-on-failure'])
     sys.exit(retcode)
 else:

-    # scons
-    pass
+    print("Unknown building system")
+    sys.exit(1)