Changeset 128966 in webkit

Timestamp:

Sep 18, 2012 10:41:20 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[WK2][WTR] CodeGeneratorTestRunner could keep original copyright.
​https://bugs.webkit.org/show_bug.cgi?id=96181

Patch by Kangil Han <​kangil.han@samsung.com> on 2012-09-18
Reviewed by Daniel Bates.

This patch enabled derived files, in DerivedSources/InjectedBundle, to keep original copyright.

• WebKitTestRunner/InjectedBundle/Bindings/CodeGeneratorTestRunner.pm:

(new):
(_parseLicenseBlock):
(_parseLicenseBlockFromFile):
(_defaultLicenseBlock):
(_licenseBlock):
(_generateHeaderFile):
(_generateImplementationFile):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/InjectedBundle/Bindings/CodeGeneratorTestRunner.pm (modified) (6 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-09-18  Kangil Han  <kangil.han@samsung.com>
+
+        [WK2][WTR] CodeGeneratorTestRunner could keep original copyright.
+        https://bugs.webkit.org/show_bug.cgi?id=96181
+
+        Reviewed by Daniel Bates.
+
+        This patch enabled derived files, in DerivedSources/InjectedBundle, to keep original copyright.
+
+        * WebKitTestRunner/InjectedBundle/Bindings/CodeGeneratorTestRunner.pm:
+        (new):
+        (_parseLicenseBlock):
+        (_parseLicenseBlockFromFile):
+        (_defaultLicenseBlock):
+        (_licenseBlock):
+        (_generateHeaderFile):
+        (_generateImplementationFile):
+
 2012-09-18  Byungwoo Lee  <bw80.lee@samsung.com>
 

trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/CodeGeneratorTestRunner.pm

@@ -1 +1 @@
 # Copyright (C) 2010 Apple Inc. All rights reserved.
+# Copyright (C) 2012 Samsung Electronics
 #
 # Redistribution and use in source and binary forms, with or without
@@ -30 +31 @@
 sub new
 {
-    my ($class, $codeGenerator, $outputDir) = @_;
+    my ($class, $codeGenerator, $outputDir, $outputHeaderDir, $layerOnTop, $preprocessor, $writeDependencies, $verbose, $idlFilePath) = @_;
 
     my $reference = {
         codeGenerator => $codeGenerator,
         outputDir => $outputDir,
+        idlFilePath => $idlFilePath,
     };
 
@@ -73 +75 @@
 }
 
-sub _fileHeaderString
-{
-    my ($filename) = @_;
-
-    # FIXME: We should pull header out of the IDL file to get the copyright
-    # year(s) right.
+sub _parseLicenseBlock
+{
+    my ($fileHandle) = @_;
+
+    my ($copyright, $readCount, $buffer, $currentCharacter, $previousCharacter);
+    my $startSentinel = "/*";
+    my $lengthOfStartSentinel = length($startSentinel);
+    $readCount = read($fileHandle, $buffer, $lengthOfStartSentinel);
+    return "" if ($readCount < $lengthOfStartSentinel || $buffer ne $startSentinel);
+    $copyright = $buffer;
+
+    while ($readCount = read($fileHandle, $currentCharacter, 1)) {
+        $copyright .= $currentCharacter;
+        return $copyright if $currentCharacter eq "/" && $previousCharacter eq "*";
+        $previousCharacter = $currentCharacter;
+    }
+
+    return "";
+}
+
+sub _parseLicenseBlockFromFile
+{
+    my ($path) = @_;
+    open my $fileHandle, "<", $path or die "Failed to open $path for reading: $!";
+    my $licenseBlock = _parseLicenseBlock($fileHandle);
+    close($fileHandle);
+    return $licenseBlock;
+}
+
+sub _defaultLicenseBlock
+{
     return <<EOF;
 /*
@@ -107 +134 @@
 }
 
+sub _licenseBlock
+{
+    my ($self) = @_;
+    return $self->{licenseBlock} if $self->{licenseBlock};
+
+    my $licenseBlock = _parseLicenseBlockFromFile($self->{idlFilePath}) || _defaultLicenseBlock();
+    $self->{licenseBlock} = $licenseBlock;
+    return $licenseBlock;
+}
+
 sub _generateHeaderFile
 {
@@ -118 +155 @@
     my $filename = $className . ".h";
 
-    push(@contents, _fileHeaderString($filename));
+    push(@contents, $self->_licenseBlock());
 
     my $parentClassName = _parentClassName($interface);
@@ -185 +222 @@
     my $filename = $className . ".cpp";
 
-    push(@contentsPrefix, _fileHeaderString($filename));
+    push(@contentsPrefix, $self->_licenseBlock());
 
     my $classRefGetter = $self->_classRefGetter($idlType);