Changeset 152226 in webkit
- Timestamp:
- Jul 1, 2013 9:25:21 AM (11 years ago)
- Location:
- trunk/Tools
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r152224 r152226 1 2013-07-01 Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> 2 3 [EFL][GTK] Migrate from WEBKITOUTPUTDIR to WEBKIT_OUTPUTDIR 4 https://bugs.webkit.org/show_bug.cgi?id=117249 5 6 Reviewed by Brent Fulgham. 7 8 Finish converting all use cases of WEBKITOUTPUTDIR to 9 WEBKIT_OUTPUTDIR, which seems to be preferred these days. 10 11 * DumpRenderTree/efl/FontManagement.cpp: 12 (getCustomBuildDir): 13 (getPlatformFontsPath): 14 * DumpRenderTree/gtk/DumpRenderTree.cpp: 15 (getOutputDir): 16 * Scripts/webkitdirs.pm: 17 (determineBaseProductDir): 18 (usesPerConfigurationBuildDirectory): 19 * Scripts/webkitpy/port/base.py: 20 (Port.to.setup_environ_for_server): 21 * Scripts/webkitpy/port/driver.py: 22 (Driver._setup_environ_for_driver): 23 * Scripts/webkitpy/port/gtk.py: 24 (GtkPort.setup_environ_for_server): 25 * WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp: 26 (WTR::getOutputDir): 27 * jhbuild/jhbuildutils.py: 28 (get_dependencies_path): 29 1 30 2013-07-01 Rafael Brandao <rafael.lobo@webkit.org> 2 31 -
trunk/Tools/DumpRenderTree/efl/FontManagement.cpp
r128292 r152226 90 90 static CString getCustomBuildDir() 91 91 { 92 if (const char* userChosenBuildDir = getenv("WEBKIT OUTPUTDIR")) {92 if (const char* userChosenBuildDir = getenv("WEBKIT_OUTPUTDIR")) { 93 93 if (ecore_file_is_dir(userChosenBuildDir)) 94 94 return userChosenBuildDir; 95 fprintf(stderr, "WEBKIT OUTPUTDIR set to '%s', but path doesn't exist.\n", userChosenBuildDir);95 fprintf(stderr, "WEBKIT_OUTPUTDIR set to '%s', but path doesn't exist.\n", userChosenBuildDir); 96 96 } 97 97 … … 105 105 CString fontsPath = buildPath(customBuildDir.data(), "Dependencies", "Root", "webkitgtk-test-fonts", 0); 106 106 if (!ecore_file_exists(fontsPath.data())) 107 fprintf(stderr, "WEBKIT OUTPUTDIR set to '%s', but could not local test fonts.\n", customBuildDir.data());107 fprintf(stderr, "WEBKIT_OUTPUTDIR set to '%s', but could not local test fonts.\n", customBuildDir.data()); 108 108 return fontsPath; 109 109 } … … 113 113 return fontsPath; 114 114 115 fprintf(stderr, "Could not locate tests fonts, try setting WEBKIT OUTPUTDIR.\n");115 fprintf(stderr, "Could not locate tests fonts, try setting WEBKIT_OUTPUTDIR.\n"); 116 116 return CString(); 117 117 } -
trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
r150275 r152226 197 197 CString getOutputDir() 198 198 { 199 const char* webkitOutputDir = g_getenv("WEBKIT OUTPUTDIR");199 const char* webkitOutputDir = g_getenv("WEBKIT_OUTPUTDIR"); 200 200 if (webkitOutputDir) 201 201 return webkitOutputDir; -
trunk/Tools/Scripts/webkitdirs.pm
r152191 r152226 184 184 185 185 my $setSharedPrecompsDir; 186 187 # FIXME: See https://bugs.webkit.org/show_bug.cgi?id=117249.188 # Once all ports have migrated to WEBKIT_OUTPUTDIR, we can stop189 # reading the WEBKITOUTPUTDIR environment variable.190 186 $baseProductDir = $ENV{"WEBKIT_OUTPUTDIR"}; 191 $baseProductDir = $ENV{"WEBKITOUTPUTDIR"} if not $baseProductDir;192 187 193 188 if (!defined($baseProductDir) and isAppleMacWebKit()) { … … 466 461 # [Gtk] We don't have Release/Debug configurations in straight 467 462 # autotool builds (non build-webkit). In this case and if 468 # WEBKIT OUTPUTDIR exist, use that as our configuration dir. This will463 # WEBKIT_OUTPUTDIR exist, use that as our configuration dir. This will 469 464 # allows us to run run-webkit-tests without using build-webkit. 470 return ($ENV{"WEBKIT OUTPUTDIR"} && isGtk()) || isAppleWinWebKit();465 return ($ENV{"WEBKIT_OUTPUTDIR"} && isGtk()) || isAppleWinWebKit(); 471 466 } 472 467 -
trunk/Tools/Scripts/webkitpy/port/base.py
r152133 r152226 897 897 # Most ports (?): 898 898 'WEBKIT_TESTFONTS', 899 'WEBKIT OUTPUTDIR',899 'WEBKIT_OUTPUTDIR', 900 900 901 901 # Chromium: -
trunk/Tools/Scripts/webkitpy/port/driver.py
r150677 r152226 290 290 environment['DUMPRENDERTREE_TEMP'] = str(self._driver_tempdir) 291 291 environment['LOCAL_RESOURCE_ROOT'] = self._port.layout_tests_dir() 292 if 'WEBKIT OUTPUTDIR' in os.environ:293 environment['WEBKIT OUTPUTDIR'] = os.environ['WEBKITOUTPUTDIR']292 if 'WEBKIT_OUTPUTDIR' in os.environ: 293 environment['WEBKIT_OUTPUTDIR'] = os.environ['WEBKIT_OUTPUTDIR'] 294 294 if self._profiler: 295 295 environment = self._profiler.adjusted_environment(environment) -
trunk/Tools/Scripts/webkitpy/port/gtk.py
r148502 r152226 74 74 environment['WEBKIT_INSPECTOR_PATH'] = self._build_path('Programs', 'resources', 'inspector') 75 75 environment['AUDIO_RESOURCES_PATH'] = self.path_from_webkit_base('Source', 'WebCore', 'platform', 'audio', 'resources') 76 self._copy_value_from_environ_if_set(environment, 'WEBKIT OUTPUTDIR')76 self._copy_value_from_environ_if_set(environment, 'WEBKIT_OUTPUTDIR') 77 77 return environment 78 78 -
trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp
r143463 r152226 57 57 CString getOutputDir() 58 58 { 59 const char* webkitOutputDir = g_getenv("WEBKIT OUTPUTDIR");59 const char* webkitOutputDir = g_getenv("WEBKIT_OUTPUTDIR"); 60 60 if (webkitOutputDir) 61 61 return webkitOutputDir; -
trunk/Tools/jhbuild/jhbuildutils.py
r124307 r152226 15 15 16 16 def get_dependencies_path(): 17 if 'WEBKIT OUTPUTDIR' in os.environ:18 return os.path.abspath(os.path.join(os.environ['WEBKIT OUTPUTDIR'], 'Dependencies'))17 if 'WEBKIT_OUTPUTDIR' in os.environ: 18 return os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], 'Dependencies')) 19 19 else: 20 20 return os.path.abspath(top_level_path('WebKitBuild', 'Dependencies'))
Note: See TracChangeset
for help on using the changeset viewer.