Title: [89041] trunk/Tools
- Revision
- 89041
- Author
- [email protected]
- Date
- 2011-06-16 10:41:10 -0700 (Thu, 16 Jun 2011)
Log Message
[wx] Unreviewed build fix, make sure the waf build checks the webKitBranchBuild
preference like the perl scripts do.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (89040 => 89041)
--- trunk/Tools/ChangeLog 2011-06-16 17:40:55 UTC (rev 89040)
+++ trunk/Tools/ChangeLog 2011-06-16 17:41:10 UTC (rev 89041)
@@ -1,3 +1,11 @@
+2011-06-16 Kevin Ollivier <[email protected]>
+
+ [wx] Unreviewed build fix, make sure the waf build checks the webKitBranchBuild
+ preference like the perl scripts do.
+
+ * waf/build/build_utils.py:
+ * waf/build/settings.py:
+
2011-06-16 Tommy Widenflycht <[email protected]>
Reviewed by Tony Gentilcore.
Modified: trunk/Tools/waf/build/build_utils.py (89040 => 89041)
--- trunk/Tools/waf/build/build_utils.py 2011-06-16 17:40:55 UTC (rev 89040)
+++ trunk/Tools/waf/build/build_utils.py 2011-06-16 17:41:10 UTC (rev 89041)
@@ -162,7 +162,6 @@
return flat_sources
-
def git_branch_name():
try:
branches = commands.getoutput("git branch --no-color")
@@ -174,10 +173,22 @@
return ""
+def is_git_branch_build():
+ branch = git_branch_name()
+ is_branch_build = commands.getoutput("git config --bool branch.%s.webKitBranchBuild" % branch)
+ if is_branch_build == "true":
+ return True
+ elif is_branch_build == "false":
+ return False
+
+ # not defined for this branch, use the default
+ is_branch_build = commands.getoutput("git config --bool core.webKitBranchBuild")
+ return is_branch_build == "true"
+
def get_base_product_dir(wk_root):
build_dir = os.path.join(wk_root, 'WebKitBuild')
git_branch = git_branch_name()
- if git_branch != "":
+ if git_branch != "" and is_git_branch_build():
build_dir = os.path.join(build_dir, git_branch)
return build_dir
Modified: trunk/Tools/waf/build/settings.py (89040 => 89041)
--- trunk/Tools/waf/build/settings.py 2011-06-16 17:40:55 UTC (rev 89040)
+++ trunk/Tools/waf/build/settings.py 2011-06-16 17:41:10 UTC (rev 89041)
@@ -161,11 +161,8 @@
config = get_config(wk_root)
arch = get_arch(wk_root)
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)
+output_dir = os.path.join(get_base_product_dir(wk_root), config_dir)
building_on_win32 = sys.platform.startswith('win')
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
