cziegeler 01/11/26 00:33:23
Modified: . build.xml
Log:
Applied lost changes
Revision Changes Path
1.109 +29 -11 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- build.xml 2001/11/26 08:27:40 1.108
+++ build.xml 2001/11/26 08:33:23 1.109
@@ -132,6 +132,7 @@
<fileset dir="./lib">
<include name="*.jar"/>
</fileset>
+ <pathelement path="${java.class.path}" />
</path>
<path id="scratchpad.classpath">
@@ -140,6 +141,7 @@
</fileset>
<!-- FIXME : how to build a path that references a property set in 'init'
target ? -->
<pathelement path="./build/cocoon/classes"/>
+ <pathelement path="${java.class.path}" />
</path>
<!-- =================================================================== -->
@@ -237,7 +239,7 @@
<!-- =================================================================== -->
<!-- Test for optional components -->
<!-- =================================================================== -->
- <target name="optional-tests"
+ <target name="optional-tests" depends="init"
description="Tests for optional classes missing to the environment">
<available property="jaxen.present" classname="org.jaxen.dom.XPath">
@@ -295,6 +297,10 @@
<classpath refid="classpath"/>
</available>
+ <available property="jdbc3.present" classname="java.sql.Savepoint">
+ <classpath refid="classpath"/>
+ </available>
+
<ClassAvailable classpathref="classpath"
property="php.present"
classname="net.php.servlet"/>
@@ -325,6 +331,18 @@
</target>
+ <target name="prepare-jdbc" depends="filter-jdbc,nofilter-jdbc"/>
+
+ <target name="filter-jdbc" unless="jdbc3.present">
+ <filter token="JDBC3_START" value="/*"/>
+ <filter token="JDBC3_END" value="*/"/>
+ </target>
+
+ <target name="nofilter-jdbc" if="jdbc3.present">
+ <filter token="JDBC3_START" value=""/>
+ <filter token="JDBC3_END" value=""/>
+ </target>
+
<!-- =================================================================== -->
<!-- Macro for optional warnings -->
<!-- =================================================================== -->
@@ -346,7 +364,7 @@
<!-- =================================================================== -->
<!-- Warnings -->
<!-- =================================================================== -->
- <target name="jfor-warn" unless="jfor.present"
+ <target name="jfor-warn" unless="jfor.present" depends="optional-tests"
description="Outputs a warning if org.jfor.jfor.* classes are missing during
compilation">
<antcall target="op-warning">
<param name="thing" value="JFOR"/>
@@ -356,7 +374,7 @@
value="JFOR is required for the fo2rtf serializer."/>
</antcall>
</target>
- <target name="xmldb-warn" unless="xmldb.present"
+ <target name="xmldb-warn" unless="xmldb.present" depends="optional-tests"
description="Outputs a warning if org.xmldb.api.* classes are missing during
compilation">
<antcall target="op-warning">
<param name="thing" value="XMLDB"/>
@@ -366,7 +384,7 @@
value="XMLDB is required for the xmldb and xmldbcollection
generator."/>
</antcall>
</target>
- <target name="xt-warn" unless="xt.present"
+ <target name="xt-warn" unless="xt.present" depends="optional-tests"
description="Outputs a warning if com.jclark.xsl.* classes are missing during
compilation">
<antcall target="op-warning">
<param name="thing" value="XT"/>
@@ -376,7 +394,7 @@
value="XT is required for the xt transformer."/>
</antcall>
</target>
- <target name="php-warn" unless="php.present"
+ <target name="php-warn" unless="php.present" depends="optional-tests"
description="Outputs a warning if net.php.* classes are missing during
compilation">
<antcall target="op-warning">
<param name="thing" value="Php"/>
@@ -386,7 +404,7 @@
value="Php is required for the php generator."/>
</antcall>
</target>
- <target name="naming-warn" unless="naming.present"
+ <target name="naming-warn" unless="naming.present" depends="optional-tests"
description="Outputs a warning if javax.naming.* classes are missing during
compilation">
<antcall target="op-warning">
<param name="thing" value="JDNI"/>
@@ -396,7 +414,7 @@
value="JNDI is required for the ldap generator and the parentcm
generator."/>
</antcall>
</target>
- <target name="svg-warn" unless="svg.present"
+ <target name="svg-warn" unless="svg.present" depends="optional-tests"
description="Outputs a warning if org.apache.batik.* classes are missing
during compilation">
<antcall target="op-warning">
<param name="thing" value="Batik"/>
@@ -406,7 +424,7 @@
value="Batik is required for the svg serializers."/>
</antcall>
</target>
- <target name="fop-warn" unless="fop.present"
+ <target name="fop-warn" unless="fop.present" depends="optional-tests"
description="Outputs a warning if org.apache.fop.* classes are missing during
compilation">
<antcall target="op-warning">
<param name="thing" value="FOP"/>
@@ -416,7 +434,7 @@
value="FOP is required for the fo2pdf, fo2ps and fo2pcl serializer."/>
</antcall>
</target>
- <target name="tidy-warn" unless="tidy.present"
+ <target name="tidy-warn" unless="tidy.present" depends="optional-tests"
description="Outputs a warning if org.w3c.tidy.* classes are missing during
compilation">
<antcall target="op-warning">
<param name="thing" value="JTidy"/>
@@ -426,7 +444,7 @@
value="JTidy is required for the html generator."/>
</antcall>
</target>
- <target name="maybeupload-warn" unless="maybeupload.present"
+ <target name="maybeupload-warn" unless="maybeupload.present"
depends="optional-tests"
description="Outputs a warning if uk.co.weft.maybeupload.* classes are
missing during compilation">
<antcall target="op-warning">
<param name="thing" value="MaybeUpload"/>
@@ -456,7 +474,7 @@
<!-- =================================================================== -->
<!-- Prepares the source code -->
<!-- =================================================================== -->
- <target name="prepare-src-main" depends="prepare,generate-java-code">
+ <target name="prepare-src-main" depends="prepare,generate-java-code,prepare-jdbc">
<mkdir dir="${build.src}"/>
<mkdir dir="${build.dest}"/>
<copy todir="${build.src}" filtering="on">
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
