Changeset 88132 in webkit

Timestamp:

Jun 4, 2011 10:28:39 PM (13 years ago)

Author:

kevino@webkit.org

Message:

[wx] Unreviewed build fix. Update git branch build dir handling to match what other WebKit scripts expect, so other scripts work properly with wx.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• waf/build/build_utils.py (modified) (3 diffs)
• waf/build/settings.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-06-04  Kevin Ollivier  <kevino@theolliviers.com>
+
+        [wx] Unreviewed build fix. Update git branch build dir handling to match what other
+        WebKit scripts expect, so other scripts work properly with wx.
+
+        * waf/build/build_utils.py:
+        * waf/build/settings.py:
+
 2011-06-04  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/Tools/waf/build/build_utils.py

@@ -169 +169 @@
         match = re.search('^\* (.*)', branches, re.MULTILINE)
         if match:
-            return ".%s" % match.group(1)
+            return "%s" % match.group(1)
     except:
         pass
@@ -175 +175 @@
     return ""
 
+def get_base_product_dir(wk_root):
+    build_dir = os.path.join(wk_root, 'WebKitBuild')
+    git_branch = git_branch_name()
+    if git_branch != "":
+        build_dir = os.path.join(build_dir, git_branch)
+        
+    return build_dir
 
 def get_config(wk_root):
-    config_file = os.path.join(wk_root, 'WebKitBuild', 'Configuration')
+    config_file = os.path.join(get_base_product_dir(wk_root), 'Configuration')
     config = 'Debug'
 
@@ -187 +194 @@
 
 def get_arch(wk_root):
-    arch_file = os.path.join(wk_root, 'WebKitBuild', 'Architecture')
+    arch_file = os.path.join(get_base_product_dir(wk_root), 'Architecture')
     arch = 'x86_64'
 

trunk/Tools/waf/build/settings.py

@@ -161 +161 @@
 config = get_config(wk_root)
 arch = get_arch(wk_root)
-config_dir = config + git_branch_name()
+config_dir = config
+git_branch = git_branch_name()
+if git_branch != "":
+    config_dir = os.path.join(git_branch, config_dir)
 
 output_dir = os.path.join(wk_root, 'WebKitBuild', config_dir)
@@ -224 +227 @@
     opt.add_option('--mac_universal_binary', action='store_true', default=False, help='Build Mac as universal (i386, x86_64, ppc) binary.')
     opt.add_option('--mac_archs', action='store', default='', help='Comma separated list of architectures (i386, x86_64, ppc) to build on Mac.')
-
 
 def common_configure(conf):