Skip to content

Commit 61878aa

Browse files
author
[email protected]
committed
<rdar://problem/21104551> Update build settings
Reviewed by Anders Carlsson. Source/bmalloc: * Configurations/DebugRelease.xcconfig: Source/JavaScriptCore: * Configurations/DebugRelease.xcconfig: * Configurations/FeatureDefines.xcconfig: * Configurations/Version.xcconfig: Source/ThirdParty: * gtest/xcode/Config/General.xcconfig: Source/ThirdParty/ANGLE: * Configurations/Base.xcconfig: * Configurations/DebugRelease.xcconfig: Source/WebCore: * Configurations/DebugRelease.xcconfig: * Configurations/FeatureDefines.xcconfig: * Configurations/Version.xcconfig: Source/WebInspectorUI: * Configurations/Base.xcconfig: * Configurations/DebugRelease.xcconfig: * Configurations/Version.xcconfig: Source/WebKit/mac: * Configurations/DebugRelease.xcconfig: * Configurations/FeatureDefines.xcconfig: * Configurations/Version.xcconfig: Source/WebKit2: * Configurations/DebugRelease.xcconfig: * Configurations/FeatureDefines.xcconfig: * Configurations/Version.xcconfig: * Configurations/WebContentService.Development.xcconfig: * Configurations/WebContentService.xcconfig: Source/WTF: * Configurations/DebugRelease.xcconfig: Tools: * ContentExtensionTester/Configurations/DebugRelease.xcconfig: * DumpRenderTree/mac/Configurations/DebugRelease.xcconfig: * MiniBrowser/Configurations/DebugRelease.xcconfig: * TestWebKitAPI/Configurations/DebugRelease.xcconfig: * WebEditingTester/Configurations/DebugRelease.xcconfig: * WebKitTestRunner/Configurations/DebugRelease.xcconfig: * asan/asan.xcconfig: git-svn-id: http://svn.webkit.org/repository/webkit/trunk@184862 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 69a5561 commit 61878aa

File tree

39 files changed

+164
-0
lines changed

39 files changed

+164
-0
lines changed

‎Source/JavaScriptCore/ChangeLog

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2015-05-26 Dan Bernstein <[email protected]>
2+
3+
<rdar://problem/21104551> Update build settings
4+
5+
Reviewed by Anders Carlsson.
6+
7+
* Configurations/DebugRelease.xcconfig:
8+
* Configurations/FeatureDefines.xcconfig:
9+
* Configurations/Version.xcconfig:
10+
111
2015-05-26 Andreas Kling <[email protected]>
212

313
Try to use StringView when comparing JSStrings for equality.

‎Source/JavaScriptCore/Configurations/DebugRelease.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_
3131
MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
3232
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
3333
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
34+
MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
3435

3536
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
3637
DEBUG_INFORMATION_FORMAT = dwarf;

‎Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

