Title: [174081] trunk/Source/WebKit2
- Revision
- 174081
- Author
- [email protected]
- Date
- 2014-09-29 13:19:52 -0700 (Mon, 29 Sep 2014)
Log Message
Set the TBA versions based on the PLATFORM_NAME
https://bugs.webkit.org/show_bug.cgi?id=137226
Follow-up fix for <rdar://problem/17761459>.
Reviewed by Dan Bernstein.
* mac/rewrite-availability-macros.sh:
Turns out that MACOSX_DEPLOYMENT_TARGET is set even for iOS builds,
so set the versions based on the PLATFORM_NAME environment variable.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (174080 => 174081)
--- trunk/Source/WebKit2/ChangeLog 2014-09-29 19:42:08 UTC (rev 174080)
+++ trunk/Source/WebKit2/ChangeLog 2014-09-29 20:19:52 UTC (rev 174081)
@@ -1,3 +1,15 @@
+2014-09-29 Anders Carlsson <[email protected]>
+
+ Set the TBA versions based on the PLATFORM_NAME
+ https://bugs.webkit.org/show_bug.cgi?id=137226
+ Follow-up fix for <rdar://problem/17761459>.
+
+ Reviewed by Dan Bernstein.
+
+ * mac/rewrite-availability-macros.sh:
+ Turns out that MACOSX_DEPLOYMENT_TARGET is set even for iOS builds,
+ so set the versions based on the PLATFORM_NAME environment variable.
+
2014-09-29 Dan Bernstein <[email protected]>
Build fix.
Modified: trunk/Source/WebKit2/mac/rewrite-availability-macros.sh (174080 => 174081)
--- trunk/Source/WebKit2/mac/rewrite-availability-macros.sh 2014-09-29 19:42:08 UTC (rev 174080)
+++ trunk/Source/WebKit2/mac/rewrite-availability-macros.sh 2014-09-29 20:19:52 UTC (rev 174081)
@@ -35,16 +35,17 @@
fi
function rewrite_headers () {
- if [[ -z "$IPHONEOS_DEPLOYMENT_TARGET" ]]; then
- IOS_VERSION="NA"
- else
+ if [[ $PLATFORM_NAME == "iphonesimulator" || $PLATFORM_NAME == "iphoneos" ]]; then
IOS_VERSION=${IPHONEOS_DEPLOYMENT_TARGET/\./_}
- fi
+ OSX_VERSION="NA"
- if [[ -z "$MACOSX_DEPLOYMENT_TARGET" ]]; then
- OSX_VERSION="NA"
+ # FIXME: Remove this once <rdar://problem/18343823> has been fixed.
+ IOS_VERSION="NA"
+ elif [[ $PLATFORM_NAME == "macosx" ]]; then
+ OSX_VERSION=${MACOSX_DEPLOYMENT_TARGET/\./_}
+ IOS_VERSION="NA"
else
- OSX_VERSION=${MACOSX_DEPLOYMENT_TARGET/\./_}
+ exit 1;
fi
for HEADER_PATH in $1/*.h; do
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
