Changeset 255086 in webkit

Timestamp:

Jan 24, 2020 12:00:16 PM (4 years ago)

Author:

keith_miller@apple.com

Message:

JSC should produce a module map.
​https://bugs.webkit.org/show_bug.cgi?id=206717

Reviewed by Mark Lam.

• Configurations/JavaScriptCore.xcconfig:
• JavaScriptCore.modulemap:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• Configurations/JavaScriptCore.xcconfig (modified) (1 diff)
• JavaScriptCore.modulemap (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2020-01-24  Keith Miller  <keith_miller@apple.com>
+
+        JSC should produce a module map.
+        https://bugs.webkit.org/show_bug.cgi?id=206717
+
+        Reviewed by Mark Lam.
+
+        * Configurations/JavaScriptCore.xcconfig:
+        * JavaScriptCore.modulemap:
+
 2020-01-24  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/JavaScriptCore/Configurations/JavaScriptCore.xcconfig

@@ -25 +25 @@
 #include "Version.xcconfig"
 
-DEFINES_MODULE = $(DEFINES_MODULE_$(WK_PLATFORM_NAME))
-DEFINES_MODULE_maccatalyst = YES;
-DEFINES_MODULE_macosx = YES;
-DEFINES_MODULE_ = NO;
+DEFINES_MODULE = YES;
 MODULEMAP_FILE = $(SRCROOT)/JavaScriptCore.modulemap;
 

trunk/Source/JavaScriptCore/JavaScriptCore.modulemap

@@ -1 @@
-framework module JavaScriptCore {
+framework module JavaScriptCore [extern_c] {
   umbrella header "JavaScriptCore.h"
 
@@ -6 +6 @@
     export *
   }
-
-  explicit module JSVirtualMachine {
-    // FIXME: 32-bit x86 is a poor way to say "fragile Objective-C ABI"
-    requires x86_32
-    exclude header "JSValue.h"
-    exclude header "JSContext.h"
-    exclude header "JSExport.h"
-    exclude header "JSManagedValue.h"
-    exclude header "JSVirtualMachine.h"
-  }
 }