- Revision
- 211338
- Author
- m...@apple.com
- Date
- 2017-01-28 10:05:17 -0800 (Sat, 28 Jan 2017)
Log Message
[Xcode] Clean up PAL and WebCore’s build settings a little
https://bugs.webkit.org/show_bug.cgi?id=167292
Reviewed by Sam Weinig.
Source/WebCore:
* Configurations/Base.xcconfig: Simplified the definition of
GCC_WARN_64_TO_32_BIT_CONVERSION, removed the unused build setting PREBINDING, removed
a duplicate definition of GCC_GENERATE_DEBUGGING_SYMBOLS, and removed definitions specific
to OS X versions that are no longer supported.
* Configurations/DebugRelease.xcconfig: Removed definitions specific to OS X versions
that are no longer supported.
Source/WebCore/PAL:
* ChangeLog: Created this file.
* Configurations/Base.xcconfig: Simplified the definition of
GCC_WARN_64_TO_32_BIT_CONVERSION, removed the unused build setting PREBINDING, removed
a duplicate definition of GCC_GENERATE_DEBUGGING_SYMBOLS, and removed definitions specific
to OS X versions that are no longer supported.
* Configurations/DebugRelease.xcconfig: Removed definitions specific to OS X versions
that are no longer supported.
* Configurations/PAL.xcconfig: Removed header search paths that do not exist or do not
make sense. Simplified the definitions of INSTALL_PATH and SKIP_INSTALL. Removed the
unusued build settings PRODUCT_BUNDLE_IDENTIFIER and
WK_PREFIXED_IPHONEOS_DEPLOYMENT_TARGET. Removed the redundant definition of
EXECUTABLE_PREFIX.
* PAL.xcodeproj/project.pbxproj: Sorted the Configurations group.
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (211337 => 211338)
--- trunk/Source/WebCore/ChangeLog 2017-01-28 16:26:48 UTC (rev 211337)
+++ trunk/Source/WebCore/ChangeLog 2017-01-28 18:05:17 UTC (rev 211338)
@@ -1,3 +1,18 @@
+2017-01-28 Dan Bernstein <m...@apple.com>
+
+ [Xcode] Clean up PAL and WebCore’s build settings a little
+ https://bugs.webkit.org/show_bug.cgi?id=167292
+
+ Reviewed by Sam Weinig.
+
+ * Configurations/Base.xcconfig: Simplified the definition of
+ GCC_WARN_64_TO_32_BIT_CONVERSION, removed the unused build setting PREBINDING, removed
+ a duplicate definition of GCC_GENERATE_DEBUGGING_SYMBOLS, and removed definitions specific
+ to OS X versions that are no longer supported.
+
+ * Configurations/DebugRelease.xcconfig: Removed definitions specific to OS X versions
+ that are no longer supported.
+
2017-01-28 Zalan Bujtas <za...@apple.com>
Resolve beforeChild's render tree position before calling addChildIgnoringContinuation.
Modified: trunk/Source/WebCore/Configurations/Base.xcconfig (211337 => 211338)
--- trunk/Source/WebCore/Configurations/Base.xcconfig 2017-01-28 16:26:48 UTC (rev 211337)
+++ trunk/Source/WebCore/Configurations/Base.xcconfig 2017-01-28 18:05:17 UTC (rev 211338)
@@ -61,14 +61,9 @@
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
// FIXME: <http://webkit.org/b/109846> WebCore should build with -Wshorten-64-to-32
-GCC_WARN_64_TO_32_BIT_CONVERSION = $(GCC_WARN_64_TO_32_BIT_CONVERSION_$(CURRENT_ARCH));
-GCC_WARN_64_TO_32_BIT_CONVERSION_ = YES;
-GCC_WARN_64_TO_32_BIT_CONVERSION_armv7 = YES;
-GCC_WARN_64_TO_32_BIT_CONVERSION_armv7k = YES;
-GCC_WARN_64_TO_32_BIT_CONVERSION_armv7s = YES;
-GCC_WARN_64_TO_32_BIT_CONVERSION_arm64 = NO;
-GCC_WARN_64_TO_32_BIT_CONVERSION_i386 = YES;
-GCC_WARN_64_TO_32_BIT_CONVERSION_x86_64 = NO;
+GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+GCC_WARN_64_TO_32_BIT_CONVERSION[arch=arm64] = NO;
+GCC_WARN_64_TO_32_BIT_CONVERSION[arch=x86_64] = NO;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
@@ -78,7 +73,6 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
-PREBINDING = NO;
WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wno-unknown-warning-option;
TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
@@ -110,10 +104,6 @@
DEAD_CODE_STRIPPING_normal = YES;
DEAD_CODE_STRIPPING = $(DEAD_CODE_STRIPPING_$(CURRENT_VARIANT));
-GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.8*] = line-tables-only;
-CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.9*] = line-tables-only;
-
SDKROOT = macosx.internal;
OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
Modified: trunk/Source/WebCore/Configurations/DebugRelease.xcconfig (211337 => 211338)
--- trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2017-01-28 16:26:48 UTC (rev 211337)
+++ trunk/Source/WebCore/Configurations/DebugRelease.xcconfig 2017-01-28 18:05:17 UTC (rev 211338)
@@ -38,9 +38,6 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
-CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.8*] = default;
-CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.9*] = default;
-
SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
Added: trunk/Source/WebCore/PAL/ChangeLog (0 => 211338)
--- trunk/Source/WebCore/PAL/ChangeLog (rev 0)
+++ trunk/Source/WebCore/PAL/ChangeLog 2017-01-28 18:05:17 UTC (rev 211338)
@@ -0,0 +1,24 @@
+2017-01-28 Dan Bernstein <m...@apple.com>
+
+ [Xcode] Clean up PAL and WebCore’s build settings a little
+ https://bugs.webkit.org/show_bug.cgi?id=167292
+
+ Reviewed by Sam Weinig.
+
+ * ChangeLog: Created this file.
+
+ * Configurations/Base.xcconfig: Simplified the definition of
+ GCC_WARN_64_TO_32_BIT_CONVERSION, removed the unused build setting PREBINDING, removed
+ a duplicate definition of GCC_GENERATE_DEBUGGING_SYMBOLS, and removed definitions specific
+ to OS X versions that are no longer supported.
+
+ * Configurations/DebugRelease.xcconfig: Removed definitions specific to OS X versions
+ that are no longer supported.
+
+ * Configurations/PAL.xcconfig: Removed header search paths that do not exist or do not
+ make sense. Simplified the definitions of INSTALL_PATH and SKIP_INSTALL. Removed the
+ unusued build settings PRODUCT_BUNDLE_IDENTIFIER and
+ WK_PREFIXED_IPHONEOS_DEPLOYMENT_TARGET. Removed the redundant definition of
+ EXECUTABLE_PREFIX.
+
+ * PAL.xcodeproj/project.pbxproj: Sorted the Configurations group.
Modified: trunk/Source/WebCore/PAL/Configurations/Base.xcconfig (211337 => 211338)
--- trunk/Source/WebCore/PAL/Configurations/Base.xcconfig 2017-01-28 16:26:48 UTC (rev 211337)
+++ trunk/Source/WebCore/PAL/Configurations/Base.xcconfig 2017-01-28 18:05:17 UTC (rev 211338)
@@ -61,14 +61,9 @@
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
// FIXME: <http://webkit.org/b/109846> WebCore should build with -Wshorten-64-to-32
-GCC_WARN_64_TO_32_BIT_CONVERSION = $(GCC_WARN_64_TO_32_BIT_CONVERSION_$(CURRENT_ARCH));
-GCC_WARN_64_TO_32_BIT_CONVERSION_ = YES;
-GCC_WARN_64_TO_32_BIT_CONVERSION_armv7 = YES;
-GCC_WARN_64_TO_32_BIT_CONVERSION_armv7k = YES;
-GCC_WARN_64_TO_32_BIT_CONVERSION_armv7s = YES;
-GCC_WARN_64_TO_32_BIT_CONVERSION_arm64 = NO;
-GCC_WARN_64_TO_32_BIT_CONVERSION_i386 = YES;
-GCC_WARN_64_TO_32_BIT_CONVERSION_x86_64 = NO;
+GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+GCC_WARN_64_TO_32_BIT_CONVERSION[arch=arm64] = NO;
+GCC_WARN_64_TO_32_BIT_CONVERSION[arch=x86_64] = NO;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
@@ -78,7 +73,6 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
-PREBINDING = NO;
WARNING_CFLAGS = -Wall -Wextra -Wcast-qual -Wchar-subscripts -Wextra-tokens -Wformat=2 -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough -Wno-unknown-warning-option;
TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
@@ -110,10 +104,6 @@
DEAD_CODE_STRIPPING_normal = YES;
DEAD_CODE_STRIPPING = $(DEAD_CODE_STRIPPING_$(CURRENT_VARIANT));
-GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.8*] = line-tables-only;
-CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.9*] = line-tables-only;
-
SDKROOT = macosx.internal;
OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
Modified: trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig (211337 => 211338)
--- trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig 2017-01-28 16:26:48 UTC (rev 211337)
+++ trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig 2017-01-28 18:05:17 UTC (rev 211338)
@@ -38,9 +38,6 @@
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
-CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.8*] = default;
-CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.9*] = default;
-
SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
SDKROOT_ = macosx;
SDKROOT_YES = macosx.internal;
Modified: trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig (211337 => 211338)
--- trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig 2017-01-28 16:26:48 UTC (rev 211337)
+++ trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig 2017-01-28 18:05:17 UTC (rev 211338)
@@ -43,16 +43,12 @@
OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Carbon.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/ApplicationServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/CoreServices.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/Quartz.framework/Frameworks -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
-HEADER_SEARCH_PATHS = PAL ForwardingHeaders icu /usr/include/libxslt /usr/include/libxml2 "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(HEADER_SEARCH_PATHS);
-INSTALL_PATH = $(INSTALL_PATH_$(CONFIGURATION));
-INSTALL_PATH_Production = /usr/local/lib;
+HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(inherited);
+INSTALL_PATH = /usr/local/lib;
INSTALLHDRS_COPY_PHASE = YES;
INSTALLHDRS_SCRIPT_PHASE = YES;
PRODUCT_NAME = PAL;
-PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
-WK_PREFIXED_IPHONEOS_DEPLOYMENT_TARGET = V$(IPHONEOS_DEPLOYMENT_TARGET);
-
NORMAL_PRODUCTION_FRAMEWORKS_DIR[sdk=iphone*] = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
NORMAL_PRODUCTION_FRAMEWORKS_DIR[sdk=macosx*] = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks;
@@ -66,6 +62,7 @@
WK_EMPTY_ = YES;
WK_NOT_ = YES;
+WK_NOT_NO = YES;
WK_NOT_YES = NO;
WK_USE_OVERRIDE_FRAMEWORKS_DIR = $(WK_NOT_$(WK_EMPTY_$(WK_OVERRIDE_FRAMEWORKS_DIR)));
@@ -76,9 +73,4 @@
WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR = $(WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_$(WK_USE_OVERRIDE_FRAMEWORKS_DIR));
WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
-SKIP_INSTALL = $(SKIP_INSTALL_$(FORCE_TOOL_INSTALL));
-SKIP_INSTALL_ = YES;
-SKIP_INSTALL_NO = YES;
-SKIP_INSTALL_YES = NO;
-
-EXECUTABLE_PREFIX = lib;
+SKIP_INSTALL = $(WK_NOT_$(FORCE_TOOL_INSTALL));
Modified: trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj (211337 => 211338)
--- trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj 2017-01-28 16:26:48 UTC (rev 211337)
+++ trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj 2017-01-28 18:05:17 UTC (rev 211338)
@@ -81,11 +81,11 @@
1C09D05C1E31C73300725F18 /* Configurations */ = {
isa = PBXGroup;
children = (
- 1C67CEA21E32EE2600F80F2E /* Version.xcconfig */,
+ 1C09D0631E31EC3100725F18 /* Base.xcconfig */,
+ 1C09D0621E31EC2800725F18 /* DebugRelease.xcconfig */,
1C67CEA11E32EDA800F80F2E /* FeatureDefines.xcconfig */,
1C09D05D1E31C77A00725F18 /* PAL.xcconfig */,
- 1C09D0621E31EC2800725F18 /* DebugRelease.xcconfig */,
- 1C09D0631E31EC3100725F18 /* Base.xcconfig */,
+ 1C67CEA21E32EE2600F80F2E /* Version.xcconfig */,
);
path = Configurations;
sourceTree = "<group>";
