⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 286018 in webkit


Ignore:
Timestamp:
Nov 18, 2021, 11:30:52 AM (5 years ago)
Author:
ddkilzer@apple.com
Message:

Add missing dependencies for <wtf/Platform.h> when generating derived sources
<​https://webkit.org/b/233304>
<rdar://problem/85533245>

Reviewed by Darin Adler.

Source/JavaScriptCore:

(Derived Sources : Generate Derived Sources):

  • Add an input dependency on the script run from the build phase script.
  • DerivedSources-input.xcfilelist:
  • Update after changes to DerivedSoures.make. WebKit headers included by <wtf/Platform.h> are now listed.
  • DerivedSources.make:

(platform_h_compiler_command): Add.
(FEATURE_AND_PLATFORM_DEFINES):

  • Extract compiler command into a call routine for reuse.

(PLATFORM_HEADER_DIR): Add.
(PLATFORM_HEADER_DEPENDENCIES): Add.
(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES):

  • Generate a makefile dependency list for <wtf/Platform.h>, then filter it to list only WebKit project headers.

Source/WebCore:

  • WebCore.xcodeproj/project.pbxproj:

(Derived Sources : Generate Derived Sources):

  • Add an input dependency on the script run from the build phase script.
  • DerivedSources-input.xcfilelist:
  • Update after changes to DerivedSoures.make. WebKit headers included by <wtf/Platform.h> are now listed.
  • DerivedSources.make:

(platform_h_compiler_command): Add.
(FEATURE_AND_PLATFORM_DEFINES):

  • Extract compiler command into a call routine for reuse.

(PLATFORM_HEADER_DIR): Add.
(PLATFORM_HEADER_DEPENDENCIES): Add.
(FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES):

  • Generate a makefile dependency list for <wtf/Platform.h>, then filter it to list only WebKit project headers.
