Title: [173763] trunk
Revision
173763
Author
[email protected]
Date
2014-09-19 11:10:32 -0700 (Fri, 19 Sep 2014)

Log Message

Always assume internal SDK when building configuration Production
https://bugs.webkit.org/show_bug.cgi?id=136925
<rdar://problem/18362399>

Reviewed by Dan Bernstein.

Source/bmalloc:

* Configurations/Base.xcconfig:

Source/_javascript_Core:

As a side effect of this change we will always enable ENABLE_TOUCH_EVENTS, ENABLE_IOS_{GESTURE, TOUCH}_EVENTS,
and ENABLE_XSLT when either building configuration Production or building with the Internal SDK.

* Configurations/Base.xcconfig:

Source/ThirdParty/ANGLE:

* Configurations/Base.xcconfig:

Source/WebCore:

As a side effect of this change we will always enable ENABLE_TOUCH_EVENTS, ENABLE_IOS_{GESTURE, TOUCH}_EVENTS,
and ENABLE_XSLT when either building configuration Production or building with the Internal SDK.

* Configurations/Base.xcconfig:

Source/WebInspectorUI:

* Configurations/DebugRelease.xcconfig: Also move #include of HaveInternalSDK.xcconfig from DebugRelease.xcconfig
to Base.xcconfig so as to be consistent with the format of other Base.xcconfig/DebugRelease.xcconfig files
(e.g. Source/WebCore/Configurations/Base.xcconfig and Source/WebCore/Configurations/DebugRelease.xcconfig).

Source/WebKit/mac:

As a side effect of this change we will always enable ENABLE_TOUCH_EVENTS, ENABLE_IOS_{GESTURE, TOUCH}_EVENTS,
and ENABLE_XSLT when either building configuration Production or building with the Internal SDK.

* Configurations/Base.xcconfig:

Source/WebKit2:

As a side effect of this change we will always enable ENABLE_TOUCH_EVENTS, ENABLE_IOS_{GESTURE, TOUCH}_EVENTS,
and ENABLE_XSLT when either building configuration Production or building with the Internal SDK.

* Configurations/Base.xcconfig:

Source/WTF:

* Configurations/Base.xcconfig:

Tools:

* DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
* MiniBrowser/Configurations/DebugRelease.xcconfig:
* TestWebKitAPI/Configurations/DebugRelease.xcconfig:
* WebKitTestRunner/Configurations/DebugRelease.xcconfig:

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (173762 => 173763)


--- trunk/Source/_javascript_Core/ChangeLog	2014-09-19 18:04:33 UTC (rev 173762)
+++ trunk/Source/_javascript_Core/ChangeLog	2014-09-19 18:10:32 UTC (rev 173763)
@@ -1,3 +1,16 @@
+2014-09-19  Daniel Bates  <[email protected]>
+
+        Always assume internal SDK when building configuration Production
+        https://bugs.webkit.org/show_bug.cgi?id=136925
+        <rdar://problem/18362399>
+
+        Reviewed by Dan Bernstein.
+
+        As a side effect of this change we will always enable ENABLE_TOUCH_EVENTS, ENABLE_IOS_{GESTURE, TOUCH}_EVENTS,
+        and ENABLE_XSLT when either building configuration Production or building with the Internal SDK.
+
+        * Configurations/Base.xcconfig:
+
 2014-09-19  Diego Pino Garcia  <[email protected]>
 
         Simple ES6 feature:String prototype additions

Modified: trunk/Source/_javascript_Core/Configurations/Base.xcconfig (173762 => 173763)


--- trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2014-09-19 18:04:33 UTC (rev 173762)
+++ trunk/Source/_javascript_Core/Configurations/Base.xcconfig	2014-09-19 18:10:32 UTC (rev 173763)
@@ -22,8 +22,13 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 #include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
-#include "../../../../Internal/Configurations/UseInternalSDK.xcconfig"
+#include "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
 
+USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
+USE_INTERNAL_SDK_Production = YES;
+USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
+USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
+
 CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_WARN_BOOL_CONVERSION = YES;
@@ -45,13 +50,9 @@
 GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME));
 GCC_ENABLE_OBJC_GC_iphoneos = NO;
 GCC_ENABLE_OBJC_GC_iphonesimulator = NO;
-GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(CONFIGURATION));
-GCC_ENABLE_OBJC_GC_macosx_Production = supported;
-GCC_ENABLE_OBJC_GC_macosx_Debug = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release);
-GCC_ENABLE_OBJC_GC_macosx_Release = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release);
-GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_$(USE_INTERNAL_SDK));
-GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_ = NO;
-GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_YES = supported;
+GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(USE_INTERNAL_SDK));
+GCC_ENABLE_OBJC_GC_macosx_ = NO;
+GCC_ENABLE_OBJC_GC_macosx_YES = supported;
 GCC_ENABLE_SYMBOL_SEPARATION = NO;
 GCC_FAST_OBJC_DISPATCH = YES;
 GCC_GENERATE_DEBUGGING_SYMBOLS = YES;

Modified: trunk/Source/ThirdParty/ANGLE/ChangeLog (173762 => 173763)


--- trunk/Source/ThirdParty/ANGLE/ChangeLog	2014-09-19 18:04:33 UTC (rev 173762)
+++ trunk/Source/ThirdParty/ANGLE/ChangeLog	2014-09-19 18:10:32 UTC (rev 173763)
@@ -1,3 +1,13 @@
+2014-09-19  Daniel Bates  <[email protected]>
+
+        Always assume internal SDK when building configuration Production
+        https://bugs.webkit.org/show_bug.cgi?id=136925
+        <rdar://problem/18362399>
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/Base.xcconfig:
+
 2014-09-10  Roger Fong  <[email protected]>
 
         Check for varying packing restrictions per program instead of per shader.

Modified: trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig (173762 => 173763)


--- trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig	2014-09-19 18:04:33 UTC (rev 173762)
+++ trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig	2014-09-19 18:10:32 UTC (rev 173763)
@@ -1,6 +1,11 @@
 #include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
-#include "../../../../../Internal/Configurations/UseInternalSDK.xcconfig"
+#include "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
 
+USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
+USE_INTERNAL_SDK_Production = YES;
+USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
+USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
+
 CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_WARN_CONSTANT_CONVERSION = YES;
@@ -16,13 +21,9 @@
 GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME));
 GCC_ENABLE_OBJC_GC_iphoneos = NO;
 GCC_ENABLE_OBJC_GC_iphonesimulator = NO;
-GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(CONFIGURATION));
-GCC_ENABLE_OBJC_GC_macosx_Production = supported;
-GCC_ENABLE_OBJC_GC_macosx_Debug = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release);
-GCC_ENABLE_OBJC_GC_macosx_Release = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release);
-GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_$(USE_INTERNAL_SDK));
-GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_ = NO;
-GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_YES = supported;
+GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(USE_INTERNAL_SDK));
+GCC_ENABLE_OBJC_GC_macosx_ = NO;
+GCC_ENABLE_OBJC_GC_macosx_YES = supported;
 GCC_ENABLE_SYMBOL_SEPARATION = NO;
 GCC_FAST_OBJC_DISPATCH = YES;
 GCC_INLINES_ARE_PRIVATE_EXTERN = YES;

Modified: trunk/Source/WTF/ChangeLog (173762 => 173763)


--- trunk/Source/WTF/ChangeLog	2014-09-19 18:04:33 UTC (rev 173762)
+++ trunk/Source/WTF/ChangeLog	2014-09-19 18:10:32 UTC (rev 173763)
@@ -1,3 +1,13 @@
+2014-09-19  Daniel Bates  <[email protected]>
+
+        Always assume internal SDK when building configuration Production
+        https://bugs.webkit.org/show_bug.cgi?id=136925
+        <rdar://problem/18362399>
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/Base.xcconfig:
+
 2014-09-19  Diego Pino Garcia  <[email protected]>
 
         Simple ES6 feature:String prototype additions

Modified: trunk/Source/WTF/Configurations/Base.xcconfig (173762 => 173763)


--- trunk/Source/WTF/Configurations/Base.xcconfig	2014-09-19 18:04:33 UTC (rev 173762)
+++ trunk/Source/WTF/Configurations/Base.xcconfig	2014-09-19 18:10:32 UTC (rev 173763)
@@ -22,8 +22,13 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 #include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
-#include "../../../../Internal/Configurations/UseInternalSDK.xcconfig"
+#include "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
 
+USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
+USE_INTERNAL_SDK_Production = YES;
+USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
+USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
+
 CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_WARN_BOOL_CONVERSION = YES;
@@ -45,13 +50,9 @@
 GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME));
 GCC_ENABLE_OBJC_GC_iphoneos = NO;
 GCC_ENABLE_OBJC_GC_iphonesimulator = NO;
-GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(CONFIGURATION));
-GCC_ENABLE_OBJC_GC_macosx_Production = supported;
-GCC_ENABLE_OBJC_GC_macosx_Debug = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release);
-GCC_ENABLE_OBJC_GC_macosx_Release = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release);
-GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_$(USE_INTERNAL_SDK));
-GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_ = NO;
-GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_YES = supported;
+GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(USE_INTERNAL_SDK));
+GCC_ENABLE_OBJC_GC_macosx_ = NO;
+GCC_ENABLE_OBJC_GC_macosx_YES = supported;
 GCC_ENABLE_SYMBOL_SEPARATION = NO;
 GCC_FAST_OBJC_DISPATCH = YES;
 GCC_GENERATE_DEBUGGING_SYMBOLS = YES;

Modified: trunk/Source/WebCore/ChangeLog (173762 => 173763)


--- trunk/Source/WebCore/ChangeLog	2014-09-19 18:04:33 UTC (rev 173762)
+++ trunk/Source/WebCore/ChangeLog	2014-09-19 18:10:32 UTC (rev 173763)
@@ -1,3 +1,16 @@
+2014-09-19  Daniel Bates  <[email protected]>
+
+        Always assume internal SDK when building configuration Production
+        https://bugs.webkit.org/show_bug.cgi?id=136925
+        <rdar://problem/18362399>
+
+        Reviewed by Dan Bernstein.
+
+        As a side effect of this change we will always enable ENABLE_TOUCH_EVENTS, ENABLE_IOS_{GESTURE, TOUCH}_EVENTS,
+        and ENABLE_XSLT when either building configuration Production or building with the Internal SDK.
+
+        * Configurations/Base.xcconfig:
+
 2014-09-19  Chris Dumez  <[email protected]>
 
         Optimize MarkupAccumulator::appendText()

Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (173762 => 173763)


--- trunk/Source/WebCore/Configurations/Base.xcconfig	2014-09-19 18:04:33 UTC (rev 173762)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig	2014-09-19 18:10:32 UTC (rev 173763)
@@ -22,8 +22,13 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 #include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
-#include "../../../../Internal/Configurations/UseInternalSDK.xcconfig"
+#include "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
 
+USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
+USE_INTERNAL_SDK_Production = YES;
+USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
+USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
+
 CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_WARN_BOOL_CONVERSION = YES;
@@ -45,13 +50,9 @@
 GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME));
 GCC_ENABLE_OBJC_GC_iphoneos = NO;
 GCC_ENABLE_OBJC_GC_iphonesimulator = NO;
-GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(CONFIGURATION));
-GCC_ENABLE_OBJC_GC_macosx_Production = supported;
-GCC_ENABLE_OBJC_GC_macosx_Debug = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release);
-GCC_ENABLE_OBJC_GC_macosx_Release = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release);
-GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_$(USE_INTERNAL_SDK));
-GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_ = NO;
-GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_YES = supported;
+GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(USE_INTERNAL_SDK));
+GCC_ENABLE_OBJC_GC_macosx_ = NO;
+GCC_ENABLE_OBJC_GC_macosx_YES = supported;
 GCC_ENABLE_SYMBOL_SEPARATION = NO;
 GCC_FAST_OBJC_DISPATCH = YES;
 GCC_GENERATE_DEBUGGING_SYMBOLS = YES;

Modified: trunk/Source/WebInspectorUI/ChangeLog (173762 => 173763)


--- trunk/Source/WebInspectorUI/ChangeLog	2014-09-19 18:04:33 UTC (rev 173762)
+++ trunk/Source/WebInspectorUI/ChangeLog	2014-09-19 18:10:32 UTC (rev 173763)
@@ -1,3 +1,15 @@
+2014-09-19  Daniel Bates  <[email protected]>
+
+        Always assume internal SDK when building configuration Production
+        https://bugs.webkit.org/show_bug.cgi?id=136925
+        <rdar://problem/18362399>
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/DebugRelease.xcconfig: Also move #include of HaveInternalSDK.xcconfig from DebugRelease.xcconfig
+        to Base.xcconfig so as to be consistent with the format of other Base.xcconfig/DebugRelease.xcconfig files
+        (e.g. Source/WebCore/Configurations/Base.xcconfig and Source/WebCore/Configurations/DebugRelease.xcconfig).
+
 2014-09-19  Carlos Garcia Campos  <[email protected]>
 
         Webkitgtk 2.5.3: tarball contains APPLE LICENSE file - stating not distributable

