Remove player from buildbot part II
authorDalai Felinto <dfelinto@gmail.com>
Tue, 17 Apr 2018 16:46:03 +0000 (18:46 +0200)
committerDalai Felinto <dfelinto@gmail.com>
Tue, 17 Apr 2018 16:46:03 +0000 (18:46 +0200)
build_files/buildbot/config/blender_linux.cmake
build_files/buildbot/slave_compile.py
build_files/buildbot/slave_pack.py

index 668f3cd813aa31096a232b7529078910483a12b4..43f2ff7239dcca9d26019f8ef7df5f4d74477714 100644 (file)
@@ -21,7 +21,7 @@ else()
        message(FATAL_ERROR "Unknown build environment")
 endif()
 
-# Default to only build Blender, not the player
+# Default to only build Blender
 set(WITH_BLENDER             ON  CACHE BOOL "" FORCE)
 
 # ######## Linux-specific build options ########
index ff19bcce758b4a4d597bb4f0ffac0c8c1595d2b9..43964dda6912ec2c81147443f26eca1904582884 100644 (file)
@@ -60,7 +60,6 @@ if 'cmake' in builder:
 
     # Config file to be used (relative to blender's sources root)
     cmake_config_file = "build_files/cmake/config/blender_full.cmake"
-    cmake_player_config_file = None
     cmake_cuda_config_file = None
 
     # Set build options.
@@ -101,14 +100,13 @@ if 'cmake' in builder:
         elif glibc == 'glibc211':
             deb_name = "squeeze"
         cmake_config_file = "build_files/buildbot/config/blender_linux.cmake"
-        cmake_player_config_file = "build_files/buildbot/config/blender_linux_player.cmake"
         if builder.endswith('x86_64_cmake'):
             chroot_name = 'buildbot_' + deb_name + '_x86_64'
-            targets = ['player', 'blender']
+            targets = ['blender']
         elif builder.endswith('i686_cmake'):
             bits = 32
             chroot_name = 'buildbot_' + deb_name + '_i686'
-            targets = ['player', 'blender']
+            targets = ['blender']
         cmake_extra_options.extend(["-DCMAKE_C_COMPILER=/usr/bin/gcc-7",
                                     "-DCMAKE_CXX_COMPILER=/usr/bin/g++-7"])
 
@@ -159,9 +157,7 @@ if 'cmake' in builder:
         os.chdir(target_build_dir)
         # Tweaking CMake options to respect the target
         target_cmake_options = cmake_options[:]
-        if target == 'player':
-            target_cmake_options.append("-C" + os.path.join(blender_dir, cmake_player_config_file))
-        elif target == 'cuda':
+        if target == 'cuda':
             target_cmake_options += cuda_cmake_options
             target_chroot_prefix = cuda_chroot_prefix[:]
             target_name = 'cycles_kernel_cuda'
index a0b5e8c6517148ad33e64ec45548ce651f0c4c3f..22cf386c77a439f5e65339f46c4e16900e9e3f42 100644 (file)
@@ -126,7 +126,6 @@ if builder.find('cmake') != -1:
 
     elif builder.startswith('linux_'):
         blender = os.path.join(install_dir, 'blender')
-        blenderplayer = os.path.join(install_dir, 'blenderplayer')
 
         buildinfo_h = os.path.join(build_dir, "source", "creator", "buildinfo.h")
         blender_h = os.path.join(blender_dir, "source", "blender", "blenkernel", "BKE_blender_version.h")
@@ -149,7 +148,7 @@ if builder.find('cmake') != -1:
         # Strip all unused symbols from the binaries
         print("Stripping binaries...")
         chroot_prefix = ['schroot', '-c', chroot_name, '--']
-        subprocess.call(chroot_prefix + ['strip', '--strip-all', blender, blenderplayer])
+        subprocess.call(chroot_prefix + ['strip', '--strip-all', blender])
 
         print("Stripping python...")
         py_target = os.path.join(install_dir, blender_version)