vgritsenko 02/02/09 06:39:16
Modified: . build.xml
Log:
Fix pizza conditional compilation
Revision Changes Path
1.164 +34 -12 xml-cocoon2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/build.xml,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- build.xml 9 Feb 2002 04:16:38 -0000 1.163
+++ build.xml 9 Feb 2002 14:39:16 -0000 1.164
@@ -425,7 +425,7 @@
<!-- =================================================================== -->
<!-- Macro for optional warnings -->
<!-- =================================================================== -->
- <target name="op-warning" description="General waring target (used by other
targets)" unless="omit.opt.warnings">
+ <target name="op-warning" description="General waring target (used by other
targets)" unless="omit.opt.warnings">
<echo>**********************************************</echo>
<echo>*</echo>
<echo>* Classes of the optional package ${thing} are not </echo>
@@ -437,7 +437,6 @@
<echo>* ${recovery}</echo>
<echo>*</echo>
<echo>***********************************************</echo>
- <echo/>
</target>
<!-- =================================================================== -->
@@ -448,11 +447,21 @@
<antcall target="op-warning">
<param name="thing" value="BSF"/>
<param name="recovery"
- value="Get the BSF package and place the jar in the lib/optional dir"/>
+ value="Get the BSF package from
http://oss.software.ibm.com/developerworks/projects/bsf/ and place the jar in the
lib/optional dir"/>
<param name="message"
value="BSF is required for the script action."/>
</antcall>
</target>
+ <target name="rhino-warn" unless="rhino.interpreter.present"
depends="optional-tests"
+ description="Outputs a warning if org.mozilla.javascript.* classes are
missing during compilation">
+ <antcall target="op-warning">
+ <param name="thing" value="Rhino"/>
+ <param name="recovery"
+ value="Get the Rhino package from http://www.mozilla.org/rhino/ and place
the jar in the lib/optional dir"/>
+ <param name="message"
+ value="Rhino is required for the XSP in Javascript."/>
+ </antcall>
+ </target>
<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">
@@ -488,7 +497,7 @@
<antcall target="op-warning">
<param name="thing" value="PHP"/>
<param name="recovery"
- value="Get the PHP servlet (phpsrvlt.jar) and place the jar in the
lib/optional dir"/>
+ value="Get the PHP servlet (phpsrvlt.jar) from http://www.php.net/ and
place the jar in the lib/optional dir"/>
<param name="message"
value="PHP is required for the php generator."/>
</antcall>
@@ -508,7 +517,7 @@
<antcall target="op-warning">
<param name="thing" value="Batik"/>
<param name="recovery"
- value="Get Batik from http://xml.apache.org/batik and place the jar in the
lib/optional dir"/>
+ value="Get Batik from http://xml.apache.org/batik/ and place the jar in the
lib/optional dir"/>
<param name="message"
value="Batik is required for the svg serializers."/>
</antcall>
@@ -518,7 +527,7 @@
<antcall target="op-warning">
<param name="thing" value="FOP"/>
<param name="recovery"
- value="Get FOP from http://xml.apache.org/fop and place the jar in the
lib/optional dir"/>
+ value="Get FOP from http://xml.apache.org/fop/ and place the jar in the
lib/optional dir"/>
<param name="message"
value="FOP is required for the fo2pdf, fo2ps and fo2pcl serializer."/>
</antcall>
@@ -568,7 +577,7 @@
<antcall target="op-warning">
<param name="thing" value="Velocity"/>
<param name="recovery"
- value="Get Velocity from http://jakarta.apache.org and place the jar in the
lib/optional dir"/>
+ value="Get Velocity from http://jakarta.apache.org/velocity/ and place the
jar in the lib/optional dir"/>
<param name="message"
value="Velocity is required for the velocity generator."/>
</antcall>
@@ -578,7 +587,7 @@
<antcall target="op-warning">
<param name="thing" value="hsqldb"/>
<param name="recovery"
- value="Get hsqldb and place the jar in the lib/optional dir"/>
+ value="Get hsqldb from http://hsqldb.sourceforge.net/ and place the jar in
the lib/optional dir"/>
<param name="message"
value="hsqldb is required for the sql examples."/>
</antcall>
@@ -588,7 +597,7 @@
<antcall target="op-warning">
<param name="thing" value="Resolver"/>
<param name="recovery"
- value="Get the resolver package from xml-commons and place the jar in the
lib/optional dir"/>
+ value="Get the resolver package from xml-commons CVS and place the jar in
the lib/optional dir"/>
<param name="message"
value="The resolver allows entity resolving."/>
</antcall>
@@ -598,17 +607,27 @@
<antcall target="op-warning">
<param name="thing" value="jisp"/>
<param name="recovery"
- value="Get jisp and place the jar in the lib/optional dir"/>
+ value="Get the jisp package from http://www.coyotegulch.com/jisp/ and place
the jar in the lib/optional dir"/>
<param name="message"
value="jisp is required for the JispFilesystemStore."/>
</antcall>
</target>
+ <target name="pizza-warn" unless="pizza.present" depends="optional-tests"
+ description="Outputs a warning if net.sf.pizzacompiler.compiler.* classes are
missing during compilation">
+ <antcall target="op-warning">
+ <param name="thing" value="Pizza"/>
+ <param name="recovery"
+ value="Get the pizza package from http://pizzacompiler.sourceforge.net/ and
place the jar in the lib/optional dir"/>
+ <param name="message"
+ value="Pizza is the alternative Java compiler."/>
+ </antcall>
+ </target>
<!-- =================================================================== -->
<!-- Print out warnings for optional components -->
<!-- =================================================================== -->
<target name="optional-warnings"
- depends="bsf-warn, jfor-warn, xmldb-warn, xt-warn, php-warn, naming-warn,
svg-warn, fop-warn, tidy-warn, maybeupload-warn, lucene-warn, deli-warn,
velocity-warn, hsqldb-warn, resolver-warn, jisp-warn"
+ depends="bsf-warn, rhino-warn, jfor-warn, xmldb-warn, xt-warn, php-warn,
naming-warn, svg-warn, fop-warn, tidy-warn, maybeupload-warn, lucene-warn, deli-warn,
velocity-warn, hsqldb-warn, resolver-warn, jisp-warn, pizza-warn"
description="Outputs warnings if some optional jars are missing from the
environment">
</target>
@@ -628,6 +647,8 @@
<mkdir dir="${build.dest}"/>
<copy todir="${build.src}" filtering="on">
<fileset dir="${java.dir}">
+ <exclude name="**/Pizza.java" unless="pizza.present"/>
+
<exclude name="**/JSP*.java" unless="servlet.present"/>
<exclude name="**/Jsp*.java" unless="servlet.present"/>
<exclude name="**/servlet.sitemap" unless="servlet.present"/>
@@ -663,7 +684,8 @@
<exclude name="**/CompiledJavascript*" unless="rhino.compiler.present"/>
- <exclude name="**/xsp/JSGenerator**" unless="rhino.interpreter.present"/>
+ <exclude name="**/xsp/JSGenerator.java" unless="rhino.interpreter.present"/>
+ <exclude name="**/xsp/javascript/**" unless="rhino.interpreter.present"/>
<exclude name="**/components/resolver/ResolverImpl.java"
unless="resolver.present"/>
<exclude name="**/resolver.xconf"
unless="resolver.present"/>
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
