Changeset 25000 in webkit for trunk/JavaScriptCore/JavaScriptCore.xcodeproj

Timestamp:

Aug 10, 2007, 4:24:24 PM (18 years ago)

Author:

thatcher

Message:

JavaScriptCore:

Reviewed by Adam.

<rdar://problem/5394449> Stop using some Carbon UI APIs for 64 bit

Disable the NPAPI for 64-bit on Mac OS X.

• Configurations/JavaScriptCore.xcconfig: Use the 64-bit export file.
• JavaScriptCore.xcodeproj/project.pbxproj: Create a 64-bit export file that filters out the NPN fnctions.
• bindings/NP_jsobject.cpp: #ifdef out this for 64-bit on Mac OS X
• bindings/NP_jsobject.h: Ditto.
• bindings/c/c_class.cpp: Ditto.
• bindings/c/c_class.h: Ditto.
• bindings/c/c_instance.cpp: Ditto.
• bindings/c/c_instance.h: Ditto.
• bindings/c/c_runtime.cpp: Ditto.
• bindings/c/c_runtime.h: Ditto.
• bindings/c/c_utility.cpp: Ditto.
• bindings/c/c_utility.h: Ditto.
• bindings/npapi.h: Ditto.
• bindings/npruntime.cpp: Ditto.
• bindings/npruntime.h: Ditto.
• bindings/npruntime_impl.h: Ditto.
• bindings/npruntime_priv.h: Ditto.
• bindings/runtime.cpp: (KJS::Bindings::Instance::createBindingForLanguageInstance): don't creat an NPObject on Mac OS X in 64-bit.

WebCore:

Reviewed by Adam.

<rdar://problem/5394449> Stop using some Carbon UI APIs for 64 bit

Disable NPObject use in 64-bit on Mac OS X.

• Configurations/WebCore.xcconfig: Add a framework search path to the sub-framworks of Carbon.
• WebCore.xcodeproj/project.pbxproj: Filter out the Frame::windowScriptNPObject() symbol in 64-bit.
• bindings/objc/DOM.mm: (-[DOMElement _NPObject]): Return null in 64-bit.
• config.h: Set WTF_USE_NPOBJECT to 0 in 64-bit Mac OS X.
• page/Frame.cpp: (WebCore::Frame::cleanupScriptObjects): Add more #if USE(NPOBJECT) blocks where needed.
• page/Frame.h: Ditto.
• page/mac/FrameMac.mm: (WebCore::Frame::createScriptInstanceForWidget): Ditto.
• page/mac/WebCoreFrameBridge.h: Ditto.
• page/mac/WebCoreFrameBridge.mm: Ditto.

WebKit:

Reviewed by Adam.

<rdar://problem/5394449> Stop using some Carbon UI APIs for 64 bit

Disable NPObject use in 64-bit on Mac OS X. Also generate the 64-bit export file.

• Configurations/WebKit.xcconfig: Point to the generated 64-bit export file.
• Plugins/WebBasePluginPackage.h:
• Plugins/npfunctions.h: #ifdef out this header in 64-bit on Mac OS X.
• WebKit.LP64.exp: Removed.
• WebKit.xcodeproj/project.pbxproj: Generate the the 64-bit export file.
• WebKitPrefix.h: Define WTF_USE_NPOBJECT.

File:

• trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (modified) (2 diffs)

trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -1306 +1306 @@
                                 9319586B09D9F91A00A56FD4 /* Check For Global Initializers */,
                                 932F5BD20822A1C700736975 /* Frameworks */,
+                                1C395CBC0C6BCC16000D1E52 /* Generate 64-bit Export File */,
                         );
                         buildRules = (
@@ -1408 +1409 @@
                         shellPath = /bin/sh;
                         shellScript = "cp \"${SRCROOT}/API/testapi.js\" \"${BUILT_PRODUCTS_DIR}\"";
+                };
+                1C395CBC0C6BCC16000D1E52 /* Generate 64-bit Export File */ = {
+                        isa = PBXShellScriptBuildPhase;
+                        buildActionMask = 2147483647;
+                        files = (
+                        );
+                        inputPaths = (
+                                "$(SRCROOT)/JavaScriptCore.exp",
+                        );
+                        name = "Generate 64-bit Export File";
+                        outputPaths = (
+                                "$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/JavaScriptCore.LP64.exp",
+                        );
+                        runOnlyForDeploymentPostprocessing = 0;
+                        shellPath = /bin/sh;
+                        shellScript = "# exclude NPN functions on 64-bit\nsed -e s/^.\\*NPN.\\*$// \"${SRCROOT}/JavaScriptCore.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore/JavaScriptCore.LP64.exp\"\n";
                 };
                 5D2F7CF90C6875BB00B5B72B /* Update Info.plist with version information */ = {