You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by br...@apache.org on 2002/03/13 05:45:00 UTC
cvs commit: jakarta-turbine-2 build.xml default.properties
brekke 02/03/12 20:45:00
Modified: . build.xml default.properties
Log:
Updated build to check for the existence of jython in the class path and pull
in the appropriate code for compiling. Added definitions of the optional jars
with version numbers to the default.properties.
Revision Changes Path
1.10 +8 -2 jakarta-turbine-2/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.xml 11 Mar 2002 17:36:43 -0000 1.9
+++ build.xml 13 Mar 2002 04:45:00 -0000 1.10
@@ -37,6 +37,7 @@
<pathelement location="${castor.jar}"/>
<pathelement location="${freemarker.jar}"/>
<pathelement location="${webmacro.jar}"/>
+ <pathelement location="${jython.jar}"/>
</path>
<!-- ================================================================== -->
@@ -122,6 +123,10 @@
classname="org.exolab.castor.jdo.Database">
<classpath refid="classpath"/>
</available>
+ <available property="jython.present"
+ classname="org.python.util.PythonInterpreter">
+ <classpath refid="classpath"/>
+ </available>
</target>
<!-- ================================================================== -->
@@ -198,7 +203,8 @@
<!-- ================================================================== -->
<!-- Adds JPython related files to the build directory -->
<!-- ================================================================== -->
- <target name="prepare-python" depends="prepare">
+ <target name="prepare-python" depends="prepare"
+ if="jython.present">
<copy todir="${build.src}/org" filtering="yes">
<fileset dir="${src.java.dir}/org">
<include name="**/assemblerbroker/util/python/*.java"/>
@@ -232,7 +238,7 @@
<!-- Compiles the source directory -->
<!-- ================================================================== -->
<target name="compile"
- depends="prepare, prepare-jsp, prepare-freemarker,
+ depends="prepare, prepare-jsp, prepare-freemarker, prepare-python,
prepare-webmacro, prepare-log4java, prepare-castor"
description="--> compiles the source code">
<javac srcdir="${build.src}"
1.6 +3 -2 jakarta-turbine-2/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/default.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- default.properties 11 Mar 2002 17:36:43 -0000 1.5
+++ default.properties 13 Mar 2002 04:45:00 -0000 1.6
@@ -60,9 +60,10 @@
xmlParserAPIs.jar = ${lib.repo}/xmlParserAPIs-2.0.0.jar
xmlrpc.jar = ${lib.repo}/xmlrpc-helma.jar
-castor.jar = ${lib.repo}/castor.jar
-freemarker.jar = ${lib.repo}/freemarker.jar
+castor.jar = ${lib.repo}/castor-0.9.3.jar
+freemarker.jar = ${lib.repo}/freemarker-1.5.3.jar
webmacro.jar = ${lib.repo}/webmacro-0.94.jar
+jython.jar = ${lib.repo}/jython-2.1.jar
# -------------------------------------------------------------------
# T E S T I N G
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>