+9
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ ENABLE_AVF_CAPTIONS[sdk=macosx*] = $(ENABLE_AVF_CAPTIONS_macosx_$(TARGET_MAC_OS_
4040
ENABLE_AVF_CAPTIONS_macosx_1090 = ;
4141
ENABLE_AVF_CAPTIONS_macosx_101000 = ENABLE_AVF_CAPTIONS;
4242
ENABLE_AVF_CAPTIONS_macosx_101100 = ENABLE_AVF_CAPTIONS;
43+
ENABLE_AVF_CAPTIONS_macosx_101200 = ENABLE_AVF_CAPTIONS;
4344
ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
4445
ENABLE_CANVAS_PATH = ENABLE_CANVAS_PATH;
4546
ENABLE_CANVAS_PROXY = ;
@@ -76,6 +77,7 @@ ENABLE_FILTERS_LEVEL_2[sdk=macosx*] = $(ENABLE_FILTERS_LEVEL_2_macosx_$(TARGET_M
7677
ENABLE_FILTERS_LEVEL_2_macosx_1090 = ;
7778
ENABLE_FILTERS_LEVEL_2_macosx_101000 = ENABLE_FILTERS_LEVEL_2;
7879
ENABLE_FILTERS_LEVEL_2_macosx_101100 = ENABLE_FILTERS_LEVEL_2;
80+
ENABLE_FILTERS_LEVEL_2_macosx_101200 = ENABLE_FILTERS_LEVEL_2;
7981
ENABLE_FONT_LOAD_EVENTS = ;
8082
ENABLE_FULLSCREEN_API[sdk=macosx*] = ENABLE_FULLSCREEN_API;
8183
ENABLE_GAMEPAD[sdk=macosx*] = ENABLE_GAMEPAD;
@@ -87,6 +89,7 @@ ENABLE_SERVICE_CONTROLS[sdk=macosx*] = $(ENABLE_SERVICE_CONTROLS_macosx_$(TARGET
8789
ENABLE_SERVICE_CONTROLS_macosx_1090 = ;
8890
ENABLE_SERVICE_CONTROLS_macosx_101000 = ENABLE_SERVICE_CONTROLS;
8991
ENABLE_SERVICE_CONTROLS_macosx_101100 = ENABLE_SERVICE_CONTROLS;
92+
ENABLE_SERVICE_CONTROLS_macosx_101200 = ENABLE_SERVICE_CONTROLS;
9093
ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
9194
ENABLE_INDEXED_DATABASE_IN_WORKERS = ;
9295
ENABLE_INDIE_UI = ENABLE_INDIE_UI;
@@ -104,12 +107,14 @@ ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS[sdk=macosx*] = $(ENABLE_INSPECTOR_ALTERNA
104107
ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_1090 = ;
105108
ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101000 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
106109
ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101100 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
110+
ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101200 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
107111

108112
ENABLE_WIRELESS_PLAYBACK_TARGET[sdk=iphone*] = ENABLE_WIRELESS_PLAYBACK_TARGET;
109113
ENABLE_WIRELESS_PLAYBACK_TARGET[sdk=macosx*] = $(ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
110114
ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_1090 = ;
111115
ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101000 = ;
112116
ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101100 = ENABLE_WIRELESS_PLAYBACK_TARGET;
117+
ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101200 = ENABLE_WIRELESS_PLAYBACK_TARGET;
113118

114119
ENABLE_IOS_GESTURE_EVENTS[sdk=iphone*] = $(ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
115120
ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_GESTURE_EVENTS;
@@ -132,6 +137,7 @@ ENABLE_MEDIA_SOURCE[sdk=macosx*] = $(ENABLE_MEDIA_SOURCE_macosx_$(TARGET_MAC_OS_
132137
ENABLE_MEDIA_SOURCE_macosx_1090 = ;
133138
ENABLE_MEDIA_SOURCE_macosx_101000 = ENABLE_MEDIA_SOURCE;
134139
ENABLE_MEDIA_SOURCE_macosx_101100 = ENABLE_MEDIA_SOURCE;
140+
ENABLE_MEDIA_SOURCE_macosx_101200 = ENABLE_MEDIA_SOURCE;
135141

136142
ENABLE_MEDIA_STATISTICS = ;
137143
ENABLE_METER_ELEMENT[sdk=macosx*] = ENABLE_METER_ELEMENT;
@@ -154,6 +160,7 @@ ENABLE_REMOTE_INSPECTOR[sdk=macosx*] = $(ENABLE_REMOTE_INSPECTOR_macosx_$(TARGET
154160
ENABLE_REMOTE_INSPECTOR_macosx_1090 = ;
155161
ENABLE_REMOTE_INSPECTOR_macosx_101000 = ENABLE_REMOTE_INSPECTOR;
156162
ENABLE_REMOTE_INSPECTOR_macosx_101100 = ENABLE_REMOTE_INSPECTOR;
163+
ENABLE_REMOTE_INSPECTOR_macosx_101200 = ENABLE_REMOTE_INSPECTOR;
157164
ENABLE_RESOLUTION_MEDIA_QUERY = ;
158165
ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
159166
ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
@@ -168,6 +175,7 @@ ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=macosx*] = $(ENABLE_TELEPHONE_NUMBER_DETEC
168175
ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_1090 = ;
169176
ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101000 = ENABLE_TELEPHONE_NUMBER_DETECTION;
170177
ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101100 = ENABLE_TELEPHONE_NUMBER_DETECTION;
178+
ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101200 = ENABLE_TELEPHONE_NUMBER_DETECTION;
171179

172180
ENABLE_TEMPLATE_ELEMENT = ENABLE_TEMPLATE_ELEMENT;
173181
ENABLE_TEXT_AUTOSIZING = ;
@@ -198,6 +206,7 @@ ENABLE_WEB_TIMING[sdk=macosx*] = $(ENABLE_WEB_TIMING_macosx_$(TARGET_MAC_OS_X_VE
198206
ENABLE_WEB_TIMING_macosx_1090 = ;
199207
ENABLE_WEB_TIMING_macosx_101000 = ENABLE_WEB_TIMING;
200208
ENABLE_WEB_TIMING_macosx_101100 = ENABLE_WEB_TIMING;
209+
ENABLE_WEB_TIMING_macosx_101200 = ENABLE_WEB_TIMING;
201210

202211
ENABLE_WEBVTT_REGIONS = ENABLE_WEBVTT_REGIONS;
203212
ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;

‎Source/JavaScriptCore/Configurations/Version.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS
3838
SYSTEM_VERSION_PREFIX_macosx_1090 = 9;
3939
SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
4040
SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
41+
SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
4142

4243
// The production build always uses the full version with a system version prefix.
4344
BUNDLE_VERSION_Production = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);

‎Source/ThirdParty/ANGLE/ChangeLog

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
2015-05-26 Dan Bernstein <[email protected]>
2+
3+
<rdar://problem/21104551> Update build settings
4+
5+
Reviewed by Anders Carlsson.
6+
7+
* Configurations/Base.xcconfig:
8+
* Configurations/DebugRelease.xcconfig:
9+
110
2015-05-19 Carlos Alberto Lopez Perez <[email protected]>
211

312
REGRESSION(r181571): Build broken when USE(OPENGL_ES_2) is defined.

‎Source/ThirdParty/ANGLE/Configurations/Base.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ TOOLCHAINS_macosx_1080 = default;
5858
TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
5959
TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
6060
TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
61+
TOOLCHAINS_macosx_101200 = $(TOOLCHAINS_macosx_101100);
6162

6263
OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
6364
OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);

‎Source/ThirdParty/ANGLE/Configurations/DebugRelease.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ MACOSX_DEPLOYMENT_TARGET_macosx_1080 = 10.8;
99
MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
1010
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
1111
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
12+
MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
1213

1314
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
1415
DEBUG_INFORMATION_FORMAT = dwarf;

‎Source/ThirdParty/ChangeLog

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
2015-05-26 Dan Bernstein <[email protected]>
2+
3+
<rdar://problem/21104551> Update build settings
4+
5+
Reviewed by Anders Carlsson.
6+
7+
* gtest/xcode/Config/General.xcconfig:
8+
19
2015-05-11 Brent Fulgham <[email protected]>
210

311
[Win] Move Windows build target to Windows 7 (or newer)

‎Source/ThirdParty/gtest/xcode/Config/General.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ TOOLCHAINS_macosx_1080 = default;
7171
TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
7272
TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_1090);
7373
TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_101000);
74+
TOOLCHAINS_macosx_101200 = $(TOOLCHAINS_101100);
7475

7576
SDKROOT[sdk=iphone*] = $(SDKROOT);
7677
SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));

‎Source/WTF/ChangeLog

+8
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
2015-05-26 Dan Bernstein <[email protected]>
2+
3+
<rdar://problem/21104551> Update build settings
4+
5+
Reviewed by Anders Carlsson.
6+
7+
* Configurations/DebugRelease.xcconfig:
8+
19
2015-05-23 Dan Bernstein <[email protected]>
210

311
Remove unused definitions of WEBKIT_VERSION_MIN_REQUIRED

‎Source/WTF/Configurations/DebugRelease.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_
3030
MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
3131
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
3232
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
33+
MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
3334

3435
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
3536
DEBUG_INFORMATION_FORMAT = dwarf;

‎Source/WebCore/ChangeLog

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2015-05-26 Dan Bernstein <[email protected]>
2+
3+
<rdar://problem/21104551> Update build settings
4+
5+
Reviewed by Anders Carlsson.
6+
7+
* Configurations/DebugRelease.xcconfig:
8+
* Configurations/FeatureDefines.xcconfig:
9+
* Configurations/Version.xcconfig:
10+
111
2015-05-26 Csaba Osztrogonác <[email protected]>
212

313
[ARM] Build SVGPathElement.cpp with -O2 due to a GCC bug

‎Source/WebCore/Configurations/DebugRelease.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_
3131
MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
3232
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
3333
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
34+
MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
3435

3536
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
3637
DEBUG_INFORMATION_FORMAT = dwarf;

‎Source/WebCore/Configurations/FeatureDefines.xcconfig

+9
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ ENABLE_AVF_CAPTIONS[sdk=macosx*] = $(ENABLE_AVF_CAPTIONS_macosx_$(TARGET_MAC_OS_
4040
ENABLE_AVF_CAPTIONS_macosx_1090 = ;
4141
ENABLE_AVF_CAPTIONS_macosx_101000 = ENABLE_AVF_CAPTIONS;
4242
ENABLE_AVF_CAPTIONS_macosx_101100 = ENABLE_AVF_CAPTIONS;
43+
ENABLE_AVF_CAPTIONS_macosx_101200 = ENABLE_AVF_CAPTIONS;
4344
ENABLE_CACHE_PARTITIONING = ENABLE_CACHE_PARTITIONING;
4445
ENABLE_CANVAS_PATH = ENABLE_CANVAS_PATH;
4546
ENABLE_CANVAS_PROXY = ;
@@ -76,6 +77,7 @@ ENABLE_FILTERS_LEVEL_2[sdk=macosx*] = $(ENABLE_FILTERS_LEVEL_2_macosx_$(TARGET_M
7677
ENABLE_FILTERS_LEVEL_2_macosx_1090 = ;
7778
ENABLE_FILTERS_LEVEL_2_macosx_101000 = ENABLE_FILTERS_LEVEL_2;
7879
ENABLE_FILTERS_LEVEL_2_macosx_101100 = ENABLE_FILTERS_LEVEL_2;
80+
ENABLE_FILTERS_LEVEL_2_macosx_101200 = ENABLE_FILTERS_LEVEL_2;
7981
ENABLE_FONT_LOAD_EVENTS = ;
8082
ENABLE_FULLSCREEN_API[sdk=macosx*] = ENABLE_FULLSCREEN_API;
8183
ENABLE_GAMEPAD[sdk=macosx*] = ENABLE_GAMEPAD;
@@ -87,6 +89,7 @@ ENABLE_SERVICE_CONTROLS[sdk=macosx*] = $(ENABLE_SERVICE_CONTROLS_macosx_$(TARGET
8789
ENABLE_SERVICE_CONTROLS_macosx_1090 = ;
8890
ENABLE_SERVICE_CONTROLS_macosx_101000 = ENABLE_SERVICE_CONTROLS;
8991
ENABLE_SERVICE_CONTROLS_macosx_101100 = ENABLE_SERVICE_CONTROLS;
92+
ENABLE_SERVICE_CONTROLS_macosx_101200 = ENABLE_SERVICE_CONTROLS;
9093
ENABLE_INDEXED_DATABASE = ENABLE_INDEXED_DATABASE;
9194
ENABLE_INDEXED_DATABASE_IN_WORKERS = ;
9295
ENABLE_INDIE_UI = ENABLE_INDIE_UI;
@@ -104,12 +107,14 @@ ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS[sdk=macosx*] = $(ENABLE_INSPECTOR_ALTERNA
104107
ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_1090 = ;
105108
ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101000 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
106109
ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101100 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
110+
ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS_macosx_101200 = ENABLE_INSPECTOR_ALTERNATE_DISPATCHERS;
107111

108112
ENABLE_WIRELESS_PLAYBACK_TARGET[sdk=iphone*] = ENABLE_WIRELESS_PLAYBACK_TARGET;
109113
ENABLE_WIRELESS_PLAYBACK_TARGET[sdk=macosx*] = $(ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_$(TARGET_MAC_OS_X_VERSION_MAJOR))
110114
ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_1090 = ;
111115
ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101000 = ;
112116
ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101100 = ENABLE_WIRELESS_PLAYBACK_TARGET;
117+
ENABLE_WIRELESS_PLAYBACK_TARGET_macosx_101200 = ENABLE_WIRELESS_PLAYBACK_TARGET;
113118

114119
ENABLE_IOS_GESTURE_EVENTS[sdk=iphone*] = $(ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_$(USE_INTERNAL_SDK));
115120
ENABLE_IOS_GESTURE_EVENTS_ios_WITH_INTERNAL_SDK_YES = ENABLE_IOS_GESTURE_EVENTS;
@@ -132,6 +137,7 @@ ENABLE_MEDIA_SOURCE[sdk=macosx*] = $(ENABLE_MEDIA_SOURCE_macosx_$(TARGET_MAC_OS_
132137
ENABLE_MEDIA_SOURCE_macosx_1090 = ;
133138
ENABLE_MEDIA_SOURCE_macosx_101000 = ENABLE_MEDIA_SOURCE;
134139
ENABLE_MEDIA_SOURCE_macosx_101100 = ENABLE_MEDIA_SOURCE;
140+
ENABLE_MEDIA_SOURCE_macosx_101200 = ENABLE_MEDIA_SOURCE;
135141

136142
ENABLE_MEDIA_STATISTICS = ;
137143
ENABLE_METER_ELEMENT[sdk=macosx*] = ENABLE_METER_ELEMENT;
@@ -154,6 +160,7 @@ ENABLE_REMOTE_INSPECTOR[sdk=macosx*] = $(ENABLE_REMOTE_INSPECTOR_macosx_$(TARGET
154160
ENABLE_REMOTE_INSPECTOR_macosx_1090 = ;
155161
ENABLE_REMOTE_INSPECTOR_macosx_101000 = ENABLE_REMOTE_INSPECTOR;
156162
ENABLE_REMOTE_INSPECTOR_macosx_101100 = ENABLE_REMOTE_INSPECTOR;
163+
ENABLE_REMOTE_INSPECTOR_macosx_101200 = ENABLE_REMOTE_INSPECTOR;
157164
ENABLE_RESOLUTION_MEDIA_QUERY = ;
158165
ENABLE_RUBBER_BANDING[sdk=macosx*] = ENABLE_RUBBER_BANDING;
159166
ENABLE_CSS_SCROLL_SNAP = ENABLE_CSS_SCROLL_SNAP;
@@ -168,6 +175,7 @@ ENABLE_TELEPHONE_NUMBER_DETECTION[sdk=macosx*] = $(ENABLE_TELEPHONE_NUMBER_DETEC
168175
ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_1090 = ;
169176
ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101000 = ENABLE_TELEPHONE_NUMBER_DETECTION;
170177
ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101100 = ENABLE_TELEPHONE_NUMBER_DETECTION;
178+
ENABLE_TELEPHONE_NUMBER_DETECTION_macosx_101200 = ENABLE_TELEPHONE_NUMBER_DETECTION;
171179

172180
ENABLE_TEMPLATE_ELEMENT = ENABLE_TEMPLATE_ELEMENT;
173181
ENABLE_TEXT_AUTOSIZING = ;
@@ -198,6 +206,7 @@ ENABLE_WEB_TIMING[sdk=macosx*] = $(ENABLE_WEB_TIMING_macosx_$(TARGET_MAC_OS_X_VE
198206
ENABLE_WEB_TIMING_macosx_1090 = ;
199207
ENABLE_WEB_TIMING_macosx_101000 = ENABLE_WEB_TIMING;
200208
ENABLE_WEB_TIMING_macosx_101100 = ENABLE_WEB_TIMING;
209+
ENABLE_WEB_TIMING_macosx_101200 = ENABLE_WEB_TIMING;
201210

202211
ENABLE_WEBVTT_REGIONS = ENABLE_WEBVTT_REGIONS;
203212
ENABLE_XHR_TIMEOUT = ENABLE_XHR_TIMEOUT;

‎Source/WebCore/Configurations/Version.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ SYSTEM_VERSION_PREFIX = $(SYSTEM_VERSION_PREFIX_$(PLATFORM_NAME)_$(TARGET_MAC_OS
3838
SYSTEM_VERSION_PREFIX_macosx_1090 = 9;
3939
SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
4040
SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
41+
SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
4142

4243
// The production build always uses the full version with a system version prefix.
4344
BUNDLE_VERSION_Production = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);

‎Source/WebInspectorUI/ChangeLog

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2015-05-26 Dan Bernstein <[email protected]>
2+
3+
<rdar://problem/21104551> Update build settings
4+
5+
Reviewed by Anders Carlsson.
6+
7+
* Configurations/Base.xcconfig:
8+
* Configurations/DebugRelease.xcconfig:
9+
* Configurations/Version.xcconfig:
10+
111
2015-05-23 Dan Bernstein <[email protected]>
212

313
Remove unused definitions of WEBKIT_VERSION_MIN_REQUIRED

‎Source/WebInspectorUI/Configurations/Base.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ TOOLCHAINS_macosx_1080 = default;
6666
TOOLCHAINS_macosx_1090 = $(TOOLCHAINS);
6767
TOOLCHAINS_macosx_101000 = $(TOOLCHAINS_macosx_1090);
6868
TOOLCHAINS_macosx_101100 = $(TOOLCHAINS_macosx_101000);
69+
TOOLCHAINS_macosx_101200 = $(TOOLCHAINS_macosx_101100);
6970

7071
OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
7172
OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);

‎Source/WebInspectorUI/Configurations/DebugRelease.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ MACOSX_DEPLOYMENT_TARGET_macosx_1080 = 10.8;
99
MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
1010
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
1111
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
12+
MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
1213

1314
ENGINEERING_BUILD = 1;
1415

‎Source/WebInspectorUI/Configurations/Version.xcconfig

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ SYSTEM_VERSION_PREFIX_macosx_1080 = 8;
1212
SYSTEM_VERSION_PREFIX_macosx_1090 = 9;
1313
SYSTEM_VERSION_PREFIX_macosx_101000 = 10;
1414
SYSTEM_VERSION_PREFIX_macosx_101100 = 11;
15+
SYSTEM_VERSION_PREFIX_macosx_101200 = 12;
1516

1617
BUNDLE_VERSION = $(SYSTEM_VERSION_PREFIX)$(FULL_VERSION);
1718
SHORT_VERSION_STRING = $(SYSTEM_VERSION_PREFIX)$(MAJOR_VERSION);

‎Source/WebKit/mac/ChangeLog

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2015-05-26 Dan Bernstein <[email protected]>
2+
3+
<rdar://problem/21104551> Update build settings
4+
5+
Reviewed by Anders Carlsson.
6+
7+
* Configurations/DebugRelease.xcconfig:
8+
* Configurations/FeatureDefines.xcconfig:
9+
* Configurations/Version.xcconfig:
10+
111
2015-05-25 Dan Bernstein <[email protected]>
212

313
ASSERT_MAIN_THREAD and DOM_ASSERT_MAIN_THREAD are unnecessary no-ops

‎Source/WebKit/mac/Configurations/DebugRelease.xcconfig

+2
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ MACOSX_DEPLOYMENT_TARGET = $(MACOSX_DEPLOYMENT_TARGET_$(PLATFORM_NAME)_$(TARGET_
3131
MACOSX_DEPLOYMENT_TARGET_macosx_1090 = 10.9;
3232
MACOSX_DEPLOYMENT_TARGET_macosx_101000 = 10.10;
3333
MACOSX_DEPLOYMENT_TARGET_macosx_101100 = 10.11;
34+
MACOSX_DEPLOYMENT_TARGET_macosx_101200 = 10.12;
3435

3536
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
3637
DEBUG_INFORMATION_FORMAT = dwarf;
@@ -41,6 +42,7 @@ WEBKIT_SYSTEM_INTERFACE_LIBRARY = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_$(PLATFORM_N
4142
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_1090 = WebKitSystemInterfaceMavericks;
4243
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000 = WebKitSystemInterfaceYosemite;
4344
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101000);
45+
WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101200 = $(WEBKIT_SYSTEM_INTERFACE_LIBRARY_macosx_101100);
4446

4547
SDKROOT[sdk=iphone*] = $(SDKROOT);
4648
SDKROOT = $(SDKROOT_$(PLATFORM_NAME)_$(USE_INTERNAL_SDK));

0 commit comments

Comments
 (0)