mirror of https://github.com/apache/maven.git
make most scripts exit on error
tested only on cygwin - if it causes issues on linux, feel free to rollback git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@162859 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
07cfd28f67
commit
cf719faeda
2
ci.sh
2
ci.sh
|
@ -24,7 +24,7 @@ export PATH=$PATH:$MBOOT_HOME:$M2_HOME/bin:$JAVA_HOME/bin
|
|||
|
||||
CMD=$1
|
||||
|
||||
[ "$1" = "" ] && echo && echo "You must specify a checkout or update!" && echo && exit
|
||||
[ "$1" = "" ] && echo && echo "You must specify a checkout or update!" && echo && exit 1
|
||||
|
||||
HOME_DIR=`pwd`
|
||||
DATE=`date`
|
||||
|
|
|
@ -44,7 +44,7 @@ findAndSetMavenRepoLocal()
|
|||
{
|
||||
if [ -f $HOME/build.properties ]
|
||||
then
|
||||
repoLocal=`cat $HOME/build.properties | grep "maven.repo.local" | sed 's/^.*= *//'`
|
||||
repoLocal=`cat $HOME/build.properties | egrep "^maven.repo.local" | sed 's/^.*= *//'`
|
||||
else
|
||||
repoLocal=$HOME/.maven/repository
|
||||
fi
|
||||
|
@ -504,7 +504,7 @@ fi
|
|||
if [ ! -x "$JAVACMD" ] ; then
|
||||
echo "Error: JAVA_HOME is not defined correctly."
|
||||
echo " We cannot execute $JAVACMD"
|
||||
exit
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# For Cygwin, switch to Windows format before running java
|
||||
|
|
|
@ -64,8 +64,8 @@ export MBOOT_HOME=`dirname $0`
|
|||
|
||||
. ${MBOOT_HOME}/maven.functions
|
||||
|
||||
[ ! -d $dir ] && echo "Specified directory doesn't exist!" && exit
|
||||
[ ! -d $dir ] && echo "Specified directory doesn't exist!" && exit 1
|
||||
|
||||
[ ! -f $dir/${POM} ] && echo "No ${POM} in specified directory!" && exit
|
||||
[ ! -f $dir/${POM} ] && echo "No ${POM} in specified directory!" && exit 1
|
||||
|
||||
buildMavenProject $dir $jar $install $pomInstall $leaveBootFiles
|
||||
|
|
|
@ -68,7 +68,7 @@ export MBOOT_HOME=`dirname $0`
|
|||
|
||||
. ${MBOOT_HOME}/maven.functions
|
||||
|
||||
[ ! -f $model ] && echo "Specified model doesn't exist!" && exit
|
||||
[ ! -f $model ] && echo "Specified model doesn't exist!" && exit 1
|
||||
|
||||
[ ! -d $dir ] && mkdir -p $dir
|
||||
|
||||
|
|
|
@ -4,21 +4,28 @@ rm -rf target
|
|||
|
||||
# Generate the sources from the model
|
||||
modello --model=maven.mdo --version=4.0.0 --mode=java --dir=target/generated-sources
|
||||
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
|
||||
|
||||
# Generate the source for the xpp3 marshaller and unmarshaller
|
||||
modello --model=maven.mdo --version=4.0.0 --mode=xpp3 --dir=target/generated-sources
|
||||
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
|
||||
|
||||
# Generate the 3.0.0 source from the model
|
||||
modello --model=maven.mdo --version=3.0.0 --mode=java --dir=target/generated-sources --package-with-version
|
||||
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
|
||||
|
||||
# Generate the 3.0.0 source for the xpp3 marshaller and unmarshaller
|
||||
modello --model=maven.mdo --version=3.0.0 --mode=xpp3 --dir=target/generated-sources --package-with-version
|
||||
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
|
||||
|
||||
# Generate XML Schema
|
||||
modello --model=maven.mdo --version=4.0.0 --mode=xsd --dir=.
|
||||
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
|
||||
|
||||
# Generate XDoc
|
||||
modello --model=maven.mdo --version=4.0.0 --mode=xdoc --dir=target/generated-xdocs
|
||||
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
|
||||
|
||||
# Build the sources
|
||||
mboot --install
|
||||
ret=$?; if [ $ret != 0 ]; then exit $ret; fi
|
||||
|
|
Loading…
Reference in New Issue