Changeset 152277 in webkit

Timestamp:

Jul 1, 2013 7:00:40 PM (11 years ago)

Author:

commit-queue@webkit.org

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 <​nick.yamane@openbossa.org> 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:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• efl/jhbuildrc (modified) (1 diff)
• gtk/jhbuildrc (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-07-01  Nick Diego Yamane  <nick.yamane@openbossa.org>
+
+        [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  <gustavo.noronha@collabora.com>
 

trunk/Tools/efl/jhbuildrc

@@ -39 +39 @@
     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'))

trunk/Tools/gtk/jhbuildrc

@@ -36 +36 @@
     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'))