Changeset 219488 in webkit


Ignore:
Timestamp:
Jul 13, 2017, 7:29:28 PM (8 years ago)
Author:
matthew_hanson@apple.com
Message:

Fix the cMake builds (GTK and WPE.)
​https://bugs.webkit.org/show_bug.cgi?id=174164
rdar://problem/33137595

Reviewed by Dan Bernstein.

.:

  • Source/CMakeLists.txt:
  • Source/cmake/OptionsGTK.cmake:
  • Source/cmake/OptionsJSCOnly.cmake:
  • Source/cmake/OptionsMac.cmake:
  • Source/cmake/OptionsWPE.cmake:
  • Source/cmake/WebKitFS.cmake:
  • Source/cmake/WebKitPackaging.cmake:

Source/WebCore/platform/gtk/po:

  • POTFILES.in:

Source/WebKit:

  • Scripts/generate-forwarding-headers.pl:

(collectFrameworkHeaderPaths):
(createForwardingHeadersForFramework):

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r219487 r219488  
     12017-07-13  Matthew Hanson  <matthew_hanson@apple.com>
     2
     3        Fix the cMake builds (GTK and WPE.)
     4        https://bugs.webkit.org/show_bug.cgi?id=174164
     5        rdar://problem/33137595
     6
     7        Reviewed by Dan Bernstein.
     8
     9        * Source/CMakeLists.txt:
     10        * Source/cmake/OptionsGTK.cmake:
     11        * Source/cmake/OptionsJSCOnly.cmake:
     12        * Source/cmake/OptionsMac.cmake:
     13        * Source/cmake/OptionsWPE.cmake:
     14        * Source/cmake/WebKitFS.cmake:
     15        * Source/cmake/WebKitPackaging.cmake:
     16
    1172017-07-13  Matthew Hanson  <matthew_hanson@apple.com>
    218

  • trunk/Source/CMakeLists.txt

    r214338 r219488  
    3131endif ()
    3232
     33if (ENABLE_WEBKIT_LEGACY)
     34    add_subdirectory(WebKitLegacy)
     35endif ()
     36
    3337if (ENABLE_WEBKIT)
    3438    add_subdirectory(WebKit)
    35 endif ()
    36 
    37 if (ENABLE_WEBKIT2)
    38     add_subdirectory(WebKit2)
    3939endif ()
    4040
    … …  
    5757endif ()
    5858
    59 if (ENABLE_WEBKIT)
     59if (ENABLE_WEBKIT_LEGACY)
     60    # FIXME: Rename this target to WebKitLegacy.
    6061    WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebKit ${ADDITIONAL_COMPILER_FLAGS})
    6162endif ()
    6263
    63 if (ENABLE_WEBKIT2)
     64if (ENABLE_WEBKIT)
     65    # FIXME: Rename this target to WebKit.
    6466    WEBKIT_SET_EXTRA_COMPILER_FLAGS(WebKit2 ${ADDITIONAL_COMPILER_FLAGS})
    6567endif ()

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

    r218796 r219488  
     12017-07-13  Matthew Hanson  <matthew_hanson@apple.com>
     2
     3        Fix the cMake builds (GTK and WPE.)
     4        https://bugs.webkit.org/show_bug.cgi?id=174164
     5        rdar://problem/33137595
     6
     7        Reviewed by Dan Bernstein.
     8
     9        * POTFILES.in:
     10
    1112017-06-25  Yuri Chornoivan  <yurchor@ukr.net>
    212

  • trunk/Source/WebCore/platform/gtk/po/POTFILES.in

    r218553 r219488  
    33../LocalizedStrings.cpp
    44../network/soup/NetworkStorageSessionSoup.cpp
    5 ../../../WebKit2/Shared/API/glib/WebKitHitTestResult.cpp
    6 ../../../WebKit2/Shared/API/glib/WebKitURIRequest.cpp
    7 ../../../WebKit2/Shared/API/glib/WebKitURIResponse.cpp
    8 ../../../WebKit2/Shared/WebErrors.cpp
    9 ../../../WebKit2/Shared/glib/WebErrorsGlib.cpp
    10 ../../../WebKit2/Shared/gtk/WebErrorsGtk.cpp
    11 ../../../WebKit2/Shared/soup/WebErrorsSoup.cpp
    12 ../../../WebKit2/UIProcess/API/glib/WebKitAutomationSession.cpp
    13 ../../../WebKit2/UIProcess/API/glib/WebKitDownload.cpp
    14 ../../../WebKit2/UIProcess/API/glib/WebKitEditorState.cpp
    15 ../../../WebKit2/UIProcess/API/glib/WebKitFaviconDatabase.cpp
    16 ../../../WebKit2/UIProcess/API/glib/WebKitFileChooserRequest.cpp
    17 ../../../WebKit2/UIProcess/API/glib/WebKitFindController.cpp
    18 ../../../WebKit2/UIProcess/API/glib/WebKitNavigationPolicyDecision.cpp
    19 ../../../WebKit2/UIProcess/API/glib/WebKitNotification.cpp
    20 ../../../WebKit2/UIProcess/API/glib/WebKitResponsePolicyDecision.cpp
    21 ../../../WebKit2/UIProcess/API/glib/WebKitSettings.cpp
    22 ../../../WebKit2/UIProcess/API/glib/WebKitUserMediaPermissionRequest.cpp
    23 ../../../WebKit2/UIProcess/API/glib/WebKitWebContext.cpp
    24 ../../../WebKit2/UIProcess/API/glib/WebKitWebResource.cpp
    25 ../../../WebKit2/UIProcess/API/glib/WebKitWebsiteData.cpp
    26 ../../../WebKit2/UIProcess/API/glib/WebKitWebsiteDataManager.cpp
    27 ../../../WebKit2/UIProcess/API/glib/WebKitWebView.cpp
    28 ../../../WebKit2/UIProcess/API/glib/WebKitWindowProperties.cpp
    29 ../../../WebKit2/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp
    30 ../../../WebKit2/UIProcess/API/gtk/WebKitColorChooserRequest.cpp
    31 ../../../WebKit2/UIProcess/API/gtk/WebKitPrintCustomWidget.cpp
    32 ../../../WebKit2/UIProcess/API/gtk/WebKitPrintOperation.cpp
    33 ../../../WebKit2/UIProcess/API/gtk/WebKitWebInspector.cpp
    34 ../../../WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp
    35 ../../../WebKit2/UIProcess/API/gtk/WebKitWebViewGtk.cpp
    36 ../../../WebKit2/UIProcess/gtk/WebColorPickerGtk.cpp
    37 ../../../WebKit2/UIProcess/gtk/WebKitInspectorWindow.cpp
    38 ../../../WebKit2/UIProcess/WebEditCommandProxy.cpp
    39 ../../../WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.cpp
    40 ../../../WebKit2/WebProcess/InjectedBundle/API/glib/WebKitWebHitTestResult.cpp
    41 ../../../WebKit2/WebProcess/InjectedBundle/API/glib/WebKitWebPage.cpp
     5../../../WebKit/Shared/API/glib/WebKitHitTestResult.cpp
     6../../../WebKit/Shared/API/glib/WebKitURIRequest.cpp
     7../../../WebKit/Shared/API/glib/WebKitURIResponse.cpp
     8../../../WebKit/Shared/WebErrors.cpp
     9../../../WebKit/Shared/glib/WebErrorsGlib.cpp
     10../../../WebKit/Shared/gtk/WebErrorsGtk.cpp
     11../../../WebKit/Shared/soup/WebErrorsSoup.cpp
     12../../../WebKit/UIProcess/API/glib/WebKitAutomationSession.cpp
     13../../../WebKit/UIProcess/API/glib/WebKitDownload.cpp
     14../../../WebKit/UIProcess/API/glib/WebKitEditorState.cpp
     15../../../WebKit/UIProcess/API/glib/WebKitFaviconDatabase.cpp
     16../../../WebKit/UIProcess/API/glib/WebKitFileChooserRequest.cpp
     17../../../WebKit/UIProcess/API/glib/WebKitFindController.cpp
     18../../../WebKit/UIProcess/API/glib/WebKitNavigationPolicyDecision.cpp
     19../../../WebKit/UIProcess/API/glib/WebKitNotification.cpp
     20../../../WebKit/UIProcess/API/glib/WebKitResponsePolicyDecision.cpp
     21../../../WebKit/UIProcess/API/glib/WebKitSettings.cpp
     22../../../WebKit/UIProcess/API/glib/WebKitUserMediaPermissionRequest.cpp
     23../../../WebKit/UIProcess/API/glib/WebKitWebContext.cpp
     24../../../WebKit/UIProcess/API/glib/WebKitWebResource.cpp
     25../../../WebKit/UIProcess/API/glib/WebKitWebsiteData.cpp
     26../../../WebKit/UIProcess/API/glib/WebKitWebsiteDataManager.cpp
     27../../../WebKit/UIProcess/API/glib/WebKitWebView.cpp
     28../../../WebKit/UIProcess/API/glib/WebKitWindowProperties.cpp
     29../../../WebKit/UIProcess/API/gtk/WebKitAuthenticationDialog.cpp
     30../../../WebKit/UIProcess/API/gtk/WebKitColorChooserRequest.cpp
     31../../../WebKit/UIProcess/API/gtk/WebKitPrintCustomWidget.cpp
     32../../../WebKit/UIProcess/API/gtk/WebKitPrintOperation.cpp
     33../../../WebKit/UIProcess/API/gtk/WebKitWebInspector.cpp
     34../../../WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp
     35../../../WebKit/UIProcess/API/gtk/WebKitWebViewGtk.cpp
     36../../../WebKit/UIProcess/gtk/WebColorPickerGtk.cpp
     37../../../WebKit/UIProcess/gtk/WebKitInspectorWindow.cpp
     38../../../WebKit/UIProcess/WebEditCommandProxy.cpp
     39../../../WebKit/UIProcess/WebsiteData/WebsiteDataRecord.cpp
     40../../../WebKit/WebProcess/InjectedBundle/API/glib/WebKitWebHitTestResult.cpp
     41../../../WebKit/WebProcess/InjectedBundle/API/glib/WebKitWebPage.cpp

  • trunk/Source/WebKit/ChangeLog

    r219487 r219488  
     12017-07-13  Matthew Hanson  <matthew_hanson@apple.com>
     2
     3        Fix the cMake builds (GTK and WPE.)
     4        https://bugs.webkit.org/show_bug.cgi?id=174164
     5        rdar://problem/33137595
     6
     7        Reviewed by Dan Bernstein.
     8
     9        * Scripts/generate-forwarding-headers.pl:
     10        (collectFrameworkHeaderPaths):
     11        (createForwardingHeadersForFramework):
     12
    1132017-07-13  Matthew Hanson  <matthew_hanson@apple.com>
    214

  • trunk/Source/WebKit/Scripts/generate-forwarding-headers.pl

    r217216 r219488  
    4141my @frameworkHeaders;
    4242my $framework;
    43 my $frameworkDirectoryName;
    4443my %neededHeaders;
    4544my $verbose = 0; # enable it for debugging purpose
    … …  
    6362foreach (@frameworks) {
    6463    $framework = $_;
    65     $frameworkDirectoryName = ($framework eq "WebKit") ? "WebKit2" : $framework;
    6664    @frameworkHeaders = ();
    6765    %neededHeaders = ();
    6866
    6967    foreach (@incFromRoot) { find(\&collectNeededHeaders, abs_path($_) ); };
    70     find(\&collectFrameworkHeaderPaths, File::Spec->catfile($srcRoot, $frameworkDirectoryName));
     68    find(\&collectFrameworkHeaderPaths, File::Spec->catfile($srcRoot, $framework));
    7169    createForwardingHeadersForFramework();
    7270}
    … …  
    9088    my $file = $_;
    9189    if ($filePath =~ '\.h$' && $filePath !~ "ForwardingHeaders" && grep{$file eq $_} keys %neededHeaders) {
    92         my $headerPath = substr($filePath, length(File::Spec->catfile($srcRoot, $frameworkDirectoryName)) + 1 );
     90        my $headerPath = substr($filePath, length(File::Spec->catfile($srcRoot, $framework)) + 1 );
    9391        push(@frameworkHeaders, $headerPath) unless (grep($headerPath =~ "$_/", @skippedPrefixes) || $headerPath =~ "config.h");
    9492    }
    … …  
    110108
    111109        my $forwardingHeaderPath = File::Spec->catfile($targetDirectory, $headerName);
    112         my $expectedIncludeStatement = "#include \"$frameworkDirectoryName/$header\"";
     110        my $expectedIncludeStatement = "#include \"$framework/$header\"";
    113111        my $foundIncludeStatement = 0;
    114112

  • trunk/Source/cmake/OptionsGTK.cmake

    r219486 r219488  
    99# Libtool library version, not to be confused with API version.
    1010# See http://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
    11 CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT2 60 0 23)
     11CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(WEBKIT 60 0 23)
    1212CALCULATE_LIBRARY_VERSIONS_FROM_LIBTOOL_TRIPLE(JAVASCRIPTCORE 24 4 6)
    1313
    … …  
    181181endif ()
    182182
    183 set(ENABLE_WEBKIT OFF)
    184 set(ENABLE_WEBKIT2 ON)
     183set(ENABLE_WEBKIT_LEGACY OFF)
     184set(ENABLE_WEBKIT ON)
    185185set(ENABLE_PLUGIN_PROCESS ${ENABLE_NETSCAPE_PLUGIN_API})
    186186

  • trunk/Source/cmake/OptionsJSCOnly.cmake

    r217736 r219488  
    3333
    3434set(ENABLE_WEBCORE OFF)
     35set(ENABLE_WEBKIT_LEGACY OFF)
    3536set(ENABLE_WEBKIT OFF)
    36 set(ENABLE_WEBKIT2 OFF)
    3737
    3838if (WIN32)

  • trunk/Source/cmake/OptionsMac.cmake

    r219403 r219488  
    112112
    113113set(ENABLE_GRAPHICS_CONTEXT_3D ON)
     114set(ENABLE_WEBKIT_LEGACY ON)
    114115set(ENABLE_WEBKIT ON)
    115 set(ENABLE_WEBKIT2 ON)

  • trunk/Source/cmake/OptionsWPE.cmake

    r219391 r219488  
    5252
    5353set(ENABLE_WEBCORE ON)
    54 set(ENABLE_WEBKIT OFF)
    55 set(ENABLE_WEBKIT2 ON)
     54set(ENABLE_WEBKIT_LEGACY OFF)
     55set(ENABLE_WEBKIT ON)
    5656set(ENABLE_API_TESTS ${DEVELOPER_MODE})
    5757set(ENABLE_TOOLS ON)

  • trunk/Source/cmake/WebKitFS.cmake

    r219486 r219488  
    3030set(DERIVED_SOURCES_JAVASCRIPTCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/JavaScriptCore")
    3131set(DERIVED_SOURCES_WEBCORE_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebCore")
    32 set(DERIVED_SOURCES_WEBKITLEGACY_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy")
     32set(DERIVED_SOURCES_WEBKIT_LEGACY_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKitLegacy")
    3333set(DERIVED_SOURCES_WEBKIT_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit")
    3434set(DERIVED_SOURCES_WEBKIT2_DIR "${CMAKE_BINARY_DIR}/DerivedSources/WebKit2")
    … …  
    4949endif ()
    5050
    51 if (ENABLE_WEBKIT2)
    52     file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT2_DIR})
     51if (ENABLE_WEBKIT)
     52    file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR})
    5353endif ()
    5454
    55 if (ENABLE_WEBKIT)
    56     file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKITLEGACY_DIR})
     55if (ENABLE_WEBKIT_LEGACY)
     56    file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_LEGACY_DIR})
    5757    file(MAKE_DIRECTORY ${DERIVED_SOURCES_WEBKIT_DIR})
    5858endif ()

  • trunk/Source/cmake/WebKitPackaging.cmake

    r219486 r219488  
    111111            "/WebKitLibraries/"
    112112            "/English\\\\.lproj/"
    113             "/Source/WebKit/"
     113            "/Source/WebKitLegacy/"
    114114            "\\\\.a$"
    115115            "\\\\.exe$"
Note: See TracChangeset for help on using the changeset viewer.