Permalink
Browse files

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).

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@1417826 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information...
1 parent 7097fdb commit 78bdcc1766bd60725935b2ba91890d6b74ec0cf3 Konstantin Kolinko committed Dec 6, 2012
Showing with 20 additions and 17 deletions.
  1. +5 −4 build.xml
  2. +7 −6 dist.xml
  3. +8 −7 extras.xml
View
9 build.xml
@@ -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"/>
View
13 dist.xml
@@ -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"/>
View
15 extras.xml
@@ -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"/>

0 comments on commit 78bdcc1

Please sign in to comment.