Merge branch 'blender2.7'
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 18 Apr 2019 09:57:44 +0000 (11:57 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 18 Apr 2019 09:57:44 +0000 (11:57 +0200)
1  2 
build_files/buildbot/slave_compile.py

@@@ -59,6 -59,7 +59,6 @@@ if 'cmake' in builder
  
      # Config file to be used (relative to blender's sources root)
      cmake_config_file = "build_files/cmake/config/blender_release.cmake"
 -    cmake_player_config_file = None
  
      # Set build options.
      cmake_options = []
          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']
          if deb_name != "stretch":
              cmake_extra_options.extend(["-DCMAKE_C_COMPILER=/usr/bin/gcc-7",
                                          "-DCMAKE_CXX_COMPILER=/usr/bin/g++-7"])
          target_name = 'install'
          # 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))
          # Do extra git fetch because not all platform/git/buildbot combinations
          # update the origin remote, causing buildinfo to detect local changes.
          os.chdir(blender_dir)
          if os.path.exists('CMakeCache.txt'):
              print("Removing CMake cache")
              os.remove('CMakeCache.txt')
+         # Remove buildinfo files to force buildbot to re-generate them.
+         for buildinfo in ('buildinfo.h', 'buildinfo.h.txt', ):
+             full_path = os.path.join('source', 'creator', buildinfo)
+             if os.path.exists(full_path):
+                 print("Removing {}" . format(buildinfo))
+                 os.remove(full_path)
          retcode = subprocess.call(target_chroot_prefix + ['cmake', blender_dir] + target_cmake_options)
          if retcode != 0:
              print('Configuration FAILED!')