Changeset 198481 in webkit


Ignore:
Timestamp:
Mar 20, 2016, 10:11:38 PM (9 years ago)
Author:
mitz@apple.com
Message:

[Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
​https://bugs.webkit.org/show_bug.cgi?id=155707
<rdar://problem/24980691>

Reviewed by Darin Adler.

Source/bmalloc:

  • Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last component of MACOSX_DEPLOYMENT_TARGET.
  • Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.

Source/JavaScriptCore:

  • Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last component of MACOSX_DEPLOYMENT_TARGET.
  • Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.

Source/ThirdParty/ANGLE:

  • Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last component of MACOSX_DEPLOYMENT_TARGET.
  • Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.

Source/WebCore:

  • Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last component of MACOSX_DEPLOYMENT_TARGET.
  • Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.

Source/WebInspectorUI:

  • Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last component of MACOSX_DEPLOYMENT_TARGET.
  • Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.

Source/WebKit/mac:

  • Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last component of MACOSX_DEPLOYMENT_TARGET.
  • Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.

Source/WebKit2:

  • Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last component of MACOSX_DEPLOYMENT_TARGET.
  • Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.

Source/WTF:

  • Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last component of MACOSX_DEPLOYMENT_TARGET.
  • Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.

Tools:

  • ContentExtensionTester/Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last component of MACOSX_DEPLOYMENT_TARGET.
  • ContentExtensionTester/Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.

Similarly for these projects:

  • DumpRenderTree/mac/Configurations/Base.xcconfig:
  • DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
  • LayoutTestRelay/Configurations/Base.xcconfig:
  • LayoutTestRelay/Configurations/DebugRelease.xcconfig:
  • MiniBrowser/Configurations/Base.xcconfig:
  • MiniBrowser/Configurations/DebugRelease.xcconfig:
  • TestWebKitAPI/Configurations/Base.xcconfig:
  • TestWebKitAPI/Configurations/DebugRelease.xcconfig:
  • WebEditingTester/Configurations/Base.xcconfig:
  • WebEditingTester/Configurations/DebugRelease.xcconfig:
  • WebKitTestRunner/Configurations/Base.xcconfig:
  • WebKitTestRunner/Configurations/DebugRelease.xcconfig:
Location:
trunk
Files:
39 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r198478 r198481  
     12016-03-20  Dan Bernstein  <mitz@apple.com>
     2
     3        [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
     4        https://bugs.webkit.org/show_bug.cgi?id=155707
     5        <rdar://problem/24980691>
     6
     7        Reviewed by Darin Adler.
     8
     9        * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
     10          component of MACOSX_DEPLOYMENT_TARGET.
     11        * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
     12          TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
     13
    1142016-03-20  Michael Saboff  <msaboff@apple.com>
    215

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

    r197010 r198481  
    8989HEADER_SEARCH_PATHS = . icu $(LLVM_LOCAL_HEADER_PATH) "${BUILT_PRODUCTS_DIR}/ExtraIncludesForLocalLLVMBuild" $(LLVM_SYSTEM_HEADER_PATH) "${BUILT_PRODUCTS_DIR}/usr/local/include" $(HEADER_SEARCH_PATHS);
    9090
    91 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     91TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
     92TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
     93TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
     94TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
     95TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    9296
    9397SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;

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

    r198475 r198481  
    2828ONLY_ACTIVE_ARCH = YES;
    2929
     30TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     31
    3032MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    3133MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;

  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r198475 r198481  
     12016-03-20  Dan Bernstein  <mitz@apple.com>
     2
     3        [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
     4        https://bugs.webkit.org/show_bug.cgi?id=155707
     5        <rdar://problem/24980691>
     6
     7        Reviewed by Darin Adler.
     8
     9        * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
     10          component of MACOSX_DEPLOYMENT_TARGET.
     11        * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
     12          TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
     13
    1142016-03-20  Dan Bernstein  <mitz@apple.com>
    215

  • trunk/Source/ThirdParty/ANGLE/Configurations/Base.xcconfig

    r197010 r198481  
    4646SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
    4747
    48 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     48TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
     49TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
     50TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
     51TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
     52TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    4953
    5054SDKROOT = macosx.internal;

  • trunk/Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig

    r198475 r198481  
    44
    55ONLY_ACTIVE_ARCH = YES;
     6
     7TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    68
    79MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));

  • trunk/Source/WTF/ChangeLog

    r198475 r198481  
     12016-03-20  Dan Bernstein  <mitz@apple.com>
     2
     3        [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
     4        https://bugs.webkit.org/show_bug.cgi?id=155707
     5        <rdar://problem/24980691>
     6
     7        Reviewed by Darin Adler.
     8
     9        * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
     10          component of MACOSX_DEPLOYMENT_TARGET.
     11        * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
     12          TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
     13
    1142016-03-20  Dan Bernstein  <mitz@apple.com>
    215

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

    r197010 r198481  
    8383HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include $(DSTROOT)/usr/local/include icu $(HEADER_SEARCH_PATHS);
    8484
    85 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     85TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
     86TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
     87TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
     88TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
     89TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    8690
    8791SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;

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

    r198475 r198481  
    2727ONLY_ACTIVE_ARCH = YES;
    2828
     29TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     30
    2931MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    3032MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;

  • trunk/Source/WebCore/ChangeLog

    r198480 r198481  
     12016-03-20  Dan Bernstein  <mitz@apple.com>
     2
     3        [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
     4        https://bugs.webkit.org/show_bug.cgi?id=155707
     5        <rdar://problem/24980691>
     6
     7        Reviewed by Darin Adler.
     8
     9        * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
     10          component of MACOSX_DEPLOYMENT_TARGET.
     11        * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
     12          TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
     13
    1142016-03-20  Konstantin Tokarev  <annulen@yandex.ru>
    215

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

    r197010 r198481  
    8080WARNING_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;
    8181
    82 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     82TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
     83TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
     84TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
     85TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
     86TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    8387
    8488SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;

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

    r198475 r198481  
    2828ONLY_ACTIVE_ARCH = YES;
    2929
     30TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     31
    3032MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    3133MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;

  • trunk/Source/WebInspectorUI/ChangeLog

    r198475 r198481  
     12016-03-20  Dan Bernstein  <mitz@apple.com>
     2
     3        [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
     4        https://bugs.webkit.org/show_bug.cgi?id=155707
     5        <rdar://problem/24980691>
     6
     7        Reviewed by Darin Adler.
     8
     9        * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
     10          component of MACOSX_DEPLOYMENT_TARGET.
     11        * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
     12          TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
     13
    1142016-03-20  Dan Bernstein  <mitz@apple.com>
    215

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

    r197010 r198481  
    5454SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
    5555
    56 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     56TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
     57TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
     58TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
     59TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
     60TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    5761
    5862SDKROOT = macosx.internal;

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

    r198475 r198481  
    44
    55ONLY_ACTIVE_ARCH = YES;
     6
     7TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
    68
    79MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));

  • trunk/Source/WebKit/mac/ChangeLog

    r198476 r198481  
     12016-03-20  Dan Bernstein  <mitz@apple.com>
     2
     3        [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
     4        https://bugs.webkit.org/show_bug.cgi?id=155707
     5        <rdar://problem/24980691>
     6
     7        Reviewed by Darin Adler.
     8
     9        * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
     10          component of MACOSX_DEPLOYMENT_TARGET.
     11        * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
     12          TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
     13
    1142016-03-20  Darin Adler  <darin@apple.com>
    215

  • trunk/Source/WebKit/mac/Configurations/Base.xcconfig

    r197010 r198481  
    7474WARNING_CFLAGS = -Wall -Wextra -Wchar-subscripts -Wextra-tokens -Wformat-security -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
    7575
    76 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     76TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
     77TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
     78TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
     79TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
     80TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    7781
    7882

  • trunk/Source/WebKit/mac/Configurations/DebugRelease.xcconfig

    r198475 r198481  
    2828ONLY_ACTIVE_ARCH = YES;
    2929
     30TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     31
    3032MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    3133MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;

  • trunk/Source/WebKit2/ChangeLog

    r198476 r198481  
     12016-03-20  Dan Bernstein  <mitz@apple.com>
     2
     3        [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
     4        https://bugs.webkit.org/show_bug.cgi?id=155707
     5        <rdar://problem/24980691>
     6
     7        Reviewed by Darin Adler.
     8
     9        * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
     10          component of MACOSX_DEPLOYMENT_TARGET.
     11        * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
     12          TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
     13
    1142016-03-20  Darin Adler  <darin@apple.com>
    215

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

    r197010 r198481  
    7474WARNING_CFLAGS = -Wall -Wextra -Wchar-subscripts -Wextra-tokens -Wformat-security -Winit-self -Wmissing-format-attribute -Wmissing-noreturn -Wno-unused-parameter -Wpacked -Wpointer-arith -Wredundant-decls -Wundef -Wwrite-strings -Wexit-time-destructors -Wglobal-constructors -Wtautological-compare -Wimplicit-fallthrough;
    7575
    76 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     76TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
     77TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
     78TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
     79TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
     80TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    7781
    7882// DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.

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

    r198475 r198481  
    2828ONLY_ACTIVE_ARCH = YES;
    2929
     30TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     31
    3032MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    3133MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;

  • trunk/Source/bmalloc/ChangeLog

    r198475 r198481  
     12016-03-20  Dan Bernstein  <mitz@apple.com>
     2
     3        [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
     4        https://bugs.webkit.org/show_bug.cgi?id=155707
     5        <rdar://problem/24980691>
     6
     7        Reviewed by Darin Adler.
     8
     9        * Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR based on the last
     10          component of MACOSX_DEPLOYMENT_TARGET.
     11        * Configurations/DebugRelease.xcconfig: For engineering builds, preserve the behavior of
     12          TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
     13
    1142016-03-20  Dan Bernstein  <mitz@apple.com>
    215

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

    r197010 r198481  
    8181WARNING_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;
    8282
    83 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     83TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
     84TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
     85TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
     86TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
     87TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    8488
    8589SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;

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

    r198475 r198481  
    2727ONLY_ACTIVE_ARCH = YES;
    2828
     29TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     30
    2931MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    3032MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;

  • trunk/Tools/ChangeLog

    r198475 r198481  
     12016-03-20  Dan Bernstein  <mitz@apple.com>
     2
     3        [Mac] Determine TARGET_MAC_OS_X_VERSION_MAJOR from MACOSX_DEPLOYMENT_TARGET rather than from MAC_OS_X_VERSION_MAJOR
     4        https://bugs.webkit.org/show_bug.cgi?id=155707
     5        <rdar://problem/24980691>
     6
     7        Reviewed by Darin Adler.
     8
     9        * ContentExtensionTester/Configurations/Base.xcconfig: Set TARGET_MAC_OS_X_VERSION_MAJOR
     10          based on the last component of MACOSX_DEPLOYMENT_TARGET.
     11        * ContentExtensionTester/Configurations/DebugRelease.xcconfig: For engineering builds,
     12          preserve the behavior of TARGET_MAC_OS_X_VERSION_MAJOR being the host’s OS version.
     13
     14        Similarly for these projects:
     15
     16        * DumpRenderTree/mac/Configurations/Base.xcconfig:
     17        * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig:
     18        * LayoutTestRelay/Configurations/Base.xcconfig:
     19        * LayoutTestRelay/Configurations/DebugRelease.xcconfig:
     20        * MiniBrowser/Configurations/Base.xcconfig:
     21        * MiniBrowser/Configurations/DebugRelease.xcconfig:
     22        * TestWebKitAPI/Configurations/Base.xcconfig:
     23        * TestWebKitAPI/Configurations/DebugRelease.xcconfig:
     24        * WebEditingTester/Configurations/Base.xcconfig:
     25        * WebEditingTester/Configurations/DebugRelease.xcconfig:
     26        * WebKitTestRunner/Configurations/Base.xcconfig:
     27        * WebKitTestRunner/Configurations/DebugRelease.xcconfig:
     28
    1292016-03-20  Dan Bernstein  <mitz@apple.com>
    230

  • trunk/Tools/ContentExtensionTester/Configurations/Base.xcconfig

    r197010 r198481  
    6666WARNING_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;
    6767
    68 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     68TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
     69TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
     70TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
     71TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
     72TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    6973
    7074// DEBUG_DEFINES, GCC_OPTIMIZATION_LEVEL, STRIP_INSTALLED_PRODUCT and DEAD_CODE_STRIPPING vary between the debug and normal variants.

  • trunk/Tools/ContentExtensionTester/Configurations/DebugRelease.xcconfig

    r198475 r198481  
    2626ONLY_ACTIVE_ARCH = YES;
    2727
     28TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     29
    2830MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    29 MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
    3031MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
    3132MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;

  • trunk/Tools/DumpRenderTree/mac/Configurations/Base.xcconfig

    r197010 r198481  
    7070DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
    7171
    72 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     72TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
     73TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
     74TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
     75TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
     76TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    7377
    7478SDKROOT = macosx.internal;

  • trunk/Tools/DumpRenderTree/mac/Configurations/DebugRelease.xcconfig

    r198475 r198481  
    2828ONLY_ACTIVE_ARCH = YES;
    2929
     30TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     31
    3032MACOSX_DEPLOYMENT_TARGET[sdk=macosx*] = $(MACOSX_DEPLOYMENT_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR));
    3133MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;

  • trunk/Tools/LayoutTestRelay/Configurations/Base.xcconfig

    r197010 r198481  
    5252DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
    5353
    54 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     54TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
     55TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
     56TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
     57TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
     58TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    5559
    5660SDKROOT = macosx.internal;

  • trunk/Tools/LayoutTestRelay/Configurations/DebugRelease.xcconfig

    r198475 r198481  
    2626ARCHS = $(ARCHS_STANDARD_64_BIT);
    2727
     28TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     29
    2830MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
    2931MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;

  • trunk/Tools/MiniBrowser/Configurations/Base.xcconfig

    r197010 r198481  
    5858SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
    5959
    60 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     60TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
     61TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
     62TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
     63TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
     64TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    6165
    6266SDKROOT = macosx.internal;

  • trunk/Tools/MiniBrowser/Configurations/DebugRelease.xcconfig

    r198475 r198481  
    2828ONLY_ACTIVE_ARCH = YES;
    2929
     30TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     31
    3032MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
    3133MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;

  • trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig

    r197010 r198481  
    7373SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;
    7474
    75 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     75TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
     76TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
     77TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
     78TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
     79TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    7680
    7781

  • trunk/Tools/TestWebKitAPI/Configurations/DebugRelease.xcconfig

    r198475 r198481  
    2828ONLY_ACTIVE_ARCH = YES;
    2929
     30TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     31
    3032MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
    3133MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;

  • trunk/Tools/WebEditingTester/Configurations/Base.xcconfig

    r197010 r198481  
    5555CLANG_ENABLE_OBJC_ARC = YES;
    5656
    57 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     57TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
     58TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
     59TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
     60TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
     61TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    5862
    5963SDKROOT = macosx.internal;

  • trunk/Tools/WebEditingTester/Configurations/DebugRelease.xcconfig

    r198475 r198481  
    2828ONLY_ACTIVE_ARCH = YES;
    2929
     30TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     31
    3032MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
    31 MACOSX_DEPLOYMENT_TARGET_1090 = 10.9;
    3233MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
    3334MACOSX_DEPLOYMENT_TARGET_101100 = 10.11;

  • trunk/Tools/WebKitTestRunner/Configurations/Base.xcconfig

    r197010 r198481  
    5454DEBUG_DEFINES = $(DEBUG_DEFINES_$(CURRENT_VARIANT));
    5555
    56 TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     56TARGET_MAC_OS_X_VERSION_MAJOR = $(TARGET_MAC_OS_X_VERSION_MAJOR$(MACOSX_DEPLOYMENT_TARGET:suffix:identifier));
     57TARGET_MAC_OS_X_VERSION_MAJOR_10 = 101000;
     58TARGET_MAC_OS_X_VERSION_MAJOR_11 = 101100;
     59TARGET_MAC_OS_X_VERSION_MAJOR_12 = 101200;
     60TARGET_MAC_OS_X_VERSION_MAJOR_13 = 101300;
    5761
    5862SUPPORTED_PLATFORMS = iphoneos iphonesimulator macosx tvos tvsimulator watchos watchsimulator;

  • trunk/Tools/WebKitTestRunner/Configurations/DebugRelease.xcconfig

    r198475 r198481  
    2828ONLY_ACTIVE_ARCH = YES;
    2929
     30TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
     31
    3032MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(TARGET_MAC_OS_X_VERSION_MAJOR))
    3133MACOSX_DEPLOYMENT_TARGET_101000 = 10.10;
Note: See TracChangeset for help on using the changeset viewer.