[Bf-blender-cvs] [0900f51] buildbot_linux_cmake: Buildbot: Make header parse function more available

Sergey Sharybin noreply at git.blender.org
Wed Dec 2 14:02:45 CET 2015


Commit: 0900f51be1b8038d5c80ab9023e13f12f896a7fb
Author: Sergey Sharybin
Date:   Wed Dec 2 18:02:18 2015 +0500
Branches: buildbot_linux_cmake
https://developer.blender.org/rB0900f51be1b8038d5c80ab9023e13f12f896a7fb

Buildbot: Make header parse function more available

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

M	build_files/buildbot/slave_pack.py

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

diff --git a/build_files/buildbot/slave_pack.py b/build_files/buildbot/slave_pack.py
index adc6a7f..203d53b 100644
--- a/build_files/buildbot/slave_pack.py
+++ b/build_files/buildbot/slave_pack.py
@@ -42,6 +42,16 @@ upload_filename = None  # Name of the archive to be uploaded
 upload_filepath = None  # Filepath to be uploaded to the server
                         # (this folder will be packed)
 
+def parse_header_file(filename, define):
+    import re
+    regex = re.compile("^#\s*define\s+%s\s+(.*)" % define)
+    for l in open(filename, "r"):
+        match = regex.match(l)
+        if match:
+            return match.group(1)
+    return None
+
+
 # scons does own packaging
 if builder.find('scons') != -1:
     python_bin = 'python'
@@ -156,15 +166,6 @@ else:
             sys.exit(1)
 
     elif builder.startswith('linux_'):
-        def parse_header_file(filename, define):
-            import re
-            regex = re.compile("^#\s*define\s+%s\s+(.*)" % define)
-            for l in open(filename, "r"):
-                match = regex.match(l)
-                if match:
-                    return match.group(1)
-            return None
-
         blender_dir = os.path.join('..', 'blender.git')
         build_dir = os.path.join('..', 'build', builder)
         install_dir = os.path.join('..', 'install', builder)




More information about the Bf-blender-cvs mailing list