Changeset 218843 in webkit
- Timestamp:
- Jun 27, 2017 2:30:01 PM (7 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 16 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r218601 r218843 3 3 set_property(DIRECTORY . PROPERTY FOLDER "WebCore") 4 4 add_subdirectory(PAL/pal) 5 6 if (PAL_LIBRARY_TYPE MATCHES STATIC) 7 add_definitions(-DSTATICALLY_LINKED_WITH_PAL=1) 8 endif () 5 9 6 10 set(WebCore_INCLUDE_DIRECTORIES … … 116 120 "${WEBCORE_DIR}/xml/parser" 117 121 "${DERIVED_SOURCES_WEBCORE_DIR}" 122 "${PAL_DIR}" 118 123 "${CMAKE_SOURCE_DIR}/Source" 119 124 ) -
trunk/Source/WebCore/ChangeLog
r218841 r218843 1 2017-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 1 14 2017-06-27 John Wilander <wilander@apple.com> 2 15 -
trunk/Source/WebCore/PAL/ChangeLog
r218626 r218843 1 2017-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 1 17 2017-06-20 Zan Dobersek <zdobersek@igalia.com> 2 18 -
trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj
r213978 r218843 7 7 objects = { 8 8 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 9 23 /* Begin PBXBuildFile section */ 24 0C2D9E731EEF5AF600DBC317 /* ExportMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 0C2D9E721EEF5AF600DBC317 /* ExportMacros.h */; }; 10 25 1C09D0531E31C44100725F18 /* CryptoDigest.h in Headers */ = {isa = PBXBuildFile; fileRef = 1C09D0521E31C44100725F18 /* CryptoDigest.h */; }; 11 26 1C09D0561E31C46500725F18 /* CryptoDigestCommonCrypto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1C09D0551E31C46500725F18 /* CryptoDigestCommonCrypto.cpp */; }; … … 13 28 /* End PBXBuildFile section */ 14 29 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 15 40 /* Begin PBXFileReference section */ 41 0C2D9E721EEF5AF600DBC317 /* ExportMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExportMacros.h; sourceTree = "<group>"; }; 16 42 1C09D03D1E31C32800725F18 /* libPAL.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPAL.a; sourceTree = BUILT_PRODUCTS_DIR; }; 17 43 1C09D0521E31C44100725F18 /* CryptoDigest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoDigest.h; sourceTree = "<group>"; }; … … 23 49 1C67CEA11E32EDA800F80F2E /* FeatureDefines.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = FeatureDefines.xcconfig; sourceTree = "<group>"; }; 24 50 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>"; }; 25 52 /* End PBXFileReference section */ 26 53 … … 57 84 isa = PBXGroup; 58 85 children = ( 86 0C2D9E721EEF5AF600DBC317 /* ExportMacros.h */, 59 87 1C09D0511E31C41200725F18 /* crypto */, 60 88 ); … … 87 115 1C09D05D1E31C77A00725F18 /* PAL.xcconfig */, 88 116 1C67CEA21E32EE2600F80F2E /* Version.xcconfig */, 117 C2147A4A1EFD0AA600056FA5 /* CopyPALHeaders.xcconfig */, 89 118 ); 90 119 path = Configurations; … … 100 129 1C09D0581E31C57E00725F18 /* config.h in Headers */, 101 130 1C09D0531E31C44100725F18 /* CryptoDigest.h in Headers */, 131 0C2D9E731EEF5AF600DBC317 /* ExportMacros.h in Headers */, 102 132 ); 103 133 runOnlyForDeploymentPostprocessing = 0; … … 117 147 ); 118 148 dependencies = ( 149 C280B42D1EFD07FE00D35135 /* PBXTargetDependency */, 119 150 ); 120 151 name = PAL; … … 133 164 1C09D03C1E31C32800725F18 = { 134 165 CreatedOnToolsVersion = 8.3; 166 ProvisioningStyle = Automatic; 167 }; 168 C280B4201EFD056400D35135 = { 169 CreatedOnToolsVersion = 8.3.3; 135 170 ProvisioningStyle = Automatic; 136 171 }; … … 156 191 targets = ( 157 192 1C09D03C1E31C32800725F18 /* PAL */, 193 C280B4201EFD056400D35135 /* Copy PAL Headers */, 158 194 ); 159 195 }; 160 196 /* 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 */ 161 214 162 215 /* Begin PBXSourcesBuildPhase section */ … … 171 224 /* End PBXSourcesBuildPhase section */ 172 225 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 173 234 /* Begin XCBuildConfiguration section */ 174 235 1C09D0461E31C32800725F18 /* Debug */ = { … … 216 277 baseConfigurationReference = 1C09D05D1E31C77A00725F18 /* PAL.xcconfig */; 217 278 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)"; 218 303 }; 219 304 name = Production; … … 242 327 defaultConfigurationName = Production; 243 328 }; 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 }; 244 339 /* End XCConfigurationList section */ 245 340 }; -
trunk/Source/WebCore/PAL/config.h
r216227 r218843 24 24 #endif 25 25 26 #include <wtf/Platform.h> 27 28 #include <wtf/ExportMacros.h> 26 #include <pal/ExportMacros.h> 29 27 30 28 #ifdef __cplusplus -
trunk/Source/WebCore/PAL/pal/ExportMacros.h
r218842 r218843 1 1 /* 2 * Copyright (C) 201 1 AppleInc. All rights reserved.2 * Copyright (C) 2017 Sony Interactive Entertainment Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 21 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 22 * (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. 24 24 * 25 25 * This file handles shared library symbol export decorations. It is recommended … … 27 27 * properly on all platforms and compilers that WebKit builds under. 28 28 */ 29 #ifndef PlatformExportMacros_h30 #define PlatformExportMacros_h31 29 32 #include <wtf/Platform.h> 30 #pragma once 31 33 32 #include <wtf/ExportMacros.h> 34 33 … … 36 35 #if USE(EXPORT_MACROS) 37 36 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 41 39 #else 42 // Windows must set this per-project 40 #define PAL_EXPORT WTF_IMPORT 43 41 #endif 44 42 43 #define PAL_TESTSUPPORT_EXPORT PAL_EXPORT 44 45 45 #else // !USE(EXPORT_MACROS) 46 #define WEBCORE_EXPORT 47 #define WEBCORE_TESTSUPPORT_EXPORT 46 47 #define PAL_EXPORT 48 #define PAL_TESTSUPPORT_EXPORT 48 49 49 50 #endif // USE(EXPORT_MACROS) 50 51 #endif // PlatformExportMacros_h -
trunk/Source/WebCore/PAL/pal/PlatformWin.cmake
r211027 r218843 2 2 crypto/win/CryptoDigestWin.cpp 3 3 ) 4 5 set(PAL_OUTPUT_NAME PAL${DEBUG_SUFFIX}) -
trunk/Source/WebCore/PAL/pal/crypto/CryptoDigest.h
r211027 r218843 43 43 SHA_512, 44 44 }; 45 static std::unique_ptr<CryptoDigest> create(Algorithm);46 ~CryptoDigest();45 PAL_EXPORT static std::unique_ptr<CryptoDigest> create(Algorithm); 46 PAL_EXPORT ~CryptoDigest(); 47 47 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(); 50 50 51 51 private: -
trunk/Source/WebCore/config.h
r217404 r218843 34 34 #endif 35 35 36 #include <wtf/ExportMacros.h>37 36 #include "PlatformExportMacros.h" 38 37 #include <pal/ExportMacros.h> 39 38 #include <runtime/JSExportMacros.h> 40 39 -
trunk/Source/WebCore/platform/PlatformExportMacros.h
r182768 r218843 27 27 * properly on all platforms and compilers that WebKit builds under. 28 28 */ 29 #ifndef PlatformExportMacros_h30 #define PlatformExportMacros_h31 29 32 #include <wtf/Platform.h> 30 #pragma once 31 33 32 #include <wtf/ExportMacros.h> 34 33 … … 48 47 49 48 #endif // USE(EXPORT_MACROS) 50 51 #endif // PlatformExportMacros_h -
trunk/Source/WebKit2/ChangeLog
r218842 r218843 1 2017-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 1 10 2017-06-27 Ryosuke Niwa <rniwa@webkit.org> 2 11 -
trunk/Source/WebKit2/config.h
r215683 r218843 29 29 #endif 30 30 31 #include <wtf/Platform.h>32 33 31 #include <WebCore/PlatformExportMacros.h> 32 #include <pal/ExportMacros.h> 34 33 #include <runtime/JSExportMacros.h> 35 34 #include <wtf/DisallowCType.h> 36 #include <wtf/ExportMacros.h>37 35 38 36 #ifdef __cplusplus -
trunk/Tools/ChangeLog
r218841 r218843 1 2017-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 1 13 2017-06-27 John Wilander <wilander@apple.com> 2 14 -
trunk/Tools/DumpRenderTree/config.h
r217404 r218843 19 19 */ 20 20 21 #pragma once22 23 21 #if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE) 24 22 #include "cmakeconfig.h" … … 26 24 27 25 #include <WebCore/PlatformExportMacros.h> 26 #include <pal/ExportMacros.h> 28 27 #include <runtime/JSExportMacros.h> 29 28 -
trunk/Tools/TestWebKitAPI/CMakeLists.txt
r218496 r218843 101 101 ${CMAKE_SOURCE_DIR}/Source 102 102 ${JAVASCRIPTCORE_DIR} 103 ${PAL_DIR} 103 104 ${THIRDPARTY_DIR}/gtest/include 104 105 ${WEBKIT2_DIR}/Platform/IPC -
trunk/Tools/TestWebKitAPI/config.h
r217404 r218843 31 31 #ifndef BUILDING_JSCONLY__ 32 32 #include <WebCore/PlatformExportMacros.h> 33 #include <pal/ExportMacros.h> 33 34 #endif 34 35 -
trunk/Tools/WebKitTestRunner/config.h
r204877 r218843 22 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 23 */ 24 25 #ifndef WebKitTestRunner_config_h26 #define WebKitTestRunner_config_h27 24 28 #if defined 25 #if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H && defined(BUILDING_WITH_CMAKE) 29 26 #include "cmakeconfig.h" 30 27 #endif … … 32 29 #include <WebCore/PlatformExportMacros.h> 33 30 #include <WebKit/WebKit2_C.h> 34 #include <wtf/Platform.h> 35 #include <wtf/ExportMacros.h> 31 #include <pal/ExportMacros.h> 36 32 #include <runtime/JSExportMacros.h> 37 38 #endif
Note: See TracChangeset
for help on using the changeset viewer.