Title: [183090] trunk/Source/WebKit2
Revision
183090
Author
ander...@apple.com
Date
2015-04-21 18:17:08 -0700 (Tue, 21 Apr 2015)

Log Message

Add module maps for WebKit
https://bugs.webkit.org/show_bug.cgi?id=144026
rdar://problem/19665428

Reviewed by Dan Bernstein.

* Configurations/WebKit.xcconfig:
* Modules/OSX.modulemap: Added.
* Modules/iOS.modulemap: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (183089 => 183090)


--- trunk/Source/WebKit2/ChangeLog	2015-04-22 00:51:07 UTC (rev 183089)
+++ trunk/Source/WebKit2/ChangeLog	2015-04-22 01:17:08 UTC (rev 183090)
@@ -1,3 +1,15 @@
+2015-04-21  Anders Carlsson  <ander...@apple.com>
+
+        Add module maps for WebKit
+        https://bugs.webkit.org/show_bug.cgi?id=144026
+        rdar://problem/19665428
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/WebKit.xcconfig:
+        * Modules/OSX.modulemap: Added.
+        * Modules/iOS.modulemap: Added.
+
 2015-04-21  Tim Horton  <timothy_hor...@apple.com>
 
         Long pause under _takeViewSnapshot when screen updates are disabled

Modified: trunk/Source/WebKit2/Configurations/WebKit.xcconfig (183089 => 183090)


--- trunk/Source/WebKit2/Configurations/WebKit.xcconfig	2015-04-22 00:51:07 UTC (rev 183089)
+++ trunk/Source/WebKit2/Configurations/WebKit.xcconfig	2015-04-22 01:17:08 UTC (rev 183090)
@@ -26,6 +26,10 @@
 PRODUCT_NAME = WebKit;
 INFOPLIST_FILE = Info.plist;
 
+DEFINES_MODULE=YES;
+MODULEMAP_FILE[sdk=macosx*]=Modules/OSX.modulemap;
+MODULEMAP_FILE[sdk=iphone*]=Modules/iOS.modulemap;
+
 INSTALL_PATH_ACTUAL = $(WEBKIT_FRAMEWORKS_DIR);
 DYLIB_INSTALL_NAME_BASE = $(NORMAL_WEBKIT_FRAMEWORKS_DIR);
 

Added: trunk/Source/WebKit2/Modules/OSX.modulemap (0 => 183090)


--- trunk/Source/WebKit2/Modules/OSX.modulemap	                        (rev 0)
+++ trunk/Source/WebKit2/Modules/OSX.modulemap	2015-04-22 01:17:08 UTC (rev 183090)
@@ -0,0 +1,21 @@
+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 *
+  }
+
+  exclude header "HIWebView.h"
+  exclude header "CarbonUtils.h"  
+}

Added: trunk/Source/WebKit2/Modules/iOS.modulemap (0 => 183090)


--- trunk/Source/WebKit2/Modules/iOS.modulemap	                        (rev 0)
+++ trunk/Source/WebKit2/Modules/iOS.modulemap	2015-04-22 01:17:08 UTC (rev 183090)
@@ -0,0 +1,5 @@
+framework module WebKit [system] [extern_c] {
+  umbrella header "WebKit.h"
+  module * { export * }
+  export *
+}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to