Update of the build system to make the script cleaner and make ./lib/endorsed libs...

git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@352231 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/appendcp.bat b/appendcp.bat
new file mode 100644 (file)
index 0000000..128ae87
--- /dev/null
+++ b/appendcp.bat
@@ -0,0 +1,2 @@
+set CLASSPATH=%CLASSPATH%;%1
+

diff --git a/build.bat b/build.bat
index 3a2c9ef8d831e4947e052c080f889b0ea9687ba5..28690474454c799ba086d733da3f96470ce10640 100755 (executable)
--- a/build.bat
+++ b/build.bat
@@ -4,10 +4,10 @@ set OLD_ANT_HOME=%ANT_HOME%
 set ANT_HOME=tools\ant
 
 set OLD_CLASSPATH=%CLASSPATH%
-set CLASSPATH=tools\centipede\lib\xml-apis.jar;tools\centipede\lib\xerces.jar;tools\centipede\lib\xalan.jar;tools\centipede\lib\junit.jar;tools\centipede\lib\jIzPress.jar;tools\centipede\lib\jtidy.jar
+for %%i in (.\lib\endorsed\*.jar) do call appendcp.bat %%i
+for %%i in (.\tools\centipede\lib\*.jar) do call appendcp.bat %%i
 
 call %ANT_HOME%\bin\ant -listener org.apache.tools.ant.XmlLogger %1 %2 %3 %4 %5 %6 %7 %8 %9
 
 set ANT_HOME=%OLD_ANT_HOME%
-set CLASSPATH=%OLD_CLASSPATH%
-
+set CLASSPATH=%OLD_CLASSPATH%
\ No newline at end of file

diff --git a/build.sh b/build.sh
index 2f51797c2d7c8ede8fee27fb88277aa53dd1fbbe..0c2e19e6aa12686e30a7aab346f4bbe2f5764cbc 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -1,8 +1,23 @@
 #!/bin/sh
+# ----- Verify and Set Required Environment Variables -------------------------
+
+if [ "$JAVA_HOME" = "" ] ; then
+  echo You must set JAVA_HOME to point at your Java Development Kit installation
+  exit 1
+fi
 
 chmod u+x ./tools/ant/bin/antRun
 chmod u+x ./tools/ant/bin/ant
 
+# ----- Verify and Set Required Environment Variables -------------------------
+
+if [ "$TERM" = "cygwin" ] ; then
+  S=';'
+else
+  S=':'
+fi
+
+# ----- Set Up The Runtime Classpath ------------------------------------------
 
 OLD_ANT_HOME=$ANT_HOME
 unset ANT_HOME
@@ -11,7 +26,7 @@ CP=$CLASSPATH
 export CP
 unset CLASSPATH
 
-CLASSPATH="./tools/centipede/lib/xml-apis.jar:./tools/centipede/lib/xerces.jar:./tools/centipede/lib/xalan.jar:./tools/centipede/lib/junit.jar:./tools/centipede/lib/jIzPress.jar:./tools/centipede/lib/jtidy.jar"
+CLASSPATH="`echo ./lib/endorsed/*.jar | tr ' ' $S``echo ./tools/centipede/lib/*.jar | tr ' ' $S`"
 export CLASSPATH
 
 $PWD/./tools/ant/bin/ant -listener org.apache.tools.ant.XmlLogger $@ 

diff --git a/build.xml b/build.xml
index d3a7d1ed6d5379d6725533d0aa0f580c88b47082..2f8a5fcf42111f2eebb867e9efb29928d9d5fd3c 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -32,14 +32,14 @@
 <!-- =================================================================== -->
 
 <!-- ==================  Krysalis Centipede targets ===================  --> 
-<!ENTITY preinit-target SYSTEM "./tools/centipede/targets/preinit.xtarget"> 
-<!ENTITY init-target    SYSTEM "./tools/centipede/targets/init.xtarget"> 
-<!ENTITY compile-target SYSTEM "./tools/centipede/targets/compile.xtarget"> 
-<!ENTITY util-target    SYSTEM "./tools/centipede/targets/util.xtarget"> 
-<!ENTITY dev-target     SYSTEM "./tools/centipede/targets/dev.xtarget"> 
-<!ENTITY test-target    SYSTEM "./tools/centipede/targets/test.xtarget"> 
-<!ENTITY robot-target   SYSTEM "./tools/centipede/targets/robot.xtarget"> 
-<!ENTITY docs-target    SYSTEM "./tools/centipede/targets/docs.xtarget"> 
+<!ENTITY preinit-target       SYSTEM "./tools/centipede/targets/preinit.xtarget"> 
+<!ENTITY init-target          SYSTEM "./tools/centipede/targets/init.xtarget"> 
+<!ENTITY compile-target       SYSTEM "./tools/centipede/targets/compile.xtarget"> 
+<!ENTITY util-target          SYSTEM "./tools/centipede/targets/util.xtarget"> 
+<!ENTITY dev-target           SYSTEM "./tools/centipede/targets/dev.xtarget"> 
+<!ENTITY test-target          SYSTEM "./tools/centipede/targets/test.xtarget"> 
+<!ENTITY robot-target         SYSTEM "./tools/centipede/targets/robot.xtarget"> 
+<!ENTITY docs-target          SYSTEM "./tools/centipede/targets/docs.xtarget"> 
 <!-- =================================================================== -->
 ]>
 
