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/forrest-shbat forrest.build.xml
Date Mon, 26 May 2003 12:15:35 GMT
jefft       2003/05/26 05:15:35

  Modified:    src/resources/forrest-shbat forrest.build.xml
  Log:
  Rewrite 'backcopy' target using a single <copy> and lots of Ant selectors.
  Files will be backcopied if:
   - The file already exists in src/documentation/* (and may be modified)
   - The file exists in the Forrest distribution, but a modified version exists
     in build/webapp/*; ie, the user intends to override a Forrest file
  
  Revision  Changes    Path
  1.71      +66 -18    xml-forrest/src/resources/forrest-shbat/forrest.build.xml
  
  Index: forrest.build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/forrest-shbat/forrest.build.xml,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- forrest.build.xml	26 May 2003 07:12:32 -0000	1.70
  +++ forrest.build.xml	26 May 2003 12:15:35 -0000	1.71
  @@ -708,23 +708,7 @@
       </echo>
     </target>
   
  -  <!--
  -  If you've been editing docs, images etc in build/webapp/*, this target copies
  -  them back to src/documentation/*.  As 'overwrite' is false, this will not
  -  clobber docs legitimately edited in src/documentation/*
  -  -->
  -  <target name="backcopy" depends="init-props" description="If anything has been edited
in build/webapps, copies them
  -    back to src/documentation">
  -    <copy toDir="${project.content-dir}" filtering="false" overwrite="false">
  -      <fileset dir="${project.webapp}">
  -        <present targetdir="${project.content-dir}"/>
  -      </fileset>
  -    </copy>
  -    <!-- Copy new xdocs -->
  -    <copy toDir="${project.xdocs-dir}" filtering="false" overwrite="false">
  -      <fileset dir="${project.webapp}/content/xdocs"/>
  -    </copy>
  -  </target>
  +
   
     <!-- ===============================================================
          Builds a cocoon .war for your project based on the siteplan.
  @@ -935,5 +919,69 @@
          <arg line="jettyconf.xml" />
       </java>
     </target>  
  +
  +
  +<!-- ***************************************************************** -->
  +<!-- ***************************************************************** -->
  +<!-- **                                                             ** -->
  +<!-- **                                                             ** -->
  +<!-- **              BACKCOPY                                       ** -->
  +<!-- **                                                             ** -->
  +<!-- **                                                             ** -->
  +<!-- ***************************************************************** -->
  +<!-- ***************************************************************** -->
  +
  +
  +  <!--
  +  If you've been editing docs, images etc in build/webapp/*, this target copies
  +  them back to src/documentation/*.  As 'overwrite' is false, this will not
  +  clobber docs legitimately edited in src/documentation/*
  +  -->
  +  <target name="backcopy" depends="init-props"
  +    description="If anything has been edited in build/webapps, copies them back to src/documentation">
  +    <!--
  +    Copy files to src/* if they already exist there, or exist in the Forrest
  +    distribution and have been locally modified
  +    -->
  +    <copy toDir="${project.content-dir}" filtering="false" overwrite="false">
  +      <fileset dir="${project.webapp}">
  +        <!-- Bah. Pesky @tokens@, ruining this nice elegant backcopy.. -->
  +        <exclude name="**/breadcrumbs.js"/>
  +        <or>
  +          <present targetdir="${project.content-dir}"/>
  +          <and>
  +            <present targetdir="${forrest.home}/context"/>
  +            <different targetdir="${forrest.home}/context"/>
  +            <type type="file"/>
  +          </and>
  +        </or>
  +      </fileset>
  +    </copy>
  +    <antcall target="overrides"/>
  +  </target>
  +
  +  <target name="overrides" depends="init-props"
  +    description="Prints a summary of which files a project is overriding">
  +    <fileset dir="${project.content-dir}" id="overridden-files">
  +      <present targetdir="${forrest.home}/context"/>
  +      <different targetdir="${forrest.home}/context"/>
  +    </fileset>
  +    <fileset dir="${project.content-dir}" id="overridden-files-unmodified">
  +      <present targetdir="${forrest.home}/context"/>
  +      <not>
  +        <different targetdir="${forrest.home}/context"/>
  +      </not>
  +    </fileset>
  +    <property name="overridden" refid="overridden-files"/>
  +    <property name="overridden-unmodified" refid="overridden-files-unmodified"/>
  +    <echo>
  +      +----------------------------+
  +      | Forrest Overrides report   |
  +      +----------------------------+
  +
  +      Overridden, modified   : ${overridden}
  +      Overridden, unmodified : ${overridden-unmodified}
  +    </echo>
  +  </target>
   
   </project>
  
  
  

Mime
View raw message