forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject cvs commit: xml-forrest/src/core forrest.build.xml
Date Mon, 20 Oct 2003 17:04:25 GMT
nicolaken    2003/10/20 10:04:25

  Modified:    src/core forrest.build.xml
  Log:
  Fix fresh-site.
  
  Remove backcopy as we now edit in-place.
  
  Revision  Changes    Path
  1.2       +4 -76     xml-forrest/src/core/forrest.build.xml
  
  Index: forrest.build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/forrest.build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- forrest.build.xml	20 Oct 2003 15:37:49 -0000	1.1
  +++ forrest.build.xml	20 Oct 2003 17:04:25 -0000	1.2
  @@ -83,10 +83,6 @@
       <property name="status"      location="${project.home}/${project.status}" />
       <property name="project.bugtracking-url" value="http://nagoya.apache.org/bugzilla/show_bug.cgi?id="
/>
   
  -    <!-- 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="content-dir" location="${project.home}/${project.content-dir}" />
       <property name="raw-content-dir" location="${project.home}/${project.content-dir}/content"
/>
  @@ -821,9 +817,9 @@
          =============================================================== -->
     <target name="seed" depends="ensure-nocontent"
       description="Seeds a directory with a template project doc structure">
  -    <unzip src="${forrest.home}/fresh-site.zip" 
  -      dest="${project.home}"
  -      overwrite="false"/>
  +     <copy todir="${project.home}" overwrite="false">
  +        <fileset dir="${forrest.home}/fresh-site"/>
  +     </copy>
       <echo>
   -------------------------------
   ~~ Template project created! ~~
  @@ -1041,74 +1037,6 @@
       </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 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="${content-dir}" overwrite="false">
  -      <fileset dir="${project.webapp}" excludes="${forrest.backcopy.excludes}">
  -        <or>
  -          <not>
  -            <present targetdir="${forrest.home}/context"/>
  -          </not>
  -          <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="${content-dir}" id="overridden-files">
  -      <present targetdir="${forrest.home}/context"/>
  -      <different targetdir="${forrest.home}/context"/>
  -    </fileset>
  -    <fileset dir="${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>
  -  <target name="clean" depends="init-props">
  -  <delete dir="${project.build-dir}" />
  -  </target>
   
   <!-- ***************************************************************** -->
   <!-- ***************************************************************** -->
  
  
  

Mime
View raw message