Reviewed by Mark Rowe.

        * Scripts/make-js-test-wrappers: Don't generate a wrapper for intersectsNode.js.
        * Scripts/prepare-ChangeLog: Add a special case for prefix of empty string.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27090 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d7a782ecbdf9916c6751508dc446aaa0a8393eab..5b73146491d9d829ca45ddff163c9d92e024a13d 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-25  Darin Adler  <darin@apple.com>
+
+        Reviewed by Mark Rowe.
+
+        * Scripts/make-js-test-wrappers: Don't generate a wrapper for intersectsNode.js.
+        * Scripts/prepare-ChangeLog: Add a special case for prefix of empty string.
+
 2007-10-25  Stephanie  <slewis@apple.com>
 
         build Fix

diff --git a/WebKitTools/Scripts/make-js-test-wrappers b/WebKitTools/Scripts/make-js-test-wrappers
index b053c17e07d6f70c522263da9c5dddfbf235b600..ea9b9b5ce6e3a822b792d723c2f66563eb3fb3ab 100755 (executable)
--- a/WebKitTools/Scripts/make-js-test-wrappers
+++ b/WebKitTools/Scripts/make-js-test-wrappers
@@ -69,7 +69,8 @@ for my $tfile (@templates) {
 
     for my $file (@files) {
         chomp $file;
-        next if $file =~ /js-test-.*\.js/;
+        next if $file =~ /js-test-.*\.js$/;
+        next if $file =~ m:resources/intersectsNode\.js$:;
 
         my $html = $file;
         $html =~ s:resources/(.*)\.js:$1.html:;

diff --git a/WebKitTools/Scripts/prepare-ChangeLog b/WebKitTools/Scripts/prepare-ChangeLog
index a095bf7e4ac09e3aaf4af04cb3ef0c5348458167..62875dbc41215269ba4933c1a84f055159e9c2ab 100755 (executable)
--- a/WebKitTools/Scripts/prepare-ChangeLog
+++ b/WebKitTools/Scripts/prepare-ChangeLog
@@ -263,7 +263,11 @@ foreach my $file (sort keys %function_lists) {
 # Get the latest ChangeLog files from svn.
 my @logs = ();
 foreach my $prefix (sort keys %files) {
-    push @logs, File::Spec->catfile($prefix, "ChangeLog");
+    if ($prefix eq "") {
+        push @logs, "ChangeLog";
+    } else {
+        push @logs, File::Spec->catfile($prefix, "ChangeLog");
+    }
 }
 
 if (@logs && $updateChangeLogs && $isSVN) {