Changeset 137519 in webkit

Timestamp:

Dec 12, 2012, 3:01:06 PM (12 years ago)

Author:

tony@chromium.org

Message:

[chromium] don't write additional idl files to a gyp temp file
​https://bugs.webkit.org/show_bug.cgi?id=104831

Reviewed by Kentaro Hara.

The <|( command doesn't work for files like <(PRODUCT_DIR) or <(SHARED_INTERMEDIATE_DIR).
For additional_idl_files, pass it as a parameter instead of a file listing the filenames.
There are currently only 3 files in this variable. This shouldn't overflow the command
line since the limit on Windows is 8k and with this change, we're still only around 4.5k.
Also, the longest part of the command line is the list of defines. If needed, we could put
that in a file instead.

No new tests, this is a refactoring of the build files.

• WebCore.gyp/WebCore.gyp: Don't use <|( for additional_idl_files.
• bindings/scripts/generate-bindings.pl: Change --additionalIdlFilesList to

--additionalIdlFiles, which is a shell argument containing the filenames.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.gyp/WebCore.gyp (modified) (3 diffs)
• bindings/scripts/generate-bindings.pl (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-12-12  Tony Chang  <tony@chromium.org>
+
+        [chromium] don't write additional idl files to a gyp temp file
+        https://bugs.webkit.org/show_bug.cgi?id=104831
+
+        Reviewed by Kentaro Hara.
+
+        The <|( command doesn't work for files like <(PRODUCT_DIR) or <(SHARED_INTERMEDIATE_DIR).
+        For additional_idl_files, pass it as a parameter instead of a file listing the filenames.
+        There are currently only 3 files in this variable. This shouldn't overflow the command
+        line since the limit on Windows is 8k and with this change, we're still only around 4.5k.
+        Also, the longest part of the command line is the list of defines. If needed, we could put
+        that in a file instead.
+
+        No new tests, this is a refactoring of the build files.
+
+        * WebCore.gyp/WebCore.gyp: Don't use <|( for additional_idl_files.
+        * bindings/scripts/generate-bindings.pl: Change --additionalIdlFilesList to
+        --additionalIdlFiles, which is a shell argument containing the filenames.
+
 2012-12-12  Chris Rogers  <crogers@google.com>
 

trunk/Source/WebCore/WebCore.gyp/WebCore.gyp

@@ -581 +581 @@
         'generate_supplemental_dependency',
       ],
-      'variables': {
-        # Write sources into a file, so that the action command line won't
-        # exceed OS limits.
-        'additional_idl_files_list': '<|(additional_idl_files_list.tmp <@(webcore_test_support_idl_files))',
-      },
       'sources': [
         # bison rule
@@ -1170 +1165 @@
             '../bindings/scripts/preprocessor.pm',
             '<(SHARED_INTERMEDIATE_DIR)/supplemental_dependency.tmp',
-            '<(additional_idl_files_list)',
-            '<!@(cat <(additional_idl_files_list))',
+            '<@(webcore_test_support_idl_files)',
           ],
           'outputs': [
@@ -1225 +1219 @@
             '--supplementalDependencyFile',
             '<(SHARED_INTERMEDIATE_DIR)/supplemental_dependency.tmp',
-            '--additionalIdlFilesList',
-            '<(additional_idl_files_list)',
+            '--additionalIdlFiles',
+            '<(webcore_test_support_idl_files)',
             '<(RULE_INPUT_PATH)',
             '<@(preprocessor)',

trunk/Source/WebCore/bindings/scripts/generate-bindings.pl

@@ -34 +34 @@
 use File::Basename;
 use Getopt::Long;
+use Text::ParseWords;
 use Cwd;
 
@@ -50 +51 @@
 my $verbose;
 my $supplementalDependencyFile;
-my $additionalIdlFilesList;
+my $additionalIdlFiles;
 
 GetOptions('include=s@' => \@idlDirectories,
@@ -63 +64 @@
            'write-dependencies' => \$writeDependencies,
            'supplementalDependencyFile=s' => \$supplementalDependencyFile,
-           'additionalIdlFilesList=s' => \$additionalIdlFilesList);
+           'additionalIdlFiles=s' => \$additionalIdlFiles);
 
 my $targetIdlFile = $ARGV[0];
@@ -103 +104 @@
     close FH;
 
-    # The file $additionalIdlFilesList contains one IDL file per line:
-    # P.idl
-    # Q.idl
-    # ...
-    # These IDL files are ones which should not be included in DerivedSources*.cpp
-    # (i.e. they are not described in the supplemental dependency file)
-    # but should generate .h and .cpp files.
-    if (!$idlFound and $additionalIdlFilesList) {
-        open FH, "< $additionalIdlFilesList" or die "Cannot open $additionalIdlFilesList\n";
-        my @idlFiles = <FH>;
-        chomp(@idlFiles);
+    # $additionalIdlFiles is list of IDL files which should not be included in
+    # DerivedSources*.cpp (i.e. they are not described in the supplemental
+    # dependency file) but should generate .h and .cpp files.
+    if (!$idlFound and $additionalIdlFiles) {
+        my @idlFiles = shellwords($additionalIdlFiles);
         $idlFound = grep { $_ and basename($_) eq basename($targetIdlFile) } @idlFiles;
-        close FH;
     }