Changeset 218843 in webkit


Ignore:
Timestamp:
Jun 27, 2017 2:30:01 PM (7 years ago)
Author:
don.olmstead@sony.com
Message:

[PAL] Add symbol export macros for PAL
https://bugs.webkit.org/show_bug.cgi?id=171519

Reviewed by Konstantin Tokarev.

Source/WebCore:

No new tests. No change in behavior.

  • CMakeLists.txt:
  • config.h:
  • platform/PlatformExportMacros.h:

Source/WebCore/PAL:

No new tests. No change in behavior.

  • Configurations/CopyPALHeaders.xcconfig: Added.
  • PAL.xcodeproj/project.pbxproj:
  • config.h:
  • pal/ExportMacros.h: Copied from Source/WebCore/platform/PlatformExportMacros.h.
  • pal/PlatformWin.cmake:
  • pal/crypto/CryptoDigest.h:

Source/WebKit2:

  • config.h:

Tools:

  • DumpRenderTree/config.h:
  • TestWebKitAPI/CMakeLists.txt:
  • TestWebKitAPI/config.h:
  • WebKitTestRunner/config.h:
Location:
trunk
Files:
1 added
16 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/CMakeLists.txt

    r218601 r218843  
    33set_property(DIRECTORY . PROPERTY FOLDER "WebCore")
    44add_subdirectory(PAL/pal)
     5
     6if (PAL_LIBRARY_TYPE MATCHES STATIC)
     7    add_definitions(-DSTATICALLY_LINKED_WITH_PAL=1)
     8endif ()
    59
    610set(WebCore_INCLUDE_DIRECTORIES
     
    116120    "${WEBCORE_DIR}/xml/parser"
    117121    "${DERIVED_SOURCES_WEBCORE_DIR}"
     122    "${PAL_DIR}"
    118123    "${CMAKE_SOURCE_DIR}/Source"
    119124)
  • trunk/Source/WebCore/ChangeLog

    r218841 r218843  
     12017-06-27  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [PAL] Add symbol export macros for PAL
     4        https://bugs.webkit.org/show_bug.cgi?id=171519
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        No new tests. No change in behavior.
     9
     10        * CMakeLists.txt:
     11        * config.h:
     12        * platform/PlatformExportMacros.h:
     13
    1142017-06-27  John Wilander  <wilander@apple.com>
    215
  • trunk/Source/WebCore/PAL/ChangeLog

    r218626 r218843  
     12017-06-27  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [PAL] Add symbol export macros for PAL
     4        https://bugs.webkit.org/show_bug.cgi?id=171519
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        No new tests. No change in behavior.
     9
     10        * Configurations/CopyPALHeaders.xcconfig: Added.
     11        * PAL.xcodeproj/project.pbxproj:
     12        * config.h:
     13        * pal/ExportMacros.h: Copied from Source/WebCore/platform/PlatformExportMacros.h.
     14        * pal/PlatformWin.cmake:
     15        * pal/crypto/CryptoDigest.h:
     16
    1172017-06-20  Zan Dobersek  <zdobersek@igalia.com>
    218
  • trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj

    r213978 r218843  
    77        objects = {
    88
     9/* Begin PBXAggregateTarget section */
     10                C280B4201EFD056400D35135 /* Copy PAL Headers */ = {
     11                        isa = PBXAggregateTarget;
     12                        buildConfigurationList = C280B4251EFD056400D35135 /* Build configuration list for PBXAggregateTarget "Copy PAL Headers" */;
     13                        buildPhases = (
     14                                C280B42A1EFD05CE00D35135 /* Copy PAL Headers */,
     15                        );
     16                        dependencies = (
     17                        );
     18                        name = "Copy PAL Headers";
     19                        productName = "Copy PAL Headers";
     20                };
     21/* End PBXAggregateTarget section */
     22
    923/* Begin PBXBuildFile section */
     24                0C2D9E731EEF5AF600DBC317 /* ExportMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2D9E721EEF5AF600DBC317 /* ExportMacros.h */; };
    1025                1C09D0531E31C44100725F18 /* CryptoDigest.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C09D0521E31C44100725F18 /* CryptoDigest.h */; };
    1126                1C09D0561E31C46500725F18 /* CryptoDigestCommonCrypto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C09D0551E31C46500725F18 /* CryptoDigestCommonCrypto.cpp */; };
     
    1328/* End PBXBuildFile section */
    1429
     30/* Begin PBXContainerItemProxy section */
     31                C280B42C1EFD07FE00D35135 /* PBXContainerItemProxy */ = {
     32                        isa = PBXContainerItemProxy;
     33                        containerPortal = 1C09D0351E31C32800725F18 /* Project object */;
     34                        proxyType = 1;
     35                        remoteGlobalIDString = C280B4201EFD056400D35135;
     36                        remoteInfo = "Copy PAL Headers";
     37                };
     38/* End PBXContainerItemProxy section */
     39
    1540/* Begin PBXFileReference section */
     41                0C2D9E721EEF5AF600DBC317 /* ExportMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExportMacros.h; sourceTree = "<group>"; };
    1642                1C09D03D1E31C32800725F18 /* libPAL.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPAL.a; sourceTree = BUILT_PRODUCTS_DIR; };
    1743                1C09D0521E31C44100725F18 /* CryptoDigest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoDigest.h; sourceTree = "<group>"; };
     
    2349                1C67CEA11E32EDA800F80F2E /* FeatureDefines.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = FeatureDefines.xcconfig; sourceTree = "<group>"; };
    2450                1C67CEA21E32EE2600F80F2E /* Version.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Version.xcconfig; sourceTree = "<group>"; };
     51                C2147A4A1EFD0AA600056FA5 /* CopyPALHeaders.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = CopyPALHeaders.xcconfig; sourceTree = "<group>"; };
    2552/* End PBXFileReference section */
    2653
     
    5784                        isa = PBXGroup;
    5885                        children = (
     86                                0C2D9E721EEF5AF600DBC317 /* ExportMacros.h */,
    5987                                1C09D0511E31C41200725F18 /* crypto */,
    6088                        );
     
    87115                                1C09D05D1E31C77A00725F18 /* PAL.xcconfig */,
    88116                                1C67CEA21E32EE2600F80F2E /* Version.xcconfig */,
     117                                C2147A4A1EFD0AA600056FA5 /* CopyPALHeaders.xcconfig */,
    89118                        );
    90119                        path = Configurations;
     
    100129                                1C09D0581E31C57E00725F18 /* config.h in Headers */,
    101130                                1C09D0531E31C44100725F18 /* CryptoDigest.h in Headers */,
     131                                0C2D9E731EEF5AF600DBC317 /* ExportMacros.h in Headers */,
    102132                        );
    103133                        runOnlyForDeploymentPostprocessing = 0;
     
    117147                        );
    118148                        dependencies = (
     149                                C280B42D1EFD07FE00D35135 /* PBXTargetDependency */,
    119150                        );
    120151                        name = PAL;
     
    133164                                        1C09D03C1E31C32800725F18 = {
    134165                                                CreatedOnToolsVersion = 8.3;
     166                                                ProvisioningStyle = Automatic;
     167                                        };
     168                                        C280B4201EFD056400D35135 = {
     169                                                CreatedOnToolsVersion = 8.3.3;
    135170                                                ProvisioningStyle = Automatic;
    136171                                        };
     
    156191                        targets = (
    157192                                1C09D03C1E31C32800725F18 /* PAL */,
     193                                C280B4201EFD056400D35135 /* Copy PAL Headers */,
    158194                        );
    159195                };
    160196/* End PBXProject section */
     197
     198/* Begin PBXShellScriptBuildPhase section */
     199                C280B42A1EFD05CE00D35135 /* Copy PAL Headers */ = {
     200                        isa = PBXShellScriptBuildPhase;
     201                        buildActionMask = 2147483647;
     202                        files = (
     203                        );
     204                        inputPaths = (
     205                        );
     206                        name = "Copy PAL Headers";
     207                        outputPaths = (
     208                        );
     209                        runOnlyForDeploymentPostprocessing = 0;
     210                        shellPath = /bin/sh;
     211                        shellScript = "if [[ \"${DEPLOYMENT_LOCATION}\" == \"NO\" ]]; then\n    PRIVATE_HEADERS_PATH=\"${TARGET_BUILD_DIR%/}/${PRIVATE_HEADERS_FOLDER_PATH}\"\nelse\n    PRIVATE_HEADERS_PATH=\"${DSTROOT}/${PRIVATE_HEADERS_FOLDER_PATH}\"\nfi;\n\nmkdir -p \"${PRIVATE_HEADERS_PATH}\"\nrsync -av --no-owner --no-group --prune-empty-dirs --exclude \".svn\" --exclude \"usr\" --exclude \"DerivedSources\" --include \"*/\" --include \"*.h\" --exclude \"*\" \"${SRCROOT}/pal/\" \"${PRIVATE_HEADERS_PATH}\"\n";
     212                };
     213/* End PBXShellScriptBuildPhase section */
    161214
    162215/* Begin PBXSourcesBuildPhase section */
     
    171224/* End PBXSourcesBuildPhase section */
    172225
     226/* Begin PBXTargetDependency section */
     227                C280B42D1EFD07FE00D35135 /* PBXTargetDependency */ = {
     228                        isa = PBXTargetDependency;
     229                        target = C280B4201EFD056400D35135 /* Copy PAL Headers */;
     230                        targetProxy = C280B42C1EFD07FE00D35135 /* PBXContainerItemProxy */;
     231                };
     232/* End PBXTargetDependency section */
     233
    173234/* Begin XCBuildConfiguration section */
    174235                1C09D0461E31C32800725F18 /* Debug */ = {
     
    216277                        baseConfigurationReference = 1C09D05D1E31C77A00725F18 /* PAL.xcconfig */;
    217278                        buildSettings = {
     279                        };
     280                        name = Production;
     281                };
     282                C280B4261EFD056400D35135 /* Debug */ = {
     283                        isa = XCBuildConfiguration;
     284                        baseConfigurationReference = C2147A4A1EFD0AA600056FA5 /* CopyPALHeaders.xcconfig */;
     285                        buildSettings = {
     286                                PRODUCT_NAME = "$(TARGET_NAME)";
     287                        };
     288                        name = Debug;
     289                };
     290                C280B4271EFD056400D35135 /* Release */ = {
     291                        isa = XCBuildConfiguration;
     292                        baseConfigurationReference = C2147A4A1EFD0AA600056FA5 /* CopyPALHeaders.xcconfig */;
     293                        buildSettings = {
     294                                PRODUCT_NAME = "$(TARGET_NAME)";
     295                        };
     296                        name = Release;
     297                };
     298                C280B4281EFD056400D35135 /* Production */ = {
     299                        isa = XCBuildConfiguration;
     300                        baseConfigurationReference = C2147A4A1EFD0AA600056FA5 /* CopyPALHeaders.xcconfig */;
     301                        buildSettings = {
     302                                PRODUCT_NAME = "$(TARGET_NAME)";
    218303                        };
    219304                        name = Production;
     
    242327                        defaultConfigurationName = Production;
    243328                };
     329                C280B4251EFD056400D35135 /* Build configuration list for PBXAggregateTarget "Copy PAL Headers" */ = {
     330                        isa = XCConfigurationList;
     331                        buildConfigurations = (
     332                                C280B4261EFD056400D35135 /* Debug */,
     333                                C280B4271EFD056400D35135 /* Release */,
     334                                C280B4281EFD056400D35135 /* Production */,
     335                        );
     336                        defaultConfigurationIsVisible = 0;
     337                        defaultConfigurationName = Production;
     338                };
    244339/* End XCConfigurationList section */
    245340        };
  • trunk/Source/WebCore/PAL/config.h

    r216227 r218843  
    2424#endif
    2525
    26 #include <wtf/Platform.h>
    27 
    28 #include <wtf/ExportMacros.h>
     26#include <pal/ExportMacros.h>
    2927
    3028#ifdef __cplusplus
  • trunk/Source/WebCore/PAL/pal/ExportMacros.h

    r218842 r218843  
    11/*
    2  * Copyright (C) 2011 Apple Inc.  All rights reserved.
     2 * Copyright (C) 2017 Sony Interactive Entertainment Inc.  All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
     
    2121 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
    2222 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
    23  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
     23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2424 *
    2525 * This file handles shared library symbol export decorations. It is recommended
     
    2727 * properly on all platforms and compilers that WebKit builds under.
    2828 */
    29 #ifndef PlatformExportMacros_h
    30 #define PlatformExportMacros_h
    3129
    32 #include <wtf/Platform.h>
     30#pragma once
     31
    3332#include <wtf/ExportMacros.h>
    3433
     
    3635#if USE(EXPORT_MACROS)
    3736
    38 #if !PLATFORM(WIN)
    39 #define WEBCORE_EXPORT WTF_EXPORT
    40 #define WEBCORE_TESTSUPPORT_EXPORT WTF_EXPORT
     37#if defined(BUILDING_PAL) || defined(STATICALLY_LINKED_WITH_PAL)
     38#define PAL_EXPORT WTF_EXPORT
    4139#else
    42 // Windows must set this per-project
     40#define PAL_EXPORT WTF_IMPORT
    4341#endif
    4442
     43#define PAL_TESTSUPPORT_EXPORT PAL_EXPORT
     44
    4545#else // !USE(EXPORT_MACROS)
    46 #define WEBCORE_EXPORT
    47 #define WEBCORE_TESTSUPPORT_EXPORT
     46
     47#define PAL_EXPORT
     48#define PAL_TESTSUPPORT_EXPORT
    4849
    4950#endif // USE(EXPORT_MACROS)
    50 
    51 #endif // PlatformExportMacros_h
  • trunk/Source/WebCore/PAL/pal/PlatformWin.cmake

    r211027 r218843  
    22    crypto/win/CryptoDigestWin.cpp
    33)
     4
     5set(PAL_OUTPUT_NAME PAL${DEBUG_SUFFIX})
  • trunk/Source/WebCore/PAL/pal/crypto/CryptoDigest.h

    r211027 r218843  
    4343        SHA_512,
    4444    };
    45     static std::unique_ptr<CryptoDigest> create(Algorithm);
    46     ~CryptoDigest();
     45    PAL_EXPORT static std::unique_ptr<CryptoDigest> create(Algorithm);
     46    PAL_EXPORT ~CryptoDigest();
    4747
    48     void addBytes(const void* input, size_t length);
    49     Vector<uint8_t> computeHash();
     48    PAL_EXPORT void addBytes(const void* input, size_t length);
     49    PAL_EXPORT Vector<uint8_t> computeHash();
    5050
    5151private:
  • trunk/Source/WebCore/config.h

    r217404 r218843  
    3434#endif
    3535
    36 #include <wtf/ExportMacros.h>
    3736#include "PlatformExportMacros.h"
    38 
     37#include <pal/ExportMacros.h>
    3938#include <runtime/JSExportMacros.h>
    4039
  • trunk/Source/WebCore/platform/PlatformExportMacros.h

    r182768 r218843  
    2727 * properly on all platforms and compilers that WebKit builds under.
    2828 */
    29 #ifndef PlatformExportMacros_h
    30 #define PlatformExportMacros_h
    3129
    32 #include <wtf/Platform.h>
     30#pragma once
     31
    3332#include <wtf/ExportMacros.h>
    3433
     
    4847
    4948#endif // USE(EXPORT_MACROS)
    50 
    51 #endif // PlatformExportMacros_h
  • trunk/Source/WebKit2/ChangeLog

    r218842 r218843  
     12017-06-27  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [PAL] Add symbol export macros for PAL
     4        https://bugs.webkit.org/show_bug.cgi?id=171519
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        * config.h:
     9
    1102017-06-27  Ryosuke Niwa  <rniwa@webkit.org>
    211
  • trunk/Source/WebKit2/config.h

    r215683 r218843  
    2929#endif
    3030
    31 #include <wtf/Platform.h>
    32 
    3331#include <WebCore/PlatformExportMacros.h>
     32#include <pal/ExportMacros.h>
    3433#include <runtime/JSExportMacros.h>
    3534#include <wtf/DisallowCType.h>
    36 #include <wtf/ExportMacros.h>
    3735
    3836#ifdef __cplusplus
  • trunk/Tools/ChangeLog

    r218841 r218843  
     12017-06-27  Don Olmstead  <don.olmstead@sony.com>
     2
     3        [PAL] Add symbol export macros for PAL
     4        https://bugs.webkit.org/show_bug.cgi?id=171519
     5
     6        Reviewed by Konstantin Tokarev.
     7
     8        * DumpRenderTree/config.h:
     9        * TestWebKitAPI/CMakeLists.txt:
     10        * TestWebKitAPI/config.h:
     11        * WebKitTestRunner/config.h:
     12
    1132017-06-27  John Wilander  <wilander@apple.com>
    214
  • trunk/Tools/DumpRenderTree/config.h

    r217404 r218843  
    1919 */
    2020
    21 #pragma once
    22 
    2321#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE)
    2422#include "cmakeconfig.h"
     
    2624
    2725#include <WebCore/PlatformExportMacros.h>
     26#include <pal/ExportMacros.h>
    2827#include <runtime/JSExportMacros.h>
    2928
  • trunk/Tools/TestWebKitAPI/CMakeLists.txt

    r218496 r218843  
    101101    ${CMAKE_SOURCE_DIR}/Source
    102102    ${JAVASCRIPTCORE_DIR}
     103    ${PAL_DIR}
    103104    ${THIRDPARTY_DIR}/gtest/include
    104105    ${WEBKIT2_DIR}/Platform/IPC
  • trunk/Tools/TestWebKitAPI/config.h

    r217404 r218843  
    3131#ifndef BUILDING_JSCONLY__
    3232#include <WebCore/PlatformExportMacros.h>
     33#include <pal/ExportMacros.h>
    3334#endif
    3435
  • trunk/Tools/WebKitTestRunner/config.h

    r204877 r218843  
    2222 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2323 */
    24  
    25 #ifndef WebKitTestRunner_config_h
    26 #define WebKitTestRunner_config_h
    2724
    28 #if defined (BUILDING_WITH_CMAKE)
     25#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE)
    2926#include "cmakeconfig.h"
    3027#endif
     
    3229#include <WebCore/PlatformExportMacros.h>
    3330#include <WebKit/WebKit2_C.h>
    34 #include <wtf/Platform.h>
    35 #include <wtf/ExportMacros.h>
     31#include <pal/ExportMacros.h>
    3632#include <runtime/JSExportMacros.h>
    37 
    38 #endif
Note: See TracChangeset for help on using the changeset viewer.