Changeset 90717 in webkit

Timestamp:

Jul 10, 2011 10:19:51 PM (13 years ago)

Author:

Patrick Gansterer

Message:

Generate conditional include statements in CodeGeneratorJS
​https://bugs.webkit.org/show_bug.cgi?id=64231

Reviewed by Brent Fulgham.

Suround headers with a correspondig #if ENABLE() line.
This allows us to generate bindings only of required IDL files.

Changing the current preprocessor statements to the Conditional attribute
in a next step helps in getting rid of calls to the preprocessor,
which causes so much pain on a natvie Windows environment.

• bindings/scripts/CodeGeneratorJS.pm:

(GenerateImplementation):
(WriteData):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/scripts/CodeGeneratorJS.pm (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-10  Patrick Gansterer  <paroga@webkit.org>
+
+        Generate conditional include statements in CodeGeneratorJS
+        https://bugs.webkit.org/show_bug.cgi?id=64231
+
+        Reviewed by Brent Fulgham.
+
+        Suround headers with a correspondig #if ENABLE() line.
+        This allows us to generate bindings only of required IDL files.
+
+        Changing the current preprocessor statements to the Conditional attribute
+        in a next step helps in getting rid of calls to the preprocessor,
+        which causes so much pain on a natvie Windows environment. 
+
+        * bindings/scripts/CodeGeneratorJS.pm:
+        (GenerateImplementation):
+        (WriteData):
+
 2011-07-10  Patrick Gansterer  <paroga@webkit.org>
 

trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm

@@ -8 +8 @@
 # Copyright (C) Research In Motion Limited 2010. All rights reserved.
 # Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
+# Copyright (C) 2011 Patrick Gansterer <paroga@webkit.org>
 #
 # This library is free software; you can redistribute it and/or
@@ -1752 +1753 @@
                             $constructorType =~ s/Constructor$//;
                             if ($constructorType ne "DOMObject") {
-                                $implIncludes{"JS" . $constructorType . ".h"} = 1;
+                                my $header = "JS" . $constructorType . ".h";
+                                my $conditional = $attribute->signature->extendedAttributes->{"Conditional"};
+                                if (not $conditional) {
+                                    $implIncludes{$header} = 1;
+                                } elsif (not exists($implIncludes{$header})) {
+                                    $implIncludes{$header} = $conditional;
+                                } else {
+                                    my $oldValue = $implIncludes{$header};
+                                    if ($oldValue ne 1) {
+                                        my %newValue = ();
+                                        $newValue{$conditional} = 1;
+                                        foreach my $condition (split(/\|/, $oldValue)) {
+                                            $newValue{$condition} = 1;
+                                        }
+                                        $implIncludes{$header} = join("|", sort keys %newValue);
+                                    }
+                                }
                             }
                             push(@implContent, "    // Shadowing a built-in constructor\n");
@@ -2927 +2944 @@
 
         my @includes = ();
+        my %implIncludeConditions = ();
         foreach my $include (keys %implIncludes) {
+            my $condition = $implIncludes{$include};
             my $checkType = $include;
             $checkType =~ s/\.h//;
@@ -2933 +2952 @@
 
             $include = "\"$include\"" unless $include =~ /^["<]/; # "
-            push @includes, $include;
+
+            if ($condition eq 1) {
+                push @includes, $include;
+            } else {
+                push @{$implIncludeConditions{$condition}}, $include;
+            }
         }
         foreach my $include (sort @includes) {
             print $IMPL "#include $include\n";
+        }
+        foreach my $condition (sort keys %implIncludeConditions) {
+            print $IMPL "\n#if " . GenerateConditionalStringFromAttributeValue($condition) . "\n";
+            foreach my $include (sort @{$implIncludeConditions{$condition}}) {
+                print $IMPL "#include $include\n";
+            }
+            print $IMPL "#endif\n";
         }