Changeset 211338 in webkit


Ignore:
Timestamp:
Jan 28, 2017 10:05:17 AM (7 years ago)
Author:
mitz@apple.com
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.
Location:
trunk/Source/WebCore
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r211337 r211338  
     12017-01-28  Dan Bernstein  <mitz@apple.com>
     2
     3        [Xcode] Clean up PAL and WebCore’s build settings a little
     4        https://bugs.webkit.org/show_bug.cgi?id=167292
     5
     6        Reviewed by Sam Weinig.
     7
     8        * Configurations/Base.xcconfig: Simplified the definition of
     9          GCC_WARN_64_TO_32_BIT_CONVERSION, removed the unused build setting PREBINDING, removed
     10          a duplicate definition of GCC_GENERATE_DEBUGGING_SYMBOLS, and removed definitions specific
     11          to OS X versions that are no longer supported.
     12
     13        * Configurations/DebugRelease.xcconfig: Removed definitions specific to OS X versions
     14          that are no longer supported.
     15
    1162017-01-28  Zalan Bujtas  <zalan@apple.com>
    217

  • trunk/Source/WebCore/Configurations/Base.xcconfig

    r209088 r211338  
    6262GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
    6363// FIXME: <http://webkit.org/b/109846> WebCore should build with -Wshorten-64-to-32
    64 GCC_WARN_64_TO_32_BIT_CONVERSION = $(GCC_WARN_64_TO_32_BIT_CONVERSION_$(CURRENT_ARCH));
    65 GCC_WARN_64_TO_32_BIT_CONVERSION_ = YES;
    66 GCC_WARN_64_TO_32_BIT_CONVERSION_armv7 = YES;
    67 GCC_WARN_64_TO_32_BIT_CONVERSION_armv7k = YES;
    68 GCC_WARN_64_TO_32_BIT_CONVERSION_armv7s = YES;
    69 GCC_WARN_64_TO_32_BIT_CONVERSION_arm64 = NO;
    70 GCC_WARN_64_TO_32_BIT_CONVERSION_i386 = YES;
    71 GCC_WARN_64_TO_32_BIT_CONVERSION_x86_64 = NO;
     64GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
     65GCC_WARN_64_TO_32_BIT_CONVERSION[arch=arm64] = NO;
     66GCC_WARN_64_TO_32_BIT_CONVERSION[arch=x86_64] = NO;
    7267GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
    7368GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
    … …  
    7974GCC_WARN_UNUSED_FUNCTION = YES;
    8075GCC_WARN_UNUSED_VARIABLE = YES;
    81 PREBINDING = NO;
    8276WARNING_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;
    8377
    … …  
    111105DEAD_CODE_STRIPPING = $(DEAD_CODE_STRIPPING_$(CURRENT_VARIANT));
    112106
    113 GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
    114 CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.8*] = line-tables-only;
    115 CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.9*] = line-tables-only;
    116 
    117107SDKROOT = macosx.internal;
    118108

  • trunk/Source/WebCore/Configurations/DebugRelease.xcconfig

    r209434 r211338  
    3939DEBUG_INFORMATION_FORMAT = dwarf;
    4040
    41 CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.8*] = default;
    42 CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.9*] = default;
    43 
    4441SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
    4542SDKROOT_ = macosx;

  • trunk/Source/WebCore/PAL/Configurations/Base.xcconfig

    r211027 r211338  
    6262GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
    6363// FIXME: <http://webkit.org/b/109846> WebCore should build with -Wshorten-64-to-32
    64 GCC_WARN_64_TO_32_BIT_CONVERSION = $(GCC_WARN_64_TO_32_BIT_CONVERSION_$(CURRENT_ARCH));
    65 GCC_WARN_64_TO_32_BIT_CONVERSION_ = YES;
    66 GCC_WARN_64_TO_32_BIT_CONVERSION_armv7 = YES;
    67 GCC_WARN_64_TO_32_BIT_CONVERSION_armv7k = YES;
    68 GCC_WARN_64_TO_32_BIT_CONVERSION_armv7s = YES;
    69 GCC_WARN_64_TO_32_BIT_CONVERSION_arm64 = NO;
    70 GCC_WARN_64_TO_32_BIT_CONVERSION_i386 = YES;
    71 GCC_WARN_64_TO_32_BIT_CONVERSION_x86_64 = NO;
     64GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
     65GCC_WARN_64_TO_32_BIT_CONVERSION[arch=arm64] = NO;
     66GCC_WARN_64_TO_32_BIT_CONVERSION[arch=x86_64] = NO;
    7267GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
    7368GCC_WARN_ABOUT_MISSING_NEWLINE = YES;
    … …  
    7974GCC_WARN_UNUSED_FUNCTION = YES;
    8075GCC_WARN_UNUSED_VARIABLE = YES;
    81 PREBINDING = NO;
    8276WARNING_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;
    8377
    … …  
    111105DEAD_CODE_STRIPPING = $(DEAD_CODE_STRIPPING_$(CURRENT_VARIANT));
    112106
    113 GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
    114 CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.8*] = line-tables-only;
    115 CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.9*] = line-tables-only;
    116 
    117107SDKROOT = macosx.internal;
    118108

  • trunk/Source/WebCore/PAL/Configurations/DebugRelease.xcconfig

    r211027 r211338  
    3939DEBUG_INFORMATION_FORMAT = dwarf;
    4040
    41 CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.8*] = default;
    42 CLANG_DEBUG_INFORMATION_LEVEL[sdk=macosx10.9*] = default;
    43 
    4441SDKROOT = $(SDKROOT_$(USE_INTERNAL_SDK));
    4542SDKROOT_ = macosx;

  • trunk/Source/WebCore/PAL/Configurations/PAL.xcconfig

    r211027 r211338  
    4444OTHER_CPLUSPLUSFLAGS = $(OTHER_CFLAGS);
    4545
    46 HEADER_SEARCH_PATHS = PAL ForwardingHeaders icu /usr/include/libxslt /usr/include/libxml2 "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(HEADER_SEARCH_PATHS);
    47 INSTALL_PATH = $(INSTALL_PATH_$(CONFIGURATION));
    48 INSTALL_PATH_Production = /usr/local/lib;
     46HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(inherited);
     47INSTALL_PATH = /usr/local/lib;
    4948INSTALLHDRS_COPY_PHASE = YES;
    5049INSTALLHDRS_SCRIPT_PHASE = YES;
    5150PRODUCT_NAME = PAL;
    52 PRODUCT_BUNDLE_IDENTIFIER = com.apple.$(PRODUCT_NAME:rfc1034identifier);
    53 
    54 WK_PREFIXED_IPHONEOS_DEPLOYMENT_TARGET = V$(IPHONEOS_DEPLOYMENT_TARGET);
    5551
    5652NORMAL_PRODUCTION_FRAMEWORKS_DIR[sdk=iphone*] = $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
    … …  
    6763WK_EMPTY_ = YES;
    6864WK_NOT_ = YES;
     65WK_NOT_NO = YES;
    6966WK_NOT_YES = NO;
    7067
    … …  
    7774WK_QUOTED_OVERRIDE_FRAMEWORKS_DIR_YES = "$(WK_OVERRIDE_FRAMEWORKS_DIR)";
    7875
    79 SKIP_INSTALL = $(SKIP_INSTALL_$(FORCE_TOOL_INSTALL));
    80 SKIP_INSTALL_ = YES;
    81 SKIP_INSTALL_NO = YES;
    82 SKIP_INSTALL_YES = NO;
    83 
    84 EXECUTABLE_PREFIX = lib;
     76SKIP_INSTALL = $(WK_NOT_$(FORCE_TOOL_INSTALL));

  • trunk/Source/WebCore/PAL/PAL.xcodeproj/project.pbxproj

    r211027 r211338  
    8282                        isa = PBXGroup;
    8383                        children = (
    84                                 1C67CEA21E32EE2600F80F2E /* Version.xcconfig */,
     84                                1C09D0631E31EC3100725F18 /* Base.xcconfig */,
     85                                1C09D0621E31EC2800725F18 /* DebugRelease.xcconfig */,
    8586                                1C67CEA11E32EDA800F80F2E /* FeatureDefines.xcconfig */,
    8687                                1C09D05D1E31C77A00725F18 /* PAL.xcconfig */,
    87                                 1C09D0621E31EC2800725F18 /* DebugRelease.xcconfig */,
    88                                 1C09D0631E31EC3100725F18 /* Base.xcconfig */,
     88                                1C67CEA21E32EE2600F80F2E /* Version.xcconfig */,
    8989                        );
    9090                        path = Configurations;
Note: See TracChangeset for help on using the changeset viewer.