Diff
Modified: trunk/Tools/ChangeLog (152225 => 152226)
--- trunk/Tools/ChangeLog 2013-07-01 15:39:00 UTC (rev 152225)
+++ trunk/Tools/ChangeLog 2013-07-01 16:25:21 UTC (rev 152226)
@@ -1,3 +1,32 @@
+2013-07-01 Raphael Kubo da Costa <[email protected]>
+
+ [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 <[email protected]>
Unreviewed change of my email address.
Modified: trunk/Tools/DumpRenderTree/efl/FontManagement.cpp (152225 => 152226)
--- trunk/Tools/DumpRenderTree/efl/FontManagement.cpp 2013-07-01 15:39:00 UTC (rev 152225)
+++ trunk/Tools/DumpRenderTree/efl/FontManagement.cpp 2013-07-01 16:25:21 UTC (rev 152226)
@@ -89,10 +89,10 @@
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);
}
return CString();
@@ -104,7 +104,7 @@
if (!customBuildDir.isNull()) {
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;
}
@@ -112,7 +112,7 @@
if (ecore_file_exists(fontsPath.data()))
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();
}
Modified: trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp (152225 => 152226)
--- trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2013-07-01 15:39:00 UTC (rev 152225)
+++ trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2013-07-01 16:25:21 UTC (rev 152226)
@@ -196,7 +196,7 @@
CString getOutputDir()
{
- const char* webkitOutputDir = g_getenv("WEBKITOUTPUTDIR");
+ const char* webkitOutputDir = g_getenv("WEBKIT_OUTPUTDIR");
if (webkitOutputDir)
return webkitOutputDir;
Modified: trunk/Tools/Scripts/webkitdirs.pm (152225 => 152226)
--- trunk/Tools/Scripts/webkitdirs.pm 2013-07-01 15:39:00 UTC (rev 152225)
+++ trunk/Tools/Scripts/webkitdirs.pm 2013-07-01 16:25:21 UTC (rev 152226)
@@ -183,12 +183,7 @@
determineSourceDir();
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()) {
# Silently remove ~/Library/Preferences/xcodebuild.plist which can
@@ -465,9 +460,9 @@
{
# [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();
}
sub determineConfigurationProductDir
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (152225 => 152226)
--- trunk/Tools/Scripts/webkitpy/port/base.py 2013-07-01 15:39:00 UTC (rev 152225)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2013-07-01 16:25:21 UTC (rev 152226)
@@ -896,7 +896,7 @@
# Most ports (?):
'WEBKIT_TESTFONTS',
- 'WEBKITOUTPUTDIR',
+ 'WEBKIT_OUTPUTDIR',
# Chromium:
'CHROME_DEVEL_SANDBOX',
Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (152225 => 152226)
--- trunk/Tools/Scripts/webkitpy/port/driver.py 2013-07-01 15:39:00 UTC (rev 152225)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py 2013-07-01 16:25:21 UTC (rev 152226)
@@ -289,8 +289,8 @@
#environment['DUMPRENDERTREE_TEMP'] = str(self._port._driver_tempdir_for_environment())
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)
return environment
Modified: trunk/Tools/Scripts/webkitpy/port/gtk.py (152225 => 152226)
--- trunk/Tools/Scripts/webkitpy/port/gtk.py 2013-07-01 15:39:00 UTC (rev 152225)
+++ trunk/Tools/Scripts/webkitpy/port/gtk.py 2013-07-01 16:25:21 UTC (rev 152226)
@@ -73,7 +73,7 @@
environment['TEST_RUNNER_TEST_PLUGIN_PATH'] = self._build_path('TestNetscapePlugin', '.libs')
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
def _generate_all_test_configurations(self):
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp (152225 => 152226)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp 2013-07-01 15:39:00 UTC (rev 152225)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp 2013-07-01 16:25:21 UTC (rev 152226)
@@ -56,7 +56,7 @@
CString getOutputDir()
{
- const char* webkitOutputDir = g_getenv("WEBKITOUTPUTDIR");
+ const char* webkitOutputDir = g_getenv("WEBKIT_OUTPUTDIR");
if (webkitOutputDir)
return webkitOutputDir;
Modified: trunk/Tools/jhbuild/jhbuildutils.py (152225 => 152226)
--- trunk/Tools/jhbuild/jhbuildutils.py 2013-07-01 15:39:00 UTC (rev 152225)
+++ trunk/Tools/jhbuild/jhbuildutils.py 2013-07-01 16:25:21 UTC (rev 152226)
@@ -14,8 +14,8 @@
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'))
