Title: [116891] releases/WebKitGTK/webkit-1.8/Tools
- Revision
- 116891
- Author
- [email protected]
- Date
- 2012-05-13 06:44:49 -0700 (Sun, 13 May 2012)
Log Message
Merge 115904 - Unreviewed. Fix mistake I committed when applying review comments.
* jhbuild/jhbuild-wrapper: dependencies_path was getting 'Root'
appended to its path, so jhbuild itself was being cloned and
installed in the wrong place when using WEBKITOUTPUTDIR.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-1.8/Tools/ChangeLog (116890 => 116891)
--- releases/WebKitGTK/webkit-1.8/Tools/ChangeLog 2012-05-13 13:44:36 UTC (rev 116890)
+++ releases/WebKitGTK/webkit-1.8/Tools/ChangeLog 2012-05-13 13:44:49 UTC (rev 116891)
@@ -1,3 +1,11 @@
+2012-05-02 Gustavo Noronha Silva <[email protected]>
+
+ Unreviewed. Fix mistake I committed when applying review comments.
+
+ * jhbuild/jhbuild-wrapper: dependencies_path was getting 'Root'
+ appended to its path, so jhbuild itself was being cloned and
+ installed in the wrong place when using WEBKITOUTPUTDIR.
+
2012-04-30 Amruth Raj Padmanabhuni <[email protected]>
[GTK] Add glib as a dependency to build glib-networking
Modified: releases/WebKitGTK/webkit-1.8/Tools/jhbuild/jhbuild-wrapper (116890 => 116891)
--- releases/WebKitGTK/webkit-1.8/Tools/jhbuild/jhbuild-wrapper 2012-05-13 13:44:36 UTC (rev 116890)
+++ releases/WebKitGTK/webkit-1.8/Tools/jhbuild/jhbuild-wrapper 2012-05-13 13:44:49 UTC (rev 116891)
@@ -36,9 +36,9 @@
jhbuild_revision = '1eedc423f75c605224b430579e4c303292199507'
if os.environ.has_key('WEBKITOUTPUTDIR'):
- dependencies_path = os.path.abspath(os.path.join(os.environ['WEBKITOUTPUTDIR'], 'Dependencies', 'Root'))
+ dependencies_path = os.path.abspath(os.path.join(os.environ['WEBKITOUTPUTDIR'], 'Dependencies'))
else:
- dependencies_path = os.path.abspath(top_level_path('WebKitBuild', 'Dependencies', 'Root'))
+ dependencies_path = os.path.abspath(top_level_path('WebKitBuild', 'Dependencies'))
installation_prefix = os.path.abspath(os.path.join(dependencies_path, 'Root'))
source_path = os.path.abspath(os.path.join(dependencies_path, 'Source'))
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes