Changeset 162512 in webkit


Ignore:
Timestamp:
Jan 22, 2014 3:03:44 AM (10 years ago)
Author:
jinwoo7.song@samsung.com
Message:

Remove Nix files from Tools
https://bugs.webkit.org/show_bug.cgi?id=127418

Reviewed by Csaba Osztrogonác.

  • Scripts/build-webkit:
  • Scripts/update-webkit-libs-jhbuild:
  • Scripts/webkitdirs.pm:

(determineArchitecture):
(argumentsForConfiguration):
(jscProductDir):
(builtDylibPathForName):
(isAppleWebKit):
(launcherPath):
(launcherName):
(checkRequiredSystemConfig):
(copyInspectorFrontendFiles):
(jhbuildWrapperPrefixIfNeeded):
(buildCMakeProjectOrExit):
(cmakeBasedPortName):

  • Scripts/webkitpy/common/config/ports.py:

(DeprecatedPort.port):
(EflWK2Port.build_webkit_command):

  • Scripts/webkitpy/port/factory.py:

(platform_options):
(PortFactory):

  • Scripts/webkitpy/port/nix.py: Removed.
  • Scripts/webkitpy/port/nix_unittest.py: Removed.
Location:
trunk/Tools
Files:
2 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r162502 r162512  
     12014-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
    1322014-01-21  Benjamin Poulain  <benjamin@webkit.org>
    233
  • trunk/Tools/Scripts/build-webkit

    r162471 r162512  
    6565my $coverageSupport = 0;
    6666my $startTime = time();
    67 my $curl = 0;
    68 my $opengles2 = 0;
    6967
    7068my @features = getFeatureOptionList();
    71 
    72 # Update defaults for the Nix port
    73 if (isNix()) {
    74     # Instead of use FeatureList.pm to list enabled features, tell the compiler to
    75     # parse Source/WTF/wtf/Platform.h and get the default values of all feature flags
    76     # 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 }
    10369
    10470# Additional environment parameters
     
    13096
    13197  --efl                             Build the EFL port
    132   --nix                             Build the Nix port
    13398  --gtk                             Build the GTK+ port
    13499  --wincairo                        Build using Cairo (rather than CoreGraphics) on Windows
     
    146111  --no-webkit1                      Omit WebKit1 code from the build (EFL/GTK only)
    147112  --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)
    151113
    152114EOF
     
    165127    'no-webkit2' => \$noWebKit2,
    166128    'coverage' => \$coverageSupport,
    167     'curl' => \$curl,
    168     'opengles2' => \$opengles2,
    169129);
    170130
     
    291251    exit exitStatus($result) if exitStatus($result);
    292252    @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 when
    307     # we enable new features. This forces a reconfiguration.
    308     removeCMakeCache();
    309 
    310     buildCMakeProjectOrExit($clean, "Nix", $prefixPath, $makeArgs, (cmakeBasedPortArguments(), cMakeArgsFromFeatures()), $cmakeArgs);
    311253}
    312254
  • trunk/Tools/Scripts/update-webkit-libs-jhbuild

    r159806 r162512  
    2525my $platformEfl = 0;
    2626my $platformGtk = 0;
    27 my $platformNix = 0;
    2827
    2928my $getOptionsResult = GetOptions(
    3029    'efl' => \$platformEfl,
    3130    'gtk' => \$platformGtk,
    32     'nix' => \$platformNix
    3331    );
    3432
    3533my $platform = "";
    3634if (!$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";
    3836} else {
    3937    if ($platformEfl) {
     
    4240    if ($platformGtk) {
    4341        $platform = "gtk";
    44     }
    45     if ($platformNix) {
    46         $platform = "nix";
    4742    }
    4843}
     
    127122chdir(relativeScriptsDir() . "/../jhbuild") or die $!;
    128123
    129 my %prettyPlatform = ( "efl" => "EFL", "gtk" => "GTK+", "nix" => "Nix" );
     124my %prettyPlatform = ( "efl" => "EFL", "gtk" => "GTK+" );
    130125
    131126if (-e getJhbuildPath() && jhbuildConfigurationChanged()) {
  • trunk/Tools/Scripts/webkitdirs.pm

    r162481 r162512  
    9797my $isWin64;
    9898my $isEfl;
    99 my $isNix;
    10099my $isInspectorFrontend;
    101100my $isWK2;
     
    312311            }
    313312        }
    314     } elsif (isEfl() || isNix() || isGtkCMake()) {
     313    } elsif (isEfl() || isGtkCMake()) {
    315314        my $host_processor = "";
    316315        $host_processor = `cmake --system-information | grep CMAKE_SYSTEM_PROCESSOR`;
     
    322321    }
    323322
    324     if (!$architecture && (isGtk() || isAppleMacWebKit() || isEfl() || isNix())) {
     323    if (!$architecture && (isGtk() || isAppleMacWebKit() || isEfl())) {
    325324        # Fall back to output of `arch', if it is present.
    326325        $architecture = `arch`;
     
    328327    }
    329328
    330     if (!$architecture && (isGtk() || isAppleMacWebKit() || isEfl() || isNix())) {
     329    if (!$architecture && (isGtk() || isAppleMacWebKit() || isEfl())) {
    331330        # Fall back to output of `uname -m', if it is present.
    332331        $architecture = `uname -m`;
     
    378377    push(@args, '--gtkcmake') if isGtkCMake();
    379378    push(@args, '--efl') if isEfl();
    380     push(@args, '--nix') if isNix();
    381379    push(@args, '--wincairo') if isWinCairo();
    382380    push(@args, '--wince') if isWinCE();
     
    542540{
    543541    my $productDir = productDir();
    544     $productDir .= "/bin" if (isEfl() || isNix() || isGtkCMake());
     542    $productDir .= "/bin" if (isEfl() || isGtkCMake());
    545543    $productDir .= "/Programs" if isGtkAutotools();
    546544
     
    805803        return "$configurationProductDir/lib/libewebkit.so";
    806804    }
    807     if (isNix()) {
    808         return "$configurationProductDir/lib/libWebKitNix.so";
    809     }
    810805    if (isWinCE()) {
    811806        return "$configurationProductDir/$libraryName";
     
    942937}
    943938
    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 
    956939sub isGtkAutotools()
    957940{
     
    11091092sub isAppleWebKit()
    11101093{
    1111     return !(isGtk() or isEfl() or isWinCE() or isNix());
     1094    return !(isGtk() or isEfl() or isWinCE());
    11121095}
    11131096
     
    13001283{
    13011284    my $relativeScriptsPath = relativeScriptsDir();
    1302     if (isGtk() || isEfl() || isWinCE() || isNix()) {
     1285    if (isGtk() || isEfl() || isWinCE()) {
    13031286        return "$relativeScriptsPath/run-launcher";
    13041287    } elsif (isAppleWebKit()) {
     
    13171300    } elsif (isWinCE()) {
    13181301        return "WinCELauncher";
    1319     } elsif (isNix()) {
    1320         return "MiniBrowser";
    13211302    }
    13221303}
     
    13411322            print "*************************************************************\n";
    13421323        }
    1343     } elsif (isGtk() or isEfl() or isWindows() or isNix()) {
     1324    } elsif (isGtk() or isEfl() or isWindows()) {
    13441325        my @cmds = qw(bison gperf flex);
    13451326        my @missing = ();
     
    15681549    } elsif (isAppleWinWebKit() || isWinCairo()) {
    15691550        $inspectorResourcesDirPath = $productDir . "/WebKit.resources/inspector";
    1570     } elsif (isGtk() || isNix()) {
     1551    } elsif (isGtk()) {
    15711552        my $prefix = $ENV{"WebKitInstallationPrefix"};
    15721553        $inspectorResourcesDirPath = (defined($prefix) ? $prefix : "/usr/share") . "/webkit-1.0/webinspector";
     
    18841865        } elsif (isGtk()) {
    18851866            push(@prefix, "--gtk");
    1886         } elsif (isNix()) {
    1887             push(@prefix, "--nix");
    18881867        }
    18891868        push(@prefix, "run");
     
    19801959    }
    19811960
    1982     if (isNix() && checkForArgumentAndRemoveFromARGV("--update-nix")) {
    1983         system("perl", "$sourceDir/Tools/Scripts/update-webkitnix-libs") == 0 or die $!;
    1984     }
    1985 
    19861961    $returnCode = exitStatus(generateBuildSystemFromCMakeProject($port, $prefixPath, @cmakeArgs));
    19871962    exit($returnCode) if $returnCode;
     
    20021977    return "Efl" if isEfl();
    20031978    return "WinCE" if isWinCE();
    2004     return "Nix" if isNix();
    20051979    return "GTK" if isGtkCMake();
    20061980    return "";
  • trunk/Tools/Scripts/webkitpy/common/config/ports.py

    r159806 r162512  
    7272            "efl": EflPort,
    7373            "efl-wk2": EflWK2Port,
    74             "nix": NixPort,
    7574        }
    7675        default_port = {
     
    233232        command.append(super(EflWK2Port, self).makeArgs())
    234233        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  
    4848            const=('efl*' if use_globs else 'efl'),
    4949            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')),
    5250        optparse.make_option('--gtk', action='store_const', dest='platform',
    5351            const=('gtk*' if use_globs else 'gtk'),
     
    7977    PORT_CLASSES = (
    8078        'efl.EflPort',
    81         'nix.NixPort',
    8279        'gtk.GtkPort',
    8380        'mac.MacPort',
Note: See TracChangeset for help on using the changeset viewer.