Return-Path: 
 <forrest-cvs-return-1784-apmail-xml-forrest-dev-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-forrest-dev-archive@www.apache.org
Received: (qmail 42556 invoked from network); 16 Dec 2003 17:06:13 -0000
Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12)
  by minotaur-2.apache.org with SMTP; 16 Dec 2003 17:06:13 -0000
Received: (qmail 91380 invoked by uid 500); 16 Dec 2003 17:06:06 -0000
Delivered-To: apmail-xml-forrest-dev-archive@xml.apache.org
Received: (qmail 91352 invoked by uid 500); 16 Dec 2003 17:06:06 -0000
Mailing-List: contact forrest-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:forrest-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:forrest-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:forrest-cvs@xml.apache.org>
Reply-To: forrest-dev@xml.apache.org
Delivered-To: mailing list forrest-cvs@xml.apache.org
Received: (qmail 91338 invoked from network); 16 Dec 2003 17:06:05 -0000
Received: from unknown (HELO minotaur.apache.org) (209.237.227.194)
  by daedalus.apache.org with SMTP; 16 Dec 2003 17:06:05 -0000
Received: (qmail 42537 invoked by uid 1775); 16 Dec 2003 17:06:12 -0000
Date: 16 Dec 2003 17:06:12 -0000
Message-ID: <20031216170612.42536.qmail@minotaur.apache.org>
From: brondsem@apache.org
To: xml-forrest-cvs@apache.org
Subject: cvs commit: xml-forrest/scratchpad/forrestbot2/core getsrc.xml
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

brondsem    2003/12/16 09:06:12

  Modified:    scratchpad/forrestbot2/core getsrc.xml
  Log:
  combine cvs.module and cvs.root-dir
  
  Revision  Changes    Path
  1.2       +8 -9      xml-forrest/scratchpad/forrestbot2/core/getsrc.xml
  
  Index: getsrc.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/scratchpad/forrestbot2/core/getsrc.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- getsrc.xml	9 Dec 2003 21:59:10 -0000	1.1
  +++ getsrc.xml	16 Dec 2003 17:06:12 -0000	1.2
  @@ -37,7 +37,6 @@
     <property name="getsrc.cvs.root" value="/home/cvspublic"/>
     <property name="getsrc.cvs.host" value="cvs.apache.org"/>
     <property name="getsrc.cvs.module" value="${ant.project.name}"/>
  -  <property name="getsrc.cvs.root-dir" value=""/>
     <property name="getsrc.cvs.tag" value=""/>
   
     <property name="build.cvsmodule-dir"    location="work/cvsmodules"/>
  @@ -47,7 +46,7 @@
       <cvspass cvsroot=":pserver:${getsrc.cvs.user}@${getsrc.cvs.host}:${getsrc.cvs.root}" password="${getsrc.cvs.password}"/>
   
       <echo><![CDATA[<cvs cvsRoot=":pserver:${getsrc.cvs.user}@${getsrc.cvs.host}:${getsrc.cvs.root}"
  -      package="${getsrc.cvs.module}/${getsrc.cvs.root-dir}"
  +      package="${getsrc.cvs.module}"
         dest="${build.cvsmodule-dir}"
         quiet="false"
         command="checkout -l"
  @@ -55,33 +54,33 @@
         />]]></echo>
   
       <cvs cvsRoot=":pserver:${getsrc.cvs.user}@${getsrc.cvs.host}:${getsrc.cvs.root}"
  -      package="${getsrc.cvs.module}/${getsrc.cvs.root-dir}"
  +      package="${getsrc.cvs.module}"
         dest="${build.cvsmodule-dir}"
         quiet="true"
         command="checkout -l"
         tag="${getsrc.cvs.tag}"
         />
   
  -    <echo>Loading ${build.cvsmodule-dir}/${getsrc.cvs.module}/${getsrc.cvs.root-dir}/forrest.properties..</echo>
  -    <loadproperties srcFile="${build.cvsmodule-dir}/${getsrc.cvs.module}/${getsrc.cvs.root-dir}/forrest.properties"/>
  -    <loadproperties srcFile="${bot.home}/core/default-forrest.properties"/>
  +    <echo>Loading ${build.cvsmodule-dir}/${getsrc.cvs.module}/forrest.properties..</echo>
  +    <loadproperties srcFile="${build.cvsmodule-dir}/${getsrc.cvs.module}/forrest.properties"/>
  +    <loadproperties srcFile="${forrest.home}/default-forrest.properties"/>
   
       <echo><![CDATA[<cvs cvsRoot=":pserver:${getsrc.cvs.user}@${getsrc.cvs.host}:${getsrc.cvs.root}"
  -      package="${getsrc.cvs.module}/${getsrc.cvs.root-dir}/${project.content-dir}"
  +      package="${getsrc.cvs.module}/${project.content-dir}"
         dest="${build.cvsmodule-dir}"
         quiet="false"
         tag="${getsrc.cvs.tag}"
         />]]></echo>
   
       <cvs cvsRoot=":pserver:${getsrc.cvs.user}@${getsrc.cvs.host}:${getsrc.cvs.root}"
  -      package="${getsrc.cvs.module}/${getsrc.cvs.root-dir}/${project.content-dir}"
  +      package="${getsrc.cvs.module}/${project.content-dir}"
         dest="${build.cvsmodule-dir}"
         quiet="true"
         tag="${getsrc.cvs.tag}"
         />
   
       <copy todir="${build.work-dir}">
  -      <fileset dir="${build.cvsmodule-dir}/${getsrc.cvs.module}/${getsrc.cvs.root-dir}"/>
  +      <fileset dir="${build.cvsmodule-dir}/${getsrc.cvs.module}"/>
       </copy>
   
     </target>