Modified: trunk/Source/WebInspectorUI/Configurations/Base.xcconfig (173762 => 173763)


--- trunk/Source/WebInspectorUI/Configurations/Base.xcconfig	2014-09-19 18:04:33 UTC (rev 173762)
+++ trunk/Source/WebInspectorUI/Configurations/Base.xcconfig	2014-09-19 18:10:32 UTC (rev 173763)
@@ -1,3 +1,10 @@
+#include "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
+
+USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
+USE_INTERNAL_SDK_Production = YES;
+USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
+USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
+
 COPY_PHASE_STRIP = NO;
 DEAD_CODE_STRIPPING = YES;
 DEBUG_INFORMATION_FORMAT = dwarf-with-dsym;

Modified: trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig (173762 => 173763)


--- trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig	2014-09-19 18:04:33 UTC (rev 173762)
+++ trunk/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig	2014-09-19 18:10:32 UTC (rev 173763)
@@ -1,4 +1,3 @@
-#include "../../../../Internal/Configurations/UseInternalSDK.xcconfig"
 #include "Base.xcconfig"
 
 ARCHS = $(ARCHS_STANDARD_32_64_BIT);

Modified: trunk/Source/WebKit/mac/ChangeLog (173762 => 173763)


--- trunk/Source/WebKit/mac/ChangeLog	2014-09-19 18:04:33 UTC (rev 173762)
+++ trunk/Source/WebKit/mac/ChangeLog	2014-09-19 18:10:32 UTC (rev 173763)
@@ -1,3 +1,16 @@
+2014-09-19  Daniel Bates  <[email protected]>
+
+        Always assume internal SDK when building configuration Production
+        https://bugs.webkit.org/show_bug.cgi?id=136925
+        <rdar://problem/18362399>
+
+        Reviewed by Dan Bernstein.
+
+        As a side effect of this change we will always enable ENABLE_TOUCH_EVENTS, ENABLE_IOS_{GESTURE, TOUCH}_EVENTS,
+        and ENABLE_XSLT when either building configuration Production or building with the Internal SDK.
+
+        * Configurations/Base.xcconfig:
+
 2014-09-17  Daniel Bates  <[email protected]>
 
         Unreviewed, rolling out r173695.

Modified: trunk/Source/WebKit/mac/Configurations/Base.xcconfig (173762 => 173763)


--- trunk/Source/WebKit/mac/Configurations/Base.xcconfig	2014-09-19 18:04:33 UTC (rev 173762)
+++ trunk/Source/WebKit/mac/Configurations/Base.xcconfig	2014-09-19 18:10:32 UTC (rev 173763)
@@ -22,8 +22,13 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
-#include "../../../../../Internal/Configurations/UseInternalSDK.xcconfig"
+#include "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
 
+USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
+USE_INTERNAL_SDK_Production = YES;
+USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
+USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
+
 CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_WARN_BOOL_CONVERSION = YES;
@@ -45,13 +50,9 @@
 GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME));
 GCC_ENABLE_OBJC_GC_iphoneos = NO;
 GCC_ENABLE_OBJC_GC_iphonesimulator = NO;
-GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(CONFIGURATION));
-GCC_ENABLE_OBJC_GC_macosx_Production = supported;
-GCC_ENABLE_OBJC_GC_macosx_Debug = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release);
-GCC_ENABLE_OBJC_GC_macosx_Release = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release);
-GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_$(USE_INTERNAL_SDK));
-GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_ = NO;
-GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_YES = supported;
+GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(USE_INTERNAL_SDK));
+GCC_ENABLE_OBJC_GC_macosx_ = NO;
+GCC_ENABLE_OBJC_GC_macosx_YES = supported;
 GCC_ENABLE_SYMBOL_SEPARATION = NO;
 GCC_FAST_OBJC_DISPATCH = YES;
 GCC_GENERATE_DEBUGGING_SYMBOLS = YES;

Modified: trunk/Source/WebKit2/ChangeLog (173762 => 173763)


