Title: [251889] trunk/Source/WebKit
- Revision
- 251889
- Author
- d...@apple.com
- Date
- 2019-10-31 15:48:22 -0700 (Thu, 31 Oct 2019)
Log Message
REGRESSION (r251215): Mail failed to build
https://bugs.webkit.org/show_bug.cgi?id=203700
<rdar://problem/56787012>
Reviewed by Antoine Quint.
Revert the private modulemap. It didn't include enough things
and caused some internal builds to fail.
We'll put it back with everything included sometime soon.
* Configurations/WebKit.xcconfig:
* Modules/OSX.modulemap: Renamed from Source/WebKit/Modules/macOS.modulemap.
* Modules/iOS.private.modulemap: Removed.
* Modules/macOS.private.modulemap: Removed.
* Shared/API/Cocoa/WebKitPrivate.h:
Modified Paths
Added Paths
Removed Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (251888 => 251889)
--- trunk/Source/WebKit/ChangeLog 2019-10-31 22:45:05 UTC (rev 251888)
+++ trunk/Source/WebKit/ChangeLog 2019-10-31 22:48:22 UTC (rev 251889)
@@ -1,3 +1,22 @@
+2019-10-31 Dean Jackson <d...@apple.com>
+
+ REGRESSION (r251215): Mail failed to build
+ https://bugs.webkit.org/show_bug.cgi?id=203700
+ <rdar://problem/56787012>
+
+ Reviewed by Antoine Quint.
+
+ Revert the private modulemap. It didn't include enough things
+ and caused some internal builds to fail.
+
+ We'll put it back with everything included sometime soon.
+
+ * Configurations/WebKit.xcconfig:
+ * Modules/OSX.modulemap: Renamed from Source/WebKit/Modules/macOS.modulemap.
+ * Modules/iOS.private.modulemap: Removed.
+ * Modules/macOS.private.modulemap: Removed.
+ * Shared/API/Cocoa/WebKitPrivate.h:
+
2019-10-31 Alex Christensen <achristen...@apple.com>
Enable more features in Mac CMake build
Modified: trunk/Source/WebKit/Configurations/WebKit.xcconfig (251888 => 251889)
--- trunk/Source/WebKit/Configurations/WebKit.xcconfig 2019-10-31 22:45:05 UTC (rev 251888)
+++ trunk/Source/WebKit/Configurations/WebKit.xcconfig 2019-10-31 22:48:22 UTC (rev 251889)
@@ -30,10 +30,7 @@
DEFINES_MODULE = YES;
MODULEMAP_FILE = $(MODULEMAP_FILE_$(WK_COCOA_TOUCH));
MODULEMAP_FILE_cocoatouch = Modules/iOS.modulemap;
-MODULEMAP_FILE_ = Modules/macOS.modulemap;
-MODULEMAP_PRIVATE_FILE = $(MODULEMAP_PRIVATE_FILE_$(WK_COCOA_TOUCH));
-MODULEMAP_PRIVATE_FILE_cocoatouch = Modules/iOS.private.modulemap;
-MODULEMAP_PRIVATE_FILE_ = Modules/macOS.private.modulemap;
+MODULEMAP_FILE_ = Modules/OSX.modulemap;
INSTALL_PATH = $(WEBKIT_FRAMEWORKS_DIR);
DYLIB_INSTALL_NAME_BASE = $(DYLIB_INSTALL_NAME_BASE_$(WK_USE_ALTERNATE_FRAMEWORKS_DIR));
Copied: trunk/Source/WebKit/Modules/OSX.modulemap (from rev 251888, trunk/Source/WebKit/Modules/macOS.modulemap) (0 => 251889)
--- trunk/Source/WebKit/Modules/OSX.modulemap (rev 0)
+++ trunk/Source/WebKit/Modules/OSX.modulemap 2019-10-31 22:48:22 UTC (rev 251889)
@@ -0,0 +1,18 @@
+framework module WebKit [system] [extern_c] {
+ umbrella header "WebKit.h"
+ module * { export * }
+ export *
+
+ explicit module NPAPI {
+ header "nptypes.h"
+ header "npapi.h"
+ header "npfunctions.h"
+ header "npruntime.h"
+ export *
+ }
+
+ explicit module DOMProgressEvent {
+ header "DOMProgressEvent.h"
+ export *
+ }
+}
Deleted: trunk/Source/WebKit/Modules/iOS.private.modulemap (251888 => 251889)
--- trunk/Source/WebKit/Modules/iOS.private.modulemap 2019-10-31 22:45:05 UTC (rev 251888)
+++ trunk/Source/WebKit/Modules/iOS.private.modulemap 2019-10-31 22:48:22 UTC (rev 251889)
@@ -1,5 +0,0 @@
-framework module WebKit_Private [system] [extern_c] {
- umbrella header "WebKitPrivate.h"
- module * { export * }
- export *
-}
Deleted: trunk/Source/WebKit/Modules/macOS.modulemap (251888 => 251889)
--- trunk/Source/WebKit/Modules/macOS.modulemap 2019-10-31 22:45:05 UTC (rev 251888)
+++ trunk/Source/WebKit/Modules/macOS.modulemap 2019-10-31 22:48:22 UTC (rev 251889)
@@ -1,18 +0,0 @@
-framework module WebKit [system] [extern_c] {
- umbrella header "WebKit.h"
- module * { export * }
- export *
-
- explicit module NPAPI {
- header "nptypes.h"
- header "npapi.h"
- header "npfunctions.h"
- header "npruntime.h"
- export *
- }
-
- explicit module DOMProgressEvent {
- header "DOMProgressEvent.h"
- export *
- }
-}
Deleted: trunk/Source/WebKit/Modules/macOS.private.modulemap (251888 => 251889)
--- trunk/Source/WebKit/Modules/macOS.private.modulemap 2019-10-31 22:45:05 UTC (rev 251888)
+++ trunk/Source/WebKit/Modules/macOS.private.modulemap 2019-10-31 22:48:22 UTC (rev 251889)
@@ -1,5 +0,0 @@
-framework module WebKit_Private [system] [extern_c] {
- umbrella header "WebKitPrivate.h"
- module * { export * }
- export *
-}
Modified: trunk/Source/WebKit/Shared/API/Cocoa/WebKitPrivate.h (251888 => 251889)
--- trunk/Source/WebKit/Shared/API/Cocoa/WebKitPrivate.h 2019-10-31 22:45:05 UTC (rev 251888)
+++ trunk/Source/WebKit/Shared/API/Cocoa/WebKitPrivate.h 2019-10-31 22:48:22 UTC (rev 251889)
@@ -25,7 +25,6 @@
#import <WebKit/WKHistoryDelegatePrivate.h>
#import <WebKit/WKNavigationPrivate.h>
-#import <WebKit/WKPreferencesPrivate.h>
#import <WebKit/WKProcessPoolPrivate.h>
#import <WebKit/WKUIDelegatePrivate.h>
#import <WebKit/WKWebViewConfigurationPrivate.h>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
