Changeset 262245 in webkit
- Timestamp:
- May 28, 2020, 9:56:10 AM (5 years ago)
- Location:
- trunk/Source
- Files:
-
- 6 edited
-
JavaScriptCore/ChangeLog (modified) (1 diff)
-
JavaScriptCore/DerivedSources.make (modified) (4 diffs)
-
WebCore/ChangeLog (modified) (1 diff)
-
WebCore/DerivedSources.make (modified) (17 diffs)
-
WebKitLegacy/mac/ChangeLog (modified) (1 diff)
-
WebKitLegacy/mac/MigrateHeaders.make (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r262243 r262245 1 2020-05-27 Darin Adler <darin@apple.com> 2 3 [Cocoa] Pass all defines from Platform.h to various scripts, not just the ones from .xcconfig 4 https://bugs.webkit.org/show_bug.cgi?id=212451 5 6 Reviewed by Sam Weinig. 7 8 * DerivedSources.make: Run the preprocessor on Platform.h and parse the output into 9 FEATURE_AND_PLATFORM_DEFINES. Use that and FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES 10 whenever we need a list of defines. Also took out some Windows-specific stuff since 11 this is now only used on Mac platforms. 12 1 13 2020-05-28 Michael Catanzaro <mcatanzaro@gnome.org> 2 14 -
trunk/Source/JavaScriptCore/DerivedSources.make
r262203 r262245 1 # Copyright (C) 2006 , 2007, 2008, 2009, 2011, 2013, 2015Apple Inc. All rights reserved.1 # Copyright (C) 2006-2020 Apple Inc. All rights reserved. 2 2 # 3 3 # Redistribution and use in source and binary forms, with or without … … 25 25 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 26 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 27 52 VPATH = \ 28 53 $(JavaScriptCore) \ … … 35 60 # 36 61 37 PYTHON = python38 PERL = perl39 RUBY = ruby40 41 62 JavaScriptCore_SCRIPTS_DIR = $(JavaScriptCore)/Scripts 42 43 ifeq ($(OS),Windows_NT)44 DELETE = cmd //C del45 else46 DELETE = rm -f47 endif48 49 PREPROCESSOR_DEFINES = $(FEATURE_DEFINES)50 51 FRAMEWORK_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) $(SYSTEM_FRAMEWORK_SEARCH_PATHS) | perl -e 'print "-F " . join(" -F ", split(" ", <>));')52 HEADER_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) $(SYSTEM_HEADER_SEARCH_PATHS) | perl -e 'print "-I" . join(" -I", split(" ", <>));')53 54 ifneq ($(SDKROOT),)55 SDK_FLAGS=-isysroot $(SDKROOT)56 endif57 58 ifeq ($(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)61 endif62 63 ifeq ($(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_MAC65 endif66 67 ifeq ($(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_FAMILY69 endif70 71 ifeq ($(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_CF73 endif74 75 ifeq ($(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_SUPPORT77 else78 endif79 80 ifeq ($(PLATFORM_FEATURE_DEFINES),)81 ifeq ($(OS), Windows_NT)82 PLATFORM_FEATURE_DEFINES = $(WEBKIT_LIBRARIES)/tools/vsprops/FeatureDefines.props83 else84 PLATFORM_FEATURE_DEFINES = Configurations/FeatureDefines.xcconfig85 endif86 endif87 88 # --------89 63 90 64 .PHONY : all … … 359 333 $(PYTHON) $(JavaScriptCore)/inspector/scripts/generate-inspector-protocol-bindings.py --framework JavaScriptCore --outputDir inspector ./CombinedDomains.json 360 334 361 inspector/InspectorBackendCommands.js : CombinedDomains.json $(INSPECTOR_GENERATOR_SCRIPTS) $( PLATFORM_FEATURE_DEFINES)335 inspector/InspectorBackendCommands.js : CombinedDomains.json $(INSPECTOR_GENERATOR_SCRIPTS) $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES) 362 336 $(PYTHON) $(JavaScriptCore)/inspector/scripts/generate-inspector-protocol-bindings.py --framework WebInspectorUI --outputDir inspector ./CombinedDomains.json 363 337 @echo Pre-processing InspectorBackendCommands... 364 $(PERL) $(JavaScriptCore)/inspector/scripts/codegen/preprocess.pl --input inspector/InspectorBackendCommands.js.in --defines "$( PREPROCESSOR_DEFINES)" --output inspector/InspectorBackendCommands.js338 $(PERL) $(JavaScriptCore)/inspector/scripts/codegen/preprocess.pl --input inspector/InspectorBackendCommands.js.in --defines "$(FEATURE_AND_PLATFORM_DEFINES)" --output inspector/InspectorBackendCommands.js 365 339 $(DELETE) inspector/InspectorBackendCommands.js.in 366 340 -
trunk/Source/WebCore/ChangeLog
r262241 r262245 1 2020-05-27 Darin Adler <darin@apple.com> 2 3 [Cocoa] Pass all defines from Platform.h to various scripts, not just the ones from .xcconfig 4 https://bugs.webkit.org/show_bug.cgi?id=212451 5 6 Reviewed by Sam Weinig. 7 8 * DerivedSources.make: Run the preprocessor on Platform.h and parse the output into 9 FEATURE_AND_PLATFORM_DEFINES. Use that and FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES 10 whenever we need a list of defines. Also took out some Windows-specific stuff since 11 this is now only used on Mac platforms. 12 1 13 2020-05-27 Simon Fraser <simon.fraser@apple.com> 2 14 -
trunk/Source/WebCore/DerivedSources.make
r262069 r262245 1 # Copyright (C) 2006-20 18Apple Inc. All rights reserved.1 # Copyright (C) 2006-2020 Apple Inc. All rights reserved. 2 2 # Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com> 3 3 # Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au> … … 26 26 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 27 27 # 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 # -------- 28 53 29 54 VPATH = \ … … 1175 1200 # 1176 1201 1177 PYTHON = python 1178 PERL = perl 1179 RUBY = ruby 1180 1181 ifeq ($(OS),Windows_NT) 1182 DELETE = cmd //C del 1183 else 1184 DELETE = rm -f 1185 endif 1186 # -------- 1187 1188 ifeq ($(OS),MACOS) 1189 1190 FRAMEWORK_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) $(SYSTEM_FRAMEWORK_SEARCH_PATHS) | perl -e 'print "-F " . join(" -F ", split(" ", <>));') 1191 HEADER_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) $(SYSTEM_HEADER_SEARCH_PATHS) | perl -e 'print "-I" . join(" -I", split(" ", <>));') 1192 1193 ifneq ($(SDKROOT),) 1194 SDK_FLAGS=-isysroot $(SDKROOT) 1195 endif 1196 1197 ifeq ($(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) 1200 endif 1201 1202 ifeq ($(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 1204 else 1205 WTF_PLATFORM_IOS_FAMILY = 0 1206 endif 1207 1208 ifeq ($(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 1210 else 1211 WTF_PLATFORM_MAC = 0 1212 endif 1213 1214 ifeq ($(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 1216 else 1217 USE_APPLE_INTERNAL_SDK = 0 1218 endif 1219 1220 ifeq ($(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 1222 else 1223 HAVE_OS_DARK_MODE_SUPPORT = 0 1224 endif 1225 1226 ifeq ($(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 1228 endif 1229 1230 ifeq ($(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 1232 endif 1233 1234 ifeq ($(WTF_PLATFORM_IOS_FAMILY), 1) 1235 FEATURE_AND_PLATFORM_DEFINES = $(FEATURE_DEFINES) WTF_PLATFORM_IOS_FAMILY 1236 else ifeq ($(WTF_PLATFORM_MAC), 1) 1237 FEATURE_AND_PLATFORM_DEFINES = $(FEATURE_DEFINES) WTF_PLATFORM_MAC 1238 else 1239 FEATURE_AND_PLATFORM_DEFINES = $(FEATURE_DEFINES) 1240 endif 1241 1242 ifeq ($(HAVE_OS_DARK_MODE_SUPPORT), 1) 1243 FEATURE_AND_PLATFORM_DEFINES += HAVE_OS_DARK_MODE_SUPPORT 1244 endif 1245 1246 ifeq ($(PLATFORM_FEATURE_DEFINES),) 1247 ifeq ($(OS), Windows_NT) 1248 PLATFORM_FEATURE_DEFINES = $(WEBKIT_LIBRARIES)/tools/vsprops/FeatureDefines.props 1249 else 1250 PLATFORM_FEATURE_DEFINES = Configurations/FeatureDefines.xcconfig 1251 endif 1252 endif 1202 # -------- 1253 1203 1254 1204 ADDITIONAL_BINDING_IDLS = 1255 ifeq ($(findstring ENABLE_MAC_GESTURE_EVENTS,$(FEATURE_DEFINES)), ENABLE_MAC_GESTURE_EVENTS) 1205 1206 ifeq ($(findstring ENABLE_IOS_GESTURE_EVENTS,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_IOS_GESTURE_EVENTS) 1256 1207 ADDITIONAL_BINDING_IDLS += GestureEvent.idl 1257 1208 endif 1258 1209 1259 ifeq ($(findstring ENABLE_IOS_GESTURE_EVENTS,$(FEATURE_DEFINES)), ENABLE_IOS_GESTURE_EVENTS) 1260 ADDITIONAL_BINDING_IDLS += GestureEvent.idl 1261 endif 1262 1263 ifeq ($(WTF_PLATFORM_IOS_FAMILY), 1) 1264 ifeq ($(findstring ENABLE_IOS_TOUCH_EVENTS,$(FEATURE_DEFINES)), ENABLE_IOS_TOUCH_EVENTS) 1210 ifeq ($(findstring ENABLE_IOS_TOUCH_EVENTS,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_IOS_TOUCH_EVENTS) 1265 1211 ADDITIONAL_BINDING_IDLS += \ 1266 1212 DocumentTouch.idl \ … … 1269 1215 TouchList.idl 1270 1216 endif 1271 endif # IOS 1217 1218 ifeq ($(findstring ENABLE_MAC_GESTURE_EVENTS,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_MAC_GESTURE_EVENTS) 1219 ADDITIONAL_BINDING_IDLS += GestureEvent.idl 1220 endif 1272 1221 1273 1222 vpath %.in $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) … … 1287 1236 cp $< . 1288 1237 1289 endif # MACOS 1290 1291 ifneq ($(WTF_PLATFORM_IOS_FAMILY), 1) 1238 ifneq ($(findstring ENABLE_IOS_TOUCH_EVENTS,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_IOS_TOUCH_EVENTS) 1292 1239 JS_BINDING_IDLS += \ 1293 1240 $(WebCore)/dom/DocumentTouch.idl \ … … 1357 1304 # -------- 1358 1305 1359 ADDITIONAL_IDL_DEFINES :=1360 1361 ifndef ENABLE_ORIENTATION_EVENTS1362 ENABLE_ORIENTATION_EVENTS = 01363 endif1364 1365 ifndef ENABLE_MEDIA_SOURCE1366 ENABLE_MEDIA_SOURCE = 01367 endif1368 1369 ifeq ($(ENABLE_ORIENTATION_EVENTS), 1)1370 ADDITIONAL_IDL_DEFINES := $(ADDITIONAL_IDL_DEFINES) ENABLE_ORIENTATION_EVENTS1371 endif1372 1373 ifeq ($(USE_APPLE_INTERNAL_SDK), 1)1374 ADDITIONAL_IDL_DEFINES := $(ADDITIONAL_IDL_DEFINES) USE_APPLE_INTERNAL_SDK1375 endif1376 1377 ifeq ($(ENABLE_MEDIA_SOURCE), 1)1378 ADDITIONAL_IDL_DEFINES := $(ADDITIONAL_IDL_DEFINES) ENABLE_MEDIA_SOURCE1379 endif1380 1381 1306 # CSS property names and value keywords 1382 1307 … … 1395 1320 1396 1321 all : $(CSS_PROPERTY_NAME_FILES) 1397 $(CSS_PROPERTY_NAME_FILES_PATTERNS) : $(WEBCORE_CSS_PROPERTY_NAMES) css/makeprop.pl $( PLATFORM_FEATURE_DEFINES)1322 $(CSS_PROPERTY_NAME_FILES_PATTERNS) : $(WEBCORE_CSS_PROPERTY_NAMES) css/makeprop.pl $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES) 1398 1323 $(PERL) -pe '' $(WEBCORE_CSS_PROPERTY_NAMES) > CSSProperties.json 1399 1324 $(PERL) "$(WebCore)/css/makeprop.pl" --defines "$(FEATURE_AND_PLATFORM_DEFINES)" … … 1406 1331 1407 1332 all : $(CSS_VALUE_KEYWORD_FILES) 1408 $(CSS_VALUE_KEYWORD_FILES_PATTERNS) : $(WEBCORE_CSS_VALUE_KEYWORDS) css/makevalues.pl bindings/scripts/preprocessor.pm $( PLATFORM_FEATURE_DEFINES)1333 $(CSS_VALUE_KEYWORD_FILES_PATTERNS) : $(WEBCORE_CSS_VALUE_KEYWORDS) css/makevalues.pl bindings/scripts/preprocessor.pm $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES) 1409 1334 $(PERL) -pe '' $(WEBCORE_CSS_VALUE_KEYWORDS) > CSSValueKeywords.in 1410 1335 $(PERL) "$(WebCore)/css/makevalues.pl" --defines "$(FEATURE_AND_PLATFORM_DEFINES)" … … 1414 1339 # CSS Selector pseudo type name to value map. 1415 1340 1416 SelectorPseudoClassAndCompatibilityElementMap.cpp : $(WebCore)/css/makeSelectorPseudoClassAndCompatibilityElementMap.py $(WebCore)/css/SelectorPseudoClassAndCompatibilityElementMap.in 1417 $(PYTHON) "$(WebCore)/css/makeSelectorPseudoClassAndCompatibilityElementMap.py" $(WebCore)/css/SelectorPseudoClassAndCompatibilityElementMap.in gperf "$(FEATURE_ DEFINES)"1418 1419 SelectorPseudoElementTypeMap.cpp : $(WebCore)/css/makeSelectorPseudoElementsMap.py $(WebCore)/css/SelectorPseudoElementTypeMap.in 1420 $(PYTHON) "$(WebCore)/css/makeSelectorPseudoElementsMap.py" $(WebCore)/css/SelectorPseudoElementTypeMap.in gperf "$(FEATURE_ DEFINES)"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)" 1421 1346 1422 1347 # -------- … … 1486 1411 USER_AGENT_STYLE_SHEETS = $(WebCore)/css/html.css $(WebCore)/css/dialog.css $(WebCore)/css/quirks.css $(WebCore)/css/plugIns.css $(WebCore)/css/svg.css 1487 1412 1488 ifeq ($(findstring ENABLE_MATHML,$(FEATURE_ DEFINES)), ENABLE_MATHML)1413 ifeq ($(findstring ENABLE_MATHML,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_MATHML) 1489 1414 USER_AGENT_STYLE_SHEETS += $(WebCore)/css/mathml.css 1490 1415 endif 1491 1416 1492 ifeq ($(findstring ENABLE_VIDEO,$(FEATURE_ DEFINES)), ENABLE_VIDEO)1417 ifeq ($(findstring ENABLE_VIDEO,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_VIDEO) 1493 1418 USER_AGENT_STYLE_SHEETS += $(WebCore)/css/mediaControls.css 1494 1419 endif 1495 1420 1496 ifeq ($(findstring ENABLE_FULLSCREEN_API,$(FEATURE_ DEFINES)), ENABLE_FULLSCREEN_API)1421 ifeq ($(findstring ENABLE_FULLSCREEN_API,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_FULLSCREEN_API) 1497 1422 USER_AGENT_STYLE_SHEETS += $(WebCore)/css/fullscreen.css 1498 1423 endif 1499 1424 1500 ifeq ($(findstring ENABLE_SERVICE_CONTROLS,$(FEATURE_ DEFINES)), ENABLE_SERVICE_CONTROLS)1425 ifeq ($(findstring ENABLE_SERVICE_CONTROLS,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_SERVICE_CONTROLS) 1501 1426 USER_AGENT_STYLE_SHEETS += $(WebCore)/html/shadow/mac/imageControlsMac.css 1502 1427 endif 1503 1428 1504 ifeq ($(OS),MACOS) 1505 USER_AGENT_STYLE_SHEETS += $(WebCore)/Modules/plugins/QuickTimePluginReplacement.css 1506 endif 1507 1508 ifeq ($(OS), Windows_NT) 1509 USER_AGENT_STYLE_SHEETS += $(WebCore)/css/themeWin.css $(WebCore)/css/themeWinQuirks.css 1510 endif 1511 1512 ifeq ($(findstring ENABLE_METER_ELEMENT,$(FEATURE_DEFINES)), ENABLE_METER_ELEMENT) 1429 USER_AGENT_STYLE_SHEETS += $(WebCore)/Modules/plugins/QuickTimePluginReplacement.css 1430 1431 ifeq ($(findstring ENABLE_METER_ELEMENT,$(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_METER_ELEMENT) 1513 1432 USER_AGENT_STYLE_SHEETS += $(WebCore)/html/shadow/meterElementShadow.css 1514 1433 endif 1515 1434 1516 UserAgentStyleSheets.h : css/make-css-file-arrays.pl bindings/scripts/preprocessor.pm $(USER_AGENT_STYLE_SHEETS) $( PLATFORM_FEATURE_DEFINES)1435 UserAgentStyleSheets.h : css/make-css-file-arrays.pl bindings/scripts/preprocessor.pm $(USER_AGENT_STYLE_SHEETS) $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES) 1517 1436 $(PERL) $< --defines "$(FEATURE_AND_PLATFORM_DEFINES)" $@ UserAgentStyleSheetsData.cpp $(USER_AGENT_STYLE_SHEETS) 1518 1437 … … 1521 1440 # user agent scripts 1522 1441 1523 USER_AGENT_SCRIPTS = 1524 1525 ifeq ($(OS),MACOS) 1526 USER_AGENT_SCRIPTS := $(USER_AGENT_SCRIPTS) $(WebCore)/Modules/plugins/QuickTimePluginReplacement.js 1527 endif 1528 1529 ifdef USER_AGENT_SCRIPTS 1442 USER_AGENT_SCRIPTS = $(WebCore)/Modules/plugins/QuickTimePluginReplacement.js 1443 1530 1444 USER_AGENT_SCRIPTS_FILES = \ 1531 1445 UserAgentScripts.h \ … … 1538 1452 $(USER_AGENT_SCRIPTS_FILES_PATTERNS) : $(JavaScriptCore_SCRIPTS_DIR)/make-js-file-arrays.py $(USER_AGENT_SCRIPTS) 1539 1453 $(PYTHON) $(JavaScriptCore_SCRIPTS_DIR)/make-js-file-arrays.py -n WebCore $(USER_AGENT_SCRIPTS_FILES) $(USER_AGENT_SCRIPTS) 1540 endif 1541 1542 # -------- 1543 1544 # plugIns resources 1454 1455 # -------- 1456 1457 # plug-ins resources 1545 1458 1546 1459 PLUG_INS_RESOURCES = $(WebCore)/Resources/plugIns.js 1547 1460 1548 PlugInsResources.h : css/make-css-file-arrays.pl bindings/scripts/preprocessor.pm $(PLUG_INS_RESOURCES) $( PLATFORM_FEATURE_DEFINES)1461 PlugInsResources.h : css/make-css-file-arrays.pl bindings/scripts/preprocessor.pm $(PLUG_INS_RESOURCES) $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES) 1549 1462 $(PERL) $< --defines "$(FEATURE_AND_PLATFORM_DEFINES)" $@ PlugInsResourcesData.cpp $(PLUG_INS_RESOURCES) 1550 1463 … … 1562 1475 1563 1476 # HTML tag and attribute names 1564 1565 ifeq ($(findstring ENABLE_DATALIST_ELEMENT,$(FEATURE_DEFINES)), ENABLE_DATALIST_ELEMENT)1566 HTML_FLAGS := $(HTML_FLAGS) ENABLE_DATALIST_ELEMENT=11567 endif1568 1569 ifeq ($(findstring ENABLE_METER_ELEMENT,$(FEATURE_DEFINES)), ENABLE_METER_ELEMENT)1570 HTML_FLAGS := $(HTML_FLAGS) ENABLE_METER_ELEMENT=11571 endif1572 1573 ifeq ($(findstring ENABLE_VIDEO,$(FEATURE_DEFINES)), ENABLE_VIDEO)1574 HTML_FLAGS := $(HTML_FLAGS) ENABLE_VIDEO=11575 endif1576 1577 ifeq ($(findstring ENABLE_VIDEO_TRACK,$(FEATURE_DEFINES)), ENABLE_VIDEO_TRACK)1578 HTML_FLAGS := $(HTML_FLAGS) ENABLE_VIDEO_TRACK=01579 endif1580 1581 ifeq ($(findstring ENABLE_DATACUE_VALUE,$(FEATURE_DEFINES)), ENABLE_DATACUE_VALUE)1582 HTML_FLAGS := $(HTML_FLAGS) ENABLE_DATACUE_VALUE=01583 endif1584 1585 ifeq ($(findstring ENABLE_MEDIA_STREAM,$(FEATURE_DEFINES)), ENABLE_MEDIA_STREAM)1586 HTML_FLAGS := $(HTML_FLAGS) ENABLE_MEDIA_STREAM=11587 endif1588 1589 ifeq ($(findstring ENABLE_LEGACY_ENCRYPTED_MEDIA,$(FEATURE_DEFINES)), ENABLE_LEGACY_ENCRYPTED_MEDIA)1590 HTML_FLAGS := $(HTML_FLAGS) ENABLE_LEGACY_ENCRYPTED_MEDIA=11591 endif1592 1593 ifeq ($(findstring ENABLE_ENCRYPTED_MEDIA,$(FEATURE_DEFINES)), ENABLE_ENCRYPTED_MEDIA)1594 HTML_FLAGS := $(HTML_FLAGS) ENABLE_ENCRYPTED_MEDIA=11595 endif1596 1477 1597 1478 HTML_TAG_FILES = \ … … 1608 1489 all : $(HTML_TAG_FILES) 1609 1490 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)")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)" 1612 1493 1613 1494 XMLNSNames.cpp : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm xml/xmlnsattrs.in … … 1620 1501 1621 1502 # SVG tag and attribute names, and element factory 1622 1623 ifeq ($(findstring ENABLE_SVG_FONTS,$(FEATURE_DEFINES)), ENABLE_SVG_FONTS)1624 SVG_FLAGS := $(SVG_FLAGS) ENABLE_SVG_FONTS=11625 endif1626 1627 # SVG tag and attribute names (need to pass an extra flag if svg experimental features are enabled)1628 1503 1629 1504 SVG_TAG_FILES = \ … … 1640 1515 all : $(SVG_TAG_FILES) 1641 1516 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)")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)" 1644 1519 1645 1520 XLinkNames.cpp : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm svg/xlinkattrs.in … … 1802 1677 IDL_INTERMEDIATE_PATTERNS = $(subst .,%,$(IDL_INTERMEDIATE_FILES)) 1803 1678 1804 $(IDL_INTERMEDIATE_PATTERNS) : $(PREPROCESS_IDLS_SCRIPTS) $(JS_BINDING_IDLS) $( PLATFORM_FEATURE_DEFINES) DerivedSources.make1679 $(IDL_INTERMEDIATE_PATTERNS) : $(PREPROCESS_IDLS_SCRIPTS) $(JS_BINDING_IDLS) $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES) DerivedSources.make $(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES) 1805 1680 $(foreach f,$(JS_BINDING_IDLS),@echo $(f)>>$(IDL_FILES_TMP)$(NL)) 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)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) 1807 1682 $(DELETE) $(IDL_FILES_TMP) 1808 1683 1809 JS%.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) $<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) $< 1811 1686 1812 1687 ifneq ($(NO_SUPPLEMENTAL_FILES),1) -
trunk/Source/WebKitLegacy/mac/ChangeLog
r262203 r262245 1 2020-05-27 Darin Adler <darin@apple.com> 2 3 [Cocoa] Pass all defines from Platform.h to various scripts, not just the ones from .xcconfig 4 https://bugs.webkit.org/show_bug.cgi?id=212451 5 6 Reviewed by Sam Weinig. 7 8 * MigrateHeaders.make: Run the preprocessor on Platform.h and parse the output into 9 FEATURE_AND_PLATFORM_DEFINES. Use that and FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES 10 whenever we need a list of defines. Also took out some Windows-specific stuff since 11 this is now only used on Mac platforms. 12 1 13 2020-05-27 Devin Rousso <drousso@apple.com> 2 14 -
trunk/Source/WebKitLegacy/mac/MigrateHeaders.make
r256184 r262245 1 # Copyright (C) 2006 , 2007, 2008, 2017Apple Inc. All rights reserved.1 # Copyright (C) 2006-2020 Apple Inc. All rights reserved. 2 2 # Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com> 3 3 # … … 25 25 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 26 26 # 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 # -------- 27 49 28 50 VPATH = DOM $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy/WebCorePrivateHeaders … … 63 85 endif 64 86 65 ifeq ($(findstring ENABLE_IOS_TOUCH_EVENTS, $(FEATURE_ DEFINES)), ENABLE_IOS_TOUCH_EVENTS)87 ifeq ($(findstring ENABLE_IOS_TOUCH_EVENTS, $(FEATURE_AND_PLATFORM_DEFINES)), ENABLE_IOS_TOUCH_EVENTS) 66 88 HEADERS += \ 67 89 $(PRIVATE_HEADERS_DIR)/WebEventRegion.h … … 73 95 WEBCORE_HEADER_REPLACE_RULES = -e 's/<WebCore\//<WebKitLegacy\//' -e "s/(^ *)WEBCORE_EXPORT /\1/" 74 96 WEBCORE_HEADER_MIGRATE_CMD = sed -E $(WEBCORE_HEADER_REPLACE_RULES) $< > $@; touch $(PRIVATE_HEADERS_DIR) 75 76 FRAMEWORK_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) $(SYSTEM_FRAMEWORK_SEARCH_PATHS) | perl -e 'print "-F " . join(" -F ", split(" ", <>));')77 HEADER_FLAGS = $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) $(SYSTEM_HEADER_SEARCH_PATHS) | perl -e 'print "-I" . join(" -I", split(" ", <>));')78 97 79 98 $(PRIVATE_HEADERS_DIR)/% : % MigrateHeaders.make
Note:
See TracChangeset
for help on using the changeset viewer.
