Changeset 166239 in webkit


Ignore:
Timestamp:
Mar 25, 2014 10:45:52 AM (10 years ago)
Author:
Martin Robinson
Message:

[GTK] Remove the autotools build
​https://bugs.webkit.org/show_bug.cgi?id=130717

Reviewed by Anders Carlsson.

.:

  • .gitignore: Remove references to autotools files.
  • GNUmakefile.am: Removed.
  • Source/autotools/CheckSystemAndBasicDependencies.m4: Removed.
  • Source/autotools/CustomMacros.m4: Removed.
  • Source/autotools/FindDependencies.m4: Removed.
  • Source/autotools/PrintBuildConfiguration.m4: Removed.
  • Source/autotools/ReadCommandLineArguments.m4: Removed.
  • Source/autotools/SetupAutoconfHeader.m4: Removed.
  • Source/autotools/SetupAutomake.m4: Removed.
  • Source/autotools/SetupCompilerFlags.m4: Removed.
  • Source/autotools/SetupLibtool.m4: Removed.
  • Source/autotools/SetupWebKitFeatures.m4: Removed.
  • Source/autotools/Versions.m4: Removed.
  • Source/autotools/acinclude.m4: Removed.
  • Source/autotools/dolt.m4: Removed.
  • Source/autotools/gsettings.m4: Removed.
  • Source/cmake/OptionsGTK.cmake:
  • autogen.sh: Removed.
  • configure.ac: Removed.

Source/JavaScriptCore:

  • GNUmakefile.am: Removed.
  • config.h: Remove references to the autotools configure file.

Source/Platform:

  • GNUmakefile.am: Removed.

Source/ThirdParty:

  • gtest/GNUmakefile.am: Removed.
  • leveldb/GNUmakefile.am: Removed.

Source/ThirdParty/ANGLE:

  • GNUmakefile.am: Removed.

Source/WebCore:

  • GNUmakefile.am: Removed.
  • bindings/gobject/GNUmakefile.am: Removed.
  • config.h: Removed references to autotools configure file.

Source/WebCore/platform/gtk/po:

  • GNUmakefile.am: Removed.

Source/WebInspectorUI:

  • GNUmakefile.am: Removed.

Source/WebKit/gtk:

  • GNUmakefile.am: Removed.

Source/WebKit2:

  • GNUmakefile.am: Removed.
  • WebKit2Prefix.h: Removed references to the autotools configure file.
  • config.h: Ditto.

Source/WTF:

  • GNUmakefile.am: Removed.
  • config.h: Removed references to the autotools configure file.

Tools:

  • DumpRenderTree/config.h: Remove references to the autotools configure file.
  • GNUmakefile.am: Removed.
  • GtkLauncher/GNUmakefile.am: Removed.
  • GtkLauncher/main.c: Remove references to the autotools configure file.
  • MiniBrowser/gtk/BrowserDownloadsBar.c: Ditto.
  • MiniBrowser/gtk/BrowserSearchBar.c: Ditto.
  • MiniBrowser/gtk/BrowserWindow.c: Ditto.
  • MiniBrowser/gtk/GNUmakefile.am: Removed.
  • MiniBrowser/gtk/main.c: Remove references to the autotools configure file.
  • Scripts/build-webkit: No longer handle autotools.
  • Scripts/run-gtk-tests: Ditto.

(TestRunner._setup_testing_environment):

  • Scripts/run-launcher: Ditto.
  • Scripts/webkitdirs.pm: Ditto.
  • Scripts/webkitpy/common/config/contributionareas.py: Remove autotools as a contribution area.
  • Scripts/webkitpy/common/config/contributors.json: Ditto.
  • Scripts/webkitpy/port/gtk.py: No longer handle autotools.
  • Scripts/webkitpy/style/checker.py:
  • TestWebKitAPI/GNUmakefile.am: Removed.
  • TestWebKitAPI/config.h: Remove references to the autotools configure file.
  • WebKitTestRunner/GNUmakefile.am: Removed.
  • WebKitTestRunner/WebKitTestRunnerPrefix.h: Ditto.
  • gtk/GNUmakefile.am: Removed.
  • gtk/common.py: Remove checks for the autotools build.
  • gtk/symbols.filter: Renamed from Source/autotools/symbols.filter.
