Changeset 262303 in webkit


Ignore:
Timestamp:
May 29, 2020, 10:41:40 AM (6 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, reverting r262245.
​https://bugs.webkit.org/show_bug.cgi?id=212531

"Caused WebCore's 'Check .xcfilelists' build phase to be ~100x
slower"

Reverted changeset:

"[Cocoa] Pass all defines from Platform.h to various scripts,
not just the ones from .xcconfig"
​https://bugs.webkit.org/show_bug.cgi?id=212451
​https://trac.webkit.org/changeset/262245

Location:
trunk/Source
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r262302 r262303  
     12020-05-29  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, reverting r262245.
     4        https://bugs.webkit.org/show_bug.cgi?id=212531
     5
     6        "Caused WebCore's 'Check .xcfilelists' build phase to be ~100x
     7        slower"
     8
     9        Reverted changeset:
     10
     11        "[Cocoa] Pass all defines from Platform.h to various scripts,
     12        not just the ones from .xcconfig"
     13        https://bugs.webkit.org/show_bug.cgi?id=212451
     14        https://trac.webkit.org/changeset/262245
     15
    1162020-05-29  Devin Rousso  <drousso@apple.com>
    217

  • trunk/Source/JavaScriptCore/DerivedSources.make

    r262245 r262303  
    1 # Copyright (C) 2006-2020 Apple Inc. All rights reserved.
     1# Copyright (C) 2006, 2007, 2008, 2009, 2011, 2013, 2015 Apple Inc. All rights reserved.
    22#
    33# Redistribution and use in source and binary forms, with or without
    … …  
    2525# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2626
    27 PYTHON = python
    28 PERL = perl
    29 RUBY = ruby
    30 DELETE = rm -f
    31 
    32 FRAMEWORK_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) $(SYSTEM_FRAMEWORK_SEARCH_PATHS) | $(PERL) -e 'print "-F " . join(" -F ", split(" ", <>));')
    33 HEADER_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) $(SYSTEM_HEADER_SEARCH_PATHS) | $(PERL) -e 'print "-I" . join(" -I", split(" ", <>));')
    34 FEATURE_DEFINE_FLAGS = $(shell echo $(FEATURE_DEFINES) | $(PERL) -e 'print "-D" . join(" -D", split(" ", <>));')
    35 
    36 ifneq ($(SDKROOT),)
    37     SDK_FLAGS=-isysroot $(SDKROOT)
    38 endif
    39 
    40 ifeq ($(USE_LLVM_TARGET_TRIPLES_FOR_CLANG),YES)
    41     WK_CURRENT_ARCH=$(word 1, $(ARCHS))
    42     TARGET_TRIPLE_FLAGS=-target $(WK_CURRENT_ARCH)-$(LLVM_TARGET_TRIPLE_VENDOR)-$(LLVM_TARGET_TRIPLE_OS_VERSION)$(LLVM_TARGET_TRIPLE_SUFFIX)
    43 endif
    44 
    45 FEATURE_AND_PLATFORM_DEFINES = $(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) $(FEATURE_DEFINE_FLAGS) -include "wtf/Platform.h" /dev/null | $(PERL) -ne "print if s/\#define ((HAVE_|USE_|ENABLE_|WTF_PLATFORM_)\w+) 1/\1/")
    46 
    47 # FIXME: Should generate the list of everything included by Platform.h as a side effect of the above command.
    48 FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES = Configurations/FeatureDefines.xcconfig DerivedSources.make
    49 
    50 # --------
    51 
    5227VPATH = \
    5328    $(JavaScriptCore) \
    … …  
    6035#
    6136
     37PYTHON = python
     38PERL = perl
     39RUBY = ruby
     40
    6241JavaScriptCore_SCRIPTS_DIR = $(JavaScriptCore)/Scripts
     42
     43ifeq ($(OS),Windows_NT)
     44    DELETE = cmd //C del
     45else
     46    DELETE = rm -f
     47endif
     48
     49PREPROCESSOR_DEFINES = $(FEATURE_DEFINES)
     50
     51FRAMEWORK_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) $(SYSTEM_FRAMEWORK_SEARCH_PATHS) | perl -e 'print "-F " . join(" -F ", split(" ", <>));')
     52HEADER_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) $(SYSTEM_HEADER_SEARCH_PATHS) | perl -e 'print "-I" . join(" -I", split(" ", <>));')
     53
     54ifneq ($(SDKROOT),)
     55    SDK_FLAGS=-isysroot $(SDKROOT)
     56endif
     57
     58ifeq ($(USE_LLVM_TARGET_TRIPLES_FOR_CLANG),YES)
     59    WK_CURRENT_ARCH=$(word 1, $(ARCHS))
     60    TARGET_TRIPLE_FLAGS=-target $(WK_CURRENT_ARCH)-$(LLVM_TARGET_TRIPLE_VENDOR)-$(LLVM_TARGET_TRIPLE_OS_VERSION)$(LLVM_TARGET_TRIPLE_SUFFIX)
     61endif
     62
     63ifeq ($(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_MAC ' | cut -d' ' -f3), 1)
     64    PREPROCESSOR_DEFINES += WTF_PLATFORM_MAC
     65endif
     66
     67ifeq ($(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_IOS_FAMILY ' | cut -d' ' -f3), 1)
     68    PREPROCESSOR_DEFINES += WTF_PLATFORM_IOS_FAMILY
     69endif
     70
     71ifeq ($(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' USE_CF ' | cut -d' ' -f3), 1)
     72    PREPROCESSOR_DEFINES += USE_CF
     73endif
     74
     75ifeq ($(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep HAVE_OS_DARK_MODE_SUPPORT | cut -d' ' -f3), 1)
     76    PREPROCESSOR_DEFINES += HAVE_OS_DARK_MODE_SUPPORT
     77else
     78endif
     79
     80ifeq ($(PLATFORM_FEATURE_DEFINES),)
     81ifeq ($(OS), Windows_NT)
     82PLATFORM_FEATURE_DEFINES = $(WEBKIT_LIBRARIES)/tools/vsprops/FeatureDefines.props
     83else
     84PLATFORM_FEATURE_DEFINES = Configurations/FeatureDefines.xcconfig
     85endif
     86endif
     87
     88# --------
    6389
    6490.PHONY : all
    … …  
    333359        $(PYTHON) $(JavaScriptCore)/inspector/scripts/generate-inspector-protocol-bindings.py --framework JavaScriptCore --outputDir inspector ./CombinedDomains.json
    334360
    335 inspector/InspectorBackendCommands.js : CombinedDomains.json $(INSPECTOR_GENERATOR_SCRIPTS) $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES)
     361inspector/InspectorBackendCommands.js : CombinedDomains.json $(INSPECTOR_GENERATOR_SCRIPTS) $(PLATFORM_FEATURE_DEFINES)
    336362        $(PYTHON) $(JavaScriptCore)/inspector/scripts/generate-inspector-protocol-bindings.py --framework WebInspectorUI --outputDir inspector ./CombinedDomains.json
    337363        @echo Pre-processing InspectorBackendCommands...
    338         $(PERL) $(JavaScriptCore)/inspector/scripts/codegen/preprocess.pl --input inspector/InspectorBackendCommands.js.in --defines "$(FEATURE_AND_PLATFORM_DEFINES)" --output inspector/InspectorBackendCommands.js
     364        $(PERL) $(JavaScriptCore)/inspector/scripts/codegen/preprocess.pl --input inspector/InspectorBackendCommands.js.in --defines "$(PREPROCESSOR_DEFINES)" --output inspector/InspectorBackendCommands.js
    339365        $(DELETE) inspector/InspectorBackendCommands.js.in
    340366

  • trunk/Source/WebCore/ChangeLog

    r262300 r262303  
     12020-05-29  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, reverting r262245.
     4        https://bugs.webkit.org/show_bug.cgi?id=212531
     5
     6        "Caused WebCore's 'Check .xcfilelists' build phase to be ~100x
     7        slower"
     8
     9        Reverted changeset:
     10
     11        "[Cocoa] Pass all defines from Platform.h to various scripts,
     12        not just the ones from .xcconfig"
     13        https://bugs.webkit.org/show_bug.cgi?id=212451
     14        https://trac.webkit.org/changeset/262245
     15
    1162020-05-29  Sergio Villar Senin  <svillar@igalia.com>
    217

  • trunk/Source/WebCore/DerivedSources.make

    r262245 r262303  
    1 # Copyright (C) 2006-2020 Apple Inc. All rights reserved.
     1# Copyright (C) 2006-2018 Apple Inc. All rights reserved.
    22# Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    33# Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
    … …  
    2626# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
    2727# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    28 
    29 PYTHON = python
    30 PERL = perl
    31 RUBY = ruby
    32 DELETE = rm -f
    33 
    34 FRAMEWORK_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) $(SYSTEM_FRAMEWORK_SEARCH_PATHS) | perl -e 'print "-F " . join(" -F ", split(" ", <>));')
    35 HEADER_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) $(SYSTEM_HEADER_SEARCH_PATHS) | perl -e 'print "-I" . join(" -I", split(" ", <>));')
    36 FEATURE_DEFINE_FLAGS = $(shell echo $(FEATURE_DEFINES) | perl -e 'print "-D" . join(" -D", split(" ", <>));')
    37 
    38 ifneq ($(SDKROOT),)
    39     SDK_FLAGS=-isysroot $(SDKROOT)
    40 endif
    41 
    42 ifeq ($(USE_LLVM_TARGET_TRIPLES_FOR_CLANG),YES)
    43     WK_CURRENT_ARCH=$(word 1, $(ARCHS))
    44     TARGET_TRIPLE_FLAGS=-target $(WK_CURRENT_ARCH)-$(LLVM_TARGET_TRIPLE_VENDOR)-$(LLVM_TARGET_TRIPLE_OS_VERSION)$(LLVM_TARGET_TRIPLE_SUFFIX)
    45 endif
    46 
    47 FEATURE_AND_PLATFORM_DEFINES = $(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) $(FEATURE_DEFINE_FLAGS) -include "wtf/Platform.h" /dev/null | perl -ne "print if s/\#define ((HAVE_|USE_|ENABLE_|WTF_PLATFORM_)\w+) 1/\1/")
    48 
    49 # FIXME: Should generate the list of everything included by Platform.h as a side effect of the above command.
    50 FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES = Configurations/FeatureDefines.xcconfig DerivedSources.make
    51 
    52 # --------
    5328
    5429VPATH = \
    … …  
    12001175#
    12011176
     1177PYTHON = python
     1178PERL = perl
     1179RUBY = ruby
     1180
     1181ifeq ($(OS),Windows_NT)
     1182    DELETE = cmd //C del
     1183else
     1184    DELETE = rm -f
     1185endif
    12021186# --------
    12031187
     1188ifeq ($(OS),MACOS)
     1189
     1190FRAMEWORK_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) $(SYSTEM_FRAMEWORK_SEARCH_PATHS) | perl -e 'print "-F " . join(" -F ", split(" ", <>));')
     1191HEADER_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) $(SYSTEM_HEADER_SEARCH_PATHS) | perl -e 'print "-I" . join(" -I", split(" ", <>));')
     1192
     1193ifneq ($(SDKROOT),)
     1194    SDK_FLAGS=-isysroot $(SDKROOT)
     1195endif
     1196
     1197ifeq ($(USE_LLVM_TARGET_TRIPLES_FOR_CLANG),YES)
     1198    WK_CURRENT_ARCH=$(word 1, $(ARCHS))
     1199    TARGET_TRIPLE_FLAGS=-target $(WK_CURRENT_ARCH)-$(LLVM_TARGET_TRIPLE_VENDOR)-$(LLVM_TARGET_TRIPLE_OS_VERSION)$(LLVM_TARGET_TRIPLE_SUFFIX)
     1200endif
     1201
     1202ifeq ($(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_IOS_FAMILY ' | cut -d' ' -f3), 1)
     1203    WTF_PLATFORM_IOS_FAMILY = 1
     1204else
     1205    WTF_PLATFORM_IOS_FAMILY = 0
     1206endif
     1207
     1208ifeq ($(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ' WTF_PLATFORM_MAC ' | cut -d' ' -f3), 1)
     1209    WTF_PLATFORM_MAC = 1
     1210else
     1211    WTF_PLATFORM_MAC = 0
     1212endif
     1213
     1214ifeq ($(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep USE_APPLE_INTERNAL_SDK | cut -d' ' -f3), 1)
     1215    USE_APPLE_INTERNAL_SDK = 1
     1216else
     1217    USE_APPLE_INTERNAL_SDK = 0
     1218endif
     1219
     1220ifeq ($(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep HAVE_OS_DARK_MODE_SUPPORT | cut -d' ' -f3), 1)
     1221    HAVE_OS_DARK_MODE_SUPPORT = 1
     1222else
     1223    HAVE_OS_DARK_MODE_SUPPORT = 0
     1224endif
     1225
     1226ifeq ($(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ENABLE_ORIENTATION_EVENTS | cut -d' ' -f3), 1)
     1227    ENABLE_ORIENTATION_EVENTS = 1
     1228endif
     1229
     1230ifeq ($(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null | grep ENABLE_MEDIA_SOURCE | cut -d' ' -f3), 1)
     1231        ENABLE_MEDIA_SOURCE = 1
     1232endif
     1233
     1234ifeq ($(WTF_PLATFORM_IOS_FAMILY), 1)
     1235FEATURE_AND_PLATFORM_DEFINES = $(FEATURE_DEFINES) WTF_PLATFORM_IOS_FAMILY
     1236else ifeq ($(WTF_PLATFORM_MAC), 1)
     1237FEATURE_AND_PLATFORM_DEFINES = $(FEATURE_DEFINES) WTF_PLATFORM_MAC
     1238else
     1239FEATURE_AND_PLATFORM_DEFINES = $(FEATURE_DEFINES)
     1240endif
     1241
     1242ifeq ($(HAVE_OS_DARK_MODE_SUPPORT), 1)
     1243FEATURE_AND_PLATFORM_DEFINES += HAVE_OS_DARK_MODE_SUPPORT
     1244endif
     1245
     1246ifeq ($(PLATFORM_FEATURE_DEFINES),)
     1247ifeq ($(OS), Windows_NT)
     1248PLATFORM_FEATURE_DEFINES = $(WEBKIT_LIBRARIES)/tools/vsprops/FeatureDefines.props
     1249else
     1250PLATFORM_FEATURE_DEFINES = Configurations/FeatureDefines.xcconfig
     1251endif
     1252endif
     1253
    12041254ADDITIONAL_BINDING_IDLS =
    1205 
    1206 ifeq ($(findstring ENABLE_IOS_GESTURE_EVENTS,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_IOS_GESTURE_EVENTS)
     1255ifeq ($(findstring ENABLE_MAC_GESTURE_EVENTS,$(FEATURE_DEFINES)), ENABLE_MAC_GESTURE_EVENTS)
    12071256ADDITIONAL_BINDING_IDLS += GestureEvent.idl
    12081257endif
    12091258
    1210 ifeq ($(findstring ENABLE_IOS_TOUCH_EVENTS,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_IOS_TOUCH_EVENTS)
     1259ifeq ($(findstring ENABLE_IOS_GESTURE_EVENTS,$(FEATURE_DEFINES)), ENABLE_IOS_GESTURE_EVENTS)
     1260ADDITIONAL_BINDING_IDLS += GestureEvent.idl
     1261endif
     1262
     1263ifeq ($(WTF_PLATFORM_IOS_FAMILY), 1)
     1264ifeq ($(findstring ENABLE_IOS_TOUCH_EVENTS,$(FEATURE_DEFINES)), ENABLE_IOS_TOUCH_EVENTS)
    12111265ADDITIONAL_BINDING_IDLS += \
    12121266    DocumentTouch.idl \
    … …  
    12151269    TouchList.idl
    12161270endif
    1217 
    1218 ifeq ($(findstring ENABLE_MAC_GESTURE_EVENTS,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_MAC_GESTURE_EVENTS)
    1219 ADDITIONAL_BINDING_IDLS += GestureEvent.idl
    1220 endif
     1271endif # IOS
    12211272
    12221273vpath %.in $(WEBKITADDITIONS_HEADER_SEARCH_PATHS)
    … …  
    12361287        cp $< .
    12371288
    1238 ifneq ($(findstring ENABLE_IOS_TOUCH_EVENTS,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_IOS_TOUCH_EVENTS)
     1289endif # MACOS
     1290
     1291ifneq ($(WTF_PLATFORM_IOS_FAMILY), 1)
    12391292JS_BINDING_IDLS += \
    12401293    $(WebCore)/dom/DocumentTouch.idl \
    … …  
    13041357# --------
    13051358
     1359ADDITIONAL_IDL_DEFINES :=
     1360
     1361ifndef ENABLE_ORIENTATION_EVENTS
     1362    ENABLE_ORIENTATION_EVENTS = 0
     1363endif
     1364
     1365ifndef ENABLE_MEDIA_SOURCE
     1366        ENABLE_MEDIA_SOURCE = 0
     1367endif
     1368
     1369ifeq ($(ENABLE_ORIENTATION_EVENTS), 1)
     1370    ADDITIONAL_IDL_DEFINES := $(ADDITIONAL_IDL_DEFINES) ENABLE_ORIENTATION_EVENTS
     1371endif
     1372
     1373ifeq ($(USE_APPLE_INTERNAL_SDK), 1)
     1374    ADDITIONAL_IDL_DEFINES := $(ADDITIONAL_IDL_DEFINES) USE_APPLE_INTERNAL_SDK
     1375endif
     1376
     1377ifeq ($(ENABLE_MEDIA_SOURCE), 1)
     1378    ADDITIONAL_IDL_DEFINES := $(ADDITIONAL_IDL_DEFINES) ENABLE_MEDIA_SOURCE
     1379endif
     1380
    13061381# CSS property names and value keywords
    13071382
    … …  
    13201395
    13211396all : $(CSS_PROPERTY_NAME_FILES)
    1322 $(CSS_PROPERTY_NAME_FILES_PATTERNS) : $(WEBCORE_CSS_PROPERTY_NAMES) css/makeprop.pl $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES)
     1397$(CSS_PROPERTY_NAME_FILES_PATTERNS) : $(WEBCORE_CSS_PROPERTY_NAMES) css/makeprop.pl $(PLATFORM_FEATURE_DEFINES)
    13231398        $(PERL) -pe '' $(WEBCORE_CSS_PROPERTY_NAMES) > CSSProperties.json
    13241399        $(PERL) "$(WebCore)/css/makeprop.pl" --defines "$(FEATURE_AND_PLATFORM_DEFINES)"
    … …  
    13311406
    13321407all : $(CSS_VALUE_KEYWORD_FILES)
    1333 $(CSS_VALUE_KEYWORD_FILES_PATTERNS) : $(WEBCORE_CSS_VALUE_KEYWORDS) css/makevalues.pl bindings/scripts/preprocessor.pm $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES)
     1408$(CSS_VALUE_KEYWORD_FILES_PATTERNS) : $(WEBCORE_CSS_VALUE_KEYWORDS) css/makevalues.pl bindings/scripts/preprocessor.pm $(PLATFORM_FEATURE_DEFINES)
    13341409        $(PERL) -pe '' $(WEBCORE_CSS_VALUE_KEYWORDS) > CSSValueKeywords.in
    13351410        $(PERL) "$(WebCore)/css/makevalues.pl" --defines "$(FEATURE_AND_PLATFORM_DEFINES)"
    … …  
    13391414# CSS Selector pseudo type name to value map.
    13401415
    1341 SelectorPseudoClassAndCompatibilityElementMap.cpp : $(WebCore)/css/makeSelectorPseudoClassAndCompatibilityElementMap.py $(WebCore)/css/SelectorPseudoClassAndCompatibilityElementMap.in $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES)
    1342         $(PYTHON) "$(WebCore)/css/makeSelectorPseudoClassAndCompatibilityElementMap.py" $(WebCore)/css/SelectorPseudoClassAndCompatibilityElementMap.in gperf "$(FEATURE_AND_PLATFORM_DEFINES)"
    1343 
    1344 SelectorPseudoElementTypeMap.cpp : $(WebCore)/css/makeSelectorPseudoElementsMap.py $(WebCore)/css/SelectorPseudoElementTypeMap.in $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES)
    1345         $(PYTHON) "$(WebCore)/css/makeSelectorPseudoElementsMap.py" $(WebCore)/css/SelectorPseudoElementTypeMap.in gperf "$(FEATURE_AND_PLATFORM_DEFINES)"
     1416SelectorPseudoClassAndCompatibilityElementMap.cpp : $(WebCore)/css/makeSelectorPseudoClassAndCompatibilityElementMap.py $(WebCore)/css/SelectorPseudoClassAndCompatibilityElementMap.in
     1417        $(PYTHON) "$(WebCore)/css/makeSelectorPseudoClassAndCompatibilityElementMap.py" $(WebCore)/css/SelectorPseudoClassAndCompatibilityElementMap.in gperf "$(FEATURE_DEFINES)"
     1418
     1419SelectorPseudoElementTypeMap.cpp : $(WebCore)/css/makeSelectorPseudoElementsMap.py $(WebCore)/css/SelectorPseudoElementTypeMap.in
     1420        $(PYTHON) "$(WebCore)/css/makeSelectorPseudoElementsMap.py" $(WebCore)/css/SelectorPseudoElementTypeMap.in gperf "$(FEATURE_DEFINES)"
    13461421
    13471422# --------
    … …  
    14111486USER_AGENT_STYLE_SHEETS = $(WebCore)/css/html.css $(WebCore)/css/dialog.css $(WebCore)/css/quirks.css $(WebCore)/css/plugIns.css $(WebCore)/css/svg.css
    14121487
    1413 ifeq ($(findstring ENABLE_MATHML,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_MATHML)
     1488ifeq ($(findstring ENABLE_MATHML,$(FEATURE_DEFINES)), ENABLE_MATHML)
    14141489    USER_AGENT_STYLE_SHEETS += $(WebCore)/css/mathml.css
    14151490endif
    14161491
    1417 ifeq ($(findstring ENABLE_VIDEO,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_VIDEO)
     1492ifeq ($(findstring ENABLE_VIDEO,$(FEATURE_DEFINES)), ENABLE_VIDEO)
    14181493    USER_AGENT_STYLE_SHEETS += $(WebCore)/css/mediaControls.css
    14191494endif
    14201495
    1421 ifeq ($(findstring ENABLE_FULLSCREEN_API,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_FULLSCREEN_API)
     1496ifeq ($(findstring ENABLE_FULLSCREEN_API,$(FEATURE_DEFINES)), ENABLE_FULLSCREEN_API)
    14221497    USER_AGENT_STYLE_SHEETS += $(WebCore)/css/fullscreen.css
    14231498endif
    14241499
    1425 ifeq ($(findstring ENABLE_SERVICE_CONTROLS,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_SERVICE_CONTROLS)
     1500ifeq ($(findstring ENABLE_SERVICE_CONTROLS,$(FEATURE_DEFINES)), ENABLE_SERVICE_CONTROLS)
    14261501    USER_AGENT_STYLE_SHEETS += $(WebCore)/html/shadow/mac/imageControlsMac.css
    14271502endif
    14281503
    1429 USER_AGENT_STYLE_SHEETS += $(WebCore)/Modules/plugins/QuickTimePluginReplacement.css
    1430 
    1431 ifeq ($(findstring ENABLE_METER_ELEMENT,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_METER_ELEMENT)
     1504ifeq ($(OS),MACOS)
     1505    USER_AGENT_STYLE_SHEETS += $(WebCore)/Modules/plugins/QuickTimePluginReplacement.css
     1506endif
     1507
     1508ifeq ($(OS), Windows_NT)
     1509    USER_AGENT_STYLE_SHEETS += $(WebCore)/css/themeWin.css $(WebCore)/css/themeWinQuirks.css
     1510endif
     1511
     1512ifeq ($(findstring ENABLE_METER_ELEMENT,$(FEATURE_DEFINES)), ENABLE_METER_ELEMENT)
    14321513        USER_AGENT_STYLE_SHEETS += $(WebCore)/html/shadow/meterElementShadow.css
    14331514endif
    14341515
    1435 UserAgentStyleSheets.h : css/make-css-file-arrays.pl bindings/scripts/preprocessor.pm $(USER_AGENT_STYLE_SHEETS) $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES)
     1516UserAgentStyleSheets.h : css/make-css-file-arrays.pl bindings/scripts/preprocessor.pm $(USER_AGENT_STYLE_SHEETS) $(PLATFORM_FEATURE_DEFINES)
    14361517        $(PERL) $< --defines "$(FEATURE_AND_PLATFORM_DEFINES)" $@ UserAgentStyleSheetsData.cpp $(USER_AGENT_STYLE_SHEETS)
    14371518
    … …  
    14401521# user agent scripts
    14411522
    1442 USER_AGENT_SCRIPTS = $(WebCore)/Modules/plugins/QuickTimePluginReplacement.js
    1443 
     1523USER_AGENT_SCRIPTS =
     1524
     1525ifeq ($(OS),MACOS)
     1526    USER_AGENT_SCRIPTS := $(USER_AGENT_SCRIPTS) $(WebCore)/Modules/plugins/QuickTimePluginReplacement.js
     1527endif
     1528
     1529ifdef USER_AGENT_SCRIPTS
    14441530USER_AGENT_SCRIPTS_FILES = \
    14451531    UserAgentScripts.h \
    … …  
    14521538$(USER_AGENT_SCRIPTS_FILES_PATTERNS) : $(JavaScriptCore_SCRIPTS_DIR)/make-js-file-arrays.py $(USER_AGENT_SCRIPTS)
    14531539        $(PYTHON) $(JavaScriptCore_SCRIPTS_DIR)/make-js-file-arrays.py -n WebCore $(USER_AGENT_SCRIPTS_FILES) $(USER_AGENT_SCRIPTS)
     1540endif
    14541541
    14551542# --------
    14561543
    1457 # plug-ins resources
     1544# plugIns resources
    14581545
    14591546PLUG_INS_RESOURCES = $(WebCore)/Resources/plugIns.js
    14601547
    1461 PlugInsResources.h : css/make-css-file-arrays.pl bindings/scripts/preprocessor.pm $(PLUG_INS_RESOURCES) $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES)
     1548PlugInsResources.h : css/make-css-file-arrays.pl bindings/scripts/preprocessor.pm $(PLUG_INS_RESOURCES) $(PLATFORM_FEATURE_DEFINES)
    14621549        $(PERL) $< --defines "$(FEATURE_AND_PLATFORM_DEFINES)" $@ PlugInsResourcesData.cpp $(PLUG_INS_RESOURCES)
    14631550
    … …  
    14751562
    14761563# HTML tag and attribute names
     1564
     1565ifeq ($(findstring ENABLE_DATALIST_ELEMENT,$(FEATURE_DEFINES)), ENABLE_DATALIST_ELEMENT)
     1566    HTML_FLAGS := $(HTML_FLAGS) ENABLE_DATALIST_ELEMENT=1
     1567endif
     1568
     1569ifeq ($(findstring ENABLE_METER_ELEMENT,$(FEATURE_DEFINES)), ENABLE_METER_ELEMENT)
     1570    HTML_FLAGS := $(HTML_FLAGS) ENABLE_METER_ELEMENT=1
     1571endif
     1572
     1573ifeq ($(findstring ENABLE_VIDEO,$(FEATURE_DEFINES)), ENABLE_VIDEO)
     1574    HTML_FLAGS := $(HTML_FLAGS) ENABLE_VIDEO=1
     1575endif
     1576
     1577ifeq ($(findstring ENABLE_VIDEO_TRACK,$(FEATURE_DEFINES)), ENABLE_VIDEO_TRACK)
     1578    HTML_FLAGS := $(HTML_FLAGS) ENABLE_VIDEO_TRACK=0
     1579endif
     1580
     1581ifeq ($(findstring ENABLE_DATACUE_VALUE,$(FEATURE_DEFINES)), ENABLE_DATACUE_VALUE)
     1582    HTML_FLAGS := $(HTML_FLAGS) ENABLE_DATACUE_VALUE=0
     1583endif
     1584
     1585ifeq ($(findstring ENABLE_MEDIA_STREAM,$(FEATURE_DEFINES)), ENABLE_MEDIA_STREAM)
     1586    HTML_FLAGS := $(HTML_FLAGS) ENABLE_MEDIA_STREAM=1
     1587endif
     1588
     1589ifeq ($(findstring ENABLE_LEGACY_ENCRYPTED_MEDIA,$(FEATURE_DEFINES)), ENABLE_LEGACY_ENCRYPTED_MEDIA)
     1590    HTML_FLAGS := $(HTML_FLAGS) ENABLE_LEGACY_ENCRYPTED_MEDIA=1
     1591endif
     1592
     1593ifeq ($(findstring ENABLE_ENCRYPTED_MEDIA,$(FEATURE_DEFINES)), ENABLE_ENCRYPTED_MEDIA)
     1594    HTML_FLAGS := $(HTML_FLAGS) ENABLE_ENCRYPTED_MEDIA=1
     1595endif
    14771596
    14781597HTML_TAG_FILES = \
    … …  
    14891608all : $(HTML_TAG_FILES)
    14901609
    1491 $(HTML_TAG_FILES_PATTERNS) : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm html/HTMLTagNames.in html/HTMLAttributeNames.in $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES)
    1492         $(PERL) $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in --factory --wrapperFactory --extraDefines "$(FEATURE_AND_PLATFORM_DEFINES)"
     1610$(HTML_TAG_FILES_PATTERNS) : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm html/HTMLTagNames.in html/HTMLAttributeNames.in
     1611        $(PERL) $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in --factory --wrapperFactory $(if $(HTML_FLAGS), --extraDefines "$(HTML_FLAGS)")
    14931612
    14941613XMLNSNames.cpp : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm xml/xmlnsattrs.in
    … …  
    15011620
    15021621# SVG tag and attribute names, and element factory
     1622
     1623ifeq ($(findstring ENABLE_SVG_FONTS,$(FEATURE_DEFINES)), ENABLE_SVG_FONTS)
     1624    SVG_FLAGS := $(SVG_FLAGS) ENABLE_SVG_FONTS=1
     1625endif
     1626
     1627# SVG tag and attribute names (need to pass an extra flag if svg experimental features are enabled)
    15031628
    15041629SVG_TAG_FILES = \
    … …  
    15151640all : $(SVG_TAG_FILES)
    15161641
    1517 $(SVG_TAG_FILES_PATTERNS) : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm svg/svgtags.in svg/svgattrs.in $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES)
    1518         $(PERL) $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --factory --wrapperFactory --extraDefines "$(FEATURE_AND_PLATFORM_DEFINES)"
     1642$(SVG_TAG_FILES_PATTERNS) : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm svg/svgtags.in svg/svgattrs.in
     1643        $(PERL) $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --factory --wrapperFactory $(if $(SVG_FLAGS), --extraDefines "$(SVG_FLAGS)")
    15191644
    15201645XLinkNames.cpp : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm svg/xlinkattrs.in
    … …  
    16771802IDL_INTERMEDIATE_PATTERNS = $(subst .,%,$(IDL_INTERMEDIATE_FILES))
    16781803
    1679 $(IDL_INTERMEDIATE_PATTERNS) : $(PREPROCESS_IDLS_SCRIPTS) $(JS_BINDING_IDLS) $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES) DerivedSources.make $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES)
     1804$(IDL_INTERMEDIATE_PATTERNS) : $(PREPROCESS_IDLS_SCRIPTS) $(JS_BINDING_IDLS) $(PLATFORM_FEATURE_DEFINES) DerivedSources.make
    16801805        $(foreach f,$(JS_BINDING_IDLS),@echo $(f)>>$(IDL_FILES_TMP)$(NL))
    1681         $(PERL) $(WebCore)/bindings/scripts/preprocess-idls.pl --defines "$(FEATURE_AND_PLATFORM_DEFINES) LANGUAGE_JAVASCRIPT" --idlFilesList $(IDL_FILES_TMP) --supplementalDependencyFile $(SUPPLEMENTAL_DEPENDENCY_FILE) --isoSubspacesHeaderFile $(ISO_SUBSPACES_HEADER_FILE) --windowConstructorsFile $(WINDOW_CONSTRUCTORS_FILE) --workerGlobalScopeConstructorsFile $(WORKERGLOBALSCOPE_CONSTRUCTORS_FILE) --dedicatedWorkerGlobalScopeConstructorsFile $(DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE) --serviceWorkerGlobalScopeConstructorsFile $(SERVICEWORKERGLOBALSCOPE_CONSTRUCTORS_FILE) --workletGlobalScopeConstructorsFile $(WORKLETGLOBALSCOPE_CONSTRUCTORS_FILE) --paintWorkletGlobalScopeConstructorsFile $(PAINTWORKLETGLOBALSCOPE_CONSTRUCTORS_FILE) --supplementalMakefileDeps $(SUPPLEMENTAL_MAKEFILE_DEPS)
     1806        $(PERL) $(WebCore)/bindings/scripts/preprocess-idls.pl --defines "$(FEATURE_AND_PLATFORM_DEFINES) $(ADDITIONAL_IDL_DEFINES) LANGUAGE_JAVASCRIPT" --idlFilesList $(IDL_FILES_TMP) --supplementalDependencyFile $(SUPPLEMENTAL_DEPENDENCY_FILE) --isoSubspacesHeaderFile $(ISO_SUBSPACES_HEADER_FILE) --windowConstructorsFile $(WINDOW_CONSTRUCTORS_FILE) --workerGlobalScopeConstructorsFile $(WORKERGLOBALSCOPE_CONSTRUCTORS_FILE) --dedicatedWorkerGlobalScopeConstructorsFile $(DEDICATEDWORKERGLOBALSCOPE_CONSTRUCTORS_FILE) --serviceWorkerGlobalScopeConstructorsFile $(SERVICEWORKERGLOBALSCOPE_CONSTRUCTORS_FILE) --workletGlobalScopeConstructorsFile $(WORKLETGLOBALSCOPE_CONSTRUCTORS_FILE) --paintWorkletGlobalScopeConstructorsFile $(PAINTWORKLETGLOBALSCOPE_CONSTRUCTORS_FILE) --supplementalMakefileDeps $(SUPPLEMENTAL_MAKEFILE_DEPS)
    16821807        $(DELETE) $(IDL_FILES_TMP)
    16831808
    1684 JS%.cpp JS%.h : %.idl $(JS_BINDINGS_SCRIPTS) $(IDL_ATTRIBUTES_FILE) $(IDL_INTERMEDIATE_FILES) $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES)
    1685         $(PERL) $(WebCore)/bindings/scripts/generate-bindings.pl $(IDL_COMMON_ARGS) --defines "$(FEATURE_AND_PLATFORM_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --idlAttributesFile $(IDL_ATTRIBUTES_FILE) --supplementalDependencyFile $(SUPPLEMENTAL_DEPENDENCY_FILE) $<
     1809JS%.cpp JS%.h : %.idl $(JS_BINDINGS_SCRIPTS) $(IDL_ATTRIBUTES_FILE) $(IDL_INTERMEDIATE_FILES) $(PLATFORM_FEATURE_DEFINES)
     1810        $(PERL) $(WebCore)/bindings/scripts/generate-bindings.pl $(IDL_COMMON_ARGS) --defines "$(FEATURE_AND_PLATFORM_DEFINES) $(ADDITIONAL_IDL_DEFINES) LANGUAGE_JAVASCRIPT" --generator JS --idlAttributesFile $(IDL_ATTRIBUTES_FILE) --supplementalDependencyFile $(SUPPLEMENTAL_DEPENDENCY_FILE) $<
    16861811
    16871812ifneq ($(NO_SUPPLEMENTAL_FILES),1)

  • trunk/Source/WebKitLegacy/mac/ChangeLog

    r262272 r262303  
     12020-05-29  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, reverting r262245.
     4        https://bugs.webkit.org/show_bug.cgi?id=212531
     5
     6        "Caused WebCore's 'Check .xcfilelists' build phase to be ~100x
     7        slower"
     8
     9        Reverted changeset:
     10
     11        "[Cocoa] Pass all defines from Platform.h to various scripts,
     12        not just the ones from .xcconfig"
     13        https://bugs.webkit.org/show_bug.cgi?id=212451
     14        https://trac.webkit.org/changeset/262245
     15
    1162020-05-28  Megan Gardner  <megan_gardner@apple.com>
    217

  • trunk/Source/WebKitLegacy/mac/MigrateHeaders.make

    r262245 r262303  
    1 # Copyright (C) 2006-2020 Apple Inc. All rights reserved.
     1# Copyright (C) 2006, 2007, 2008, 2017 Apple Inc. All rights reserved.
    22# Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
    33#
    … …  
    2525# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
    2626# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    27 
    28 PERL = perl
    29 
    30 FRAMEWORK_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) $(SYSTEM_FRAMEWORK_SEARCH_PATHS) | $(PERL) -e 'print "-F " . join(" -F ", split(" ", <>));')
    31 HEADER_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) $(SYSTEM_HEADER_SEARCH_PATHS) | $(PERL) -e 'print "-I" . join(" -I", split(" ", <>));')
    32 FEATURE_DEFINE_FLAGS = $(shell echo $(FEATURE_DEFINES) | $(PERL) -e 'print "-D" . join(" -D", split(" ", <>));')
    33 
    34 ifneq ($(SDKROOT),)
    35     SDK_FLAGS=-isysroot $(SDKROOT)
    36 endif
    37 
    38 ifeq ($(USE_LLVM_TARGET_TRIPLES_FOR_CLANG),YES)
    39     WK_CURRENT_ARCH=$(word 1, $(ARCHS))
    40     TARGET_TRIPLE_FLAGS=-target $(WK_CURRENT_ARCH)-$(LLVM_TARGET_TRIPLE_VENDOR)-$(LLVM_TARGET_TRIPLE_OS_VERSION)$(LLVM_TARGET_TRIPLE_SUFFIX)
    41 endif
    42 
    43 FEATURE_AND_PLATFORM_DEFINES = $(shell $(CC) -std=gnu++1z -x c++ -E -P -dM $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) $(FEATURE_DEFINE_FLAGS) -include "wtf/Platform.h" /dev/null | $(PERL) -ne "print if s/\#define ((HAVE_|USE_|ENABLE_|WTF_PLATFORM_)\w+) 1/\1/")
    44 
    45 # FIXME: Should generate the list of everything included by Platform.h as a side effect of the above command.
    46 FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES = Configurations/FeatureDefines.xcconfig DerivedSources.make
    47 
    48 # --------
    4927
    5028VPATH = DOM $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebCorePrivateHeaders
    … …  
    8563endif
    8664
    87 ifeq ($(findstring ENABLE_IOS_TOUCH_EVENTS, $(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_IOS_TOUCH_EVENTS)
     65ifeq ($(findstring ENABLE_IOS_TOUCH_EVENTS, $(FEATURE_DEFINES)), ENABLE_IOS_TOUCH_EVENTS)
    8866HEADERS += \
    8967    $(PRIVATE_HEADERS_DIR)/WebEventRegion.h
    … …  
    9573WEBCORE_HEADER_REPLACE_RULES = -e 's/<WebCore\//<WebKitLegacy\//' -e "s/(^ *)WEBCORE_EXPORT /\1/"
    9674WEBCORE_HEADER_MIGRATE_CMD = sed -E $(WEBCORE_HEADER_REPLACE_RULES) $< > $@; touch $(PRIVATE_HEADERS_DIR)
     75
     76FRAMEWORK_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) $(SYSTEM_FRAMEWORK_SEARCH_PATHS) | perl -e 'print "-F " . join(" -F ", split(" ", <>));')
     77HEADER_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) $(SYSTEM_HEADER_SEARCH_PATHS) | perl -e 'print "-I" . join(" -I", split(" ", <>));')
    9778
    9879$(PRIVATE_HEADERS_DIR)/% : % MigrateHeaders.make
Note: See TracChangeset for help on using the changeset viewer.