forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From je...@apache.org
Subject cvs commit: xml-forrest/src/resources/forrestbot2/core cvs.xml forrestbot.xml local.xml
Date Sat, 04 Oct 2003 14:07:09 GMT
jefft       2003/10/04 07:07:09

  Modified:    src/resources/forrestbot2 xml-forrest.xml xml-xmlbeans.xml
               src/resources/forrestbot2/core cvs.xml forrestbot.xml
                        local.xml
  Added:       src/resources/forrestbot2 xml-fop.xml
  Log:
  Cleanups, fixes, some additional diagnostics
  
  Revision  Changes    Path
  1.3       +0 -2      xml-forrest/src/resources/forrestbot2/xml-forrest.xml
  
  Index: xml-forrest.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/forrestbot2/xml-forrest.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- xml-forrest.xml	4 Oct 2003 08:41:15 -0000	1.2
  +++ xml-forrest.xml	4 Oct 2003 14:07:09 -0000	1.3
  @@ -3,7 +3,5 @@
   
     <import file="core/forrestbot.xml"/>
   
  -  <target name="getsrc" depends="local.getsrc"/>
  -
   </project>
    
  
  
  
  1.3       +2 -4      xml-forrest/src/resources/forrestbot2/xml-xmlbeans.xml
  
  Index: xml-xmlbeans.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/forrestbot2/xml-xmlbeans.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- xml-xmlbeans.xml	4 Oct 2003 08:41:15 -0000	1.2
  +++ xml-xmlbeans.xml	4 Oct 2003 14:07:09 -0000	1.3
  @@ -2,12 +2,10 @@
   <project name="xml-xmlbeans" default="main">
   
     <property name="project.root-dir" value="website"/>
  -  <import file="core/forrestbot.xml"/>
   
  -  <target name="getsrc" depends="local.getsrc"/>
  +  <import file="core/forrestbot.xml"/>
   
  -  <!-- <target name="notify" depends="email.notify-onfail"/> -->
  -  <target name="notify" depends="local.notify"/>
  +  <!--<target name="getsrc" depends="local.getsrc"/>-->
   
   </project>
    
  
  
  
  1.1                  xml-forrest/src/resources/forrestbot2/xml-fop.xml
  
  Index: xml-fop.xml
  ===================================================================
  <?xml version="1.0"?>
  <project name="xml-fop" default="main">
  
    <property name="project.root-dir" value="/home/jeff/apache/xml/xml-fop"/>
    <import file="core/forrestbot.xml"/>
    <target name="getsrc" depends="local.getsrc"/>
  
  </project>
   
  
  
  
  1.2       +3 -2      xml-forrest/src/resources/forrestbot2/core/cvs.xml
  
  Index: cvs.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/forrestbot2/core/cvs.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- cvs.xml	1 Oct 2003 12:16:54 -0000	1.1
  +++ cvs.xml	4 Oct 2003 14:07:09 -0000	1.2
  @@ -12,17 +12,18 @@
     <property name="project.root-dir" value="."/>
   
     <target name="getsrc">
  +
       <cvspass cvsroot=":pserver:${user}@${host}:${root}" password="${password}"/>
   
       <cvs cvsRoot=":pserver:${user}@${host}:${root}"
         package="${module}/${project.root-dir}"
         dest="${build.cvsmodule-dir}"
  -      quiet="true"
  +      quiet="false"
         command="checkout -l"
         />
   
       <loadproperties srcFile="${build.cvsmodule-dir}/${module}/${project.root-dir}/forrest.properties"/>
  -    <loadproperties srcFile="default-forrest.properties"/>
  +    <loadproperties srcFile="${bot.home}/default-forrest.properties"/>
   
       <cvs cvsRoot=":pserver:${user}@${host}:${root}"
         package="${module}/${project.root-dir}/${project.content-dir}"
  
  
  
  1.4       +12 -5     xml-forrest/src/resources/forrestbot2/core/forrestbot.xml
  
  Index: forrestbot.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/forrestbot2/core/forrestbot.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- forrestbot.xml	4 Oct 2003 09:45:03 -0000	1.3
  +++ forrestbot.xml	4 Oct 2003 14:07:09 -0000	1.4
  @@ -26,25 +26,31 @@
     <property name="mail.host" value="localhost"/>
     <property name="mail.to"   value="${user.name}@localhost"/>
   
  -
  -  <target name="getsrc" depends="local.getsrc"/>
  +  <target name="getsrc" depends="cvs.getsrc"/>
   
     <target name="site" depends="getsrc">
   
  -    <taskdef name="trycatch" classname="net.sf.antcontrib.logic.TryCatchTask">
  +    <taskdef resource="net/sf/antcontrib/antcontrib.properties">
         <classpath>
           <pathelement location="${forrest.home}/forrestbot/lib/ant-contrib-0.1.jar"/>
         </classpath>
       </taskdef>
   
  -    <trycatch>
  +    <trycatch property="errmsg">
         <try>
           <record name="${build.logfile}" action="start"/>
  +        <echo>
  +          ....... Forrest render START
  +          ... Rendering docs in ${build.work-dir}
  +        </echo>
           <antcall target="forrest.site" inheritAll="false">
             <param name="project.home" value="${build.work-dir}"/>
             <param name="project.build-dir" value="${build.work-dir}"/>
             <param name="project.site-dir" value="${build.site-dir}"/>
           </antcall>
  +        <echo>
  +          ....... Forrest render END
  +        </echo>
           <record name="${build.logfile}" action="stop"/>
           <property name="completion-status" value="succeeded" />
         </try>
  @@ -53,6 +59,7 @@
           <echo>Oops, something broke</echo>
           <property name="completion-status" value="FAILED" />
           <property name="build-failed" value="true"/>
  +        <throw refid="exception" message="${errmsg}"/>
         </catch>
       </trycatch>
       <copy file="${build.logfile}" tofile="${build.logfile-stored}"/>
  @@ -60,7 +67,7 @@
   
     <target name="deploy" depends="local.deploy"/>
   
  -  <target name="notify" depends="email.notify"/>
  +  <target name="notify" depends="local.notify"/>
   
     <target name="main" depends="getsrc, site, deploy, notify"/>
   
  
  
  
  1.3       +15 -4     xml-forrest/src/resources/forrestbot2/core/local.xml
  
  Index: local.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/forrestbot2/core/local.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- local.xml	4 Oct 2003 08:41:15 -0000	1.2
  +++ local.xml	4 Oct 2003 14:07:09 -0000	1.3
  @@ -1,23 +1,34 @@
   <project name="local">
   
  -  <property name="local.root-dir" value="${user.home}/apache/xml/${ant.project.name}/${project.root-dir}"/>
     <property name="build.work-dir"         value="work/${ant.project.name}"/>
   
     <target name="getsrc">
  +    <echo>
  +      ....... local.getsrc START
  +      Copying source from ${project.root-dir}
  +    </echo>
       <mkdir dir="${build.work-dir}"/>
       <copy todir="${build.work-dir}">
  -      <fileset dir="${local.root-dir}">
  +      <fileset dir="${project.root-dir}">
           <include name="forrest.properties"/>
           <include name="status.xml"/>
           <include name="module.xml"/>
         </fileset>
       </copy>
  +    <echo>
  +      Loading ${build.work-dir}/forrest.properties..
  +    </echo>
       <loadproperties srcFile="${build.work-dir}/forrest.properties"/>
       <loadproperties srcFile="${bot.home}/default-forrest.properties"/>
  -
  +    <echo>
  +      Copying source from ${project.root-dir}/${project.content-dir}
  +    </echo>
       <copy todir="${build.work-dir}/${project.content-dir}">
  -      <fileset dir="${local.root-dir}/${project.content-dir}"/>
  +      <fileset dir="${project.root-dir}/${project.content-dir}"/>
       </copy>
  +    <echo>
  +      ....... local.getsrc END
  +    </echo>
     </target>
   
     <target name="deploy">
  
  
  

Mime
View raw message