Changeset 162512 in webkit
- Timestamp:
- Jan 22, 2014 3:03:44 AM (10 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 deleted
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r162502 r162512 1 2014-01-22 Jinwoo Song <jinwoo7.song@samsung.com> 2 3 Remove Nix files from Tools 4 https://bugs.webkit.org/show_bug.cgi?id=127418 5 6 Reviewed by Csaba Osztrogonác. 7 8 * Scripts/build-webkit: 9 * Scripts/update-webkit-libs-jhbuild: 10 * Scripts/webkitdirs.pm: 11 (determineArchitecture): 12 (argumentsForConfiguration): 13 (jscProductDir): 14 (builtDylibPathForName): 15 (isAppleWebKit): 16 (launcherPath): 17 (launcherName): 18 (checkRequiredSystemConfig): 19 (copyInspectorFrontendFiles): 20 (jhbuildWrapperPrefixIfNeeded): 21 (buildCMakeProjectOrExit): 22 (cmakeBasedPortName): 23 * Scripts/webkitpy/common/config/ports.py: 24 (DeprecatedPort.port): 25 (EflWK2Port.build_webkit_command): 26 * Scripts/webkitpy/port/factory.py: 27 (platform_options): 28 (PortFactory): 29 * Scripts/webkitpy/port/nix.py: Removed. 30 * Scripts/webkitpy/port/nix_unittest.py: Removed. 31 1 32 2014-01-21 Benjamin Poulain <benjamin@webkit.org> 2 33 -
trunk/Tools/Scripts/build-webkit
r162471 r162512 65 65 my $coverageSupport = 0; 66 66 my $startTime = time(); 67 my $curl = 0;68 my $opengles2 = 0;69 67 70 68 my @features = getFeatureOptionList(); 71 72 # Update defaults for the Nix port73 if (isNix()) {74 # Instead of use FeatureList.pm to list enabled features, tell the compiler to75 # parse Source/WTF/wtf/Platform.h and get the default values of all feature flags76 # from the result.77 my $portDefine = "BUILDING_".uc(cmakeBasedPortName())."__";78 my $definitions = `gcc -E -P -dM -D$portDefine -I Source/WTF Source/WTF/wtf/Platform.h | grep '^#define ENABLE_\\w\\+ \[01\]\$\\|^#define WTF_USE_\\w\\+ \[01\]\$' | cut -d' ' -f2-3`;79 80 my %featureDefaults;81 foreach (split(/\n/, $definitions)) {82 my @macroDefinition = split(/ /);83 $featureDefaults{$macroDefinition[0]} = $macroDefinition[1];84 }85 86 @features = ();87 foreach (sort keys %featureDefaults) {88 next if (!/^ENABLE/);89 my $optionName = lc $_;90 $optionName =~ s/^enable_//;91 $optionName =~ s/_/-/g;92 my $descName = $optionName;93 $descName =~ s/-/ /g;94 95 push @features, {96 option => $optionName,97 desc => "Toggle $descName support",98 define => $_,99 default => $featureDefaults{$_}100 };101 }102 }103 69 104 70 # Additional environment parameters … … 130 96 131 97 --efl Build the EFL port 132 --nix Build the Nix port133 98 --gtk Build the GTK+ port 134 99 --wincairo Build using Cairo (rather than CoreGraphics) on Windows … … 146 111 --no-webkit1 Omit WebKit1 code from the build (EFL/GTK only) 147 112 --no-webkit2 Omit WebKit2 code from the build 148 149 --curl Use libCurl as network backend (Nix only)150 --opengles2 Use EGL and OpenGLES2 instead of GLX (Nix only)151 113 152 114 EOF … … 165 127 'no-webkit2' => \$noWebKit2, 166 128 'coverage' => \$coverageSupport, 167 'curl' => \$curl,168 'opengles2' => \$opengles2,169 129 ); 170 130 … … 291 251 exit exitStatus($result) if exitStatus($result); 292 252 @projects = ("Source/WebInspectorUI"); 293 }294 295 if (isNix()) {296 if ($noWebKit2) {297 print STDERR "Nix is a WebKit2 port, you can't disable WebKit2 on it!\n";298 exit 1;299 }300 301 # By default we build using all of the available CPUs.302 $makeArgs .= ($makeArgs ? " " : "") . "-j" . numberOfCPUs() if $makeArgs !~ /-j\s*\d+/;303 $cmakeArgs = "-DWTF_USE_CURL=ON " . $cmakeArgs if $curl;304 $cmakeArgs = "-DWTF_USE_OPENGL_ES_2=ON " . $cmakeArgs if $opengles2;305 306 # We remove CMakeCache to avoid the bots to reuse cached flags when307 # we enable new features. This forces a reconfiguration.308 removeCMakeCache();309 310 buildCMakeProjectOrExit($clean, "Nix", $prefixPath, $makeArgs, (cmakeBasedPortArguments(), cMakeArgsFromFeatures()), $cmakeArgs);311 253 } 312 254 -
trunk/Tools/Scripts/update-webkit-libs-jhbuild
r159806 r162512 25 25 my $platformEfl = 0; 26 26 my $platformGtk = 0; 27 my $platformNix = 0;28 27 29 28 my $getOptionsResult = GetOptions( 30 29 'efl' => \$platformEfl, 31 30 'gtk' => \$platformGtk, 32 'nix' => \$platformNix33 31 ); 34 32 35 33 my $platform = ""; 36 34 if (!$getOptionsResult) { 37 die "No platform specified for " . basename($0) .". Use --gtk , --efl or --nix.\n";35 die "No platform specified for " . basename($0) .". Use --gtk or --efl.\n"; 38 36 } else { 39 37 if ($platformEfl) { … … 42 40 if ($platformGtk) { 43 41 $platform = "gtk"; 44 }45 if ($platformNix) {46 $platform = "nix";47 42 } 48 43 } … … 127 122 chdir(relativeScriptsDir() . "/../jhbuild") or die $!; 128 123 129 my %prettyPlatform = ( "efl" => "EFL", "gtk" => "GTK+" , "nix" => "Nix");124 my %prettyPlatform = ( "efl" => "EFL", "gtk" => "GTK+" ); 130 125 131 126 if (-e getJhbuildPath() && jhbuildConfigurationChanged()) { -
trunk/Tools/Scripts/webkitdirs.pm
r162481 r162512 97 97 my $isWin64; 98 98 my $isEfl; 99 my $isNix;100 99 my $isInspectorFrontend; 101 100 my $isWK2; … … 312 311 } 313 312 } 314 } elsif (isEfl() || is Nix() || isGtkCMake()) {313 } elsif (isEfl() || isGtkCMake()) { 315 314 my $host_processor = ""; 316 315 $host_processor = `cmake --system-information | grep CMAKE_SYSTEM_PROCESSOR`; … … 322 321 } 323 322 324 if (!$architecture && (isGtk() || isAppleMacWebKit() || isEfl() || isNix())) {323 if (!$architecture && (isGtk() || isAppleMacWebKit() || isEfl())) { 325 324 # Fall back to output of `arch', if it is present. 326 325 $architecture = `arch`; … … 328 327 } 329 328 330 if (!$architecture && (isGtk() || isAppleMacWebKit() || isEfl() || isNix())) {329 if (!$architecture && (isGtk() || isAppleMacWebKit() || isEfl())) { 331 330 # Fall back to output of `uname -m', if it is present. 332 331 $architecture = `uname -m`; … … 378 377 push(@args, '--gtkcmake') if isGtkCMake(); 379 378 push(@args, '--efl') if isEfl(); 380 push(@args, '--nix') if isNix();381 379 push(@args, '--wincairo') if isWinCairo(); 382 380 push(@args, '--wince') if isWinCE(); … … 542 540 { 543 541 my $productDir = productDir(); 544 $productDir .= "/bin" if (isEfl() || is Nix() || isGtkCMake());542 $productDir .= "/bin" if (isEfl() || isGtkCMake()); 545 543 $productDir .= "/Programs" if isGtkAutotools(); 546 544 … … 805 803 return "$configurationProductDir/lib/libewebkit.so"; 806 804 } 807 if (isNix()) {808 return "$configurationProductDir/lib/libWebKitNix.so";809 }810 805 if (isWinCE()) { 811 806 return "$configurationProductDir/$libraryName"; … … 942 937 } 943 938 944 sub determineIsNix()945 {946 return if defined($isNix);947 $isNix = checkForArgumentAndRemoveFromARGV("--nix");948 }949 950 sub isNix()951 {952 determineIsNix();953 return $isNix;954 }955 956 939 sub isGtkAutotools() 957 940 { … … 1109 1092 sub isAppleWebKit() 1110 1093 { 1111 return !(isGtk() or isEfl() or isWinCE() or isNix());1094 return !(isGtk() or isEfl() or isWinCE()); 1112 1095 } 1113 1096 … … 1300 1283 { 1301 1284 my $relativeScriptsPath = relativeScriptsDir(); 1302 if (isGtk() || isEfl() || isWinCE() || isNix()) {1285 if (isGtk() || isEfl() || isWinCE()) { 1303 1286 return "$relativeScriptsPath/run-launcher"; 1304 1287 } elsif (isAppleWebKit()) { … … 1317 1300 } elsif (isWinCE()) { 1318 1301 return "WinCELauncher"; 1319 } elsif (isNix()) {1320 return "MiniBrowser";1321 1302 } 1322 1303 } … … 1341 1322 print "*************************************************************\n"; 1342 1323 } 1343 } elsif (isGtk() or isEfl() or isWindows() or isNix()) {1324 } elsif (isGtk() or isEfl() or isWindows()) { 1344 1325 my @cmds = qw(bison gperf flex); 1345 1326 my @missing = (); … … 1568 1549 } elsif (isAppleWinWebKit() || isWinCairo()) { 1569 1550 $inspectorResourcesDirPath = $productDir . "/WebKit.resources/inspector"; 1570 } elsif (isGtk() || isNix()) {1551 } elsif (isGtk()) { 1571 1552 my $prefix = $ENV{"WebKitInstallationPrefix"}; 1572 1553 $inspectorResourcesDirPath = (defined($prefix) ? $prefix : "/usr/share") . "/webkit-1.0/webinspector"; … … 1884 1865 } elsif (isGtk()) { 1885 1866 push(@prefix, "--gtk"); 1886 } elsif (isNix()) {1887 push(@prefix, "--nix");1888 1867 } 1889 1868 push(@prefix, "run"); … … 1980 1959 } 1981 1960 1982 if (isNix() && checkForArgumentAndRemoveFromARGV("--update-nix")) {1983 system("perl", "$sourceDir/Tools/Scripts/update-webkitnix-libs") == 0 or die $!;1984 }1985 1986 1961 $returnCode = exitStatus(generateBuildSystemFromCMakeProject($port, $prefixPath, @cmakeArgs)); 1987 1962 exit($returnCode) if $returnCode; … … 2002 1977 return "Efl" if isEfl(); 2003 1978 return "WinCE" if isWinCE(); 2004 return "Nix" if isNix();2005 1979 return "GTK" if isGtkCMake(); 2006 1980 return ""; -
trunk/Tools/Scripts/webkitpy/common/config/ports.py
r159806 r162512 72 72 "efl": EflPort, 73 73 "efl-wk2": EflWK2Port, 74 "nix": NixPort,75 74 } 76 75 default_port = { … … 233 232 command.append(super(EflWK2Port, self).makeArgs()) 234 233 return command 235 236 237 class NixPort(DeprecatedPort):238 port_flag_name = "nix"239 240 def build_webkit_command(self, build_style=None):241 command = super(NixPort, self).build_webkit_command(build_style=build_style)242 command.append("--nix")243 command.append("--update-nix")244 command.append(super(NixPort, self).makeArgs())245 return command -
trunk/Tools/Scripts/webkitpy/port/factory.py
r159806 r162512 48 48 const=('efl*' if use_globs else 'efl'), 49 49 help=('Alias for --platform=efl*' if use_globs else 'Alias for --platform=efl')), 50 optparse.make_option('--nix', action='store_const', dest='platform',51 const=('nix'), help=('Alias for --platform=nix')),52 50 optparse.make_option('--gtk', action='store_const', dest='platform', 53 51 const=('gtk*' if use_globs else 'gtk'), … … 79 77 PORT_CLASSES = ( 80 78 'efl.EflPort', 81 'nix.NixPort',82 79 'gtk.GtkPort', 83 80 'mac.MacPort',
Note: See TracChangeset
for help on using the changeset viewer.