Title: [152277] trunk/Tools
Revision
152277
Author
[email protected]
Date
2013-07-01 19:00:40 -0700 (Mon, 01 Jul 2013)

Log Message

[Efl][Gtk] Look at WEBKIT_OUTPUTDIR instead of WEBKITOUTPUTDIR in jhbuildrc
https://bugs.webkit.org/show_bug.cgi?id=118267

Patch by Nick Diego Yamane <[email protected]> on 2013-07-01
Reviewed by Gyuyoung Kim.

After r152226 (from https://bugs.webkit.org/show_bug.cgi?id=117249)
WEBKIT_OUTPUTDIR should be used instead of WEBKITOUPUTDIR. However
Efl's jhbuildrc is still using the WEBKITOUTPUTDIR environment variable.

* efl/jhbuildrc:
* gtk/jhbuildrc:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (152276 => 152277)


--- trunk/Tools/ChangeLog	2013-07-02 01:01:42 UTC (rev 152276)
+++ trunk/Tools/ChangeLog	2013-07-02 02:00:40 UTC (rev 152277)
@@ -1,3 +1,17 @@
+2013-07-01  Nick Diego Yamane  <[email protected]>
+
+        [Efl][Gtk] Look at WEBKIT_OUTPUTDIR instead of WEBKITOUTPUTDIR in jhbuildrc
+        https://bugs.webkit.org/show_bug.cgi?id=118267
+
+        Reviewed by Gyuyoung Kim.
+
+        After r152226 (from https://bugs.webkit.org/show_bug.cgi?id=117249)
+        WEBKIT_OUTPUTDIR should be used instead of WEBKITOUPUTDIR. However
+        Efl's jhbuildrc is still using the WEBKITOUTPUTDIR environment variable.
+
+        * efl/jhbuildrc:
+        * gtk/jhbuildrc:
+
 2013-07-01  Gustavo Noronha Silva  <[email protected]>
 
         [GTK] Remove unsupported AC backends

Modified: trunk/Tools/efl/jhbuildrc (152276 => 152277)


--- trunk/Tools/efl/jhbuildrc	2013-07-02 01:01:42 UTC (rev 152276)
+++ trunk/Tools/efl/jhbuildrc	2013-07-02 02:00:40 UTC (rev 152277)
@@ -38,9 +38,9 @@
 if __extra_modules != ['']:
     modules.extend(__extra_modules)
 
-if os.environ.has_key('WEBKITOUTPUTDIR'):
-    checkoutroot = os.path.abspath(os.path.join(os.environ['WEBKITOUTPUTDIR'], 'Dependencies', 'Source'))
-    prefix = os.path.abspath(os.path.join(os.environ['WEBKITOUTPUTDIR'], 'Dependencies', 'Root'))
+if os.environ.has_key('WEBKIT_OUTPUTDIR'):
+    checkoutroot = os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], 'Dependencies', 'Source'))
+    prefix = os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], 'Dependencies', 'Root'))
 else:
     checkoutroot = os.path.abspath(common.top_level_path('WebKitBuild','Dependencies', 'Source'))
     prefix = os.path.abspath(common.top_level_path('WebKitBuild','Dependencies', 'Root'))

Modified: trunk/Tools/gtk/jhbuildrc (152276 => 152277)


--- trunk/Tools/gtk/jhbuildrc	2013-07-02 01:01:42 UTC (rev 152276)
+++ trunk/Tools/gtk/jhbuildrc	2013-07-02 02:00:40 UTC (rev 152277)
@@ -35,9 +35,9 @@
 if __extra_modules != ['']:
     modules.extend(__extra_modules)
 
-if os.environ.has_key('WEBKITOUTPUTDIR'):
-    checkoutroot = os.path.abspath(os.path.join(os.environ['WEBKITOUTPUTDIR'], 'Dependencies', 'Source'))
-    prefix = os.path.abspath(os.path.join(os.environ['WEBKITOUTPUTDIR'], 'Dependencies', 'Root'))
+if os.environ.has_key('WEBKIT_OUTPUTDIR'):
+    checkoutroot = os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], 'Dependencies', 'Source'))
+    prefix = os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], 'Dependencies', 'Root'))
 else:
     checkoutroot = os.path.abspath(common.top_level_path('WebKitBuild','Dependencies', 'Source'))
     prefix = os.path.abspath(common.top_level_path('WebKitBuild','Dependencies', 'Root'))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to