Title: [88132] trunk/Tools
- Revision
- 88132
- Author
- [email protected]
- Date
- 2011-06-04 22:28:39 -0700 (Sat, 04 Jun 2011)
Log 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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (88131 => 88132)
--- trunk/Tools/ChangeLog 2011-06-05 05:07:04 UTC (rev 88131)
+++ trunk/Tools/ChangeLog 2011-06-05 05:28:39 UTC (rev 88132)
@@ -1,5 +1,13 @@
2011-06-04 Kevin Ollivier <[email protected]>
+ [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 <[email protected]>
+
[wx] Unreviewed build fix. Restore the PPC build and allow users to specify architectures
to build on Mac.
Modified: trunk/Tools/waf/build/build_utils.py (88131 => 88132)
--- trunk/Tools/waf/build/build_utils.py 2011-06-05 05:07:04 UTC (rev 88131)
+++ trunk/Tools/waf/build/build_utils.py 2011-06-05 05:28:39 UTC (rev 88132)
@@ -168,15 +168,22 @@
branches = commands.getoutput("git branch --no-color")
match = re.search('^\* (.*)', branches, re.MULTILINE)
if match:
- return ".%s" % match.group(1)
+ return "%s" % match.group(1)
except:
pass
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'
if os.path.exists(config_file):
@@ -186,7 +193,7 @@
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'
if os.path.exists(arch_file):
Modified: trunk/Tools/waf/build/settings.py (88131 => 88132)
--- trunk/Tools/waf/build/settings.py 2011-06-05 05:07:04 UTC (rev 88131)
+++ trunk/Tools/waf/build/settings.py 2011-06-05 05:28:39 UTC (rev 88132)
@@ -160,7 +160,10 @@
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,7 +227,6 @@
opt.add_option('--mac_universal_binary', action='', default=False, help='Build Mac as universal (i386, x86_64, ppc) binary.')
opt.add_option('--mac_archs', action='', default='', help='Comma separated list of architectures (i386, x86_64, ppc) to build on Mac.')
-
def common_configure(conf):
"""
Configuration used by all targets, called from the target's configure() step.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
