Author: kkolinko
Date: Thu Dec 6 13:14:13 2012
New Revision: 1417826
URL: http://svn.apache.org/viewvc?rev=1417826&view=rev
Log:
Merged revision 1408376 from tomcat/tc6.0.x/branches/tomcat6-testing:
Introduce property "tomcat.output" that is used to specify location of the
build output directory.
This simplifies configuration when the output directory is located outside of
the source tree.
(One would have to define a single property instead of several ones).
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/build.xml
tomcat/tc6.0.x/trunk/dist.xml
tomcat/tc6.0.x/trunk/extras.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/tc6.0.x/branches/tomcat6-testing:r1408376
Modified: tomcat/tc6.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=1417826&r1=1417825&r2=1417826&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Thu Dec 6 13:14:13 2012
@@ -53,10 +53,11 @@
<!-- Build Defaults -->
<property name="tomcat.home" value="${basedir}"/>
- <property name="tomcat.build" value="${basedir}/output/build"/>
- <property name="tomcat.classes" value="${basedir}/output/classes"/>
- <property name="tomcat.dist" value="${basedir}/output/dist"/>
- <property name="tomcat.manifests" value="${basedir}/output/manifests"/>
+ <property name="tomcat.output" value="${basedir}/output"/>
+ <property name="tomcat.build" value="${tomcat.output}/build"/>
+ <property name="tomcat.classes" value="${tomcat.output}/classes"/>
+ <property name="tomcat.dist" value="${tomcat.output}/dist"/>
+ <property name="tomcat.manifests" value="${tomcat.output}/manifests"/>
<property name="test.failonerror" value="true"/>
<property name="test.runner" value="junit.textui.TestRunner"/>
Modified: tomcat/tc6.0.x/trunk/dist.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=1417826&r1=1417825&r2=1417826&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Thu Dec 6 13:14:13 2012
@@ -54,12 +54,13 @@
<property name="final-src.name" value="${project}-${version}-src" />
<!-- Build Defaults -->
- <property name="tomcat.build" value="${basedir}/output/build"/>
- <property name="tomcat.classes" value="${basedir}/output/classes"/>
- <property name="tomcat.dist" value="${basedir}/output/dist"/>
- <property name="tomcat.deployer" value="${basedir}/output/deployer"/>
- <property name="tomcat.extras" value="${basedir}/output/extras"/>
- <property name="tomcat.release" value="${basedir}/output/release"/>
+ <property name="tomcat.output" value="${basedir}/output"/>
+ <property name="tomcat.build" value="${tomcat.output}/build"/>
+ <property name="tomcat.classes" value="${tomcat.output}/classes"/>
+ <property name="tomcat.dist" value="${tomcat.output}/dist"/>
+ <property name="tomcat.deployer" value="${tomcat.output}/deployer"/>
+ <property name="tomcat.extras" value="${tomcat.output}/extras"/>
+ <property name="tomcat.release" value="${tomcat.output}/release"/>
<property name="test.failonerror" value="true"/>
<property name="test.runner" value="junit.textui.TestRunner"/>
Modified: tomcat/tc6.0.x/trunk/extras.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/extras.xml?rev=1417826&r1=1417825&r2=1417826&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/extras.xml (original)
+++ tomcat/tc6.0.x/trunk/extras.xml Thu Dec 6 13:14:13 2012
@@ -54,13 +54,14 @@
<property name="final-src.name" value="${project}-${version}-src" />
<!-- Build Defaults -->
- <property name="tomcat.build" value="${basedir}/output/build"/>
- <property name="tomcat.classes" value="${basedir}/output/classes"/>
- <property name="tomcat.dist" value="${basedir}/output/dist"/>
- <property name="tomcat.extras" value="${basedir}/output/extras"/>
- <property name="tomcat.manifests" value="${basedir}/output/manifests"/>
- <property name="tomcat.deployer" value="${basedir}/output/deployer"/>
- <property name="tomcat.release" value="${basedir}/output/release"/>
+ <property name="tomcat.output" value="${basedir}/output"/>
+ <property name="tomcat.build" value="${tomcat.output}/build"/>
+ <property name="tomcat.classes" value="${tomcat.output}/classes"/>
+ <property name="tomcat.dist" value="${tomcat.output}/dist"/>
+ <property name="tomcat.extras" value="${tomcat.output}/extras"/>
+ <property name="tomcat.manifests" value="${tomcat.output}/manifests"/>
+ <property name="tomcat.deployer" value="${tomcat.output}/deployer"/>
+ <property name="tomcat.release" value="${tomcat.output}/release"/>
<property name="test.failonerror" value="true"/>
<property name="test.runner" value="junit.textui.TestRunner"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
