Don't use embedded Ant. An Ant installation is now required.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@197032 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 24 insertions, 25 deletions

diff --git a/build.bat b/build.bat
index 7721f45c9..43ceff449 100755
--- a/build.bat
+++ b/build.bat
@@ -1,37 +1,36 @@
 @echo off
+rem $Id$
 
-echo Fop Build System
-echo ----------------
+echo Apache FOP: Build System
+echo --------------------------
 
-if "%JAVA_HOME%" == "" goto error
+if "%JAVA_HOME%" == "" goto no_java_home
+if "%ANT_HOME%" == "" goto no_ant_home
 
-set LIBDIR=lib
-set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip
-set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\ant.jar
-set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xml-apis.jar
-set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xercesImpl-2.2.1.jar
-set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xalan-2.4.1.jar
+call %ANT_HOME%\bin\ant.bat %1 %2 %3 %4 %5 %6 %7 %8
 
-set ANT_HOME_BAK=%ANT_HOME%
-set ANT_HOME=%LIBDIR%
-
-echo Building with classpath %LOCALCLASSPATH%
-
-echo Starting Ant...
-
-%JAVA_HOME%\bin\java.exe -Dant.home=%ANT_HOME% -classpath "%LOCALCLASSPATH%" org.apache.tools.ant.Main %1 %2 %3 %4 %5
-
-set ANT_HOME=%ANT_HOME_BAK%
 goto end
 
-:error
-
+:no_java_home
 echo ERROR: JAVA_HOME not found in your environment.
 echo Please, set the JAVA_HOME variable in your environment to match the
 echo location of the Java Virtual Machine you want to use.
+goto end
 
-:end
-
-rem set LOCALCLASSPATH=
+:no_ant_home
+echo ERROR: ANT_HOME not found in your environment.
+echo Please install Apache Ant first. FOP uses Ant as its build system.
+echo You can download Apache Ant from http://ant.apache.org
+echo 1. Download and install Ant
+echo 2. Set the ANT_HOME environment variable to the directory where you've
+echo    placed Ant.
+echo 3. Add "%%ANT_HOME%%\bin" to your PATH so the "ant.bat" batch file
+echo    can be executed from wherever needed.
+echo 4. (optional) Download JUnit and place junit-*.jar in %%ANT_HOME%%\lib.
+echo    This enables the JUnit test cases.
+echo You will now be directed to the Apache Ant website...
+pause
+start http://ant.apache.org
+goto end
 
-pause;
+:end