Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Second attempt on FreeBSD checkout bug 33568. Use a shell function instead of nested eval's. r=pavlov a=waterson

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@70619 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
slamm%netscape.com 2000-05-22 22:04:45 +00:00
parent 5a077e84c4
commit 10c9790349
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mozilla/client.mk
View File

@ -257,12 +257,12 @@ real_checkout:
@: Start the checkout. Split the output to the tty and a log file. \
: If it fails, touch an error file because "tee" hides the error.
@failed=.cvs-failed.tmp; rm -f $$failed*; \
cvs_co='echo $$cmd ; \
(eval "$$cmd" || touch $$failed) 2>&1 | tee -a $(CVSCO_LOGFILE) && \
if test -f $$failed; then false; else true; fi;'; \
cmd='$(CVSCO_NSPR)' && eval $$cvs_co && \
cmd='$(CVSCO_PSM)' && eval $$cvs_co && \
cmd='$(CVSCO_SEAMONKEY)' && eval $$cvs_co
cvs_co() { echo "$$@" ; \
("$$@" || touch $$failed) 2>&1 | tee -a $(CVSCO_LOGFILE) && \
if test -f $$failed; then false; else true; fi; }; \
cvs_co $(CVSCO_NSPR) && \
cvs_co $(CVSCO_PSM) && \
cvs_co $(CVSCO_SEAMONKEY) && \
@echo "checkout finish: "`date` | tee -a $(CVSCO_LOGFILE)
@: Check the log for conflicts. ;\
conflicts=`egrep "^C " $(CVSCO_LOGFILE)` ;\