Title: [130781] trunk/Tools
- Revision
- 130781
- Author
- ale...@webkit.org
- Date
- 2012-10-09 11:37:29 -0700 (Tue, 09 Oct 2012)
Log Message
[GTK] Shadow builds are not working anymore.
https://bugs.webkit.org/show_bug.cgi?id=98785
Reviewed by Martin Robinson.
When setting WEBKITOUTPUTDIR the build was failing with a python
error : the os.execve expect three arguments. Also the condition
to check whether we build the GTK port with jhbuild or not was buggy
as it was always assuming an in source build. We can use now jhbuildutils
which has a convenient function to locate the directory where
the dependencies built with jhbuild are and take into account WEBKITOUTPUTDIR.
If the Dependencies path does not exist then the build was not done using
jhbuild so we can fallback to a regular build against system libraries.
* gtk/run-with-jhbuild:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (130780 => 130781)
--- trunk/Tools/ChangeLog 2012-10-09 18:36:17 UTC (rev 130780)
+++ trunk/Tools/ChangeLog 2012-10-09 18:37:29 UTC (rev 130781)
@@ -1,3 +1,21 @@
+2012-10-09 Alexis Menard <ale...@webkit.org>
+
+ [GTK] Shadow builds are not working anymore.
+ https://bugs.webkit.org/show_bug.cgi?id=98785
+
+ Reviewed by Martin Robinson.
+
+ When setting WEBKITOUTPUTDIR the build was failing with a python
+ error : the os.execve expect three arguments. Also the condition
+ to check whether we build the GTK port with jhbuild or not was buggy
+ as it was always assuming an in source build. We can use now jhbuildutils
+ which has a convenient function to locate the directory where
+ the dependencies built with jhbuild are and take into account WEBKITOUTPUTDIR.
+ If the Dependencies path does not exist then the build was not done using
+ jhbuild so we can fallback to a regular build against system libraries.
+
+ * gtk/run-with-jhbuild:
+
2012-10-08 Simon Fraser <simon.fra...@apple.com>
Remove DRT/WTR implementations of layerTreeAsText
Modified: trunk/Tools/gtk/run-with-jhbuild (130780 => 130781)
--- trunk/Tools/gtk/run-with-jhbuild 2012-10-09 18:36:17 UTC (rev 130780)
+++ trunk/Tools/gtk/run-with-jhbuild 2012-10-09 18:37:29 UTC (rev 130781)
@@ -22,10 +22,11 @@
import subprocess
import sys
-base_build_dir = os.getenv('WEBKITOUTPUTDIR', common.top_level_path('WebKitBuild'))
+sys.path.append(common.top_level_path('Tools', 'jhbuild'))
+import jhbuildutils
-if not os.path.exists(os.path.join(base_build_dir, 'Dependencies')):
- os.execve(sys.argv[1], sys.argv[1])
+if (not os.path.exists(jhbuildutils.get_dependencies_path())):
+ os.execve(sys.argv[1], sys.argv[1:], os.environ)
else:
wrapper = common.top_level_path('Tools', 'jhbuild', 'jhbuild-wrapper')
os.execve(wrapper, [wrapper, '--gtk', 'run'] + sys.argv[1:], os.environ)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
