Fix: Disable leftover debug prints from earlier work on the rna path renaming/fixing...
[blender.git] / build_files / buildbot / slave_pack.py
index 6005b42fd827735702c32937254b850069676c6c..41841d809eb49cd2abba4f92fd8672cc09b316ed 100644 (file)
@@ -39,6 +39,7 @@ branch = sys.argv[2] if (len(sys.argv) >= 3 and sys.argv[2] != 'master') else ''
 blender_dir = os.path.join('..', 'blender.git')
 build_dir = os.path.join('..', 'build', builder)
 install_dir = os.path.join('..', 'install', builder)
+buildbot_upload_zip = os.path.abspath(os.path.join(os.path.dirname(install_dir), "buildbot_upload.zip"))
 
 upload_filename = None  # Name of the archive to be uploaded
                         # (this is the name of archive which will appear on the
@@ -63,86 +64,26 @@ if not os.path.exists(install_dir):
     os.makedirs(install_dir)
 
 
-# scons does own packaging
-if builder.find('scons') != -1:
-    python_bin = 'python'
-    if builder.find('linux') != -1:
-        python_bin = '/opt/lib/python-2.7/bin/python2.7'
+def create_tar_bz2(src, dest, package_name):
+    # One extra to remove leading os.sep when cleaning root for package_root
+    ln = len(src) + 1
+    flist = list()
 
-    os.chdir('../blender.git')
-    scons_options = ['BF_QUICK=slnt', 'BUILDBOT_BRANCH=' + branch, 'buildslave', 'BF_FANCY=False']
+    # Create list of tuples containing file and archive name
+    for root, dirs, files in os.walk(src):
+        package_root = os.path.join(package_name, root[ln:])
+        flist.extend([(os.path.join(root, file), os.path.join(package_root, file)) for file in files])
 
-    buildbot_dir = os.path.dirname(os.path.realpath(__file__))
-    config_dir = os.path.join(buildbot_dir, 'config')
+    import tarfile
+    package = tarfile.open(dest, 'w:bz2')
+    for entry in flist:
+        package.add(entry[0], entry[1], recursive=False)
+    package.close()
 
-    if builder.find('linux') != -1:
-        scons_options += ['WITH_BF_NOBLENDER=True', 'WITH_BF_PLAYER=False',
-                          'BF_BUILDDIR=' + build_dir,
-                          'BF_INSTALLDIR=' + install_dir,
-                          'WITHOUT_BF_INSTALL=True']
 
-        config = None
-        bits = None
-
-        if builder.endswith('linux_glibc211_x86_64_scons'):
-            config = 'user-config-glibc211-x86_64.py'
-            chroot_name = 'buildbot_squeeze_x86_64'
-            bits = 64
-        elif builder.endswith('linux_glibc211_i386_scons'):
-            config = 'user-config-glibc211-i686.py'
-            chroot_name = 'buildbot_squeeze_i686'
-            bits = 32
-
-        if config is not None:
-            config_fpath = os.path.join(config_dir, config)
-            scons_options.append('BF_CONFIG=' + config_fpath)
-
-        blender = os.path.join(install_dir, 'blender')
-        blenderplayer = os.path.join(install_dir, 'blenderplayer')
-        subprocess.call(['schroot', '-c', chroot_name, '--', 'strip', '--strip-all', blender, blenderplayer])
-
-        extra = "/home/sources/release-builder/extra/"
-        mesalibs = os.path.join(extra, 'mesalibs%d.tar.bz2' % bits)
-        software_gl = os.path.join(extra, 'blender-softwaregl')
-
-        os.system('tar -xpf %s -C %s' % (mesalibs, install_dir))
-        os.system('cp %s %s' % (software_gl, install_dir))
-        os.system('chmod 755 %s' % (os.path.join(install_dir, 'blender-softwaregl')))
-
-        retcode = subprocess.call(['schroot', '-c', chroot_name, '--', python_bin, 'scons/scons.py'] + scons_options)
-
-        sys.exit(retcode)
-    else:
-        if builder.find('win') != -1:
-            bitness = '32'
-
-            if builder.find('win64') != -1:
-                bitness = '64'
-
-            scons_options.append('BF_INSTALLDIR=' + install_dir)
-            scons_options.append('BF_BUILDDIR=' + build_dir)
-            scons_options.append('BF_BITNESS=' + bitness)
-            scons_options.append('WITH_BF_CYCLES_CUDA_BINARIES=True')
-            scons_options.append('BF_CYCLES_CUDA_NVCC=nvcc.exe')
-            if builder.find('mingw') != -1:
-                scons_options.append('BF_TOOLSET=mingw')
-            if builder.endswith('vc2013'):
-                scons_options.append('MSVS_VERSION=12.0')
-                scons_options.append('MSVC_VERSION=12.0')
-
-        elif 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:
+    if 'win' in builder or 'mac' in builder:
         os.chdir(build_dir)
 
         files = [f for f in os.listdir('.') if os.path.isfile(f) and f.endswith('.zip')]
