Update of /var/cvs/tests
In directory james.mmbase.org:/tmp/cvs-serv26215
Modified Files:
build.xml
Log Message:
ant build is broken (commons logging). Never mind, but the tests wont compile
now either. Removed the ant-call, and included the maven artifact to the class
path. Still a loss, because no automatic recompilation of mmbase.jar at the
moment.
See also: http://cvs.mmbase.org/viewcvs/tests
Index: build.xml
===================================================================
RCS file: /var/cvs/tests/build.xml,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- build.xml 13 Jun 2008 12:55:25 -0000 1.51
+++ build.xml 7 Jul 2008 08:34:38 -0000 1.52
@@ -13,6 +13,7 @@
<property file="${source.dir}/build.properties" />
<property name="build.dir" value="${source.dir}/build" />
+ <property name="target.dir" value="${source.dir}/target" />
<property name="download.dir" value="${build.dir}/download" />
<property name="expand.dir" value="${download.dir}/expanded" />
@@ -69,7 +70,7 @@
</fileset>
</copy>
<copy file="${junit.jar}" todir="${tests.lib}"
preservelastmodified="true" />
- <copy file="${build.dir}/mmbase.jar" todir="${tests.lib}"
preservelastmodified="true" overwrite="true" />
+ <copy file="${target.dir}/mmbase-1.9.0-SNAPSHOT.jar" todir="${tests.lib}"
preservelastmodified="true" overwrite="true" />
<copy
file="${source.dir}/applications/resources/build/mmbase-resources.jar"
todir="${tests.lib}" preservelastmodified="true" />
<copy
file="${source.dir}/applications/rmmci/target/mmbase-rmmci-1.9.0-SNAPSHOT.jar"
tofile="${tests.lib}/mmbase-rmmci.jar" preservelastmodified="true" />
<copy
file="${source.dir}/applications/rmmci/target/mmbase-rmmci-client-1.9.0-SNAPSHOT.jar"
tofile="${tests.lib}/mmbase-rmmci-client.jar" preservelastmodified="true" />
@@ -121,11 +122,12 @@
</target>
<target name="mmbase">
+ <!-- Ant build is broken now
<ant dir="${source.dir}" target="jar">
<property name="build.documentation" value="false" />
</ant>
<ant dir="${source.dir}" target="lib.compile" />
- <!--<ant dir="${source.dir}" target="expand.hsqldb" />-->
+ -->
</target>
<!-- =================================================================== -->
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