@@ -181,7 +181,7 @@ or
   <!-- =================================================================== -->
   <!-- Documentation targets   -->  &docs-target;  
   <!-- =================================================================== -->
-  
+    
 </project>
 
 <!-- End of file -->

diff --git a/lib/endorsed/xalan-2.2.0.jar b/lib/endorsed/xalan-2.2.0.jar
new file mode 100644 (file)
index 0000000..8dd6dca
Binary files /dev/null and b/lib/endorsed/xalan-2.2.0.jar differ

diff --git a/lib/endorsed/xerces-2.0.0.jar b/lib/endorsed/xerces-2.0.0.jar
new file mode 100644 (file)
index 0000000..28d3642
Binary files /dev/null and b/lib/endorsed/xerces-2.0.0.jar differ

diff --git a/lib/endorsed/xml-apis.jar b/lib/endorsed/xml-apis.jar
new file mode 100644 (file)
index 0000000..2c42757
Binary files /dev/null and b/lib/endorsed/xml-apis.jar differ

diff --git a/tools/centipede/lib/VERSIONS b/tools/centipede/lib/VERSIONS
deleted file mode 100644 (file)
index 84611d6..0000000
--- a/tools/centipede/lib/VERSIONS
+++ /dev/null
@@ -1,3 +0,0 @@
-xalan-2.2.0.jar
-xerces-2.0.0.jar
-junit-3.7.jar
\ No newline at end of file

diff --git a/tools/centipede/lib/junit-3.7.jar b/tools/centipede/lib/junit-3.7.jar
new file mode 100644 (file)
index 0000000..914a5cf
Binary files /dev/null and b/tools/centipede/lib/junit-3.7.jar differ

diff --git a/tools/centipede/lib/junit.jar b/tools/centipede/lib/junit.jar
deleted file mode 100644 (file)
index 914a5cf..0000000
Binary files a/tools/centipede/lib/junit.jar and /dev/null differ

diff --git a/tools/centipede/lib/xalan.jar b/tools/centipede/lib/xalan.jar
deleted file mode 100644 (file)
index 8dd6dca..0000000
Binary files a/tools/centipede/lib/xalan.jar and /dev/null differ

diff --git a/tools/centipede/lib/xerces.jar b/tools/centipede/lib/xerces.jar
deleted file mode 100644 (file)
index 28d3642..0000000
Binary files a/tools/centipede/lib/xerces.jar and /dev/null differ

diff --git a/tools/centipede/lib/xml-apis.jar b/tools/centipede/lib/xml-apis.jar
deleted file mode 100644 (file)
index 2c42757..0000000
Binary files a/tools/centipede/lib/xml-apis.jar and /dev/null differ

diff --git a/tools/centipede/targets/preinit.xtarget b/tools/centipede/targets/preinit.xtarget
index 4bee003556ae6a5b576b2dea36ec67a805e348b9..a3896926cc334dc68a849821cb03f63e29f5b26e 100644 (file)
--- a/tools/centipede/targets/preinit.xtarget
+++ b/tools/centipede/targets/preinit.xtarget
@@ -19,12 +19,18 @@
   <!-- Indentify Classpath                                                 -->
   <!-- =================================================================== -->
   <path id="centipede.classpath">
+    <fileset dir="./lib/endorsed">
+      <include name="*.jar"/>
+    </fileset>    
     <fileset dir="./tools/centipede/lib">
       <include name="*.jar"/>
     </fileset>
   </path>
     
   <path id="classpath">
+    <fileset dir="./lib/endorsed">
+      <include name="*.jar"/>
+    </fileset>  
     <fileset dir="./lib/core">
       <include name="*.jar"/>
     </fileset>
@@ -34,11 +40,17 @@
   </path>
 
   <path id="examples.classpath">
+    <fileset dir="./lib/endorsed">
+      <include name="*.jar"/>
+    </fileset>    
     <!-- FIXME : how to build a path that references a property set in 'init' target ? -->
     <pathelement path="./build/jakarta-poi/classes"/>
   </path>
 
   <path id="scratchpad.classpath">
+    <fileset dir="./lib/endorsed">
+      <include name="*.jar"/>
+    </fileset>    
     <fileset dir="./lib/core">
       <include name="*.jar"/>
     </fileset>
@@ -53,6 +65,9 @@
   </path>
 
   <path id="contrib.classpath">
+    <fileset dir="./lib/endorsed">
+      <include name="*.jar"/>
+    </fileset>    
     <fileset dir="./lib/core">
       <include name="*.jar"/>
     </fileset>