Location:
trunk/Source
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r285988 r286018  
     12021-11-18  David Kilzer  <ddkilzer@apple.com>
     2
     3        Add missing dependencies for <wtf/Platform.h> when generating derived sources
     4        <https://webkit.org/b/233304>
     5        <rdar://problem/85533245>
     6
     7        Reviewed by Darin Adler.
     8
     9        * JavaScriptCore.xcodeproj/project.pbxproj:
     10        (Derived Sources : Generate Derived Sources):
     11        - Add an input dependency on the script run from the build phase
     12          script.
     13
     14        * DerivedSources-input.xcfilelist:
     15        - Update after changes to DerivedSoures.make.  WebKit headers
     16          included by <wtf/Platform.h> are now listed.
     17        * DerivedSources.make:
     18        (platform_h_compiler_command): Add.
     19        (FEATURE_AND_PLATFORM_DEFINES):
     20        - Extract compiler command into a call routine for reuse.
     21        (PLATFORM_HEADER_DIR): Add.
     22        (PLATFORM_HEADER_DEPENDENCIES): Add.
     23        (FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES):
     24        - Generate a makefile dependency list for <wtf/Platform.h>, then
     25          filter it to list only WebKit project headers.
     26
    1272021-11-18  Carlos Garcia Campos  <cgarcia@igalia.com>
    228

  • trunk/Source/JavaScriptCore/DerivedSources-input.xcfilelist

    r285178 r286018  
    11# This file is generated by the generate-xcfilelists script.
     2$(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions/AdditionalFeatureDefines.h
     3$(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions/AdditionalPlatform.h
     4$(BUILT_PRODUCTS_DIR)/usr/local/include/bmalloc/BCompiler.h
     5$(BUILT_PRODUCTS_DIR)/usr/local/include/bmalloc/BPlatform.h
     6$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Compiler.h
     7$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Platform.h
     8$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformCPU.h
     9$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformCallingConventions.h
     10$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformEnable.h
     11$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformEnableCocoa.h
     12$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformHave.h
     13$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformLegacy.h
     14$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformOS.h
     15$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformUse.h
    216$(PROJECT_DIR)/DerivedSources.make
    317$(PROJECT_DIR)/KeywordLookupGenerator.py

  • trunk/Source/JavaScriptCore/DerivedSources.make

    r285178 r286018  
    1 # Copyright (C) 2006-2020 Apple Inc. All rights reserved.
     1# Copyright (C) 2006-2021 Apple Inc. All rights reserved.
    22#
    33# Redistribution and use in source and binary forms, with or without
    … …  
    4444FRAMEWORK_FLAGS := $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) $(SYSTEM_FRAMEWORK_SEARCH_PATHS) | $(PERL) -e 'print "-F " . join(" -F ", split(" ", <>));')
    4545HEADER_FLAGS := $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) $(SYSTEM_HEADER_SEARCH_PATHS) | $(PERL) -e 'print "-I" . join(" -I", split(" ", <>));')
    46 FEATURE_AND_PLATFORM_DEFINES := $(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 | $(PERL) -ne "print if s/\#define ((HAVE_|USE_|ENABLE_|WTF_PLATFORM_)\w+) 1/\1/")
    47 
    48 # FIXME: This should list Platform.h and all the things it includes. Could do that by using the -MD flag in the CC line above.
    49 FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES = DerivedSources.make
     46
     47platform_h_compiler_command = $(CC) -std=gnu++1z -x c++ $(1) $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null
     48
     49FEATURE_AND_PLATFORM_DEFINES := $(shell $(call platform_h_compiler_command,-E -P -dM) | $(PERL) -ne "print if s/\#define ((HAVE_|USE_|ENABLE_|WTF_PLATFORM_)\w+) 1/\1/")
     50
     51PLATFORM_HEADER_DIR := $(realpath $(BUILT_PRODUCTS_DIR)/usr/local/include)
     52PLATFORM_HEADER_DEPENDENCIES := $(filter $(PLATFORM_HEADER_DIR)/%,$(realpath $(shell $(call platform_h_compiler_command,-M) | $(PERL) -e "local \$$/; my (\$$target, \$$deps) = split(/:/, <>); print split(/\\\\/, \$$deps);")))
     53FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES = DerivedSources.make $(PLATFORM_HEADER_DEPENDENCIES)
    5054
    5155# --------

  • trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

    r285955 r286018  
    1167111671                        );
    1167211672                        inputPaths = (
     11673                                "$(SRCROOT)/Scripts/generate-derived-sources.sh",
    1167311674                        );
    1167411675                        name = "Generate Derived Sources";

  • trunk/Source/WebCore/ChangeLog

    r286015 r286018  
     12021-11-18  David Kilzer  <ddkilzer@apple.com>
     2
     3        Add missing dependencies for <wtf/Platform.h> when generating derived sources
     4        <https://webkit.org/b/233304>
     5        <rdar://problem/85533245>
     6
     7        Reviewed by Darin Adler.
     8
     9        * WebCore.xcodeproj/project.pbxproj:
     10        (Derived Sources : Generate Derived Sources):
     11        - Add an input dependency on the script run from the build phase
     12          script.
     13
     14        * DerivedSources-input.xcfilelist:
     15        - Update after changes to DerivedSoures.make.  WebKit headers
     16          included by <wtf/Platform.h> are now listed.
     17        * DerivedSources.make:
     18        (platform_h_compiler_command): Add.
     19        (FEATURE_AND_PLATFORM_DEFINES):
     20        - Extract compiler command into a call routine for reuse.
     21        (PLATFORM_HEADER_DIR): Add.
     22        (PLATFORM_HEADER_DEPENDENCIES): Add.
     23        (FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES):
     24        - Generate a makefile dependency list for <wtf/Platform.h>, then
     25          filter it to list only WebKit project headers.
     26
    1272021-11-18  Christopher Reid  <c29reid@uwaterloo.ca>
    228

  • trunk/Source/WebCore/DerivedSources-input.xcfilelist

    r285564 r286018  
    11# This file is generated by the generate-xcfilelists script.
     2$(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions/AdditionalFeatureDefines.h
     3$(BUILT_PRODUCTS_DIR)/usr/local/include/bmalloc/BCompiler.h
     4$(BUILT_PRODUCTS_DIR)/usr/local/include/bmalloc/BPlatform.h
     5$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Compiler.h
     6$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Platform.h
     7$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformCPU.h
     8$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformCallingConventions.h
     9$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformEnable.h
     10$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformEnableCocoa.h
     11$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformHave.h
     12$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformLegacy.h
     13$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformOS.h
     14$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/PlatformUse.h
    215$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Scripts/Preferences/WebPreferences.yaml
    316$(BUILT_PRODUCTS_DIR)/usr/local/include/wtf/Scripts/Preferences/WebPreferencesDebug.yaml
    … …  
    159172$(PROJECT_DIR)/Modules/WebGPU/NavigatorGPU.idl
    160173$(PROJECT_DIR)/Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.idl
     174$(PROJECT_DIR)/Modules/applepay-ams-ui/ApplePayAMSUIRequest.idl
    161175$(PROJECT_DIR)/Modules/applepay/ApplePayCancelEvent.idl
    162176$(PROJECT_DIR)/Modules/applepay/ApplePayContactField.idl
    … …  
    206220$(PROJECT_DIR)/Modules/applepay/paymentrequest/ApplePayModifier.idl
    207221$(PROJECT_DIR)/Modules/applepay/paymentrequest/ApplePayRequest.idl
    208 $(PROJECT_DIR)/Modules/applepay-ams-ui/ApplePayAMSUIRequest.idl
    209222$(PROJECT_DIR)/Modules/async-clipboard/Clipboard.idl
    210223$(PROJECT_DIR)/Modules/async-clipboard/ClipboardItem.idl

  • trunk/Source/WebCore/DerivedSources.make

    r285564 r286018  
    4646FRAMEWORK_FLAGS := $(shell echo $(BUILT_PRODUCTS_DIR) $(FRAMEWORK_SEARCH_PATHS) $(SYSTEM_FRAMEWORK_SEARCH_PATHS) | $(PERL) -e 'print "-F " . join(" -F ", split(" ", <>));')
    4747HEADER_FLAGS := $(shell echo $(BUILT_PRODUCTS_DIR) $(HEADER_SEARCH_PATHS) $(SYSTEM_HEADER_SEARCH_PATHS) | $(PERL) -e 'print "-I" . join(" -I", split(" ", <>));')
    48 FEATURE_AND_PLATFORM_DEFINES := $(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 | $(PERL) -ne "print if s/\#define ((HAVE_|USE_|ENABLE_|WTF_PLATFORM_)\w+) 1/\1/")
    49 
    50 # FIXME: This should list Platform.h and all the things it includes. Could do that by using the -MD flag in the CC line above.
    51 FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES = $(WebCore)/DerivedSources.make
     48
     49platform_h_compiler_command = $(CC) -std=gnu++1z -x c++ $(1) $(SDK_FLAGS) $(TARGET_TRIPLE_FLAGS) $(FRAMEWORK_FLAGS) $(HEADER_FLAGS) -include "wtf/Platform.h" /dev/null
     50
     51FEATURE_AND_PLATFORM_DEFINES := $(shell $(call platform_h_compiler_command,-E -P -dM) | $(PERL) -ne "print if s/\#define ((HAVE_|USE_|ENABLE_|WTF_PLATFORM_)\w+) 1/\1/")
     52
     53PLATFORM_HEADER_DIR := $(realpath $(BUILT_PRODUCTS_DIR)/usr/local/include)
     54PLATFORM_HEADER_DEPENDENCIES := $(filter $(PLATFORM_HEADER_DIR)/%,$(realpath $(shell $(call platform_h_compiler_command,-M) | $(PERL) -e "local \$$/; my (\$$target, \$$deps) = split(/:/, <>); print split(/\\\\/, \$$deps);")))
     55FEATURE_AND_PLATFORM_DEFINE_DEPENDENCIES = $(WebCore)/DerivedSources.make $(PLATFORM_HEADER_DEPENDENCIES)
    5256
    5357# --------

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

    r286012 r286018  
    3741437414                        );
    3741537415                        inputPaths = (
     37416                                "$(SRCROOT)/Scripts/generate-derived-sources.sh",
    3741637417                        );
    3741737418                        name = "Generate Derived Sources";
Note: See TracChangeset for help on using the changeset viewer.