svn commit: r1065151 - in /forrest/trunk: etc/README.txt main/build.xml

[cr...@apache.org]

Author: crossley
Date: Sun Jan 30 00:15:51 2011
New Revision: 1065151

URL: http://svn.apache.org/viewvc?rev=1065151&view=rev
Log:
Only release some relevant files in the "etc" directory. Needs cleanup.

Modified:
    forrest/trunk/etc/README.txt
    forrest/trunk/main/build.xml

Modified: forrest/trunk/etc/README.txt
URL: http://svn.apache.org/viewvc/forrest/trunk/etc/README.txt?rev=1065151&r1=1065150&r2=1065151&view=diff
==============================================================================
--- forrest/trunk/etc/README.txt (original)
+++ forrest/trunk/etc/README.txt Sun Jan 30 00:15:51 2011
@@ -3,4 +3,10 @@ Odds-and-ends directory.
 Contents:
 
 RELEASE-NOTES*:  Release notes for various Forrest versions
-build.number:  File automatically generated by build.xml.
+
+build.number:  File automatically generated by build.xml
+
+publishing_our_site.txt : Notes and examples about publishing our project
+site documentation. Other users can learn from our methods.
+
+xmlformat.conf : Configuration file for the Ant build targets.

Modified: forrest/trunk/main/build.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/main/build.xml?rev=1065151&r1=1065150&r2=1065151&view=diff
==============================================================================
--- forrest/trunk/main/build.xml (original)
+++ forrest/trunk/main/build.xml Sun Jan 30 00:15:51 2011
@@ -187,6 +187,11 @@ Remove any build directories in a tree b
     </apply>
   </target>
   <target name="xmlformat-single" depends="init">
+<!-- Notes:
+You need 'xmlformat' locally installed.
+Change the last arg to be your single file.
+See other notes above.
+-->
     <exec dir="${build.dir}" executable="xmlformat">
       <arg line="-f${forrest.home}/etc/xmlformat.conf"/>
       <arg line="-i"/>
@@ -199,6 +204,7 @@ Remove any build directories in a tree b
 <!-- =================================================================== -->
 <!-- Test tidy.sf.net on a single xml-type file                          -->
 <!-- See also etc/tidy-xml.pl                                            -->
+<!-- FIXME: We use 'xmlformat' instead. See above and FOR-644.           -->
 <!-- =================================================================== -->
   <target name="tidy-xml-file" depends="init">
     <exec dir="${build.dir}" executable="tidy">
@@ -260,6 +266,7 @@ Remove any build directories in a tree b
       <fileset dir="${forrest.home}" >
         <exclude name="admin/**"/>
         <exclude name="build/**"/>
+        <exclude name="etc/**"/>
         <exclude name="whiteboard/**"/>
         <exclude name="plugins/**"/>
 <!-- exclude some tools that are not yet ready to be bundled -->
@@ -292,6 +299,15 @@ Remove any build directories in a tree b
         <include name="build/xml-forrest.jar"/>
       </fileset>
     </copy>
+    <echo level="info">Copy some miscellaneous stuff</echo>
+    <copy todir="${dist-shbat.dir}">
+      <fileset dir="${forrest.home}" >
+        <include name="etc/README.txt"/>
+        <include name="etc/RELEASE*.txt"/>
+        <include name="etc/publishing_our_site.txt"/>
+        <include name="etc/xmlformat.conf"/>
+      </fileset>
+    </copy>
 <!-- Fix bin/ permissions -->
     <fixcrlf eol="crlf" srcdir="${dist-shbat.dir}/bin" includes="*.bat"/>
     <fixcrlf eol="lf" srcdir="${dist-shbat.dir}/bin" excludes="*.bat"/>