nickchalko 2003/08/07 23:34:26 Modified: . gump.sh Log: Test for gen.sh failure. Make sure ant is in the path before calling ant. PR: Obtained from: Adam Jack [EMAIL PROTECTED] Submitted by: Reviewed by: CVS: ---------------------------------------------------------------------- CVS: PR: CVS: If this change addresses a PR in the problem report tracking CVS: database, then enter the PR number(s) here. CVS: Obtained from: CVS: If this change has been taken from another system, such as NCSA, CVS: then name the system in this line, otherwise delete it. CVS: Submitted by: CVS: If this code has been contributed to Apache by someone else; i.e., CVS: they sent us a patch or a new module, then include their name/email CVS: address here. If this is your work then delete this line. CVS: Reviewed by: CVS: If we are doing pre-commit code reviews and someone else has CVS: reviewed your changes, include their name(s) here. CVS: If you have not had it reviewed then delete this line. Revision Changes Path 1.10 +46 -13 jakarta-gump/gump.sh Index: gump.sh =================================================================== RCS file: /home/cvs/jakarta-gump/gump.sh,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gump.sh 19 Jul 2003 21:55:19 -0000 1.9 +++ gump.sh 8 Aug 2003 06:34:26 -0000 1.10 @@ -93,19 +93,25 @@ cvs -q update -dP >> $GUMP_LOG 2>&1 rm -f .timestamp -# -# generate nobuild projects -# -cd $GUMP -echo $SEPARATOR >> $GUMP_LOG -ant nobuild-projects >> $GUMP_LOG 2>&1 +export ANT=`which ant 2>/dev/null` +if [ -n "$ANT" ] ; then + # + # generate nobuild projects + # + cd $GUMP + echo $SEPARATOR >> $GUMP_LOG + $ANT -Dworkspace=${GUMP_WORKSPACE}.xml nobuild-projects >> $GUMP_LOG 2>&1 + + # + # Check the projects + # + cd $GUMP + echo $SEPARATOR >> $GUMP_LOG + $ANT -Dworkspace=${GUMP_WORKSPACE}.xml check >> $GUMP_LOG 2>&1 +else + echo "Ant was not found in the environment, steps skipped." >> $GUMP_LOG +fi -# -# Check the projects -# -cd $GUMP -echo $SEPARATOR >> $GUMP_LOG -ant check >> $GUMP_LOG 2>&1 # # Do a gen @@ -113,8 +119,13 @@ cd $GUMP echo $SEPARATOR >> $GUMP_LOG bash gen.sh ${GUMP_WORKSPACE}.xml >> $GUMP_LOG 2>&1 +if [ $? -ge 1 ] ; then + echo "Gump failed in generation, can't continue." + exit 1 +fi echo >> $GUMP_LOG + # # Do a clean # @@ -146,11 +157,11 @@ pkill -P $$ # $Log$ -# Revision 1.9 2003/07/19 21:55:19 nickchalko -# Added GUMP_WORKSPACE variable +# Revision 1.10 2003/08/08 06:34:26 nickchalko +# Test for gen.sh failure. Make sure ant is in the path before calling ant. # PR: -# Obtained from: -# Submitted by: Adam Jack [EMAIL PROTECTED] +# Obtained from: Adam Jack [EMAIL PROTECTED] +# Submitted by: # Reviewed by: # CVS: ---------------------------------------------------------------------- # CVS: PR: @@ -166,6 +177,28 @@ # CVS: Reviewed by: # CVS: If we are doing pre-commit code reviews and someone else has # CVS: reviewed your changes, include their name(s) here. +# CVS: If you have not had it reviewed then delete this line. +# +# Revision 1.9 2003/07/19 21:55:19 nickchalko +# Added GUMP_WORKSPACE variable +# PR: +# Obtained from: +# Submitted by: Adam Jack [EMAIL PROTECTED] +# Reviewed by: +# CVS: ---------------------------------------------------------------------- +# CVS: PR: +# CVS: If this change addresses a PR in the problem report tracking +# CVS: database, then enter the PR number(s) here. +# CVS: Obtained from: +# CVS: If this change has been taken from another system, such as NCSA, +# CVS: then name the system in this line, otherwise delete it. +# CVS: Submitted by: +# CVS: If this code has been contributed to Apache by someone else; i.e., +# CVS: they sent us a patch or a new module, then include their name/email +# CVS: address here. If this is your work then delete this line. +# CVS: Reviewed by: +# CVS: If we are doing pre-commit code reviews and someone else has +# CVS: reviewed your changes, include their name(s) here. # CVS: If you have not had it reviewed then delete this line. # # Revision 1.8 2003/06/26 06:39:55 nickchalko
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]