[Bf-blender-cvs] [e5d7cbd] master: Buildbot: Attempt to make windows cmake builds names matching buldbot's names

Sergey Sharybin noreply at git.blender.org
Mon Jul 27 11:23:08 CEST 2015


Commit: e5d7cbd191d593a9751d0bfc35971aa8d2698452
Author: Sergey Sharybin
Date:   Mon Jul 27 11:17:57 2015 +0200
Branches: master
https://developer.blender.org/rBe5d7cbd191d593a9751d0bfc35971aa8d2698452

Buildbot: Attempt to make windows cmake builds names matching buldbot's names

Did this in packaging buildbot rule because of several reasons:

- CMake doesn't deliver name of package which we expect it to be for buildbot
- CMake doesn't really know that building happens for buildbot
- Making default CPAck name matching buildbot's naming is kinda stupid

Probably we can pass CPack name via command line arguments, but i'm happy with
the current state and one might change things in the future.

===================================================================

M	build_files/buildbot/slave_pack.py

===================================================================

diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py
index 4e5d77b..3cab27c 100644
--- a/build_files/buildbot/slave_pack.py
+++ b/build_files/buildbot/slave_pack.py
@@ -123,7 +123,17 @@ else:
             os.remove(f)
         retcode = subprocess.call(['cpack', '-G', 'ZIP'])
         result_file = [f for f in os.listdir('.') if os.path.isfile(f) and f.endswith('.zip')][0]
-        os.rename(result_file, "{}.zip".format(builder))
+
+        # TODO(sergey): Such magic usually happens in SCon's packaging bu we don't have it
+        # in the CMake yet. For until then we do some magic here.
+        tokens = result_file.split('-')
+        blender_version = tokens[1].split('.')
+        blender_full_version = '.'.join(blender_version[0:2])
+        git_hash = tokens[2].split('.')[1]
+        platform = builder.split('_')[0]
+        builderified_name = 'blender-{}-{}-{}'.format(blender_full_version, git_hash, platform)
+
+        os.rename(result_file, "{}.zip".format(builderified_name))
         # create zip file
         try:
             upload_zip = "buildbot_upload.zip"




More information about the Bf-blender-cvs mailing list