REGRESSION (r251215): Mail failed to build
authordino@apple.com <dino@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 31 Oct 2019 22:48:22 +0000 (22:48 +0000)
committerdino@apple.com <dino@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 31 Oct 2019 22:48:22 +0000 (22:48 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@251889 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/ChangeLog
Source/WebKit/Configurations/WebKit.xcconfig
Source/WebKit/Modules/OSX.modulemap [moved from Source/WebKit/Modules/macOS.modulemap with 100% similarity]
Source/WebKit/Modules/iOS.private.modulemap [deleted file]
Source/WebKit/Modules/macOS.private.modulemap [deleted file]
Source/WebKit/Shared/API/Cocoa/WebKitPrivate.h

index 54b7475..a801a54 100644 (file)
@@ -1,3 +1,22 @@
+2019-10-31  Dean Jackson  <dino@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  <achristensen@apple.com>
 
         Enable more features in Mac CMake build
index b67f1c2..fea25ee 100644 (file)
@@ -30,10 +30,7 @@ INFOPLIST_FILE = Info.plist;
 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));
diff --git a/Source/WebKit/Modules/iOS.private.modulemap b/Source/WebKit/Modules/iOS.private.modulemap
deleted file mode 100644 (file)
index 02d82e9..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-framework module WebKit_Private [system] [extern_c] {
-  umbrella header "WebKitPrivate.h"
-  module * { export * }
-  export *
-}
diff --git a/Source/WebKit/Modules/macOS.private.modulemap b/Source/WebKit/Modules/macOS.private.modulemap
deleted file mode 100644 (file)
index 02d82e9..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-framework module WebKit_Private [system] [extern_c] {
-  umbrella header "WebKitPrivate.h"
-  module * { export * }
-  export *
-}
index 6ec3b4d..18bf0c5 100644 (file)
@@ -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>