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
+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
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
+
+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.
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
+
{
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