Changeset 268682 in webkit


Ignore:
Timestamp:
Oct 19, 2020 12:40:36 PM (3 years ago)
Author:
weinig@apple.com
Message:

Switch to a static pattern for DumpRenderTree preferences generation to avoid ambiguous rules
​https://bugs.webkit.org/show_bug.cgi?id=217907

Reviewed by Simon Fraser.

  • DumpRenderTree/DerivedSources-input.xcfilelist:

Add DerivedSources.make and generate-derived-sources.sh to ensure things get rebuilt when they change.

  • DumpRenderTree/DerivedSources.make:

Switch to using a static pattern to avoid ambiguous and ciruclar rules.

Location:
trunk/Tools
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r268674 r268682  
     12020-10-19  Sam Weinig  <weinig@apple.com>
     2
     3        Switch to a static pattern for DumpRenderTree preferences generation to avoid ambiguous rules
     4        https://bugs.webkit.org/show_bug.cgi?id=217907
     5
     6        Reviewed by Simon Fraser.
     7
     8        * DumpRenderTree/DerivedSources-input.xcfilelist:
     9        Add DerivedSources.make and generate-derived-sources.sh to ensure things get rebuilt when they change.
     10
     11        * DumpRenderTree/DerivedSources.make:
     12        Switch to using a static pattern to avoid ambiguous and ciruclar rules.
     13
    1142020-10-19  Aakash Jain  <aakash_jain@apple.com>
    215

  • trunk/Tools/DumpRenderTree/DerivedSources-input.xcfilelist

    r268495 r268682  
    77$(PROJECT_DIR)/../TestRunnerShared/UIScriptContext/Bindings/UIScriptController.idl
    88$(PROJECT_DIR)/Bindings/CodeGeneratorDumpRenderTree.pm
     9$(PROJECT_DIR)/DerivedSources.make
    910$(PROJECT_DIR)/Scripts/PreferencesTemplates/TestOptionsGeneratedKeys.h.erb
     11$(PROJECT_DIR)/Scripts/generate-derived-sources.sh
    1012$(WEBCORE_PRIVATE_HEADERS_DIR)/CodeGenerator.pm
    1113$(WEBCORE_PRIVATE_HEADERS_DIR)/IDLAttributes.json

  • trunk/Tools/DumpRenderTree/DerivedSources.make

    r268571 r268682  
    2424RUBY = ruby
    2525
    26 WEB_PREFERENCES = \
    27     ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferences.yaml \
    28     ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesDebug.yaml \
    29     ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesExperimental.yaml \
    30     ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesInternal.yaml \
    31 #
    32 
    33 WEB_PREFERENCES_TEMPLATES = \
    34     $(DumpRenderTree)/Scripts/PreferencesTemplates/TestOptionsGeneratedKeys.h.erb \
    35 #
    36 WEB_PREFERENCES_FILES = $(basename $(notdir $(WEB_PREFERENCES_TEMPLATES)))
    37 WEB_PREFERENCES_PATTERNS = $(subst .erb,,$(WEB_PREFERENCES_FILES))
    38 
    39 all : $(WEB_PREFERENCES_FILES)
    40 
    41 $(WEB_PREFERENCES_PATTERNS) : $(WTF_BUILD_SCRIPTS_DIR)/GeneratePreferences.rb $(WEB_PREFERENCES_TEMPLATES) $(WEB_PREFERENCES)
    42         $(RUBY) $< --frontend WebKitLegacy --base ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferences.yaml --debug ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesDebug.yaml --experimental ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesExperimental.yaml --internal ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesInternal.yaml $(addprefix --template , $(WEB_PREFERENCES_TEMPLATES))
    43 
    44 
    4526UISCRIPTCONTEXT_DIR = $(DumpRenderTree)/../TestRunnerShared/UIScriptContext/Bindings
     27DUMPRENDERTREE_PREFERENCES_TEMPLATES_DIR = $(DumpRenderTree)/Scripts/PreferencesTemplates
    4628
    4729VPATH = \
    4830    $(UISCRIPTCONTEXT_DIR) \
     31    $(DUMPRENDERTREE_PREFERENCES_TEMPLATES_DIR) \
    4932#
    5033
    … …  
    7255    $(UICONTEXT_INTERFACES:%=JS%.cpp) \
    7356#
     57
     58
     59WEB_PREFERENCES = \
     60    ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferences.yaml \
     61    ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesDebug.yaml \
     62    ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesExperimental.yaml \
     63    ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesInternal.yaml \
     64#
     65
     66WEB_PREFERENCES_GENERATED_FILES = \
     67    TestOptionsGeneratedKeys.h \
     68#
     69
     70all : $(WEB_PREFERENCES_GENERATED_FILES)
     71
     72$(WEB_PREFERENCES_GENERATED_FILES) : % : %.erb $(WEB_PREFERENCES) $(WTF_BUILD_SCRIPTS_DIR)/GeneratePreferences.rb
     73        $(RUBY) $(WTF_BUILD_SCRIPTS_DIR)/GeneratePreferences.rb --frontend WebKitLegacy --base ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferences.yaml --debug ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesDebug.yaml --experimental ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesExperimental.yaml --internal ${WTF_BUILD_SCRIPTS_DIR}/Preferences/WebPreferencesInternal.yaml --template $<
Note: See TracChangeset for help on using the changeset viewer.