@@ -158,17 +99,24 @@ else:
         blender_full_version = '.'.join(blender_version[0:2])
         git_hash = tokens[2].split('.')[1]
         platform = builder.split('_')[0]
+        if platform == 'mac':
+            # Special exception for OSX
+            platform = 'OSX-10.9-'
+            if builder.endswith('x86_64_10_9_cmake'):
+                platform += 'x86_64'
+        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))
         # create zip file
         try:
-            upload_zip = os.path.join("..", "install", "buildbot_upload.zip")
-            if os.path.exists(upload_zip):
-                os.remove(upload_zip)
-            z = zipfile.ZipFile(upload_zip, "w", compression=zipfile.ZIP_STORED)
+            if os.path.exists(buildbot_upload_zip):
+                os.remove(buildbot_upload_zip)
+            z = zipfile.ZipFile(buildbot_upload_zip, "w", compression=zipfile.ZIP_STORED)
             z.write("{}.zip".format(builderified_name))
             z.close()
             sys.exit(retcode)
@@ -177,18 +125,23 @@ else:
             sys.exit(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.h")
+        blender_h = os.path.join(blender_dir, "source", "blender", "blenkernel", "BKE_blender_version.h")
+
+        # Get version information
+        blender_version = int(parse_header_file(blender_h, 'BLENDER_VERSION'))
+        blender_version = "%d.%d" % (blender_version // 100, blender_version % 100)
+        blender_hash = parse_header_file(buildinfo_h, 'BUILD_HASH')[1:-1]
+        blender_glibc = builder.split('_')[1]
 
         if builder.endswith('x86_64_cmake'):
             chroot_name = 'buildbot_squeeze_x86_64'
             bits = 64
             blender_arch = 'x86_64'
-        elif builder.endswith('i386_cmake'):
+        elif builder.endswith('i686_cmake'):
             chroot_name = 'buildbot_squeeze_i686'
             bits = 32
             blender_arch = 'i686'
@@ -198,6 +151,10 @@ else:
         chroot_prefix = ['schroot', '-c', chroot_name, '--']
         subprocess.call(chroot_prefix + ['strip', '--strip-all', blender, blenderplayer])
 
+        print("Stripping python...")
+        py_target = os.path.join(install_dir, blender_version)
+        subprocess.call(chroot_prefix + ['find', py_target, '-iname', '*.so', '-exec', 'strip', '-s', '{}', ';'])
+
         # Copy all specific files which are too specific to be copied by
         # the CMake rules themselves
         print("Copying extra scripts and libs...")
@@ -212,22 +169,23 @@ else:
         os.system('cp -r %s %s' % (icons, install_dir))
         os.system('chmod 755 %s' % (os.path.join(install_dir, 'blender-softwaregl')))
 
-        # Get version information for the archive name
-        blender_version = int(parse_header_file(blender_h, 'BLENDER_VERSION'))
-        blender_version = "%d.%d" % (blender_version / 100, blender_version % 100)
-        blender_hash = parse_header_file(buildinfo_h, 'BUILD_HASH')[1:-1]
-        blender_glibc = builder.split('_')[1]
+        # Construct archive name
+        package_name = 'blender-%s-%s-linux-%s-%s' % (blender_version,
+                                                      blender_hash,
+                                                      blender_glibc,
+                                                      blender_arch)
+        # NOTE: Blender 2.8 is already respected by blender_full_version.
+        if branch != '' and branch != 'blender2.8':
+            package_name = branch + "-" + package_name
 
-        upload_filename = 'blender-%s-%s-linux-%s-%s.tar.bz2' % (blender_version,
-                                                                 blender_hash,
-                                                                 blender_glibc,
-                                                                 blender_arch)
-        if branch != '':
-            upload_filename = branch + "-" + upload_filename
+        upload_filename = package_name + ".tar.bz2"
 
         print("Creating .tar.bz2 archive")
-        os.system('tar -C../install -cjf ../install/%s.tar.bz2 %s' % (builder, builder))
         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:
@@ -270,7 +228,7 @@ if upload_filepath is None:
 
 # create zip file
 try:
-    upload_zip = os.path.join(os.path.dirname(install_dir), "buildbot_upload.zip")
+    upload_zip = os.path.join(buildbot_upload_zip)
     if os.path.exists(upload_zip):
         os.remove(upload_zip)
     z = zipfile.ZipFile(upload_zip, "w", compression=zipfile.ZIP_STORED)