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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit f4ea5bbad165d0d8f466453851f8d9e08d5c932c
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Mar 3 18:49:22 2004 +0000

            Reviewed by Chris
    
            * copy-webcore-files-to-webkit: Fixed up this script so that
    	it does not fail if it is running "non-locally", like for
    	B&I. The idiom is to check these files into WebKit after
    	copying them from WebCore, hence this script is merely
    	a convenience to keep the files in sync.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6161 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8adff9b..c07c570 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,6 +1,16 @@
+2004-03-03  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Chris
+
+        * copy-webcore-files-to-webkit: Fixed up this script so that
+	it does not fail if it is running "non-locally", like for
+	B&I. The idiom is to check these files into WebKit after
+	copying them from WebCore, hence this script is merely
+	a convenience to keep the files in sync.
+
 2004-03-02  Ken Kocienda  <kocienda at apple.com>
 
-        Reviewed by NOBODY (OOPS!).
+        Reviewed by me
 
         * DOM.subproj/DOM.h: Checked in header copied over
         from WebCore.
diff --git a/WebKit/copy-webcore-files-to-webkit b/WebKit/copy-webcore-files-to-webkit
index 9e5e978..da45ce3 100755
--- a/WebKit/copy-webcore-files-to-webkit
+++ b/WebKit/copy-webcore-files-to-webkit
@@ -16,8 +16,8 @@ my %Files = (
 my $WebCorePath = '';
 my $WebKitPath = '';
 
-AssertInWebKit();
-AssertWebCoreFound();
+CheckInWebKit();
+CheckWebCoreFound();
 CopyFilesIfNeeded();
 
 #=======================================================================================
@@ -34,30 +34,27 @@ sub Say {
     print STDERR $say, "\n";
 }
 
-sub AssertInWebKit {
+sub CheckInWebKit {
 	if (cwd() =~ /WebKit$/) {
 		# ok...we're in WebCore
 		$WebKitPath = cwd();
 	}
 	else {
-		Fail("not being run from WebKit directory. exiting...");
+		Say("*** $ProgramName: not being run from WebKit directory. Cannot copy, exiting...");
+        exit(0);
 	}
 }
 
-sub AssertWebCoreFound {
+sub CheckWebCoreFound {
 	my $path = cwd();
-	my $localpath = dirname($path) . '/WebCore';
-	my $builditpath = dirname(dirname($path)) . '/WebCore.roots/WebCore';
-	if (-d $localpath) {
+	$path = dirname($path) . '/WebCore';
+	if (-d $path) {
 		# ok...WebCore is where we expect it
-		$WebCorePath = $localpath;
-	}
-	elsif (-d $builditpath) {
-		# ok...WebCore is where we expect it
-		$WebCorePath = $builditpath;
+		$WebCorePath = $path;
 	}
 	else {
-		Fail("WebCore is not a sibling directory to WebKit. exiting...");
+		Say("*** $ProgramName: WebCore is not a sibling directory to WebKit. Cannot copy, exiting...");
+        exit(0);
 	}
 }
 

-- 
WebKit Debian packaging