diff options
| -rwxr-xr-x | bootstrap.bat | 11 | ||||
| -rwxr-xr-x | bootstrap.sh | 9 |
2 files changed, 10 insertions, 10 deletions
diff --git a/bootstrap.bat b/bootstrap.bat index 7e7297b9d..5e70c8e63 100755 --- a/bootstrap.bat +++ b/bootstrap.bat @@ -8,9 +8,9 @@ REM this work for additional information regarding copyright ownership. REM The ASF licenses this file to You under the Apache License, Version 2.0 REM (the "License"); you may not use this file except in compliance with REM the License. You may obtain a copy of the License at -REM +REM REM http://www.apache.org/licenses/LICENSE-2.0 -REM +REM REM Unless required by applicable law or agreed to in writing, software REM distributed under the License is distributed on an "AS IS" BASIS, REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -62,7 +62,7 @@ if not exist build\classes\nul mkdir build\classes echo. echo ... Compiling Ant Classes -"%JAVAC%" %BOOTJAVAC_OPTS% -d %CLASSDIR% %TOOLS%\bzip2\*.java %TOOLS%\tar\*.java %TOOLS%\zip\*.java %TOOLS%\ant\*.java %TOOLS%\ant\types\*.java %TOOLS%\ant\taskdefs\*.java %TOOLS%\ant\util\regexp\RegexpMatcher.java %TOOLS%\ant\util\regexp\RegexpMatcherFactory.java %TOOLS%\ant\taskdefs\condition\*.java %TOOLS%\ant\taskdefs\compilers\*.java +"%JAVAC%" %BOOTJAVAC_OPTS% -d %CLASSDIR% %TOOLS%\bzip2\*.java %TOOLS%\tar\*.java %TOOLS%\zip\*.java %TOOLS%\ant\*.java %TOOLS%\ant\types\*.java %TOOLS%\ant\taskdefs\*.java %TOOLS%\ant\util\regexp\RegexpMatcher.java %TOOLS%\ant\util\regexp\RegexpMatcherFactory.java %TOOLS%\ant\taskdefs\condition\*.java %TOOLS%\ant\taskdefs\compilers\*.java %TOOLS%\ant\types\resources\*.java if ERRORLEVEL 1 goto mainend @@ -92,7 +92,7 @@ set ANT_CMD_LINE_ARGS=%$ goto doneStart :win9xStart -rem Slurp the command line arguments. This loop allows for an unlimited number of +rem Slurp the command line arguments. This loop allows for an unlimited number of rem agruments (up to the command line limit, anyway). set ANT_CMD_LINE_ARGS= @@ -104,7 +104,7 @@ shift goto setupArgs :doneStart -rem This label provides a place for the argument list loop to break out +rem This label provides a place for the argument list loop to break out rem and for NT handling to skip to. "%JAVA%" %ANT_OPTS% org.apache.tools.ant.Main -emacs %ANT_CMD_LINE_ARGS% bootstrap @@ -135,4 +135,3 @@ set BOOTOLDCLASSPATH= set LOCALCLASSPATH= set OLDANTHOME= set TOOLS= - diff --git a/bootstrap.sh b/bootstrap.sh index 077eb246b..7b1185ca3 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -22,7 +22,7 @@ case "`uname`" in CYGWIN*) cygwin=true ;; Darwin*) darwin=true if [ -z "$JAVA_HOME" ] ; then - JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home + JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Home fi ;; esac @@ -131,11 +131,12 @@ echo ... Compiling Ant Classes ${TOOLS}/ant/util/regexp/RegexpMatcher.java \ ${TOOLS}/ant/util/regexp/RegexpMatcherFactory.java \ ${TOOLS}/ant/types/*.java \ + ${TOOLS}/ant/types/resources/*.java \ ${TOOLS}/ant/*.java ${TOOLS}/ant/taskdefs/*.java \ ${TOOLS}/ant/taskdefs/compilers/*.java \ ${TOOLS}/ant/taskdefs/condition/*.java ret=$? -if [ $ret != 0 ]; then +if [ $ret != 0 ]; then echo ... Failed compiling Ant classes ! exit $ret fi @@ -153,7 +154,7 @@ echo ... Building Ant Distribution "${JAVACMD}" -classpath "${CLASSPATH}" -Dant.home=. $ANT_OPTS org.apache.tools.ant.Main -emacs "$@" bootstrap ret=$? -if [ $ret != 0 ]; then +if [ $ret != 0 ]; then echo ... Failed Building Ant Distribution ! exit $ret fi @@ -164,4 +165,4 @@ echo ... Cleaning Up Build Directories rm -rf ${CLASSDIR} rm -rf bin -echo ... Done Bootstrapping Ant Distribution +echo ... Done Bootstrapping Ant Distribution
\ No newline at end of file |