Modified: trunk/Tools/ChangeLog (128965 => 128966)
--- trunk/Tools/ChangeLog 2012-09-19 05:26:16 UTC (rev 128965)
+++ trunk/Tools/ChangeLog 2012-09-19 05:41:20 UTC (rev 128966)
@@ -1,3 +1,21 @@
+2012-09-18 Kangil Han <[email protected]>
+
+ [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 <[email protected]>
Title string should be changed when document.title is set to ''.
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/CodeGeneratorTestRunner.pm (128965 => 128966)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/CodeGeneratorTestRunner.pm 2012-09-19 05:26:16 UTC (rev 128965)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/CodeGeneratorTestRunner.pm 2012-09-19 05:41:20 UTC (rev 128966)
@@ -1,4 +1,5 @@
# Copyright (C) 2010 Apple Inc. All rights reserved.
+# Copyright (C) 2012 Samsung Electronics
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -29,11 +30,12 @@
sub new
{
- my ($class, $codeGenerator, $outputDir) = @_;
+ my ($class, $codeGenerator, $outputDir, $outputHeaderDir, $layerOnTop, $preprocessor, $writeDependencies, $verbose, $idlFilePath) = @_;
my $reference = {
codeGenerator => $codeGenerator,
outputDir => $outputDir,
+ idlFilePath => $idlFilePath,
};
bless($reference, $class);
@@ -72,12 +74,37 @@
return $$self{codeGenerator}->WK_lcfirst(_implementationClassName($idlType)) . "Class";
}
-sub _fileHeaderString
+sub _parseLicenseBlock
{
- my ($filename) = @_;
+ my ($fileHandle) = @_;
- # FIXME: We should pull header out of the IDL file to get the copyright
- # year(s) right.
+ 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;
/*
* Copyright (C) 2010 Apple Inc. All rights reserved.
@@ -106,6 +133,16 @@
EOF
}
+sub _licenseBlock
+{
+ my ($self) = @_;
+ return $self->{licenseBlock} if $self->{licenseBlock};
+
+ my $licenseBlock = _parseLicenseBlockFromFile($self->{idlFilePath}) || _defaultLicenseBlock();
+ $self->{licenseBlock} = $licenseBlock;
+ return $licenseBlock;
+}
+
sub _generateHeaderFile
{
my ($self, $interface) = @_;
@@ -117,7 +154,7 @@
my $implementationClassName = _implementationClassName($idlType);
my $filename = $className . ".h";
- push(@contents, _fileHeaderString($filename));
+ push(@contents, $self->_licenseBlock());
my $parentClassName = _parentClassName($interface);
@@ -184,7 +221,7 @@
my $implementationClassName = _implementationClassName($idlType);
my $filename = $className . ".cpp";
- push(@contentsPrefix, _fileHeaderString($filename));
+ push(@contentsPrefix, $self->_licenseBlock());
my $classRefGetter = $self->_classRefGetter($idlType);
my $parentClassName = _parentClassName($interface);
