Title: [161887] trunk/Source/WebKit
- Revision
- 161887
- Author
- [email protected]
- Date
- 2014-01-13 10:20:44 -0800 (Mon, 13 Jan 2014)
Log Message
[iOS] Build Fix: switch back to calling postprocess-headers.sh
Source/WebKit:
* WebKit.xcodeproj/project.pbxproj:
Source/WebKit/mac:
* postprocess-headers.sh:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (161886 => 161887)
--- trunk/Source/WebKit/ChangeLog 2014-01-13 17:46:17 UTC (rev 161886)
+++ trunk/Source/WebKit/ChangeLog 2014-01-13 18:20:44 UTC (rev 161887)
@@ -1,3 +1,9 @@
+2014-01-13 Andy Estes <[email protected]>
+
+ [iOS] Build Fix: switch back to calling postprocess-headers.sh
+
+ * WebKit.xcodeproj/project.pbxproj:
+
2014-01-12 Dan Bernstein <[email protected]>
Try to fix the Windows build after r161852.
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (161886 => 161887)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-01-13 17:46:17 UTC (rev 161886)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2014-01-13 18:20:44 UTC (rev 161887)
@@ -2137,7 +2137,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "postProcessInDirectory() {\n cd \"$1\"\n\n if [[ ${PLATFORM_NAME} == iphoneos ]]; then\n local unifdefOptions=\"-DTARGET_OS_EMBEDDED=1 -DTARGET_OS_IPHONE=1 -DTARGET_IPHONE_SIMULATOR=0 -DENABLE_IOS_TOUCH_EVENTS=1 -DENABLE_IOS_GESTURE_EVENTS=1\";\n elif [[ ${PLATFORM_NAME} == iphonesimulator ]]; then\n local unifdefOptions=\"-DTARGET_OS_EMBEDDED=0 -DTARGET_OS_IPHONE=1 -DTARGET_IPHONE_SIMULATOR=1 -DENABLE_IOS_TOUCH_EVENTS=1 -DENABLE_IOS_GESTURE_EVENTS=1\";\n else\n local unifdefOptions=\"-DTARGET_OS_EMBEDDED=0 -DTARGET_OS_IPHONE=0 -DTARGET_IPHONE_SIMULATOR=0 -DENABLE_IOS_TOUCH_EVENTS=0 -DENABLE_IOS_GESTURE_EVENTS=0\";\n fi\n\n for header in $(find . -name '*.h' -type f); do\n unifdef -B ${unifdefOptions} -o ${header}.unifdef ${header}\n case $? in\n 0)\n rm ${header}.unifdef\n ;;\n 1)\n mv ${header}{.unifdef,}\n ;;\n *)\n exit 1\n ;;\n esac\n done\n}\n\npostProcessInDirectory \"${TARGET_BUILD_DIR}/${PUBLIC_HEADERS_FOLDER_PATH}\"\npostProcessInDirectory \"${TARGET_BUILD_DIR}/${PRIVATE_HEADERS_FOLDER_PATH}\"";
+ shellScript = "exec \"${SRCROOT}/mac/postprocess-headers.sh\"";
};
A55DEAA516703F9F003DB841 /* Check For Inappropriate Macros in External Headers */ = {
isa = PBXShellScriptBuildPhase;
Modified: trunk/Source/WebKit/mac/ChangeLog (161886 => 161887)
--- trunk/Source/WebKit/mac/ChangeLog 2014-01-13 17:46:17 UTC (rev 161886)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-13 18:20:44 UTC (rev 161887)
@@ -1,3 +1,9 @@
+2014-01-13 Andy Estes <[email protected]>
+
+ [iOS] Build Fix: switch back to calling postprocess-headers.sh
+
+ * postprocess-headers.sh:
+
2014-01-13 Zalan Bujtas <[email protected]>
Enable SUBPIXEL_LAYOUT on Mac
Modified: trunk/Source/WebKit/mac/postprocess-headers.sh (161886 => 161887)
--- trunk/Source/WebKit/mac/postprocess-headers.sh 2014-01-13 17:46:17 UTC (rev 161886)
+++ trunk/Source/WebKit/mac/postprocess-headers.sh 2014-01-13 18:20:44 UTC (rev 161887)
@@ -7,11 +7,11 @@
local unifdefOptions sedExpression
if [[ ${PLATFORM_NAME} == iphoneos ]]; then
- unifdefOptions="-DTARGET_OS_EMBEDDED=1 -DTARGET_OS_IPHONE=1 -DTARGET_IPHONE_SIMULATOR=0";
+ unifdefOptions="-DTARGET_OS_EMBEDDED=1 -DTARGET_OS_IPHONE=1 -DTARGET_IPHONE_SIMULATOR=0 -DENABLE_IOS_TOUCH_EVENTS=1 -DENABLE_IOS_GESTURE_EVENTS=1";
elif [[ ${PLATFORM_NAME} == iphonesimulator ]]; then
- unifdefOptions="-DTARGET_OS_EMBEDDED=0 -DTARGET_OS_IPHONE=1 -DTARGET_IPHONE_SIMULATOR=1";
+ unifdefOptions="-DTARGET_OS_EMBEDDED=0 -DTARGET_OS_IPHONE=1 -DTARGET_IPHONE_SIMULATOR=1 -DENABLE_IOS_TOUCH_EVENTS=1 -DENABLE_IOS_GESTURE_EVENTS=1";
else
- unifdefOptions="-DTARGET_OS_EMBEDDED=0 -DTARGET_OS_IPHONE=0 -DTARGET_IPHONE_SIMULATOR=0";
+ unifdefOptions="-DTARGET_OS_EMBEDDED=0 -DTARGET_OS_IPHONE=0 -DTARGET_IPHONE_SIMULATOR=0 -DENABLE_IOS_TOUCH_EVENTS=0 -DENABLE_IOS_GESTURE_EVENTS=0";
fi
if [[ ${PLATFORM_NAME} == iphone* ]]; then
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
