From f384eb7c96face1a3c2343fcab97622f3344257e Mon Sep 17 00:00:00 2001 From: "bstell%netscape.com" Date: Wed, 15 Aug 2001 04:20:31 +0000 Subject: [PATCH] bug 88454, r=mcafee, sr-sfraser add "fast-update" target which paralles "checkout" target git-svn-id: svn://10.0.0.236/trunk@101073 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/client.mk | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/mozilla/client.mk b/mozilla/client.mk index b892e239866..286be101316 100644 --- a/mozilla/client.mk +++ b/mozilla/client.mk @@ -407,6 +407,32 @@ real_checkout: else true; \ fi +fast-update: +# @: Start the update. Split the output to the tty and a log file. \ +# : If it fails, touch an error file because "tee" hides the error. + @failed=.fast_update-failed.tmp; rm -f $$failed*; \ + fast_update() { (config/cvsco-fast-update.pl $$@ || touch $$failed) 2>&1 | tee -a $(CVSCO_LOGFILE) && \ + if test -f $$failed; then false; else true; fi; }; \ + fast_update $(CVSCO_NSPR) && \ + fast_update $(CVSCO_PSM) && \ + fast_update $(CVSCO_NSS) && \ + fast_update $(CVSCO_LDAPCSDK) && \ + fast_update $(CVSCO_ACCESSIBLE) && \ + fast_update $(CVSCO_GFX2) && \ + fast_update $(CVSCO_IMGLIB2) && \ + fast_update $(CVSCO_SEAMONKEY) && \ + fast_update $(CVSCO_NOSUBDIRS) + @echo "fast_update finish: "`date` | tee -a $(CVSCO_LOGFILE) +# @: Check the log for conflicts. ; + @conflicts=`egrep "^C " $(CVSCO_LOGFILE)` ;\ + if test "$$conflicts" ; then \ + echo "$(MAKE): *** Conflicts during fast-update." ;\ + echo "$$conflicts" ;\ + echo "$(MAKE): Refer to $(CVSCO_LOGFILE) for full log." ;\ + false; \ + else true; \ + fi + #################################### # Web configure