Skip to content

Commit 69a1205

Browse files
author
slewis
committed
 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: Canonical link: https://commits.webkit.org/14668@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17447 268f45cc-cd09-0410-ab3c-d52691b4dbfc
1 parent 5709f52 commit 69a1205

5 files changed

Lines changed: 49 additions & 14 deletions

File tree

‎ChangeLog‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
2006-10-30 Stephanie Lewis <slewis@apple.com>
2+
3+
Reviewed by Darin.
4+
5+
Change Makefiles to return non-zero when module make fails.
6+
7+
* Makefile:
8+
19
2006-10-27 Brady Eidson <beidson@apple.com>
210

311
Rubber stamped by Tim Hatcher

‎Makefile‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools
22

33
all:
4-
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
4+
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
5+
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
56

67
debug d development dev develop:
7-
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
8-
8+
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
9+
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
10+
911
release r deployment dep deploy:
10-
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
11-
12+
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
13+
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
14+
1215
universal u:
1316
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
1417

1518
clean:
16-
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
19+
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
20+
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
21+

‎WebKitTools/ChangeLog‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
2006-10-30 Stephanie Lewis <slewis@apple.com>
2+
3+
Reviewed by Darin.
4+
5+
Change Makefiles to return non-zero when module make fails.
6+
Fix bug where if xcode options are not set, modules can build in the
7+
wrong directory.
8+
9+
* Makefile:
10+
* Scripts/webkitdirs.pm:
11+
112
2006-10-30 Matt Lilek <pewtermoose@gmail.com>
213

314
Reviewed by Tim H.

‎WebKitTools/Makefile‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
MODULES = Drosera DumpRenderTree
22

33
all:
4-
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
4+
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
5+
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
56

67
debug d development dev develop:
7-
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
8-
8+
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
9+
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
10+
911
release r deployment dep deploy:
10-
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
12+
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
13+
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
1114

1215
universal u:
1316
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
1417

1518
clean:
16-
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
19+
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
20+
if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
21+

‎WebKitTools/Scripts/webkitdirs.pm‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,21 @@ sub determineSourceDir
5757
{
5858
return if $sourceDir;
5959
$sourceDir = $FindBin::Bin;
60-
if ($sourceDir !~ s|/[^/]+/[^/]+$||) {
61-
die "Could not find two levels above source directory using FindBin.\n";
60+
61+
# walks up path checking each directory to see if it is the main WebKit project dir,
62+
# defined by containing JavaScriptCore, WebCore, and WebKit
63+
until (-d "$sourceDir/JavaScriptCore" && -d "$sourceDir/WebCore" && -d "$sourceDir/WebKit")
64+
{
65+
if ($sourceDir !~ s|/[^/]+$||) {
66+
die "Could not find top level webkit directory above source directory using FindBin.\n";
67+
}
6268
}
6369
}
6470

6571
# used for scripts which are stored in a non-standard location
6672
sub setSourceDir($)
6773
{
68-
$sourceDir = $_;
74+
($sourceDir) = @_;
6975
}
7076

7177
sub determineBaseProductDir

0 commit comments

Comments
 (0)