Location:
trunk
Files:
22 deleted
35 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/.gitignore

    r163970 r166239  
    2222*~
    2323.*.sw[a-p]
    24 
    25 # Though the GTK build builds in a subdirectory, autogen.sh still deposits
    26 # a few files into the source tree.
    27 /aclocal.m4
    28 /autom4te.cache
    29 /Source/autotools/compile
    30 /Source/autotools/config.guess
    31 /Source/autotools/config.sub
    32 /Source/autotools/depcomp
    33 /Source/autotools/gtk-doc.m4
    34 /Source/autotools/install-sh
    35 /Source/autotools/libtool.m4
    36 /Source/autotools/ltmain.sh
    37 /Source/autotools/ltoptions.m4
    38 /Source/autotools/ltsugar.m4
    39 /Source/autotools/ltversion.m4
    40 /Source/autotools/lt~obsolete.m4
    41 /Source/autotools/missing
    42 /Source/WebCore/GNUmakefile.features.am
    43 /Source/WebKit/gtk/docs/GNUmakefile.in
    44 /Source/WebKit/gtk/po/*.pot
    45 /autotoolsconfig.h.in
    46 /configure
    47 /GNUmakefile.in
    48 /gtk-doc.make
    49 /INSTALL
    50 /README
    5124
    5225# Ignore files installed by WebKitSupportLibrary/WebKitAuxiliaryLibrary

  • trunk/ChangeLog

    r166232 r166239  
     12014-03-25  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Remove the autotools build
     4        https://bugs.webkit.org/show_bug.cgi?id=130717
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * .gitignore: Remove references to autotools files.
     9        * GNUmakefile.am: Removed.
     10        * Source/autotools/CheckSystemAndBasicDependencies.m4: Removed.
     11        * Source/autotools/CustomMacros.m4: Removed.
     12        * Source/autotools/FindDependencies.m4: Removed.
     13        * Source/autotools/PrintBuildConfiguration.m4: Removed.
     14        * Source/autotools/ReadCommandLineArguments.m4: Removed.
     15        * Source/autotools/SetupAutoconfHeader.m4: Removed.
     16        * Source/autotools/SetupAutomake.m4: Removed.
     17        * Source/autotools/SetupCompilerFlags.m4: Removed.
     18        * Source/autotools/SetupLibtool.m4: Removed.
     19        * Source/autotools/SetupWebKitFeatures.m4: Removed.
     20        * Source/autotools/Versions.m4: Removed.
     21        * Source/autotools/acinclude.m4: Removed.
     22        * Source/autotools/dolt.m4: Removed.
     23        * Source/autotools/gsettings.m4: Removed.
     24        * Source/cmake/OptionsGTK.cmake:
     25        * autogen.sh: Removed.
     26        * configure.ac: Removed.
     27
    1282014-03-25  Gabor Rapcsanyi  <rgabor@webkit.org>
    229

  • trunk/Source/JavaScriptCore/ChangeLog

    r166218 r166239  
     12014-03-25  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Remove the autotools build
     4        https://bugs.webkit.org/show_bug.cgi?id=130717
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * GNUmakefile.am: Removed.
     9        * config.h: Remove references to the autotools configure file.
     10
    1112014-03-24  Filip Pizlo  <fpizlo@apple.com>
    212

  • trunk/Source/JavaScriptCore/config.h

    r156302 r166239  
    2020 */
    2121
    22 #if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
    23 #ifdef BUILDING_WITH_CMAKE
     22#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE)
    2423#include "cmakeconfig.h"
    25 #else
    26 #include "autotoolsconfig.h"
    27 #endif
    2824#endif
    2925

  • trunk/Source/Platform/ChangeLog

    r162427 r166239  
     12014-03-25  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Remove the autotools build
     4        https://bugs.webkit.org/show_bug.cgi?id=130717
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * GNUmakefile.am: Removed.
     9
    1102014-01-20  Ryuan Choi  <ryuan.choi@samsung.com>
    211

  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r165677 r166239  
     12014-03-25  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Remove the autotools build
     4        https://bugs.webkit.org/show_bug.cgi?id=130717
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * GNUmakefile.am: Removed.
     9
    1102014-03-14  Mark Rowe  <mrowe@apple.com>
    211

  • trunk/Source/ThirdParty/ChangeLog

    r166232 r166239  
     12014-03-25  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Remove the autotools build
     4        https://bugs.webkit.org/show_bug.cgi?id=130717
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * gtest/GNUmakefile.am: Removed.
     9        * leveldb/GNUmakefile.am: Removed.
     10
    1112014-03-25  Gabor Rapcsanyi  <rgabor@webkit.org>
    212

  • trunk/Source/WTF/ChangeLog

    r166234 r166239  
     12014-03-25  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Remove the autotools build
     4        https://bugs.webkit.org/show_bug.cgi?id=130717
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * GNUmakefile.am: Removed.
     9        * config.h: Removed references to the autotools configure file.
     10
    1112014-03-25  Gabor Rapcsanyi  <rgabor@webkit.org>
    212

  • trunk/Source/WTF/config.h

    r156302 r166239  
    2020 */
    2121
    22 #if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
    23 #ifdef BUILDING_WITH_CMAKE
     22#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE)
    2423#include "cmakeconfig.h"
    25 #else
    26 #include "autotoolsconfig.h"
    27 #endif
    2824#endif
    2925

  • trunk/Source/WebCore/ChangeLog

    r166238 r166239  
     12014-03-25  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Remove the autotools build
     4        https://bugs.webkit.org/show_bug.cgi?id=130717
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * GNUmakefile.am: Removed.
     9        * bindings/gobject/GNUmakefile.am: Removed.
     10        * config.h: Removed references to autotools configure file.
     11
    1122014-03-24  Brent Fulgham  <bfulgham@apple.com>
    213

  • trunk/Source/WebCore/config.h

    r164358 r166239  
    2020 */
    2121
    22 #if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
    23 #ifdef BUILDING_WITH_CMAKE
     22#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE)
    2423#include "cmakeconfig.h"
    25 #else
    26 #include "autotoolsconfig.h"
    27 #endif
    2824#endif
    2925

  • trunk/Source/WebCore/platform/gtk/po/ChangeLog

    r165875 r166239  
     12014-03-25  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Remove the autotools build
     4        https://bugs.webkit.org/show_bug.cgi?id=130717
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * GNUmakefile.am: Removed.
     9
    1102014-03-19  Piotr Drąg  <piotrdrag@gmail.com>
    211

  • trunk/Source/WebInspectorUI/ChangeLog

    r166190 r166239  
     12014-03-25  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Remove the autotools build
     4        https://bugs.webkit.org/show_bug.cgi?id=130717
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * GNUmakefile.am: Removed.
     9
    1102014-03-24  Timothy Hatcher  <timothy@apple.com>
    211

  • trunk/Source/WebKit/gtk/ChangeLog

    r165810 r166239  
     12014-03-25  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Remove the autotools build
     4        https://bugs.webkit.org/show_bug.cgi?id=130717
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * GNUmakefile.am: Removed.
     9
    1102014-03-18  Jae Hyun Park  <jaepark@webkit.org>
    211

  • trunk/Source/WebKit2/ChangeLog

    r166230 r166239  
     12014-03-25  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Remove the autotools build
     4        https://bugs.webkit.org/show_bug.cgi?id=130717
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * GNUmakefile.am: Removed.
     9        * WebKit2Prefix.h: Removed references to the autotools configure file.
     10        * config.h: Ditto.
     11
    1122014-03-25  Michał Pakuła vel Rutka  <m.pakula@samsung.com>
    213

  • trunk/Source/WebKit2/WebKit2Prefix.h

    r164357 r166239  
    2525 */
    2626
    27 #if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
    28 #ifdef BUILDING_WITH_CMAKE
     27#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE)
    2928#include "cmakeconfig.h"
    30 #else
    31 #include "autotoolsconfig.h"
    32 #endif
    3329#endif
    3430

  • trunk/Source/WebKit2/config.h

    r164714 r166239  
    2525 */
    2626
    27 #if defined(BUILDING_WITH_CMAKE)
     27#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE)
    2828#include "cmakeconfig.h"
    29 #elif defined(BUILDING_GTK__)
    30 #include "autotoolsconfig.h"
    3129#endif
    3230

  • trunk/Tools/ChangeLog

    r166235 r166239  
     12014-03-25  Martin Robinson  <mrobinson@igalia.com>
     2
     3        [GTK] Remove the autotools build
     4        https://bugs.webkit.org/show_bug.cgi?id=130717
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * DumpRenderTree/config.h: Remove references to the autotools configure file.
     9        * GNUmakefile.am: Removed.
     10        * GtkLauncher/GNUmakefile.am: Removed.
     11        * GtkLauncher/main.c: Remove references to the autotools configure file.
     12        * MiniBrowser/gtk/BrowserDownloadsBar.c: Ditto.
     13        * MiniBrowser/gtk/BrowserSearchBar.c: Ditto.
     14        * MiniBrowser/gtk/BrowserWindow.c: Ditto.
     15        * MiniBrowser/gtk/GNUmakefile.am: Removed.
     16        * MiniBrowser/gtk/main.c: Remove references to the autotools configure file.
     17        * Scripts/build-webkit: No longer handle autotools.
     18        * Scripts/run-gtk-tests: Ditto.
     19        (TestRunner._setup_testing_environment):
     20        * Scripts/run-launcher: Ditto.
     21        * Scripts/webkitdirs.pm: Ditto.
     22        * Scripts/webkitpy/common/config/contributionareas.py: Remove autotools as a contribution area.
     23        * Scripts/webkitpy/common/config/contributors.json: Ditto.
     24        * Scripts/webkitpy/port/gtk.py: No longer handle autotools.
     25        * Scripts/webkitpy/style/checker.py:
     26        * TestWebKitAPI/GNUmakefile.am: Removed.
     27        * TestWebKitAPI/config.h: Remove references to the autotools configure file.
     28        * WebKitTestRunner/GNUmakefile.am: Removed.
     29        * WebKitTestRunner/WebKitTestRunnerPrefix.h: Ditto.
     30        * gtk/GNUmakefile.am: Removed.
     31        * gtk/common.py: Remove checks for the autotools build.
     32        * gtk/symbols.filter: Renamed from Source/autotools/symbols.filter.
     33
    1342014-03-25  László Langó  <llango.u-szeged@partner.samsung.com>
    235

  • trunk/Tools/DumpRenderTree/config.h

    r164270 r166239  
    2121#define Config_H
    2222
    23 #if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
    24 #if defined(BUILDING_WITH_CMAKE)
     23#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE)
    2524#include "cmakeconfig.h"
    26 #else
    27 #include "autotoolsconfig.h"
    28 #endif
    2925#endif
    3026

  • trunk/Tools/GtkLauncher/main.c

    r165676 r166239  
    2626 */
    2727
    28 #if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
    29 #ifdef BUILDING_WITH_CMAKE
    3028#include "cmakeconfig.h"
    31 #else
    32 #include "autotoolsconfig.h"
    33 #endif
    34 #endif
    35 
    3629#include "LauncherInspectorWindow.h"
    3730#include <errno.h>

  • trunk/Tools/MiniBrowser/gtk/BrowserDownloadsBar.c

    r165488 r166239  
    2424 */
    2525
    26 #if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
    27 #ifdef BUILDING_WITH_CMAKE
    2826#include "cmakeconfig.h"
    29 #else
    30 #include "autotoolsconfig.h"
    31 #endif
    32 #endif
    3327#include "BrowserDownloadsBar.h"
    3428

  • trunk/Tools/MiniBrowser/gtk/BrowserSearchBar.c

    r165488 r166239  
    2424 */
    2525
    26 #if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
    27 #ifdef BUILDING_WITH_CMAKE
    2826#include "cmakeconfig.h"
    29 #else
    30 #include "autotoolsconfig.h"
    31 #endif
    32 #endif
    3327#include "BrowserSearchBar.h"
    34 
    3528
    3629static const char *searchEntryFailedStyle = "GtkEntry#searchEntry {background-color: #ff6666;}";

  • trunk/Tools/MiniBrowser/gtk/BrowserWindow.c

    r165697 r166239  
    2626 */
    2727
    28 #if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
    29 #ifdef BUILDING_WITH_CMAKE
     28#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE)
    3029#include "cmakeconfig.h"
    31 #else
    32 #include "autotoolsconfig.h"
    33 #endif
    3430#endif
    3531#include "BrowserWindow.h"

  • trunk/Tools/MiniBrowser/gtk/main.c

    r165735 r166239  
    2626 */
    2727
    28 #if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
    29 #ifdef BUILDING_WITH_CMAKE
    3028#include "cmakeconfig.h"
    31 #else
    32 #include "autotoolsconfig.h"
    33 #endif
    34 #endif
    3529
    3630#include "BrowserWindow.h"

  • trunk/Tools/Scripts/build-webkit

    r166058 r166239  
    288288    $result = 0;
    289289
    290     # For Gtk the WebKit project builds all others
    291     if (isGtkAutotools() && $dir ne "Source/WebKit") {
    292         chdirWebKit();
    293         next;
    294     }
    295 
    296290    my $project = basename($dir);
    297291    my $baseProductDir = baseProductDir();
    298     if (isGtkAutotools()) {
    299         $result = buildGtkProject($project, $clean, $prefixPath, $makeArgs, $noWebKit1, $noWebKit2, @features);
    300     } elsif (isAppleMacWebKit()) {
     292    if (isAppleMacWebKit()) {
    301293        my @local_options = @options;
    302294        push @local_options, XcodeCoverageSupportOptions() if $coverageSupport;

  • trunk/Tools/Scripts/run-gtk-tests

    r164739 r166239  
    197197        self._test_env['GSETTINGS_BACKEND'] = 'memory'
    198198        self._test_env["TEST_WEBKIT_API_WEBKIT2_RESOURCES_PATH"] = common.top_level_path("Tools", "TestWebKitAPI", "Tests", "WebKit2")
    199         self._test_env["TEST_WEBKIT_API_WEBKIT2_INJECTED_BUNDLE_PATH"] = common.tests_library_build_path()
     199        self._test_env["TEST_WEBKIT_API_WEBKIT2_INJECTED_BUNDLE_PATH"] = common.library_build_path()
    200200        self._test_env["WEBKIT_EXEC_PATH"] = self._programs_path
    201201

  • trunk/Tools/Scripts/run-launcher

    r165676 r166239  
    4646
    4747# Set paths according to the build system used
    48 if (isGtk()) {
    49     if (isGtkAutotools()) {
    50         $launcherPath = catdir($productDir, "Programs");
    51     } else {
    52         $launcherPath = catdir($productDir, "bin");
    53     }
    54 
    55     if (isWK2()) {
    56         $launcherPath = catdir($launcherPath, "MiniBrowser");
    57     } else {
    58         $launcherPath = catdir($launcherPath, "GtkLauncher");
    59     }
    60 }
    61 
    62 if (isEfl()) {
     48if (isGtk() || isEfl()) {
    6349    if (isWK2()) {
    6450        $launcherPath = catdir($productDir, "bin", "MiniBrowser");
    65     } else {
     51    } elif (isEfl()) {
    6652        $launcherPath = catdir($productDir, "bin", "EWebLauncher");
     53    } elif (isGtk()) {
     54        $launcherPath = catdir($productDir, "bin", "GtkLauncher");
    6755    }
    6856}

  • trunk/Tools/Scripts/webkitdirs.pm

    r166232 r166239  
    9393my $osXVersion;
    9494my $generateDsym;
    95 my $isGtkAutotools;
    96 my $isGtkCMake;
     95my $isGtk;
    9796my $isWinCE;
    9897my $isWinCairo;
    … …  
    288287    determineXcodeSDK();
    289288
    290     if (isGtkAutotools()) {
    291         determineConfigurationProductDir();
    292         my $host_triple = `grep -E '^host = ' $configurationProductDir/GNUmakefile 2> /dev/null`;
    293         if ($host_triple =~ m/^host = ([^-]+)-/) {
    294             # We have a configured build tree; use it.
    295             $architecture = $1;
    296         }
    297     } elsif (isAppleMacWebKit()) {
     289    if (isAppleMacWebKit()) {
    298290        if (open ARCHITECTURE, "$baseProductDir/Architecture") {
    299291            $architecture = <ARCHITECTURE>;
    … …  
    313305            }
    314306        }
    315     } elsif (isEfl() || isGtkCMake()) {
     307    } elsif (isEfl() || isGtk()) {
    316308        my $host_processor = "";
    317309        $host_processor = `cmake --system-information | grep CMAKE_SYSTEM_PROCESSOR`;
    … …  
    386378    push(@args, '--32-bit') if ($architecture ne "x86_64" and !isWin64());
    387379    push(@args, '--64-bit') if (isWin64());
    388     push(@args, '--gtkautotools') if isGtkAutotools();
    389     push(@args, '--gtk') if isGtkCMake();
     380    push(@args, '--gtk') if isGtk();
    390381    push(@args, '--efl') if isEfl();
    391382    push(@args, '--wincairo') if isWinCairo();
    … …  
    552543{
    553544    my $productDir = productDir();
    554     $productDir .= "/bin" if (isEfl() || isGtkCMake());
    555     $productDir .= "/Programs" if isGtkAutotools();
     545    $productDir .= "/bin" if (isEfl() || isGtk());
    556546
    557547    return $productDir;
    … …  
    803793        my @libraries = ("libwebkitgtk-1.0", "libwebkitgtk-3.0", "libwebkit2gtk-3.0");
    804794        my $extension = isDarwin() ? ".dylib" : ".so";
    805 
    806         my $builtLibraryPath = "$configurationProductDir/.libs/";
    807         if (isGtkCMake()) {
    808             $builtLibraryPath = "$configurationProductDir/lib/";
    809         }
     795        my $builtLibraryPath = "$configurationProductDir/lib/";
    810796
    811797        foreach $libraryName (@libraries) {
    … …  
    960946}
    961947
    962 sub determineIsGtkCMake()
    963 {
    964     return if defined($isGtkCMake);
    965     $isGtkCMake = checkForArgumentAndRemoveFromARGV("--gtk");
    966 }
    967 
    968 sub isGtkCMake()
    969 {
    970     determineIsGtkCMake();
    971     return $isGtkCMake;
    972 }
    973 
    974 sub isGtkAutotools()
    975 {
    976     determineIsGtkAutotools();
    977     return $isGtkAutotools;
     948sub determineIsGtk()
     949{
     950    return if defined($isGtk);
     951    $isGtk = checkForArgumentAndRemoveFromARGV("--gtk");
    978952}
    979953
    980954sub isGtk()
    981955{
    982     return isGtkCMake() || isGtkAutotools();
    983 }
    984 
    985 sub determineIsGtkAutotools()
    986 {
    987     return if defined($isGtkAutotools);
    988     $isGtkAutotools = checkForArgumentAndRemoveFromARGV("--gtkautotools");
     956    determineIsGtk();
     957    return $isGtk;
    989958}
    990959
    … …  
    16921661}
    16931662
    1694 sub autotoolsFlag($$)
    1695 {
    1696     my ($flag, $feature) = @_;
    1697     my $prefix = $flag ? "--enable" : "--disable";
    1698 
    1699     return $prefix . '-' . $feature;
    1700 }
    1701 
    1702 sub runAutogenForAutotoolsProjectIfNecessary($@)
    1703 {
    1704     my ($dir, $prefix, $sourceDir, $project, $joinedOverridableFeatures, @buildArgs) = @_;
    1705 
    1706     # Always enable introspection when building WebKitGTK+.
    1707     unshift(@buildArgs, "--enable-introspection");
    1708 
    1709     # Also, always enable developer mode for developer/test builds.
    1710     unshift(@buildArgs, "--enable-developer-mode");
    1711 
    1712     # Optimize for running WebKit inside the build tree
    1713     unshift(@buildArgs, "--disable-fast-install");
    1714 
    1715     my $joinedBuildArgs = join(" ", @buildArgs);
    1716 
    1717     if (-e "GNUmakefile") {
    1718         # Just assume that build-jsc will never be used to reconfigure JSC. Later
    1719         # we can go back and make this more complicated if the demand is there.
    1720         if ($project ne "WebKit") {
    1721             return;
    1722         }
    1723 
    1724         # Run autogen.sh again if either the features overrided by build-webkit or build arguments have changed.
    1725         if (!isCachedArgumentfileOutOfDate("WebKitFeatureOverrides.txt", $joinedOverridableFeatures)
    1726             && !isCachedArgumentfileOutOfDate("previous-autogen-arguments.txt", $joinedBuildArgs)) {
    1727             return;
    1728         }
    1729     }
    1730 
    1731     print "Calling autogen.sh in " . $dir . "\n\n";
    1732     print "Installation prefix directory: $prefix\n" if(defined($prefix));
    1733 
    1734     # Only for WebKit, write the autogen.sh arguments to a file so that we can detect
    1735     # when they change and automatically re-run it.
    1736     if ($project eq 'WebKit') {
    1737         open(OVERRIDABLE_FEATURES, ">WebKitFeatureOverrides.txt");
    1738         print OVERRIDABLE_FEATURES $joinedOverridableFeatures;
    1739         close(OVERRIDABLE_FEATURES);
    1740 
    1741         open(AUTOTOOLS_ARGUMENTS, ">previous-autogen-arguments.txt");
    1742         print AUTOTOOLS_ARGUMENTS $joinedBuildArgs;
    1743         close(AUTOTOOLS_ARGUMENTS);
    1744     }
    1745 
    1746     # Make the path relative since it will appear in all -I compiler flags.
    1747     # Long argument lists cause bizarre slowdowns in libtool.
    1748     my $relSourceDir = File::Spec->abs2rel($sourceDir) || ".";
    1749 
    1750     # Compiler options to keep floating point values consistent
    1751     # between 32-bit and 64-bit architectures. The options are also
    1752     # used on Chromium build.
    1753     determineArchitecture();
    1754     if ($architecture ne "x86_64" && !isARM() && !isCrossCompilation()) {
    1755         $ENV{'CXXFLAGS'} = "-march=pentium4 -msse2 -mfpmath=sse " . ($ENV{'CXXFLAGS'} || "");
    1756     }
    1757 
    1758     # Prefix the command with jhbuild run.
    1759     unshift(@buildArgs, "$relSourceDir/autogen.sh");
    1760     unshift(@buildArgs, jhbuildWrapperPrefixIfNeeded());
    1761     if (system(@buildArgs) ne 0) {
    1762         die "Calling autogen.sh failed!\n";
    1763     }
    1764 }
    1765 
    17661663sub getJhbuildPath()
    17671664{
    … …  
    17911688        print "New contents are: $currentContents\n";
    17921689        return 1;
    1793     }
    1794 
    1795     return 0;
    1796 }
    1797 
    1798 sub buildAutotoolsProject($@)
    1799 {
    1800     my ($project, $clean, $prefix, $makeArgs, $noWebKit1, $noWebKit2, @features) = @_;
    1801 
    1802     my $make =  $ENV{'MAKE'} //= 'make';
    1803     my $dir = productDir();
    1804     my $config = passedConfiguration() || configuration();
    1805 
    1806     # Use rm to clean the build directory since distclean may miss files
    1807     if ($clean && -d $dir) {
    1808         system "rm", "-rf", "$dir";
    1809     }
    1810 
    1811     if (! -d $dir) {
    1812         File::Path::mkpath($dir) or die "Failed to create build directory " . $dir
    1813     }
    1814     chdir $dir or die "Failed to cd into " . $dir . "\n";
    1815 
    1816     if ($clean) {
    1817         return 0;
    1818     }
    1819 
    1820     my @buildArgs = @ARGV;
    1821     if ($noWebKit1) {
    1822         unshift(@buildArgs, "--disable-webkit1");
    1823     }
    1824     if ($noWebKit2) {
    1825         unshift(@buildArgs, "--disable-webkit2");
    1826     }
    1827 
    1828     # Configurable features listed here should be kept in sync with the
    1829     # features for which there exists a configuration option in configure.ac.
    1830     my %configurableFeatures = (
    1831         "battery-status" => 1,
    1832         "gamepad" => 1,
    1833         "geolocation" => 1,
    1834         "svg" => 1,
    1835         "svg-fonts" => 1,
    1836         "video" => 1,
    1837         "webgl" => 1,
    1838         "web-audio" => 1,
    1839     );
    1840 
    1841     # These features are ones which build-webkit cannot control, typically because
    1842     # they can only be active when we have the proper dependencies.
    1843     my %unsetFeatures = (
    1844         "accelerated-2d-canvas" => 1,
    1845     );
    1846 
    1847     my @overridableFeatures = ();
    1848     foreach (@features) {
    1849         if ($configurableFeatures{$_->{option}}) {
    1850             push @buildArgs, autotoolsFlag(${$_->{value}}, $_->{option});;
    1851         } elsif (!$unsetFeatures{$_->{option}}) {
    1852             push @overridableFeatures, $_->{define} . "=" . (${$_->{value}} ? "1" : "0");
    1853         }
    1854     }
    1855 
    1856     $makeArgs = $makeArgs || "";
    1857     $makeArgs = $makeArgs . " " . $ENV{"WebKitMakeArguments"} if $ENV{"WebKitMakeArguments"};
    1858 
    1859     # Automatically determine the number of CPUs for make only
    1860     # if make arguments haven't already been specified.
    1861     if ($makeArgs eq "") {
    1862         $makeArgs = "-j" . numberOfCPUs();
    1863     }
    1864 
    1865     # WebKit is the default target, so we don't need to specify anything.
    1866     if ($project eq "JavaScriptCore") {
    1867         $makeArgs .= " jsc";
    1868     } elsif ($project eq "WTF") {
    1869         $makeArgs .= " libWTF.la";
    1870     }
    1871 
    1872     $prefix = $ENV{"WebKitInstallationPrefix"} if !defined($prefix);
    1873     push @buildArgs, "--prefix=" . $prefix if defined($prefix);
    1874 
    1875     # Check if configuration is Debug.
    1876     my $debug = $config =~ m/debug/i;
    1877     if ($debug) {
    1878         push @buildArgs, "--enable-debug";
    1879     } else {
    1880         push @buildArgs, "--disable-debug";
    1881     }
    1882 
    1883     if (checkForArgumentAndRemoveFromArrayRef("--update-gtk", \@buildArgs)) {
    1884         # Force autogen to run, to catch the possibly updated libraries.
    1885         system("rm -f previous-autogen-arguments.txt");
    1886 
    1887         system("perl", "$sourceDir/Tools/Scripts/update-webkitgtk-libs") == 0 or die $!;
    1888     }
    1889 
    1890     # If GNUmakefile exists, don't run autogen.sh unless its arguments
    1891     # have changed. The makefile should be smart enough to track autotools
    1892     # dependencies and re-run autogen.sh when build files change.
    1893     my $joinedOverridableFeatures = join(" ", @overridableFeatures);
    1894     runAutogenForAutotoolsProjectIfNecessary($dir, $prefix, $sourceDir, $project, $joinedOverridableFeatures, @buildArgs);
    1895 
    1896     my $runWithJhbuild = join(" ", jhbuildWrapperPrefixIfNeeded());
    1897     if (system("$runWithJhbuild $make $makeArgs") ne 0) {
    1898         die "\nFailed to build WebKit using '$make'!\n";
    1899     }
    1900 
    1901     chdir ".." or die;
    1902 
    1903     if (!checkForArgumentAndRemoveFromARGV("--disable-gtk-doc")) {
    1904         if ($project eq 'WebKit' && !isCrossCompilation() && !($noWebKit1 && $noWebKit2)) {
    1905             my @docGenerationOptions = ("$sourceDir/Tools/gtk/generate-gtkdoc", "--skip-html");
    1906             unshift(@docGenerationOptions, jhbuildWrapperPrefixIfNeeded());
    1907 
    1908             if (system(@docGenerationOptions)) {
    1909                 die "\n gtkdoc did not build without warnings\n";
    1910             }
    1911         }
    19121690    }
    19131691
    … …  
    21291907    return "Efl" if isEfl();
    21301908    return "WinCE" if isWinCE();
    2131     return "GTK" if isGtkCMake();
     1909    return "GTK" if isGtk();
    21321910    return "";
    21331911}
    … …  
    21351913sub isCMakeBuild()
    21361914{
    2137     return isEfl() || isWinCE() || isGtkCMake();
     1915    return isEfl() || isWinCE() || isGtk();
    21381916}
    21391917
    … …  
    21451923    chomp(my $input = <STDIN>);
    21461924    return $input ? $input : $default;
    2147 }
    2148 
    2149 sub buildGtkProject
    2150 {
    2151     my ($project, $clean, $prefix, $makeArgs, $noWebKit1, $noWebKit2, @features) = @_;
    2152 
    2153     if ($project ne "WebKit" and $project ne "JavaScriptCore" and $project ne "WTF") {
    2154         die "Unsupported project: $project. Supported projects: WebKit, JavaScriptCore, WTF\n";
    2155     }
    2156 
    2157     return buildAutotoolsProject($project, $clean, $prefix, $makeArgs, $noWebKit1, $noWebKit2, @features);
    21581925}
    21591926
    … …  
    23412108    if (isAppleMacWebKit()) {
    23422109        return runMacWebKitApp(File::Spec->catfile(productDir(), "WebKitTestRunner"));
    2343     } elsif (isGtk()) {
    2344         my $productDir = productDir();
    2345         my $injectedBundlePath = "$productDir/Libraries/.libs/libTestRunnerInjectedBundle";
    2346         print "Starting WebKitTestRunner with TEST_RUNNER_INJECTED_BUNDLE_FILENAME set to point to $injectedBundlePath.\n";
    2347         $ENV{TEST_RUNNER_INJECTED_BUNDLE_FILENAME} = $injectedBundlePath;
    2348         my @args = ("$productDir/Programs/WebKitTestRunner", @ARGV);
    2349         return system {$args[0] } @args;
    23502110    }
    23512111

  • trunk/Tools/Scripts/webkitpy/common/config/contributionareas.py

    r149347 r166239  
    7373    _Area('Animation', ['animation', 'animator']),
    7474    _Area('Apple\'s Windows port', ['win', 'windows']),  # FIXME: need to exclude chromium...
    75     _Area('Autotools Build', ['autotools']),
    7675    _Area('Basic types and data structures (WTF)', ['wtf']),
    7776# FIXME: 'Bidirectional text'

  • trunk/Tools/Scripts/webkitpy/common/config/contributors.json

    r165868 r166239  
    38713871            "jmalonzo@webkit.org"
    38723872         ],
    3873          "expertise" : "The WebKitGtk Port, Autotools Build",
     3873         "expertise" : "The WebKitGtk Port",
    38743874         "nicks" : [
    38753875            "janm"

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

    r165284 r166239  
    5454                raise ValueError('use --wrapper=\"valgrind\" for memory leak detection on GTK')
    5555
    56     def _is_cmake_build(self):
    57         # Look for the autotools config.log file, which means that we
    58         # assume a CMake build (--gtk) when lacking evidence of either.
    59         return not os.path.exists(self._build_path('config.log'))
    60 
    6156    def _built_executables_path(self, *path):
    62         if self._is_cmake_build():
    63             return self._build_path(*(('bin',) + path))
    64         else:
    65             return self._build_path(*(('Programs',) + path))
     57        return self._build_path(*(('bin',) + path))
    6658
    6759    def _built_libraries_path(self, *path):
    68         if self._is_cmake_build():
    69             return self._build_path(*(('lib',) + path))
    70         else:
    71             return self._build_path(*(('.libs',) + path))
     60        return self._build_path(*(('lib',) + path))
    7261
    7362    def warn_if_bug_missing_in_test_expectations(self):
    … …  
    7564
    7665    def _port_flag_for_scripts(self):
    77         if self._is_cmake_build():
    78             return "--gtk"
    79         else:
    80             return "--gtkautotools"
     66        return "--gtk"
    8167
    8268    @memoized
    … …  
    115101        environment['GSETTINGS_BACKEND'] = 'memory'
    116102        environment['LIBOVERLAY_SCROLLBAR'] = '0'
    117         if self._is_cmake_build():
    118             environment['TEST_RUNNER_INJECTED_BUNDLE_FILENAME'] = self._build_path('lib', 'libTestRunnerInjectedBundle.so')
    119             environment['TEST_RUNNER_TEST_PLUGIN_PATH'] = self._build_path('lib')
    120         else:
    121             environment['TEST_RUNNER_INJECTED_BUNDLE_FILENAME'] = self._build_path('Libraries', 'libTestRunnerInjectedBundle.la')
    122             environment['TEST_RUNNER_TEST_PLUGIN_PATH'] = self._build_path('TestNetscapePlugin', '.libs')
     103        environment['TEST_RUNNER_INJECTED_BUNDLE_FILENAME'] = self._build_path('lib', 'libTestRunnerInjectedBundle.so')
     104        environment['TEST_RUNNER_TEST_PLUGIN_PATH'] = self._build_path('lib')
    123105        environment['AUDIO_RESOURCES_PATH'] = self.path_from_webkit_base('Source', 'WebCore', 'platform', 'audio', 'resources')
    124106        self._copy_value_from_environ_if_set(environment, 'WEBKIT_OUTPUTDIR')
    … …  
    217199    def build_webkit_command(self, build_style=None):
    218200        command = super(GtkPort, self).build_webkit_command(build_style)
    219         if self._is_cmake_build():
    220             command.extend(["--gtk", "--update-gtk"])
    221         else:
    222             command.extend(["--gtkautotools", "--update-gtk"])
     201        command.extend(["--gtk", "--update-gtk"])
    223202
    224203        if self.get_option('webkit_test_runner'):

  • trunk/Tools/Scripts/webkitpy/style/checker.py

    r164360 r166239  
    147147     ["-readability/naming"]),
    148148
    149     ([# The GTK+ port uses the autotoolsconfig.h header in some C sources
    150       # to serve the same purpose of config.h.
     149    ([# The GTK+ port uses the cmakeconfig.h header directly in some C sources.
    151150      "Tools/GtkLauncher/main.c"],
    152151     ["-build/include_order"]),

  • trunk/Tools/TestWebKitAPI/config.h

    r164295 r166239  
    2424 */
    2525
    26 #if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
    27 #ifdef BUILDING_WITH_CMAKE
     26#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE)
    2827#include "cmakeconfig.h"
    29 #else
    30 #include "autotoolsconfig.h"
    31 #endif
    3228#endif
    3329

  • trunk/Tools/WebKitTestRunner/WebKitTestRunnerPrefix.h

    r162729 r166239  
    2828#endif
    2929
    30 #if defined(BUILDING_GTK__)
    31 #include "autotoolsconfig.h"
    32 #endif /* defined (BUILDING_GTK__) */
    33 
    3430#include <wtf/Platform.h>
    3531#include <WebKit2/WebKit2_C.h>

  • trunk/Tools/gtk/common.py

    r165328 r166239  
    2626library_build_dir = None
    2727tests_library_build_dir = None
    28 is_cmake = None
    2928build_types = ('Release', 'Debug')
    3029
    … …  
    4241
    4342
    44 def is_cmake_build():
    45     global is_cmake
    46     if is_cmake is None:
    47         is_cmake = not os.path.exists(build_path('config.log'))
    48     return is_cmake
    49 
    50 
    5143def library_build_path(*args):
    5244    global library_build_dir
    5345    if not library_build_dir:
    54         if is_cmake_build():
    55             library_build_dir = build_path('lib', *args)
    56         else:
    57             library_build_dir = build_path('.libs', *args)
     46        library_build_dir = build_path('lib', *args)
    5847    return library_build_dir
    59 
    60 
    61 def tests_library_build_path(*args):
    62     if is_cmake_build():
    63         return library_build_path(*args)
    64 
    65     global tests_library_build_dir
    66     if not tests_library_build_dir:
    67         tests_library_build_dir = build_path('Libraries', *args)
    68     return tests_library_build_dir
    6948
    7049
    … …  
    7251    global library_build_dir
    7352    if not library_build_dir:
    74         if is_cmake_build():
    75             library_build_dir = build_path('bin', *args)
    76         else:
    77             library_build_dir = build_path('Programs', *args)
     53        library_build_dir = build_path('bin', *args)
    7854    return library_build_dir
    7955
    … …  
    8561
    8662    def is_valid_build_directory(path):
    87         return os.path.exists(os.path.join(path, 'GNUmakefile')) or \
    88             os.path.exists(os.path.join(path, 'Programs', 'GtkLauncher')) or \
    89             os.path.exists(os.path.join(path, 'Programs', 'MiniBrowser')) or \
    90             os.path.exists(os.path.join(path, 'CMakeCache.txt')) or \
     63        return os.path.exists(os.path.join(path, 'CMakeCache.txt')) or \
    9164            os.path.exists(os.path.join(path, 'bin/GtkLauncher')) or \
    9265            os.path.exists(os.path.join(path, 'bin/MiniBrowser'))
Note: See TracChangeset for help on using the changeset viewer.