--- trunk/Source/WebKit2/ChangeLog	2014-09-19 18:04:33 UTC (rev 173762)
+++ trunk/Source/WebKit2/ChangeLog	2014-09-19 18:10:32 UTC (rev 173763)
@@ -1,3 +1,16 @@
+2014-09-19  Daniel Bates  <[email protected]>
+
+        Always assume internal SDK when building configuration Production
+        https://bugs.webkit.org/show_bug.cgi?id=136925
+        <rdar://problem/18362399>
+
+        Reviewed by Dan Bernstein.
+
+        As a side effect of this change we will always enable ENABLE_TOUCH_EVENTS, ENABLE_IOS_{GESTURE, TOUCH}_EVENTS,
+        and ENABLE_XSLT when either building configuration Production or building with the Internal SDK.
+
+        * Configurations/Base.xcconfig:
+
 2014-09-19  Simon Fraser  <[email protected]>
 
         Fix the Mac Mavericks build. Only iOS cares about fencing.

Modified: trunk/Source/WebKit2/Configurations/Base.xcconfig (173762 => 173763)


--- trunk/Source/WebKit2/Configurations/Base.xcconfig	2014-09-19 18:04:33 UTC (rev 173762)
+++ trunk/Source/WebKit2/Configurations/Base.xcconfig	2014-09-19 18:10:32 UTC (rev 173763)
@@ -22,8 +22,13 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
-#include "../../../../Internal/Configurations/UseInternalSDK.xcconfig"
+#include "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
 
+USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
+USE_INTERNAL_SDK_Production = YES;
+USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
+USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
+
 CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_WARN_BOOL_CONVERSION = YES;
@@ -45,13 +50,9 @@
 GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME));
 GCC_ENABLE_OBJC_GC_iphoneos = NO;
 GCC_ENABLE_OBJC_GC_iphonesimulator = NO;
-GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(CONFIGURATION));
-GCC_ENABLE_OBJC_GC_macosx_Production = supported;
-GCC_ENABLE_OBJC_GC_macosx_Debug = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release);
-GCC_ENABLE_OBJC_GC_macosx_Release = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release);
-GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_$(USE_INTERNAL_SDK));
-GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_ = NO;
-GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_YES = supported;
+GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(USE_INTERNAL_SDK));
+GCC_ENABLE_OBJC_GC_macosx_ = NO;
+GCC_ENABLE_OBJC_GC_macosx_YES = supported;
 GCC_ENABLE_SYMBOL_SEPARATION = NO;
 GCC_FAST_OBJC_DISPATCH = YES;
 GCC_GENERATE_DEBUGGING_SYMBOLS = YES;

Modified: trunk/Source/bmalloc/ChangeLog (173762 => 173763)


--- trunk/Source/bmalloc/ChangeLog	2014-09-19 18:04:33 UTC (rev 173762)
+++ trunk/Source/bmalloc/ChangeLog	2014-09-19 18:10:32 UTC (rev 173763)
@@ -1,3 +1,13 @@
+2014-09-19  Daniel Bates  <[email protected]>
+
+        Always assume internal SDK when building configuration Production
+        https://bugs.webkit.org/show_bug.cgi?id=136925
+        <rdar://problem/18362399>
+
+        Reviewed by Dan Bernstein.
+
+        * Configurations/Base.xcconfig:
+
 2014-09-16  Geoffrey Garen  <[email protected]>
 
         bmalloc: moved line caches from the deallocator to the allocator

Modified: trunk/Source/bmalloc/Configurations/Base.xcconfig (173762 => 173763)


--- trunk/Source/bmalloc/Configurations/Base.xcconfig	2014-09-19 18:04:33 UTC (rev 173762)
+++ trunk/Source/bmalloc/Configurations/Base.xcconfig	2014-09-19 18:10:32 UTC (rev 173763)
@@ -22,8 +22,13 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
 #include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenFamily.xcconfig"
-#include "../../../../Internal/Configurations/UseInternalSDK.xcconfig"
+#include "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
 
+USE_INTERNAL_SDK = $(USE_INTERNAL_SDK_$(CONFIGURATION));
+USE_INTERNAL_SDK_Production = YES;
+USE_INTERNAL_SDK_Debug = $(HAVE_INTERNAL_SDK);
+USE_INTERNAL_SDK_Release = $(HAVE_INTERNAL_SDK);
+
 CLANG_CXX_LANGUAGE_STANDARD = gnu++0x;
 CLANG_CXX_LIBRARY = libc++;
 CLANG_WARN_BOOL_CONVERSION = YES;
