Fix 64-bit builds.
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 10 Mar 2008 23:02:43 +0000 (23:02 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 10 Mar 2008 23:02:43 +0000 (23:02 +0000)
        Reviewed by Stephanie.

        WebCore.exp only gets generated once for both 32-bit and 64-bit builds,
        so we must exclude the _NPN symbols when creating WebCore.LP64.exp.

        * WebCore.xcodeproj/project.pbxproj: Reverted build phase shell code to
        r30826 to remove _NPN symbols from 64-bit builds in WebCore.LP64.exp.

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

WebCore/ChangeLog
WebCore/WebCore.xcodeproj/project.pbxproj

index 38807ab..7f645e4 100644 (file)
@@ -1,3 +1,15 @@
+2008-03-10  David Kilzer  <ddkilzer@apple.com>
+
+        Fix 64-bit builds.
+
+        Reviewed by Stephanie.
+
+        WebCore.exp only gets generated once for both 32-bit and 64-bit builds,
+        so we must exclude the _NPN symbols when creating WebCore.LP64.exp.
+
+        * WebCore.xcodeproj/project.pbxproj: Reverted build phase shell code to
+        r30826 to remove _NPN symbols from 64-bit builds in WebCore.LP64.exp.
+
 2008-03-10  Eric Seidel  <eric@webkit.org>
 
         Reviewed by Darin.
index af624f5..25468c1 100644 (file)
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                        shellPath = /bin/sh;
-                       shellScript = "# Corrections for 64-bit\n# 1) Switch NSRect, NSSize and NSPoint with their CG counterparts\n# 2) Append any 64-bit only symbols from WebCore.LP64.exp\nsed -e s/7_NSRect/6CGRect/ -e s/7_NSSize/6CGSize/ -e s/8_NSPoint/7CGPoint/ \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/WebCore.exp\" > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/WebCore.LP64.exp\"\ncat \"${SRCROOT}/WebCore.LP64.exp\" >> \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/WebCore.LP64.exp\"\n";
+                       shellScript = "# Corrections for 64-bit\n# 1) Exclude _NPN_ symbols as NPAPI support is disabled in 64-bit\n# 2) Switch NSRect, NSSize and NSPoint with their CG counterparts\n# 3) Append any 64-bit only symbols from WebCore.LP64.exp\ngrep -v \"^__NPN_\" \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/WebCore.exp\" | sed -e s/7_NSRect/6CGRect/ -e s/7_NSSize/6CGSize/ -e s/8_NSPoint/7CGPoint/ -e s/^__ZN7WebCore5Frame20windowScriptNPObjectEv$// > \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/WebCore.LP64.exp\"\ncat \"${SRCROOT}/WebCore.LP64.exp\" >> \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/WebCore.LP64.exp\"\n";
                };
                5D2F7DA00C6879C600B5B72B /* Update Info.plist with version information */ = {
                        isa = PBXShellScriptBuildPhase;