Reviewed by Darin.

        Change Makefiles to return non-zero when module make fails.

        * Makefile:

WebKitTools:
        Change Makefiles to return non-zero when module make fails.
        Fix bug where if xcode options are not set, modules can build in the
        wrong directory.

        * Makefile:
        * Scripts/webkitdirs.pm:

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

diff --git a/ChangeLog b/ChangeLog
index 9d666891ec006d174a5b15ae39838d3e3ced8103..31db14c67e3b976b576abb58e2439ef3fd695ed2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-30  Stephanie Lewis  <slewis@apple.com>
+
+        Reviewed by Darin.
+
+        Change Makefiles to return non-zero when module make fails.
+
+        * Makefile:
+
 2006-10-27  Brady Eidson  <beidson@apple.com>
 
         Rubber stamped by Tim Hatcher

diff --git a/Makefile b/Makefile
index 42283bb6a4197dd1278be39e6e8e6b1a354bbbac..c9b0d901926b990930acd0519d3458516fee7526 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,21 @@
 MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools
 
 all:
-       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
+       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
 
 debug d development dev develop:
-       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
-
+       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+       
 release r deployment dep deploy:
-       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
-
+       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+       
 universal u:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
 
 clean:
-       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
+       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b5bdf20f8c3bc34494812ebb59d324e0c1bc3da8..c38b144ad2d1cc15d22cb8e1b937132ad4f57bc0 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2006-10-30  Stephanie Lewis  <slewis@apple.com>
+
+        Reviewed by Darin.
+        
+        Change Makefiles to return non-zero when module make fails.
+        Fix bug where if xcode options are not set, modules can build in the
+        wrong directory.
+
+        * Makefile:
+        * Scripts/webkitdirs.pm:
+
 2006-10-30  Matt Lilek  <pewtermoose@gmail.com>
 
         Reviewed by Tim H.

diff --git a/WebKitTools/Makefile b/WebKitTools/Makefile
index 05624248ac0d21852980d2fe30b78218716adeb0..a0f946a0007704f9966afb7a41a8ba625e546fb0 100644 (file)
--- a/WebKitTools/Makefile
+++ b/WebKitTools/Makefile
@@ -1,16 +1,21 @@
 MODULES = Drosera DumpRenderTree
 
 all:
-       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
+       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
 
 debug d development dev develop:
-       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
-
+       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+       
 release r deployment dep deploy:
-       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
+       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
 
 universal u:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
 
 clean:
-       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
+       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
+

diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 8e9b2ce92c7a6f5c744cae52093054553669de4d..6a7f6715be5267907c23f405a34bf13a4c2d0e33 100644 (file)
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -57,15 +57,21 @@ sub determineSourceDir
 {
     return if $sourceDir;
     $sourceDir = $FindBin::Bin;
-    if ($sourceDir !~ s|/[^/]+/[^/]+$||) {
-        die "Could not find two levels above source directory using FindBin.\n";
+    
+    # walks up path checking each directory to see if it is the main WebKit project dir, 
+    # defined by containing JavaScriptCore, WebCore, and WebKit
+    until (-d "$sourceDir/JavaScriptCore" && -d "$sourceDir/WebCore" && -d "$sourceDir/WebKit")
+    {
+        if ($sourceDir !~ s|/[^/]+$||) {
+            die "Could not find top level webkit directory above source directory using FindBin.\n";
+        }
     }
 }
 
 # used for scripts which are stored in a non-standard location
 sub setSourceDir($)
 {
-    $sourceDir = $_;
+    ($sourceDir) = @_;
 }
 
 sub determineBaseProductDir