Modified: trunk/Tools/ChangeLog (184863 => 184864)
--- trunk/Tools/ChangeLog 2015-05-26 18:23:59 UTC (rev 184863)
+++ trunk/Tools/ChangeLog 2015-05-26 18:52:34 UTC (rev 184864)
@@ -1,5 +1,11 @@
2015-05-26 Dan Bernstein <[email protected]>
+ Changed a file to use Unix line endings.
+
+ * LayoutTestRelay/Configurations/DebugRelease.xcconfig:
+
+2015-05-26 Dan Bernstein <[email protected]>
+
<rdar://problem/21104551> Update build settings
Reviewed by Anders Carlsson.
Modified: trunk/Tools/LayoutTestRelay/Configurations/DebugRelease.xcconfig (184863 => 184864)
--- trunk/Tools/LayoutTestRelay/Configurations/DebugRelease.xcconfig 2015-05-26 18:23:59 UTC (rev 184863)
+++ trunk/Tools/LayoutTestRelay/Configurations/DebugRelease.xcconfig 2015-05-26 18:52:34 UTC (rev 184864)
@@ -1,39 +1,39 @@
-// Copyright (C) 2014 Apple Inc. All rights reserved.-//-// Redistribution and use in source and binary forms, with or without-// modification, are permitted provided that the following conditions-// are met:-// 1. Redistributions of source code must retain the above copyright-// notice, this list of conditions and the following disclaimer.-// 2. Redistributions in binary form must reproduce the above copyright-// notice, this list of conditions and the following disclaimer in the-// documentation and/or other materials provided with the distribution.-//-// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE-// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR-// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,-// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO,-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY-// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT-// (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 "Base.xcconfig"--ARCHS = $(ARCHS_STANDARD_64_BIT);--MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))-MACOSX_DEPLOYMENT_TARGET_1090 = 10.9;-MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;-MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;--FRAMEWORK_SEARCH_PATHS = $(DEVELOPER_DIR)/Library/PrivateFrameworks;-LD_RUNPATH_SEARCH_PATHS = $(DEVELOPER_DIR)/Library/PrivateFrameworks;-OTHER_LDFLAGS = -framework CoreSimulator -framework AppKit;--SDKROOT = $(SDKROOT_macosx_$(USE_INTERNAL_SDK));-SDKROOT_macosx_ = macosx;-SDKROOT_macosx_YES = macosx.internal;+// Copyri
ght (C) 2014 Apple Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (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 "Base.xcconfig"
+
+ARCHS = $(ARCHS_STANDARD_64_BIT);
+
+MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
+MACOSX_DEPLOYMENT_TARGET_1090 = 10.9;
+MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
+MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;
+
+FRAMEWORK_SEARCH_PATHS = $(DEVELOPER_DIR)/Library/PrivateFrameworks;
+LD_RUNPATH_SEARCH_PATHS = $(DEVELOPER_DIR)/Library/PrivateFrameworks;
+OTHER_LDFLAGS = -framework CoreSimulator -framework AppKit;
+
+SDKROOT = $(SDKROOT_macosx_$(USE_INTERNAL_SDK));
+SDKROOT_macosx_ = macosx;
+SDKROOT_macosx_YES = macosx.internal;
