Changeset 184043 in webkit
- Timestamp:
- May 9, 2015, 8:58:20 PM (9 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r184040 r184043 1 2015-05-09 Dan Bernstein <mitz@apple.com> 2 3 Deployment-target __NSi_ and __NSd_ definitions in WKFoundation.h are redundant 4 https://bugs.webkit.org/show_bug.cgi?id=144831 5 6 Reviewed by Sam Weinig. 7 8 Reverted r182846 and r182904. 9 10 * Shared/API/Cocoa/WKFoundation.h: 11 * WebKit2.xcodeproj/project.pbxproj: 12 1 13 2015-05-09 Yoav Weiss <yoav@yoav.ws> 2 14 -
trunk/Source/WebKit2/Shared/API/Cocoa/WKFoundation.h
r183152 r184043 25 25 26 26 #import <Availability.h> 27 #import <CoreFoundation/CoreFoundation.h>28 27 #import <TargetConditionals.h> 29 28 … … 40 39 #else 41 40 #define WK_EXTERN extern __attribute__((visibility ("default"))) 42 #endif43 44 #ifdef WK_FRAMEWORK_HEADER_POSTPROCESSING_ENABLED45 // Do not remove or change this comment. POSTPROCESSING_INSERTS_DEPLOYMENT_TARGET_AVAILABILITY_DEFINITION_HERE46 41 #endif 47 42 -
trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj
r183841 r184043 9081 9081 runOnlyForDeploymentPostprocessing = 0; 9082 9082 shellPath = /bin/sh; 9083 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\\\\\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";9083 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"; 9084 9084 }; 9085 9085 1ADAE12C1919A43F00F48E21 /* Migrate Headers to WebKit2 */ = {
Note:
See TracChangeset
for help on using the changeset viewer.