You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2005/06/16 16:14:20 UTC
svn commit: r190920 -
/cocoon/trunk/tools/external-project-build/generic-build.xml
Author: reinhard
Date: Thu Jun 16 07:14:20 2005
New Revision: 190920
URL: http://svn.apache.org/viewcvs?rev=190920&view=rev
Log:
add support for mor than one build directory; make the name of the WAR file configureable
Modified:
cocoon/trunk/tools/external-project-build/generic-build.xml
Modified: cocoon/trunk/tools/external-project-build/generic-build.xml
URL: http://svn.apache.org/viewcvs/cocoon/trunk/tools/external-project-build/generic-build.xml?rev=190920&r1=190919&r2=190920&view=diff
==============================================================================
--- cocoon/trunk/tools/external-project-build/generic-build.xml (original)
+++ cocoon/trunk/tools/external-project-build/generic-build.xml Thu Jun 16 07:14:20 2005
@@ -46,13 +46,14 @@
<property name="cocoon.rep.cocoon.classes.dir" value="${cocoon.rep.cocoon.dir}/webapp/WEB-INF/classes"/>
<property name="cocoon.rep.cocoon.db.dir" value="${cocoon.rep.cocoon.webapp.dir}/WEB-INF/db"/>
<property name="cocoon.rep.container.dir" value="${cocoon.rep}/container/${cocoon.container.version}"/>
-
- <!-- container properties -->
+
+ <!-- container properties -->
<property file="${cocoon.rep.container.dir}/server.properties"/>
-
+
<!-- target directory structure -->
<property name="cocoon.build.dir" value="build"/>
<property name="cocoon.build.java" value="${cocoon.build.dir}/java"/>
+ <property name="cocoon.build.sourcepathref" value="cocoon:core-compile-sourcepath"/>
<property name="cocoon.build.java.classes" value="${cocoon.build.java}/classes"/>
<property name="cocoon.build.junit" value="${cocoon.build.dir}/test/junit"/>
<property name="cocoon.build.junit.classes" value="${cocoon.build.junit}/classes"/>
@@ -64,6 +65,9 @@
<property name="cocoon.build.webapp.dir" value="${cocoon.build.dir}/${cocoon.server}_webapp/ROOT"/>
<property name="cocoon.build.container.dir" value="${cocoon.build.dir}/${cocoon.server}_container"/>
+ <!-- WAR -->
+ <property name="cocoon.build.war.name" value="ROOT.war"/>
+
<!-- local directories -->
<property name="cocoon.local.webapp.dir" value="webapp"/>
<property name="cocoon.local.src.dir" value="java"/>
@@ -80,6 +84,9 @@
<property name="cocoon.compiler.source.vm" value="1.3"/>
<property name="cocoon.compiler.target.vm" value="1.3"/>
+ <!-- sourcepath -->
+ <path id="cocoon:core-compile-sourcepath"/>
+
<!-- classpaths -->
<path id="cocoon:classpath">
<fileset dir="${cocoon.rep.cocoon.lib.dir}">
@@ -150,7 +157,7 @@
</target>
<target name="cocoon:core-war" depends="cocoon:before-war">
- <zip destfile="${cocoon.build.webapp.war.dir}/ROOT.war">
+ <zip destfile="${cocoon.build.webapp.war.dir}/${cocoon.build.war.name}">
<fileset dir="${cocoon.build.webapp.dir}"/>
</zip>
</target>
@@ -171,7 +178,6 @@
</target>
<target name="cocoon:core-compile" depends="cocoon:before-compile">
- <!-- TODO support more than one directory with Java classes -->
<mkdir dir="${cocoon.build.java}"/>
<mkdir dir="${cocoon.build.java.classes}"/>
<mkdir dir="${cocoon.build.webapp.dir}/WEB-INF/classes"/>
@@ -180,7 +186,7 @@
<exclude name="**/*.java"/>
<exclude name="**/.svn"/>
</fileset>
- </copy>
+ </copy>
<javac classpathref="cocoon:classpath"
compiler="${cocoon.compiler}"
nowarn="${cocoon.compiler.nowarn}"
@@ -189,8 +195,10 @@
deprecation="${cocoon.compiler.deprecation}"
optimize="${cocoon.compiler.optimize}"
debug="${cocoon.compiler.debug}"
+ srcdir="${cocoon.local.src.dir}"
destdir="${cocoon.build.java.classes}"
- srcdir="${cocoon.local.src.dir}" />
+ sourcepathref="${cocoon.build.sourcepathref}"
+ />
<copy todir="${cocoon.build.webapp.dir}/WEB-INF/classes" filtering="off">
<fileset dir="${cocoon.build.java.classes}">
<exclude name="**/*.java"/>
@@ -244,8 +252,8 @@
<target name="cocoon:clean" depends="cocoon:after-clean" description="clean webapps and container"/>
<target name="cocoon:clean-all" depends="cocoon:after-clean-all" description="clean *everything* in the build dir"/>
- <!-- short versions for public cocoon:* targets - as these are very common names they might be
- overriden in a custom project build file -->
+ <!-- short versions for public cocoon:* targets - as these are very common names they might be
+ overriden in a custom project build file -->
<target name="container" depends="cocoon:container" if="cond.container.use" description="short version for cocoon:container"/>
<target name="webapp" depends="cocoon:webapp" description="short version for cocoon:webapp"/>
<target name="war" depends="cocoon:war" description="short version for cocoon:war"/>
@@ -253,8 +261,8 @@
<target name="stop" depends="cocoon:stop" description="short version for cocoon:stop"/>
<target name="compile" depends="cocoon:compile" description="short version for cocoon:compile" if="cocoon.cond.webapp.in.context"/>
<target name="clean" depends="cocoon:clean" description="short version for cocoon:clean"/>
- <target name="clean-all" depends="cocoon:clean-all" description="short version for cocoon:clean-all"/>
-
+ <target name="clean-all" depends="cocoon:clean-all" description="short version for cocoon:clean-all"/>
+
<!-- internally available targets -->
<target name="cocoon:setProperties" depends="cocoon:after-setProperties"/>