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

Changeset 267588 in webkit


Ignore:
Timestamp:
Sep 25, 2020, 12:49:23 PM (6 years ago)
Author:
Fujii Hironori
Message:

make_names.pl no longer needs C preprocessor
​https://bugs.webkit.org/show_bug.cgi?id=216953

Reviewed by Sam Weinig.

.:

  • Source/cmake/WebKitCompilerFlags.cmake: Removed CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS which was used only for make_names.pl.

Source/WebCore:

  • CMakeLists.txt:
  • DerivedSources.make:
  • WebCoreMacros.cmake: Changed GENERATE_DOM_NAMES from a macro to a function so that list(POP_FRONT ARGN var) works as exepected.
  • dom/make_names.pl: Removed --preprocessor and --extraDefines options.

(readNames):
(readAttrs):
(readTags):
(buildConstructorMap):
(printConstructorSignature):
(printConstructorInterior):
(printConstructors):
(printFunctionTable):
(printJSElementIncludes):
(printElementIncludes):
(printConditionalElementIncludes):
(usesDefaultJSWrapper):
(printWrapperFunctions):
(printWrapperFactoryCppFile):
(preprocessorCommand): Deleted.

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r267562 r267588  
     12020-09-25  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        make_names.pl no longer needs C preprocessor
     4        https://bugs.webkit.org/show_bug.cgi?id=216953
     5
     6        Reviewed by Sam Weinig.
     7
     8        * Source/cmake/WebKitCompilerFlags.cmake: Removed CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS which was used only for make_names.pl.
     9
    1102020-09-25  Antti Koivisto  <antti@apple.com>
    211

  • trunk/Source/WebCore/CMakeLists.txt

    r267576 r267588  
    20472047
    20482048
    2049 GENERATE_DOM_NAMES(HTML ${WEBCORE_DIR}/html/HTMLAttributeNames.in ${WEBCORE_DIR}/html/HTMLTagNames.in "")
     2049GENERATE_DOM_NAMES(HTML ${WEBCORE_DIR}/html/HTMLAttributeNames.in ${WEBCORE_DIR}/html/HTMLTagNames.in)
    20502050list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/HTMLNames.cpp ${WebCore_DERIVED_SOURCES_DIR}/HTMLElementFactory.cpp ${WebCore_DERIVED_SOURCES_DIR}/JSHTMLElementWrapperFactory.cpp)
    20512051
    … …  
    20652065
    20662066
    2067 GENERATE_DOM_NAMES(MathML ${WEBCORE_DIR}/mathml/mathattrs.in ${WEBCORE_DIR}/mathml/mathtags.in "")
     2067GENERATE_DOM_NAMES(MathML ${WEBCORE_DIR}/mathml/mathattrs.in ${WEBCORE_DIR}/mathml/mathtags.in)
    20682068list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/MathMLNames.cpp)
    20692069if (ENABLE_MATHML)

  • trunk/Source/WebCore/ChangeLog

    r267587 r267588  
     12020-09-25  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        make_names.pl no longer needs C preprocessor
     4        https://bugs.webkit.org/show_bug.cgi?id=216953
     5
     6        Reviewed by Sam Weinig.
     7
     8        * CMakeLists.txt:
     9        * DerivedSources.make:
     10        * WebCoreMacros.cmake: Changed GENERATE_DOM_NAMES from a macro to a function so that list(POP_FRONT ARGN var) works as exepected.
     11        * dom/make_names.pl: Removed --preprocessor and --extraDefines options.
     12        (readNames):
     13        (readAttrs):
     14        (readTags):
     15        (buildConstructorMap):
     16        (printConstructorSignature):
     17        (printConstructorInterior):
     18        (printConstructors):
     19        (printFunctionTable):
     20        (printJSElementIncludes):
     21        (printElementIncludes):
     22        (printConditionalElementIncludes):
     23        (usesDefaultJSWrapper):
     24        (printWrapperFunctions):
     25        (printWrapperFactoryCppFile):
     26        (preprocessorCommand): Deleted.
     27
    1282020-09-25  Zalan Bujtas  <zalan@apple.com>
    229

  • trunk/Source/WebCore/DerivedSources.make

    r267576 r267588  
    15841584
    15851585$(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)
    1586         $(PERL) $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in --factory --wrapperFactory --extraDefines "$(FEATURE_AND_PLATFORM_DEFINES)"
     1586        $(PERL) $< --tags $(WebCore)/html/HTMLTagNames.in --attrs $(WebCore)/html/HTMLAttributeNames.in --factory --wrapperFactory
    15871587
    15881588XMLNSNames.cpp : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm xml/xmlnsattrs.in
    … …  
    16101610
    16111611$(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)
    1612         $(PERL) $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --factory --wrapperFactory --extraDefines "$(FEATURE_AND_PLATFORM_DEFINES)"
     1612        $(PERL) $< --tags $(WebCore)/svg/svgtags.in --attrs $(WebCore)/svg/svgattrs.in --factory --wrapperFactory
    16131613
    16141614XLinkNames.cpp : dom/make_names.pl bindings/scripts/Hasher.pm bindings/scripts/StaticString.pm svg/xlinkattrs.in

  • trunk/Source/WebCore/WebCoreMacros.cmake

    r258083 r267588  
    213213
    214214
    215 macro(GENERATE_DOM_NAMES _namespace _attrs)
     215function(GENERATE_DOM_NAMES _namespace _attrs)
     216    list(POP_FRONT ARGN _tags)
    216217    set(NAMES_GENERATOR ${WEBCORE_DIR}/dom/make_names.pl)
    217218    set(_arguments  --attrs ${_attrs})
    218219    set(_outputfiles ${WebCore_DERIVED_SOURCES_DIR}/${_namespace}Names.cpp ${WebCore_DERIVED_SOURCES_DIR}/${_namespace}Names.h)
    219     set(_extradef)
    220     set(_tags)
    221 
    222     foreach (f ${ARGN})
    223         if (_tags)
    224             set(_extradef "${_extradef} ${f}")
    225         else ()
    226             set(_tags ${f})
    227         endif ()
    228     endforeach ()
    229220
    230221    if (_tags)
    … …  
    233224    endif ()
    234225
    235     if (_extradef)
    236         set(_additionArguments "${_additionArguments}" --extraDefines=${_extradef})
    237     endif ()
    238 
    239226    add_custom_command(
    240227        OUTPUT  ${_outputfiles}
    241228        DEPENDS ${MAKE_NAMES_DEPENDENCIES} ${NAMES_GENERATOR} ${SCRIPTS_BINDINGS} ${_attrs} ${_tags}
    242         COMMAND ${PERL_EXECUTABLE} ${NAMES_GENERATOR} --preprocessor "${CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS}" --outputDir ${WebCore_DERIVED_SOURCES_DIR} ${_arguments} ${_additionArguments}
    243         VERBATIM)
    244 endmacro()
     229        COMMAND ${PERL_EXECUTABLE} ${NAMES_GENERATOR} --outputDir ${WebCore_DERIVED_SOURCES_DIR} ${_arguments} ${_additionArguments}
     230        VERBATIM)
     231endfunction()

  • trunk/Source/WebCore/dom/make_names.pl

    r262486 r267588  
    4343use InFilesParser;
    4444
    45 sub readTags($$);
    46 sub readAttrs($$);
     45sub readTags($);
     46sub readAttrs($);
    4747
    4848my $printFactory = 0;
    … …  
    5454my %parsedTags = ();
    5555my %parsedAttrs = ();
    56 my %enabledTags = ();
    57 my %enabledAttrs = ();
    5856my %allTags = ();
    5957my %allAttrs = ();
    6058my %allStrings = ();
    6159my %parameters = ();
    62 my $extraDefines = 0;
    6360my $initDefaults = 1;
    6461my %extensionAttrs = ();
    … …  
    7572}
    7673
    77 my $preprocessor = "";
    78 if ($Config::Config{"osname"} eq "MSWin32") {
    79     $preprocessor = "\"$ccLocation\" /EP";
    80 } else {
    81     $preprocessor = $ccLocation . " -E -x c++";
    82 }
    83 
    8474GetOptions(
    8575    'tags=s' => \$tagsFile,
    … …  
    8777    'factory' => \$printFactory,
    8878    'outputDir=s' => \$outputDir,
    89     'extraDefines=s' => \$extraDefines,
    90     'preprocessor=s' => \$preprocessor,
    9179    'wrapperFactory' => \$printWrapperFactory,
    9280    'fonts=s' => \$fontNamesIn
    … …  
    149137
    150138if (length($tagsFile)) {
    151     %allTags = %{readTags($tagsFile, 0)};
    152     %enabledTags = %{readTags($tagsFile, 1)};
     139    %allTags = %{readTags($tagsFile)};
    153140    namesToStrings(\%allTags, \%allStrings);
    154141}
    155142
    156143if (length($attrsFile)) {
    157     %allAttrs = %{readAttrs($attrsFile, 0)};
    158     %enabledAttrs = %{readAttrs($attrsFile, 1)};
     144    %allAttrs = %{readAttrs($attrsFile)};
    159145    namesToStrings(\%allAttrs, \%allStrings);
    160146}
    … …  
    308294## Support routines
    309295
    310 sub preprocessorCommand()
    311 {
    312     return $preprocessor if $extraDefines eq 0;
    313     return $preprocessor . " -D" . join(" -D", split(" ", $extraDefines));
    314 }
    315 
    316 sub readNames($$$$)
    317 {
    318     my ($namesFile, $hashToFillRef, $handler, $usePreprocessor) = @_;
     296sub readNames($$$)
     297{
     298    my ($namesFile, $hashToFillRef, $handler) = @_;
    319299
    320300    my $names = new IO::File;
    321     if ($usePreprocessor) {
    322         open($names, preprocessorCommand() . " " . $namesFile . "|") or die "Failed to open file: $namesFile";
    323     } else {
    324         open($names, $namesFile) or die "Failed to open file: $namesFile";
    325     }
     301    open($names, $namesFile) or die "Failed to open file: $namesFile";
    326302
    327303    my $InParser = InFilesParser->new();
    … …  
    333309}
    334310
    335 sub readAttrs($$)
    336 {
    337     my ($namesFile, $usePreprocessor) = @_;
     311sub readAttrs($)
     312{
     313    my ($namesFile) = @_;
    338314    %parsedAttrs = ();
    339     return readNames($namesFile, \%parsedAttrs, \&attrsHandler, $usePreprocessor);
    340 }
    341 
    342 sub readTags($$)
    343 {
    344     my ($namesFile, $usePreprocessor) = @_;
     315    return readNames($namesFile, \%parsedAttrs, \&attrsHandler);
     316}
     317
     318sub readTags($)
     319{
     320    my ($namesFile) = @_;
    345321    %parsedTags = ();
    346     return readNames($namesFile, \%parsedTags, \&tagsHandler, $usePreprocessor);
     322    return readNames($namesFile, \%parsedTags, \&tagsHandler);
    347323}
    348324
    … …  
    367343{
    368344    my %tagConstructorMap = ();
    369     for my $tagName (keys %enabledTags) {
    370         my $interfaceName = $enabledTags{$tagName}{interfaceName};
    371 
    372         if ($enabledTags{$tagName}{mapToTagName}) {
    373             die "Cannot handle multiple mapToTagName for $tagName\n" if $enabledTags{$enabledTags{$tagName}{mapToTagName}}{mapToTagName};
    374             $interfaceName = $enabledTags{ $enabledTags{$tagName}{mapToTagName} }{interfaceName};
     345    for my $tagName (keys %allTags) {
     346        my $interfaceName = $allTags{$tagName}{interfaceName};
     347
     348        if ($allTags{$tagName}{mapToTagName}) {
     349            die "Cannot handle multiple mapToTagName for $tagName\n" if $allTags{$allTags{$tagName}{mapToTagName}}{mapToTagName};
     350            $interfaceName = $allTags{ $allTags{$tagName}{mapToTagName} }{interfaceName};
    375351        }
    376352
    … …  
    392368    if ($parameters{namespace} eq "HTML") {
    393369        print F ", HTMLFormElement*";
    394         print F " formElement" if $enabledTags{$tagName}{constructorNeedsFormElement};
     370        print F " formElement" if $allTags{$tagName}{constructorNeedsFormElement};
    395371    }
    396372    print F ", bool";
    397     print F " createdByParser" if $enabledTags{$tagName}{constructorNeedsCreatedByParser};
     373    print F " createdByParser" if $allTags{$tagName}{constructorNeedsCreatedByParser};
    398374    print F ")\n{\n";
    399375}
    … …  
    411387    # FIXME: Could we instead do this entirely in the wrapper, and use custom wrappers
    412388    # instead of having all the support for this here in this script?
    413     if ($enabledTags{$tagName}{wrapperOnlyIfMediaIsAvailable}) {
     389    if ($allTags{$tagName}{wrapperOnlyIfMediaIsAvailable}) {
    414390        print F <<END
    415391    if (!document.settings().mediaEnabled())
    … …  
    421397
    422398    my $runtimeCondition;
    423     my $settingsConditional = $enabledTags{$tagName}{settingsConditional};
    424     my $runtimeEnabled = $enabledTags{$tagName}{runtimeEnabled};
     399    my $settingsConditional = $allTags{$tagName}{settingsConditional};
     400    my $runtimeEnabled = $allTags{$tagName}{runtimeEnabled};
    425401    if ($settingsConditional) {
    426402        $runtimeCondition = "document.settings().${settingsConditional}()";
    … …  
    439415    # Call the constructor with the right parameters.
    440416    print F "    return ${interfaceName}::create($constructorTagName, document";
    441     print F ", formElement" if $enabledTags{$tagName}{constructorNeedsFormElement};
    442     print F ", createdByParser" if $enabledTags{$tagName}{constructorNeedsCreatedByParser};
     417    print F ", formElement" if $allTags{$tagName}{constructorNeedsFormElement};
     418    print F ", createdByParser" if $allTags{$tagName}{constructorNeedsCreatedByParser};
    443419    print F ");\n}\n";
    444420}
    … …  
    452428    my %uniqueTags = ();
    453429    for my $tagName (sort keys %tagConstructorMap) {
    454         my $interfaceName = $enabledTags{$tagName}{interfaceName};
     430        my $interfaceName = $allTags{$tagName}{interfaceName};
    455431
    456432        # Ignore the mapped tag
    457433        # FIXME: It could be moved inside this loop but was split for readibility.
    458         next if (defined($uniqueTags{$interfaceName}) || $enabledTags{$tagName}{mapToTagName});
     434        next if (defined($uniqueTags{$interfaceName}) || $allTags{$tagName}{mapToTagName});
    459435        # Tags can have wrappers without constructors.
    460436        # This is useful to make user-agent shadow elements internally testable
    461437        # while keeping them from being avaialble in the HTML markup.
    462         next if $enabledTags{$tagName}{noConstructor};
     438        next if $allTags{$tagName}{noConstructor};
    463439
    464440        $uniqueTags{$interfaceName} = '1';
    465441
    466         my $conditional = $enabledTags{$tagName}{conditional};
     442        my $conditional = $allTags{$tagName}{conditional};
    467443        if ($conditional) {
    468444            my $conditionalString = "ENABLE(" . join(") && ENABLE(", split(/&/, $conditional)) . ")";
    … …  
    482458    # Mapped tag name uses a special wrapper to keep their prefix and namespaceURI while using the mapped localname.
    483459    for my $tagName (sort keys %tagConstructorMap) {
    484         if ($enabledTags{$tagName}{mapToTagName}) {
    485             my $mappedName = $enabledTags{$tagName}{mapToTagName};
     460        if ($allTags{$tagName}{mapToTagName}) {
     461            my $mappedName = $allTags{$tagName}{mapToTagName};
    486462            printConstructorSignature($F, $mappedName, $mappedName . "To" . $tagName, "tagName");
    487             printConstructorInterior($F, $mappedName, $enabledTags{$mappedName}{interfaceName}, "QualifiedName(tagName.prefix(), ${mappedName}Tag->localName(), tagName.namespaceURI())");
     463            printConstructorInterior($F, $mappedName, $allTags{$mappedName}{interfaceName}, "QualifiedName(tagName.prefix(), ${mappedName}Tag->localName(), tagName.namespaceURI())");
    488464        }
    489465    }
    … …  
    496472
    497473    for my $tagName (sort keys %tagConstructorMap) {
    498         next if $enabledTags{$tagName}{noConstructor};
    499 
    500         my $conditional = $enabledTags{$tagName}{conditional};
     474        next if $allTags{$tagName}{noConstructor};
     475
     476        my $conditional = $allTags{$tagName}{conditional};
    501477        if ($conditional) {
    502478            my $conditionalString = "ENABLE(" . join(") && ENABLE(", split(/&/, $conditional)) . ")";
    … …  
    504480        }
    505481
    506         if ($enabledTags{$tagName}{mapToTagName}) {
    507             print F "        { $parameters{namespace}Names::${tagName}Tag, $enabledTags{$tagName}{mapToTagName}To${tagName}Constructor },\n";
     482        if ($allTags{$tagName}{mapToTagName}) {
     483            print F "        { $parameters{namespace}Names::${tagName}Tag, $allTags{$tagName}{mapToTagName}To${tagName}Constructor },\n";
    508484        } else {
    509485            print F "        { $parameters{namespace}Names::${tagName}Tag, $tagConstructorMap{$tagName}Constructor },\n";
    … …  
    817793
    818794    my %tagsSeen;
    819     for my $tagName (sort keys %enabledTags) {
    820         my $JSInterfaceName = $enabledTags{$tagName}{JSInterfaceName};
     795    for my $tagName (sort keys %allTags) {
     796        my $JSInterfaceName = $allTags{$tagName}{JSInterfaceName};
    821797        next if defined($tagsSeen{$JSInterfaceName}) || usesDefaultJSWrapper($tagName);
    822         if ($enabledTags{$tagName}{conditional}) {
     798        if ($allTags{$tagName}{conditional}) {
    823799            # We skip feature-define-specific #includes here since we handle them separately.
    824800            next;
    … …  
    836812
    837813    my %tagsSeen;
    838     for my $tagName (sort keys %enabledTags) {
    839         my $interfaceName = $enabledTags{$tagName}{interfaceName};
     814    for my $tagName (sort keys %allTags) {
     815        my $interfaceName = $allTags{$tagName}{interfaceName};
    840816        next if defined($tagsSeen{$interfaceName});
    841         if ($enabledTags{$tagName}{conditional}) {
     817        if ($allTags{$tagName}{conditional}) {
    842818            # We skip feature-define-specific #includes here since we handle them separately.
    843819            next;
    … …  
    858834    my %unconditionalJSElementIncludes;
    859835
    860     for my $tagName (keys %enabledTags) {
    861         my $conditional = $enabledTags{$tagName}{conditional};
    862         my $interfaceName = $enabledTags{$tagName}{interfaceName};
    863         my $JSInterfaceName = $enabledTags{$tagName}{JSInterfaceName};
     836    for my $tagName (keys %allTags) {
     837        my $conditional = $allTags{$tagName}{conditional};
     838        my $interfaceName = $allTags{$tagName}{interfaceName};
     839        my $JSInterfaceName = $allTags{$tagName}{JSInterfaceName};
    864840
    865841        if ($conditional) {
    … …  
    11331109
    11341110    # A tag reuses the default wrapper if its JSInterfaceName matches the default namespace Element.
    1135     return $enabledTags{$name}{JSInterfaceName} eq $parameters{namespace} . "Element";
     1111    return $allTags{$name}{JSInterfaceName} eq $parameters{namespace} . "Element";
    11361112}
    11371113
    … …  
    11411117
    11421118    my %tagsSeen;
    1143     for my $tagName (sort keys %enabledTags) {
     1119    for my $tagName (sort keys %allTags) {
    11441120        # Avoid defining the same wrapper method twice.
    1145         my $JSInterfaceName = $enabledTags{$tagName}{JSInterfaceName};
    1146         next if (defined($tagsSeen{$JSInterfaceName}) || (usesDefaultJSWrapper($tagName) && ($parameters{fallbackJSInterfaceName} eq $parameters{namespace} . "Element"))) && !$enabledTags{$tagName}{settingsConditional};
     1121        my $JSInterfaceName = $allTags{$tagName}{JSInterfaceName};
     1122        next if (defined($tagsSeen{$JSInterfaceName}) || (usesDefaultJSWrapper($tagName) && ($parameters{fallbackJSInterfaceName} eq $parameters{namespace} . "Element"))) && !$allTags{$tagName}{settingsConditional};
    11471123        $tagsSeen{$JSInterfaceName} = 1;
    11481124
    1149         my $conditional = $enabledTags{$tagName}{conditional};
     1125        my $conditional = $allTags{$tagName}{conditional};
    11501126        if ($conditional) {
    11511127            my $conditionalString = "ENABLE(" . join(") && ENABLE(", split(/&/, $conditional)) . ")";
    … …  
    11531129        }
    11541130
    1155         if ($enabledTags{$tagName}{wrapperOnlyIfMediaIsAvailable}) {
     1131        if ($allTags{$tagName}{wrapperOnlyIfMediaIsAvailable}) {
    11561132            print F <<END
    11571133static JSDOMObject* create${JSInterfaceName}Wrapper(JSDOMGlobalObject* globalObject, Ref<$parameters{namespace}Element>&& element)
    … …  
    11641140END
    11651141            ;
    1166         } elsif ($enabledTags{$tagName}{settingsConditional}) {
     1142        } elsif ($allTags{$tagName}{settingsConditional}) {
    11671143            print F <<END
    1168 static JSDOMObject* create$enabledTags{$tagName}{interfaceName}Wrapper(JSDOMGlobalObject* globalObject, Ref<$parameters{namespace}Element>&& element)
     1144static JSDOMObject* create$allTags{$tagName}{interfaceName}Wrapper(JSDOMGlobalObject* globalObject, Ref<$parameters{namespace}Element>&& element)
    11691145{
    11701146    if (element->is$parameters{fallbackInterfaceName}())
    … …  
    11751151END
    11761152            ;
    1177         } elsif ($enabledTags{$tagName}{runtimeEnabled}) {
    1178             my $runtimeEnabled = $enabledTags{$tagName}{runtimeEnabled};
     1153        } elsif ($allTags{$tagName}{runtimeEnabled}) {
     1154            my $runtimeEnabled = $allTags{$tagName}{runtimeEnabled};
    11791155            print F <<END
    11801156static JSDOMObject* create${JSInterfaceName}Wrapper(JSDOMGlobalObject* globalObject, Ref<$parameters{namespace}Element>&& element)
    … …  
    12591235;
    12601236
    1261     for my $tag (sort keys %enabledTags) {
     1237    for my $tag (sort keys %allTags) {
    12621238        # Do not add the name to the map if it does not have a JS wrapper constructor or uses the default wrapper.
    1263         next if (usesDefaultJSWrapper($tag, \%enabledTags) && ($parameters{fallbackJSInterfaceName} eq $parameters{namespace} . "Element"));
    1264 
    1265         my $conditional = $enabledTags{$tag}{conditional};
     1239        next if (usesDefaultJSWrapper($tag, \%allTags) && ($parameters{fallbackJSInterfaceName} eq $parameters{namespace} . "Element"));
     1240
     1241        my $conditional = $allTags{$tag}{conditional};
    12661242        if ($conditional) {
    12671243            my $conditionalString = "ENABLE(" . join(") && ENABLE(", split(/&/, $conditional)) . ")";
    … …  
    12701246
    12711247        my $ucTag;
    1272         if ($enabledTags{$tag}{settingsConditional}) {
    1273             $ucTag = $enabledTags{$tag}{interfaceName};
     1248        if ($allTags{$tag}{settingsConditional}) {
     1249            $ucTag = $allTags{$tag}{interfaceName};
    12741250        } else {
    1275             $ucTag = $enabledTags{$tag}{JSInterfaceName};
     1251            $ucTag = $allTags{$tag}{JSInterfaceName};
    12761252        }
    12771253

  • trunk/Source/cmake/WebKitCompilerFlags.cmake

    r266025 r267588  
    241241
    242242
    243 # CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS only matters with GCC >= 4.7.0.  Since this
    244 # version, -P does not output empty lines, which currently breaks make_names.pl in
    245 # WebCore. Investigating whether make_names.pl should be changed instead is left as an exercise to
    246 # the reader.
    247243if (MSVC)
    248     set(CODE_GENERATOR_PREPROCESSOR_ARGUMENTS "/nologo /EP /TP")
    249     set(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS_ARGUMENTS ${CODE_GENERATOR_PREPROCESSOR_ARGUMENTS})
     244    set(CODE_GENERATOR_PREPROCESSOR "\"${CMAKE_CXX_COMPILER}\" /nologo /EP /TP")
    250245else ()
    251     set(CODE_GENERATOR_PREPROCESSOR_ARGUMENTS "-E -P -x c++")
    252     set(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS_ARGUMENTS "-E -x c++")
    253 endif ()
    254 
    255 set(CODE_GENERATOR_PREPROCESSOR "\"${CMAKE_CXX_COMPILER}\" ${CODE_GENERATOR_PREPROCESSOR_ARGUMENTS}")
    256 set(CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS "\"${CMAKE_CXX_COMPILER}\" ${CODE_GENERATOR_PREPROCESSOR_WITH_LINEMARKERS_ARGUMENTS}")
     246    set(CODE_GENERATOR_PREPROCESSOR "\"${CMAKE_CXX_COMPILER}\" -E -P -x c++")
     247endif ()
    257248
    258249
Note: See TracChangeset for help on using the changeset viewer.