Changeset 182846 in webkit

Timestamp:

Apr 15, 2015, 10:50:44 AM (11 years ago)

Author:

mitz@apple.com

Message:

<rdar://problem/20549298> No matching NSi_ definition for postprocessed value of WK_{MAC,IOS}_TBA
​https://bugs.webkit.org/show_bug.cgi?id=143786

Reviewed by Anders Carlsson.

• Shared/API/Cocoa/WKFoundation.h: Added a placeholder for the postprocessing script to

insert a definition of NSi_* for the current deployment target. Import CoreFoundation.h so
that we can check if the macro is already defined.

• WebKit2.xcodeproj/project.pbxproj: In the Postprocess WKFoundation.h script build phase,

replace the placeholder with a definition of NSi_{current deployment target} if not
already defined.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/API/Cocoa/WKFoundation.h (modified) (2 diffs)
• WebKit2.xcodeproj/project.pbxproj (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-04-15  Dan Bernstein  <mitz@apple.com>
+
+        <rdar://problem/20549298> No matching __NSi_ definition for postprocessed value of WK_{MAC,IOS}_TBA
+        https://bugs.webkit.org/show_bug.cgi?id=143786
+
+        Reviewed by Anders Carlsson.
+
+        * Shared/API/Cocoa/WKFoundation.h: Added a placeholder for the postprocessing script to
+        insert a definition of __NSi_* for the current deployment target. Import CoreFoundation.h so
+        that we can check if the macro is already defined.
+        * WebKit2.xcodeproj/project.pbxproj: In the Postprocess WKFoundation.h script build phase,
+        replace the placeholder with a definition of __NSi_{current deployment target} if not
+        already defined.
+
 2015-04-14  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h

@@ -25 +25 @@
 
 #import <Availability.h>
+#import <CoreFoundation/CoreFoundation.h>
 #import <TargetConditionals.h>
 
@@ -39 +40 @@
 #else
 #define WK_EXTERN extern __attribute__((visibility ("default")))
+#endif
+
+#ifdef WK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED
+// Do not remove or change this comment. POSTPROCESSING_INSERTS_DEPLOYMENT_TARGET_AVAILABILITY_DEFINITION_HERE
 #endif
 

trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

@@ -9085 +9085 @@
                         runOnlyForDeploymentPostprocessing = 0;
                         shellPath = /bin/sh;
-                        shellScript = "WKFOUNDATION_H=${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}/WKFoundation.h\n\nif [[ \"${WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED}\" == \"YES\" ]]; then\n    UNIFDEF_OPTIONS=\"-UWK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED\";\nelse\n    UNIFDEF_OPTIONS=\"-DWK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED\";\nfi\n\nunifdef -B ${UNIFDEF_OPTIONS} -o ${WKFOUNDATION_H}.unifdef ${WKFOUNDATION_H}\n\ncase $? in\n0)\n    rm ${WKFOUNDATION_H}.unifdef\n    ;;\n1)\n    mv ${WKFOUNDATION_H}{.unifdef,}\n    ;;\n*)\n    exit 1\nesac\n";
+                        shellScript = "WKFOUNDATION_H=${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}/WKFoundation.h\n\nif [[ \"${WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED}\" == \"YES\" ]]; then\n    UNIFDEF_OPTIONS=\"-UWK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED\";\nelse\n    UNIFDEF_OPTIONS=\"-DWK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED\";\nfi\n\nunifdef -B ${UNIFDEF_OPTIONS} -o ${WKFOUNDATION_H}.unifdef ${WKFOUNDATION_H}\n\ncase $? in\n0)\n    rm ${WKFOUNDATION_H}.unifdef\n    ;;\n1)\n    mv ${WKFOUNDATION_H}{.unifdef,}\n    ;;\n*)\n    exit 1\nesac\n\nif [[ \"${WK_FRAMEWORK_HEADER_POSTPROCESSING_DISABLED}\" != \"YES\" ]]; then\n    eval DEPLOYMENT_TARGET=\\$$DEPLOYMENT_TARGET_SETTING_NAME\n\n    sed -e \"/POSTPROCESSING_INSERTS_DEPLOYMENT_TARGET_AVAILABILITY_DEFINITION_HERE/c\\\\\n        #ifndef __NSi_${DEPLOYMENT_TARGET/\\./_}\\\\\n        #define __NSi_${DEPLOYMENT_TARGET/\\./_} introduced=${DEPLOYMENT_TARGET}\\\\\n        #endif\" ${WKFOUNDATION_H} > ${WKFOUNDATION_H}.sed\n\n    if ( cmp ${WKFOUNDATION_H} ${WKFOUNDATION_H}.sed > /dev/null ); then\n        rm ${WKFOUNDATION_H}.sed\n    else\n        mv ${WKFOUNDATION_H}{.sed,}\n    fi\nfi";
                 };
                 1ADAE12C1919A43F00F48E21 /* Migrate Headers to WebKit2 */ = {