[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 61258b3a2fae21689730ba1256f85c0d49b58c7c
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed May 19 19:14:46 2004 +0000

            Updated header copy script to only copy if modified headers
            are different.
    
            * copy-webcore-files-to-webkit:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6643 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c645a30..414da76 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-19  Richard Williamson   <rjw at apple.com>
+
+        Updated header copy script to only copy if modified headers
+        are different.
+
+        * copy-webcore-files-to-webkit:
+
 2004-05-19  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Hyatt and Darin
diff --git a/WebKit/copy-webcore-files-to-webkit b/WebKit/copy-webcore-files-to-webkit
index fb68580..25b6cff 100755
--- a/WebKit/copy-webcore-files-to-webkit
+++ b/WebKit/copy-webcore-files-to-webkit
@@ -100,14 +100,18 @@ sub CopyFilesIfNeeded {
 		if (-e $dest && ! -f $dest) {
 			Fail("$dest is not a plain file");	
 		}
-		if (! -e $dest || system("cmp $source $dest > /dev/null 2>&1")) {
-			Say("$ProgramName: copying files...") if $blab == 0;
-			$blab = 1;
-			#ExecuteCommand("cp -f $source $dest");
-			ExecuteCommand("sed -e 's%#import .*<WebCore/\\(.*\\)>%#import <WebKit/\\1>%' $source > $dest-X");
-			ExecuteCommand("sed -e 's%#import .*<JavaScriptCore/\\(.*\\)>%#import <WebKit/\\1>%' $dest-X > $dest");
-			ExecuteCommand("rm $dest-X");
-		}
+
+        Say("$ProgramName: comparing files...") if $blab == 0;
+        ExecuteCommand("sed -e 's%#import .*<WebCore/\\(.*\\)>%#import <WebKit/\\1>%' $source > $dest-X");
+        ExecuteCommand("sed -e 's%#import .*<JavaScriptCore/\\(.*\\)>%#import <WebKit/\\1>%' $dest-X > $dest-Y");
+        ExecuteCommand("rm $dest-X");
+        if (! -e $dest || system("cmp $dest $dest-Y > /dev/null 2>&1")){
+            Say("$ProgramName: copying files...") if $blab == 0;
+            $blab = 1;
+            ExecuteCommand("cp -f $dest-Y $dest");
+       }
+       ExecuteCommand("rm $dest-Y");
+
 	}
 
 	for my $file (keys(%JavaScriptCoreFiles)) {
@@ -119,14 +123,18 @@ sub CopyFilesIfNeeded {
 		if (-e $dest && ! -f $dest) {
 			Fail("$dest is not a plain file");	
 		}
-		if (! -e $dest || system("cmp $source $dest > /dev/null 2>&1")) {
-			Say("$ProgramName: copying files...") if $blab == 0;
-			$blab = 1;
-			#ExecuteCommand("cp -f $source $dest");
-			ExecuteCommand("sed -e 's%#import .*<WebCore/\\(.*\\)>%#import <WebKit/\\1>%' $source > $dest-X");
-			ExecuteCommand("sed -e 's%#import .*<JavaScriptCore/\\(.*\\)>%#import <WebKit/\\1>%' $dest-X > $dest");
-			ExecuteCommand("rm $dest-X");
-		}
+		
+        Say("$ProgramName: comparing files...") if $blab == 0;
+        ExecuteCommand("sed -e 's%#import .*<WebCore/\\(.*\\)>%#import <WebKit/\\1>%' $source > $dest-X");
+        ExecuteCommand("sed -e 's%#import .*<JavaScriptCore/\\(.*\\)>%#import <WebKit/\\1>%' $dest-X > $dest-Y");
+        ExecuteCommand("rm $dest-X");
+        if (! -e $dest || system("cmp $dest $dest-Y > /dev/null 2>&1")){
+            Say("$ProgramName: copying files...") if $blab == 0;
+            $blab = 1;
+            ExecuteCommand("cp -f $dest-Y $dest");
+       }
+       ExecuteCommand("rm $dest-Y");
+       
 	}
 }
 

-- 
WebKit Debian packaging