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
This commit is contained in:
Nicola Ken Barozzi
parent
aedcb64537
commit
91f2aab60a
2
appendcp.bat
Normal file
2
appendcp.bat
Normal file
@ -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%
|
||||
17
build.sh
17
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 $@
|
||||
|
||||
18
build.xml
18
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 -->
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
xalan-2.2.0.jar
|
||||
xerces-2.0.0.jar
|
||||
junit-3.7.jar
|
||||
@ -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>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user