Changeset 152226 in webkit

Timestamp:

Jul 1, 2013 9:25:21 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][GTK] Migrate from WEBKITOUTPUTDIR to WEBKIT_OUTPUTDIR
​https://bugs.webkit.org/show_bug.cgi?id=117249

Patch by Raphael Kubo da Costa <​raphael.kubo.da.costa@intel.com> on 2013-07-01
Reviewed by Brent Fulgham.

Finish converting all use cases of WEBKITOUTPUTDIR to
WEBKIT_OUTPUTDIR, which seems to be preferred these days.

• DumpRenderTree/efl/FontManagement.cpp:

(getCustomBuildDir):
(getPlatformFontsPath):

• DumpRenderTree/gtk/DumpRenderTree.cpp:

(getOutputDir):

• Scripts/webkitdirs.pm:

(determineBaseProductDir):
(usesPerConfigurationBuildDirectory):

• Scripts/webkitpy/port/base.py:

(Port.to.setup_environ_for_server):

• Scripts/webkitpy/port/driver.py:

(Driver._setup_environ_for_driver):

• Scripts/webkitpy/port/gtk.py:

(GtkPort.setup_environ_for_server):

• WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp:

(WTR::getOutputDir):

• jhbuild/jhbuildutils.py:

(get_dependencies_path):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/efl/FontManagement.cpp (modified) (3 diffs)
• DumpRenderTree/gtk/DumpRenderTree.cpp (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (2 diffs)
• Scripts/webkitpy/port/base.py (modified) (1 diff)
• Scripts/webkitpy/port/driver.py (modified) (1 diff)
• Scripts/webkitpy/port/gtk.py (modified) (1 diff)
• WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp (modified) (1 diff)
• jhbuild/jhbuildutils.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-07-01  Raphael Kubo da Costa  <raphael.kubo.da.costa@intel.com>
+
+        [EFL][GTK] Migrate from WEBKITOUTPUTDIR to WEBKIT_OUTPUTDIR
+        https://bugs.webkit.org/show_bug.cgi?id=117249
+
+        Reviewed by Brent Fulgham.
+
+        Finish converting all use cases of WEBKITOUTPUTDIR to
+        WEBKIT_OUTPUTDIR, which seems to be preferred these days.
+
+        * DumpRenderTree/efl/FontManagement.cpp:
+        (getCustomBuildDir):
+        (getPlatformFontsPath):
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (getOutputDir):
+        * Scripts/webkitdirs.pm:
+        (determineBaseProductDir):
+        (usesPerConfigurationBuildDirectory):
+        * Scripts/webkitpy/port/base.py:
+        (Port.to.setup_environ_for_server):
+        * Scripts/webkitpy/port/driver.py:
+        (Driver._setup_environ_for_driver):
+        * Scripts/webkitpy/port/gtk.py:
+        (GtkPort.setup_environ_for_server):
+        * WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp:
+        (WTR::getOutputDir):
+        * jhbuild/jhbuildutils.py:
+        (get_dependencies_path):
+
 2013-07-01  Rafael Brandao  <rafael.lobo@webkit.org>
 

trunk/Tools/DumpRenderTree/efl/FontManagement.cpp

@@ -90 +90 @@
 static CString getCustomBuildDir()
 {
-    if (const char* userChosenBuildDir = getenv("WEBKITOUTPUTDIR")) {
+    if (const char* userChosenBuildDir = getenv("WEBKIT_OUTPUTDIR")) {
         if (ecore_file_is_dir(userChosenBuildDir))
             return userChosenBuildDir;
-        fprintf(stderr, "WEBKITOUTPUTDIR set to '%s', but path doesn't exist.\n", userChosenBuildDir);
+        fprintf(stderr, "WEBKIT_OUTPUTDIR set to '%s', but path doesn't exist.\n", userChosenBuildDir);
     }
 
@@ -105 +105 @@
         CString fontsPath = buildPath(customBuildDir.data(), "Dependencies", "Root", "webkitgtk-test-fonts", 0);
         if (!ecore_file_exists(fontsPath.data()))
-            fprintf(stderr, "WEBKITOUTPUTDIR set to '%s', but could not local test fonts.\n", customBuildDir.data());
+            fprintf(stderr, "WEBKIT_OUTPUTDIR set to '%s', but could not local test fonts.\n", customBuildDir.data());
         return fontsPath;
     }
@@ -113 +113 @@
         return fontsPath;
 
-    fprintf(stderr, "Could not locate tests fonts, try setting WEBKITOUTPUTDIR.\n");
+    fprintf(stderr, "Could not locate tests fonts, try setting WEBKIT_OUTPUTDIR.\n");
     return CString();
 }

trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp

@@ -197 +197 @@
 CString getOutputDir()
 {
-    const char* webkitOutputDir = g_getenv("WEBKITOUTPUTDIR");
+    const char* webkitOutputDir = g_getenv("WEBKIT_OUTPUTDIR");
     if (webkitOutputDir)
         return webkitOutputDir;

trunk/Tools/Scripts/webkitdirs.pm

@@ -184 +184 @@
 
     my $setSharedPrecompsDir;
-
-    # FIXME: See https://bugs.webkit.org/show_bug.cgi?id=117249.
-    #        Once all ports have migrated to WEBKIT_OUTPUTDIR, we can stop
-    #        reading the WEBKITOUTPUTDIR environment variable.
     $baseProductDir = $ENV{"WEBKIT_OUTPUTDIR"};
-    $baseProductDir = $ENV{"WEBKITOUTPUTDIR"} if not $baseProductDir;
 
     if (!defined($baseProductDir) and isAppleMacWebKit()) {
@@ -466 +461 @@
     # [Gtk] We don't have Release/Debug configurations in straight
     # autotool builds (non build-webkit). In this case and if
-    # WEBKITOUTPUTDIR exist, use that as our configuration dir. This will
+    # WEBKIT_OUTPUTDIR exist, use that as our configuration dir. This will
     # allows us to run run-webkit-tests without using build-webkit.
-    return ($ENV{"WEBKITOUTPUTDIR"} && isGtk()) || isAppleWinWebKit();
+    return ($ENV{"WEBKIT_OUTPUTDIR"} && isGtk()) || isAppleWinWebKit();
 }
 

trunk/Tools/Scripts/webkitpy/port/base.py

@@ -897 +897 @@
             # Most ports (?):
             'WEBKIT_TESTFONTS',
-            'WEBKITOUTPUTDIR',
+            'WEBKIT_OUTPUTDIR',
 
             # Chromium:

trunk/Tools/Scripts/webkitpy/port/driver.py

@@ -290 +290 @@
         environment['DUMPRENDERTREE_TEMP'] = str(self._driver_tempdir)
         environment['LOCAL_RESOURCE_ROOT'] = self._port.layout_tests_dir()
-        if 'WEBKITOUTPUTDIR' in os.environ:
-            environment['WEBKITOUTPUTDIR'] = os.environ['WEBKITOUTPUTDIR']
+        if 'WEBKIT_OUTPUTDIR' in os.environ:
+            environment['WEBKIT_OUTPUTDIR'] = os.environ['WEBKIT_OUTPUTDIR']
         if self._profiler:
             environment = self._profiler.adjusted_environment(environment)

trunk/Tools/Scripts/webkitpy/port/gtk.py

@@ -74 +74 @@
         environment['WEBKIT_INSPECTOR_PATH'] = self._build_path('Programs', 'resources', 'inspector')
         environment['AUDIO_RESOURCES_PATH'] = self.path_from_webkit_base('Source', 'WebCore', 'platform', 'audio', 'resources')
-        self._copy_value_from_environ_if_set(environment, 'WEBKITOUTPUTDIR')
+        self._copy_value_from_environ_if_set(environment, 'WEBKIT_OUTPUTDIR')
         return environment
 

trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp

@@ -57 +57 @@
 CString getOutputDir()
 {
-    const char* webkitOutputDir = g_getenv("WEBKITOUTPUTDIR");
+    const char* webkitOutputDir = g_getenv("WEBKIT_OUTPUTDIR");
     if (webkitOutputDir)
         return webkitOutputDir;

trunk/Tools/jhbuild/jhbuildutils.py

@@ -15 +15 @@
 
 def get_dependencies_path():
-    if 'WEBKITOUTPUTDIR' in os.environ:
-        return os.path.abspath(os.path.join(os.environ['WEBKITOUTPUTDIR'], 'Dependencies'))
+    if 'WEBKIT_OUTPUTDIR' in os.environ:
+        return os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], 'Dependencies'))
     else:
         return os.path.abspath(top_level_path('WebKitBuild', 'Dependencies'))