diff options
author | Nicola Ken Barozzi <nicolaken@apache.org> | 2002-03-16 17:08:00 +0000 |
---|---|---|
committer | Nicola Ken Barozzi <nicolaken@apache.org> | 2002-03-16 17:08:00 +0000 |
commit | 612d2d4c6417b34e07e23ef736b2bfbadea9e33b (patch) | |
tree | 41c3c14cdc269cd619452f4b47c472ad856d4777 | |
parent | 993db4c925628d68daa6fbab4c2903fde871a0c1 (diff) | |
download | poi-612d2d4c6417b34e07e23ef736b2bfbadea9e33b.tar.gz poi-612d2d4c6417b34e07e23ef736b2bfbadea9e33b.zip |
Update of the build system to make the script cleaner and make ./lib/endorsed libs automatically used in both script and build classpaths.
git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@352231 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | appendcp.bat | 2 | ||||
-rwxr-xr-x | build.bat | 6 | ||||
-rwxr-xr-x | build.sh | 17 | ||||
-rw-r--r-- | build.xml | 18 | ||||
-rw-r--r-- | lib/endorsed/xalan-2.2.0.jar (renamed from tools/centipede/lib/xalan.jar) | bin | 923866 -> 923866 bytes | |||
-rw-r--r-- | lib/endorsed/xerces-2.0.0.jar (renamed from tools/centipede/lib/xerces.jar) | bin | 1730053 -> 1730053 bytes | |||
-rw-r--r-- | lib/endorsed/xml-apis.jar (renamed from tools/centipede/lib/xml-apis.jar) | bin | 100196 -> 100196 bytes | |||
-rw-r--r-- | tools/centipede/lib/VERSIONS | 3 | ||||
-rw-r--r-- | tools/centipede/lib/junit-3.7.jar (renamed from tools/centipede/lib/junit.jar) | bin | 117522 -> 117522 bytes | |||
-rw-r--r-- | tools/centipede/targets/preinit.xtarget | 15 |
10 files changed, 45 insertions, 16 deletions
diff --git a/appendcp.bat b/appendcp.bat new file mode 100644 index 0000000000..128ae87745 --- /dev/null +++ b/appendcp.bat @@ -0,0 +1,2 @@ +set CLASSPATH=%CLASSPATH%;%1 + @@ -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 @@ -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 $@ @@ -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/tools/centipede/lib/xalan.jar b/lib/endorsed/xalan-2.2.0.jar Binary files differindex 8dd6dca254..8dd6dca254 100644 --- a/tools/centipede/lib/xalan.jar +++ b/lib/endorsed/xalan-2.2.0.jar diff --git a/tools/centipede/lib/xerces.jar b/lib/endorsed/xerces-2.0.0.jar Binary files differindex 28d3642eeb..28d3642eeb 100644 --- a/tools/centipede/lib/xerces.jar +++ b/lib/endorsed/xerces-2.0.0.jar diff --git a/tools/centipede/lib/xml-apis.jar b/lib/endorsed/xml-apis.jar Binary files differindex 2c42757296..2c42757296 100644 --- a/tools/centipede/lib/xml-apis.jar +++ b/lib/endorsed/xml-apis.jar diff --git a/tools/centipede/lib/VERSIONS b/tools/centipede/lib/VERSIONS deleted file mode 100644 index 84611d6a3f..0000000000 --- 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.jar b/tools/centipede/lib/junit-3.7.jar Binary files differindex 914a5cfa9b..914a5cfa9b 100644 --- a/tools/centipede/lib/junit.jar +++ b/tools/centipede/lib/junit-3.7.jar diff --git a/tools/centipede/targets/preinit.xtarget b/tools/centipede/targets/preinit.xtarget index 4bee003556..a3896926cc 100644 --- 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> |