nicolaken 02/03/16 09:08:00
Modified: . build.bat build.sh build.xml
tools/centipede/targets preinit.xtarget
Added: . appendcp.bat
tools/centipede/lib junit-3.7.jar
lib/endorsed xalan-2.2.0.jar xerces-2.0.0.jar xml-apis.jar
Removed: tools/centipede/lib junit.jar VERSIONS xalan.jar xerces.jar
xml-apis.jar
Log:
Update of the build system to make the script cleaner and make ./lib/endorsed libs
automatically used in both script and build classpaths.
Revision Changes Path
1.3 +3 -3 jakarta-poi/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/jakarta-poi/build.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.bat 14 Mar 2002 11:04:59 -0000 1.2
+++ build.bat 16 Mar 2002 17:07:58 -0000 1.3
@@ -4,10 +4,10 @@
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.3 +16 -1 jakarta-poi/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/jakarta-poi/build.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.sh 14 Mar 2002 11:04:59 -0000 1.2
+++ build.sh 16 Mar 2002 17:07:58 -0000 1.3
@@ -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 @@
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 $@
1.5 +9 -9 jakarta-poi/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-poi/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- build.xml 14 Mar 2002 11:04:59 -0000 1.4
+++ build.xml 16 Mar 2002 17:07:58 -0000 1.5
@@ -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 @@
<!-- =================================================================== -->
<!-- Documentation targets --> &docs-target;
<!-- =================================================================== -->
-
+
</project>
<!-- End of file -->
1.1 jakarta-poi/appendcp.bat
Index: appendcp.bat
===================================================================
set CLASSPATH=%CLASSPATH%;%1
1.1 jakarta-poi/tools/centipede/lib/junit-3.7.jar
<<Binary file>>
1.3 +15 -0 jakarta-poi/tools/centipede/targets/preinit.xtarget
Index: preinit.xtarget
===================================================================
RCS file: /home/cvs/jakarta-poi/tools/centipede/targets/preinit.xtarget,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- preinit.xtarget 14 Mar 2002 11:05:05 -0000 1.2
+++ preinit.xtarget 16 Mar 2002 17:08:00 -0000 1.3
@@ -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>
1.1 jakarta-poi/lib/endorsed/xalan-2.2.0.jar
<<Binary file>>
1.1 jakarta-poi/lib/endorsed/xerces-2.0.0.jar
<<Binary file>>
1.1 jakarta-poi/lib/endorsed/xml-apis.jar
<<Binary file>>
