You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2003/12/31 02:12:57 UTC

cvs commit: maven/src/test/touchstone-build/src/reactor-build/resources maven.xml

brett       2003/12/30 17:12:57

  Modified:    src/test/touchstone-build/src/reactor-build/resources Tag:
                        MAVEN-1_0-BRANCH maven.xml
  Log:
  allow test to be run via reactor from touchstone by including basedir on relative paths
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.2.4.1   +5 -5      maven/src/test/touchstone-build/src/reactor-build/resources/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/maven/src/test/touchstone-build/src/reactor-build/resources/maven.xml,v
  retrieving revision 1.2
  retrieving revision 1.2.4.1
  diff -u -r1.2 -r1.2.4.1
  --- maven.xml	19 Aug 2003 04:45:37 -0000	1.2
  +++ maven.xml	31 Dec 2003 01:12:57 -0000	1.2.4.1
  @@ -10,15 +10,15 @@
       </goal>
   
       <goal name="run-maven">
  -        <delete dir="subproject/target" quiet="true"/>
  +        <delete dir="${basedir}/subproject/target" quiet="true"/>
   
           <maven:maven
  -          descriptor="subproject/project.xml"
  +          descriptor="${basedir}/subproject/project.xml"
             goals="java:jar-resources"
             ignoreFailures="false"
             />
           
  -        <util:available file="subproject/target/classes/test.properties">
  +        <util:available file="${basedir}/subproject/target/classes/test.properties">
               <j:set var="resourcesCopied" value="true"/>
           </util:available>
           <j:if test="${resourcesCopied != 'true'}">
  @@ -27,7 +27,7 @@
       </goal>
   
       <goal name="run-reactor">
  -        <delete dir="subproject/target" quiet="true"/>
  +        <delete dir="${basedir}/subproject/target" quiet="true"/>
   
           <maven:reactor
             basedir="${basedir}"
  @@ -37,7 +37,7 @@
             ignoreFailures="false"
             />
           
  -        <util:available file="subproject/target/classes/test.properties">
  +        <util:available file="${basedir}/subproject/target/classes/test.properties">
               <j:set var="resourcesCopied" value="true"/>
           </util:available>
           <j:if test="${resourcesCopied != 'true'}">
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org