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 Wed, 28 May 2003 02:36:22 GMT
jefft       2003/05/27 19:36:22

  Modified:    src/resources/forrest-shbat forrest.build.xml
  Log:
  Fix the backcopy command, so that new files are copied across
  
  Revision  Changes    Path
  1.72      +14 -7     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.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- forrest.build.xml	26 May 2003 12:15:35 -0000	1.71
  +++ forrest.build.xml	28 May 2003 02:36:22 -0000	1.72
  @@ -72,6 +72,11 @@
       <!-- use of these property should be removed when the siteplan becomes active -->
       <property name="project.skin"        value="forrest-site" />
       <property name="project.status"      location="${project.home}/status.xml" />
  +
  +    <!-- Files we don't want copied from build/* to src/* by the backcopy
  +    command. Relative to build/webapp -->
  +    <property name="forrest.backcopy.excludes" value="**/breadcrumbs.js,WEB-INF/**,status.xml"/>
  +
       <!-- FIXME: rename project.content-dir to project.documentation-dir -->
       <property name="project.content-dir" location="${project.home}/src/documentation"
/>
       <!-- NOTE: Do not rely on this 'project.real-content-dir' property, as it
  @@ -940,15 +945,17 @@
     <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 everything EXCEPT docs that are in the Forrest context directory and
  +    have been modified.
  +    This translates to: copy all docs that are not in the Forrest context
  +    directory, or that are, but are different.
       -->
       <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"/>
  +      <fileset dir="${project.webapp}" excludes="${forrest.backcopy.excludes}">
           <or>
  -          <present targetdir="${project.content-dir}"/>
  +          <not>
  +            <present targetdir="${forrest.home}/context"/>
  +          </not>
             <and>
               <present targetdir="${forrest.home}/context"/>
               <different targetdir="${forrest.home}/context"/>
  
  
  

Mime
View raw message