Title: [184043] trunk/Source/WebKit2
- Revision
- 184043
- Author
- [email protected]
- Date
- 2015-05-09 20:58:20 -0700 (Sat, 09 May 2015)
Log Message
Deployment-target __NSi_ and __NSd_ definitions in WKFoundation.h are redundant
https://bugs.webkit.org/show_bug.cgi?id=144831
Reviewed by Sam Weinig.
Reverted r182846 and r182904.
* Shared/API/Cocoa/WKFoundation.h:
* WebKit2.xcodeproj/project.pbxproj:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (184042 => 184043)
--- trunk/Source/WebKit2/ChangeLog 2015-05-10 03:22:21 UTC (rev 184042)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-10 03:58:20 UTC (rev 184043)
@@ -1,3 +1,15 @@
+2015-05-09 Dan Bernstein <[email protected]>
+
+ Deployment-target __NSi_ and __NSd_ definitions in WKFoundation.h are redundant
+ https://bugs.webkit.org/show_bug.cgi?id=144831
+
+ Reviewed by Sam Weinig.
+
+ Reverted r182846 and r182904.
+
+ * Shared/API/Cocoa/WKFoundation.h:
+ * WebKit2.xcodeproj/project.pbxproj:
+
2015-05-09 Yoav Weiss <[email protected]>
Remove the PICTURE_SIZES build flag
Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h (184042 => 184043)
--- trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2015-05-10 03:22:21 UTC (rev 184042)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h 2015-05-10 03:58:20 UTC (rev 184043)
@@ -24,7 +24,6 @@
*/
#import <Availability.h>
-#import <CoreFoundation/CoreFoundation.h>
#import <TargetConditionals.h>
#if !defined(WK_API_ENABLED)
@@ -41,10 +40,6 @@
#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
-
#ifndef WK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED
#define WK_AVAILABLE(_mac, _ios)
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (184042 => 184043)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-05-10 03:22:21 UTC (rev 184042)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-05-10 03:58:20 UTC (rev 184043)
@@ -9080,7 +9080,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\\\\\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";
+ 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";
};
1ADAE12C1919A43F00F48E21 /* Migrate Headers to WebKit2 */ = {
isa = PBXShellScriptBuildPhase;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