@@ -43,13 +48,9 @@
 GCC_ENABLE_OBJC_GC = $(GCC_ENABLE_OBJC_GC_$(PLATFORM_NAME));
 GCC_ENABLE_OBJC_GC_iphoneos = NO;
 GCC_ENABLE_OBJC_GC_iphonesimulator = NO;
-GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(CONFIGURATION));
-GCC_ENABLE_OBJC_GC_macosx_Production = supported;
-GCC_ENABLE_OBJC_GC_macosx_Debug = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release);
-GCC_ENABLE_OBJC_GC_macosx_Release = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release);
-GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release = $(GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_$(USE_INTERNAL_SDK));
-GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_ = NO;
-GCC_ENABLE_OBJC_GC_macosx_Debug_or_Release_YES = supported;
+GCC_ENABLE_OBJC_GC_macosx = $(GCC_ENABLE_OBJC_GC_macosx_$(USE_INTERNAL_SDK));
+GCC_ENABLE_OBJC_GC_macosx_ = NO;
+GCC_ENABLE_OBJC_GC_macosx_YES = supported;
 GCC_ENABLE_SYMBOL_SEPARATION = NO;
 GCC_FAST_OBJC_DISPATCH = YES;
 GCC_GENERATE_DEBUGGING_SYMBOLS = YES;

Modified: trunk/Tools/ChangeLog (173762 => 173763)


--- trunk/Tools/ChangeLog	2014-09-19 18:04:33 UTC (rev 173762)
+++ trunk/Tools/ChangeLog	2014-09-19 18:10:32 UTC (rev 173763)
@@ -1,3 +1,16 @@
+2014-09-19  Daniel Bates  <[email protected]>
+
+        Always assume internal SDK when building configuration Production
+        https://bugs.webkit.org/show_bug.cgi?id=136925
+        <rdar://problem/18362399>
+
+        Reviewed by Dan Bernstein.
+
+        * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
+        * MiniBrowser/Configurations/DebugRelease.xcconfig:
+        * TestWebKitAPI/Configurations/DebugRelease.xcconfig:
+        * WebKitTestRunner/Configurations/DebugRelease.xcconfig:
+
 2014-09-19  Youenn Fablet  <[email protected]>
 
         WTR and DRT didReceiveAuthenticationChallengeInFrame should print messages consistently

Modified: trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig (173762 => 173763)


--- trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig	2014-09-19 18:04:33 UTC (rev 173762)
+++ trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig	2014-09-19 18:10:32 UTC (rev 173763)
@@ -21,7 +21,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
-#include "../../../../../Internal/Configurations/UseInternalSDK.xcconfig"
+#include "../../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
 #include "Base.xcconfig"
 
 ARCHS = $(ARCHS_STANDARD_32_64_BIT);

Modified: trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig (173762 => 173763)


--- trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig	2014-09-19 18:04:33 UTC (rev 173762)
+++ trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig	2014-09-19 18:10:32 UTC (rev 173763)
@@ -21,7 +21,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
-#include "../../../../Internal/Configurations/UseInternalSDK.xcconfig"
+#include "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
 #include "Base.xcconfig"
 
 ARCHS = $(ARCHS_STANDARD_32_64_BIT);

Modified: trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig (173762 => 173763)


--- trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig	2014-09-19 18:04:33 UTC (rev 173762)
+++ trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig	2014-09-19 18:10:32 UTC (rev 173763)
@@ -21,7 +21,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
-#include "../../../../Internal/Configurations/UseInternalSDK.xcconfig"
+#include "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
 #include "Base.xcconfig"
 
 ARCHS = $(ARCHS_STANDARD_32_64_BIT);

Modified: trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig (173762 => 173763)


--- trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig	2014-09-19 18:04:33 UTC (rev 173762)
+++ trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig	2014-09-19 18:10:32 UTC (rev 173763)
@@ -21,7 +21,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
 
-#include "../../../../Internal/Configurations/UseInternalSDK.xcconfig"
+#include "../../../../Internal/Configurations/HaveInternalSDK.xcconfig"
 #include "Base.xcconfig"
 
 ARCHS = $(ARCHS_STANDARD_32_64_BIT);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to