diff options
| author | Jon Scott Stevens <jon@apache.org> | 2000-12-13 18:58:38 +0000 |
|---|---|---|
| committer | Jon Scott Stevens <jon@apache.org> | 2000-12-13 18:58:38 +0000 |
| commit | a94814d513f437b3cbc4ba5acb4a012cbaa40250 (patch) | |
| tree | 03839dc154a095c5a940abb0b6c6ef9de5d5c7fe /bootstrap.sh | |
| parent | 6eda9f0794dee070d4c5003780f2977ebdcc9bb9 (diff) | |
| download | ant-a94814d513f437b3cbc4ba5acb4a012cbaa40250.tar.gz | |
remove unnecessary -f check cause -x does the job well enough
line wrap things to make it pretty.
git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268350 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'bootstrap.sh')
| -rwxr-xr-x | bootstrap.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/bootstrap.sh b/bootstrap.sh index d6922e98b..3ae87a84f 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -17,12 +17,6 @@ else echo " to the installation directory of java." fi -if [ ! -f "$JAVA_HOME/bin/java" ] ; then - echo "Error: JAVA_HOME is not defined correctly." - echo " We were unable to locate JAVA_HOME/bin/java" - exit -fi - if [ ! -x "$JAVA_HOME/bin/java" ] ; then echo "Error: JAVA_HOME is not defined correctly." echo " We cannot execute JAVA_HOME/bin/java" @@ -83,12 +77,18 @@ mkdir -p ${CLASSDIR} echo ... Compiling Ant Classes -${JAVAC} -d ${CLASSDIR} ${TOOLS}/tar/*.java ${TOOLS}/ant/util/regexp/RegexpMatcher.java ${TOOLS}/ant/util/regexp/RegexpMatcherFactory.java ${TOOLS}/ant/util/*.java ${TOOLS}/ant/types/*.java ${TOOLS}/ant/*.java ${TOOLS}/ant/taskdefs/*.java +${JAVAC} -d ${CLASSDIR} ${TOOLS}/tar/*.java \ + ${TOOLS}/ant/util/regexp/RegexpMatcher.java \ + ${TOOLS}/ant/util/regexp/RegexpMatcherFactory.java \ + ${TOOLS}/ant/util/*.java ${TOOLS}/ant/types/*.java \ + ${TOOLS}/ant/*.java ${TOOLS}/ant/taskdefs/*.java echo ... Copying Required Files -cp src/main/org/apache/tools/ant/taskdefs/defaults.properties ${CLASSDIR}/org/apache/tools/ant/taskdefs -cp src/main/org/apache/tools/ant/types/defaults.properties ${CLASSDIR}/org/apache/tools/ant/types +cp src/main/org/apache/tools/ant/taskdefs/defaults.properties \ + ${CLASSDIR}/org/apache/tools/ant/taskdefs +cp src/main/org/apache/tools/ant/types/defaults.properties \ + ${CLASSDIR}/org/apache/tools/ant/types echo ... Building Ant Distribution |