Mods to make scripts independent of any particular jars in lib.FOP_0-20-0_Alt-Design

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/FOP_0-20-0_Alt-Design@198014 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 4 insertions, 8 deletions

diff --git a/build.bat b/build.bat
index 2d1429db9..224283918 100755
--- a/build.bat
+++ b/build.bat
@@ -7,10 +7,7 @@ if "%JAVA_HOME%" == "" goto error
 
 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
+for %%j in ( %LIBDIR%\*.jar ) do set LOCALCLASSPATH=%LOCALCLASSPATH%;%%j
 
 set ANT_HOME=%LIBDIR%
 
diff --git a/build.sh b/build.sh
index e61bb3365..7628a752e 100755
--- a/build.sh
+++ b/build.sh
@@ -79,10 +79,9 @@ fi
 
 LIBDIR=lib
 LOCALCLASSPATH="$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip"
-LOCALCLASSPATH="$LOCALCLASSPATH:$LIBDIR/ant.jar"
-LOCALCLASSPATH="$LOCALCLASSPATH:$LIBDIR/xml-apis.jar"
-LOCALCLASSPATH="$LOCALCLASSPATH:$LIBDIR/xercesImpl-2.2.1.jar"
-LOCALCLASSPATH="$LOCALCLASSPATH:$LIBDIR/xalan-2.4.1.jar"
+for jar in $LIBDIR/*.jar; do
+    LOCALCLASSPATH="$LOCALCLASSPATH:$jar"
+done
 
 ANT_HOME="$LIBDIR"
 # antRun must be executable (can't do this in build.xml because Ant uses antRun