You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by ni...@apache.org on 2002/03/23 18:13:18 UTC
cvs commit: xml-forrest/lib/endorsed xalan-2.2.0.jar xerces-2.0.0.jar xml-apis.jar
nicolaken 02/03/23 09:13:17
Modified: . build.bat build.sh
tools/centipede/targets compile.xtarget dev.xtarget
init.xtarget preinit.xtarget robot.xtarget
test.xtarget
Added: . appendcp.bat
tools/centipede/lib junit-3.7.jar
src/examples/src Manifest.mf
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:
Updated Centipede stuff to latest changes:
- added lib/endorsed dir for endorsed jars that are put in global calsspath
- changed the build scripts to not make direct reference to jar files
- added "examples" dir in src and creation of examples jar in buils
- added "testmodule" target to be run before committing stuff
- added "gump" build to be run by Gump
Revision Changes Path
1.2 +3 -3 xml-forrest/build.bat
Index: build.bat
===================================================================
RCS file: /home/cvs/xml-forrest/build.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.bat 26 Feb 2002 23:50:24 -0000 1.1
+++ build.bat 23 Mar 2002 17:13:13 -0000 1.2
@@ -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.2 +16 -1 xml-forrest/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-forrest/build.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.sh 26 Feb 2002 23:50:24 -0000 1.1
+++ build.sh 23 Mar 2002 17:13:13 -0000 1.2
@@ -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.1 xml-forrest/appendcp.bat
Index: appendcp.bat
===================================================================
set CLASSPATH=%CLASSPATH%;%1
1.3 +33 -0 xml-forrest/tools/centipede/targets/compile.xtarget
Index: compile.xtarget
===================================================================
RCS file: /home/cvs/xml-forrest/tools/centipede/targets/compile.xtarget,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- compile.xtarget 23 Mar 2002 16:10:44 -0000 1.2
+++ compile.xtarget 23 Mar 2002 17:13:13 -0000 1.3
@@ -21,6 +21,12 @@
<fileset dir="${scratchpad.src}"/>
</copy>
+ <mkdir dir="${build.examples.src}"/>
+ <mkdir dir="${build.examples.dest}"/>
+ <copy todir="${build.examples.src}" filtering="on">
+ <fileset dir="${examples.src}"/>
+ </copy>
+
<mkdir dir="${build.contrib.src}"/>
<mkdir dir="${build.contrib.dest}"/>
<copy todir="${build.contrib.src}" filtering="on">
@@ -66,6 +72,27 @@
<classpath refid="scratchpad.classpath"/>
</javac>
+ <copy todir="${build.examples.dest}">
+ <fileset dir="${build.examples.src}">
+ <include name="**"/>
+ <!--
+ <include name="**/Manifest.mf"/>
+ <include name="**/*.xsl"/>
+ <include name="**/*.roles"/>
+ <include name="**/*.xconf"/>
+ <include name="META-INF/**"/>
+ -->
+ </fileset>
+ </copy>
+
+ <javac srcdir="${build.examples.src}"
+ destdir="${build.examples.dest}"
+ debug="${debug}"
+ optimize="${optimize}"
+ deprecation="${deprecation}"
+ target="${target.vm}">
+ <classpath refid="examples.classpath"/>
+ </javac>
<copy todir="${build.contrib.dest}">
<fileset dir="${build.contrib.src}">
@@ -102,6 +129,12 @@
</fileset>
</jar>
+ <jar jarfile="${build.dir}/${examples.name}.jar">
+ <fileset dir="${build.examples.dest}">
+ <include name="**"/>
+ </fileset>
+ </jar>
+
<jar jarfile="${build.dir}/${contrib.name}.jar">
<fileset dir="${build.contrib.dest}">
<include name="**"/>
1.2 +19 -1 xml-forrest/tools/centipede/targets/dev.xtarget
Index: dev.xtarget
===================================================================
RCS file: /home/cvs/xml-forrest/tools/centipede/targets/dev.xtarget,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dev.xtarget 26 Feb 2002 23:50:29 -0000 1.1
+++ dev.xtarget 23 Mar 2002 17:13:13 -0000 1.2
@@ -7,6 +7,9 @@
<mkdir dir="${dist.root}"/>
<mkdir dir="${dist.src.dir}"/>
<mkdir dir="${dist.src.dir}/lib"/>
+ <mkdir dir="${dist.src.dir}/lib/core"/>
+ <mkdir dir="${dist.src.dir}/lib/optional"/>
+ <mkdir dir="${dist.src.dir}/lib/endorsed"/>
<mkdir dir="${dist.src.dir}/src"/>
<mkdir dir="${dist.src.dir}/src/java"/>
<mkdir dir="${dist.src.dir}/src/documentation"/>
@@ -14,6 +17,7 @@
<mkdir dir="${dist.src.dir}/src/scratchpad"/>
<mkdir dir="${dist.src.dir}/src/testcases"/>
<mkdir dir="${dist.src.dir}/src/contrib"/>
+ <mkdir dir="${dist.src.dir}/src/examples"/>
<mkdir dir="${dist.src.dir}/src/targets"/>
<mkdir dir="${dist.src.dir}/docs"/>
<mkdir dir="${dist.src.dir}/docs/apidocs"/>
@@ -63,6 +67,10 @@
<fileset dir="${contrib.dir}"/>
</copy>
+ <copy todir="${dist.src.dir}/src/examples" filtering="off">
+ <fileset dir="${examples.dir}"/>
+ </copy>
+
<copy todir="${dist.src.dir}/src/targets" filtering="off">
<fileset dir="./src/targets"/>
</copy>
@@ -131,10 +139,20 @@
<mkdir dir="${dist.root}"/>
<mkdir dir="${dist.bin.dir}"/>
<mkdir dir="${dist.bin.dir}/lib"/>
+ <mkdir dir="${dist.src.dir}/lib/core"/>
+ <mkdir dir="${dist.src.dir}/lib/optional"/>
<mkdir dir="${dist.bin.dir}/docs"/>
<mkdir dir="${dist.bin.dir}/docs/apidocs"/>
- <copy file="${build.dir}/${name}.jar" tofile="${dist.bin.dir}/lib/${name}-${version}.jar"/>
+ <copy todir="${dist.bin.dir}/lib/core">
+ <fileset dir="${lib.dir}/core"/>
+ </copy>
+
+ <copy todir="${dist.bin.dir}/lib/optional">
+ <fileset dir="${lib.dir}/optional"/>
+ </copy>
+
+ <copy file="${build.dir}/${name}.jar" tofile="${dist.bin.dir}/lib/core/${name}-${version}.jar"/>
<copy todir="${dist.bin.dir}/docs">
<fileset dir="${build.docs}"/>
1.3 +8 -0 xml-forrest/tools/centipede/targets/init.xtarget
Index: init.xtarget
===================================================================
RCS file: /home/cvs/xml-forrest/tools/centipede/targets/init.xtarget,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- init.xtarget 23 Mar 2002 16:10:44 -0000 1.2
+++ init.xtarget 23 Mar 2002 17:13:13 -0000 1.3
@@ -90,6 +90,11 @@
<property name="scratchpad.lib" value="${scratchpad.dir}/lib"/>
<property name="scratchpad.name" value="${name}-scratchpad"/>
+ <property name="examples.dir" value="${src.dir}/examples"/>
+ <property name="examples.src" value="${examples.dir}/src"/>
+ <property name="examples.lib" value="${examples.dir}/lib"/>
+ <property name="examples.name" value="${name}-examples"/>
+
<property name="contrib.dir" value="${src.dir}/contrib"/>
<property name="contrib.src" value="${contrib.dir}/src"/>
<property name="contrib.lib" value="${contrib.dir}/lib"/>
@@ -108,6 +113,9 @@
<property name="build.scratchpad" value="${build.dir}/scratchpad"/>
<property name="build.scratchpad.src" value="${build.scratchpad}/src"/>
<property name="build.scratchpad.dest" value="${build.scratchpad}/classes"/>
+ <property name="build.examples" value="${build.dir}/examples"/>
+ <property name="build.examples.src" value="${build.examples}/src"/>
+ <property name="build.examples.dest" value="${build.examples}/classes"/>
<property name="build.contrib" value="${build.dir}/contrib"/>
<property name="build.contrib.src" value="${build.contrib}/src"/>
<property name="build.contrib.dest" value="${build.contrib}/classes"/>
1.2 +21 -0 xml-forrest/tools/centipede/targets/preinit.xtarget
Index: preinit.xtarget
===================================================================
RCS file: /home/cvs/xml-forrest/tools/centipede/targets/preinit.xtarget,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- preinit.xtarget 26 Feb 2002 23:50:29 -0000 1.1
+++ preinit.xtarget 23 Mar 2002 17:13:13 -0000 1.2
@@ -15,16 +15,26 @@
<property name="build.compiler.depend" value="true"/>
<property name="build.compiler.fulldepend" value="true"/>
+ <!-- Temporary fix. Longer term solution to be discussed. -->
+ <property name="build.root" value="./build"/>
+
+
<!-- =================================================================== -->
<!-- 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>
@@ -33,7 +43,18 @@
</fileset>
</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.root}/jakarta-poi/classes"/>
+ </path>
+
<path id="scratchpad.classpath">
+ <fileset dir="./lib/endorsed">
+ <include name="*.jar"/>
+ </fileset>
<fileset dir="./lib/core">
<include name="*.jar"/>
</fileset>
1.2 +8 -0 xml-forrest/tools/centipede/targets/robot.xtarget
Index: robot.xtarget
===================================================================
RCS file: /home/cvs/xml-forrest/tools/centipede/targets/robot.xtarget,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- robot.xtarget 26 Feb 2002 23:50:29 -0000 1.1
+++ robot.xtarget 23 Mar 2002 17:13:13 -0000 1.2
@@ -73,3 +73,11 @@
files="${build.patchqueue}/bugzillapatchqueue.txt"/>
</target>
+
+ <!-- =================================================================== -->
+ <!-- Calls the targets needed for Gump -->
+ <!-- =================================================================== -->
+ <target name="gump" depends="testmodule, package">
+ </target>
+
+
1.2 +7 -0 xml-forrest/tools/centipede/targets/test.xtarget
Index: test.xtarget
===================================================================
RCS file: /home/cvs/xml-forrest/tools/centipede/targets/test.xtarget,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- test.xtarget 26 Feb 2002 23:50:29 -0000 1.1
+++ test.xtarget 23 Mar 2002 17:13:13 -0000 1.2
@@ -38,3 +38,10 @@
</batchtest>
</junit>
</target>
+
+ <!-- =================================================================== -->
+ <!-- Testing that all major targets work; useful before a commit -->
+ <!-- =================================================================== -->
+ <target name="testmodule" depends="clean, docs, test, javadocs"
+ description="Testing that all major targets work; useful before a commit ">
+ </target>
1.1 xml-forrest/tools/centipede/lib/junit-3.7.jar
<<Binary file>>
1.1 xml-forrest/src/examples/src/Manifest.mf
Index: Manifest.mf
===================================================================
Manifest-Version: 1.0
1.1 xml-forrest/lib/endorsed/xalan-2.2.0.jar
<<Binary file>>
1.1 xml-forrest/lib/endorsed/xerces-2.0.0.jar
<<Binary file>>
1.1 xml-forrest/lib/endorsed/xml-apis.jar
<<Binary file>>