Title: [182908] tags/Safari-601.1.27.1/Source/WebKit2
Revision
182908
Author
bshaf...@apple.com
Date
2015-04-16 13:40:58 -0700 (Thu, 16 Apr 2015)

Log Message

Merged r182904.  rdar://problem/20575744

Modified Paths

Diff

Modified: tags/Safari-601.1.27.1/Source/WebKit2/ChangeLog (182907 => 182908)


--- tags/Safari-601.1.27.1/Source/WebKit2/ChangeLog	2015-04-16 20:37:30 UTC (rev 182907)
+++ tags/Safari-601.1.27.1/Source/WebKit2/ChangeLog	2015-04-16 20:40:58 UTC (rev 182908)
@@ -1,3 +1,15 @@
+2015-04-16  Babak Shafiei  <bshaf...@apple.com>
+
+        Merge r182904.
+
+    2015-04-16  Dan Bernstein  <m...@apple.com>
+
+            <rdar://problem/20575744> Also include a definition of __NSd_{current deployment target} in WKFoundation.h.
+
+            Reviewed by Tim Horton.
+
+            * WebKit2.xcodeproj/project.pbxproj:
+
 2015-04-15  Babak Shafiei  <bshaf...@apple.com>
 
         Merge r182846.

Modified: tags/Safari-601.1.27.1/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (182907 => 182908)


--- tags/Safari-601.1.27.1/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj	2015-04-16 20:37:30 UTC (rev 182907)
+++ tags/Safari-601.1.27.1/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj	2015-04-16 20:40:58 UTC (rev 182908)
@@ -9084,7 +9084,7 @@
 			);
 			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\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_TA
 RGET}\\\\\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";
+			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_TAR
 GET}\\\\\n        #endif\\\\\n        #ifndef __NSd_${DEPLOYMENT_TARGET/\\./_}\\\\\n        #define __NSd_${DEPLOYMENT_TARGET/\\./_} ,deprecated=${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 */ = {
 			isa = PBXShellScriptBuildPhase;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to