You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by he...@apache.org on 2007/01/28 20:35:40 UTC

svn commit: r500861 - in /velocity/engine/branches/Velocity_1.5_BRANCH: README.txt build/build.xml

Author: henning
Date: Sun Jan 28 11:35:39 2007
New Revision: 500861

URL: http://svn.apache.org/viewvc?view=rev&rev=500861
Log:
Make sure that all docs from the root are copied into the
distribution. Update README.txt accordingly.


Modified:
    velocity/engine/branches/Velocity_1.5_BRANCH/README.txt
    velocity/engine/branches/Velocity_1.5_BRANCH/build/build.xml

Modified: velocity/engine/branches/Velocity_1.5_BRANCH/README.txt
URL: http://svn.apache.org/viewvc/velocity/engine/branches/Velocity_1.5_BRANCH/README.txt?view=diff&rev=500861&r1=500860&r2=500861
==============================================================================
--- velocity/engine/branches/Velocity_1.5_BRANCH/README.txt (original)
+++ velocity/engine/branches/Velocity_1.5_BRANCH/README.txt Sun Jan 28 11:35:39 2007
@@ -9,21 +9,26 @@
 
   http://velocity.apache.org/index.html
 
-Here is a description of what each of the top level directories
-contains. Please consult the documentation in each of the lower level
+The following top level directories are in the Velocity distribution
+archive. Please consult the documentation in each of the lower level
 directories for information that is specific to their contents.
 
-bin/        This is a temporary build directory.
 build/      This is where the build scripts live.
-contrib/    The home for source code which is not officially maintained.
 convert/    The WebMacro to Apache Velocity conversion program.
-docs/       This is where the documentation lives.
-examples/   This is where the examples live.
-src/        This is where all of the source code to Velocity lives.
-test/       This is where all of the tests live.
-whiteboard/ The place for developer experimentation (unmaintained).
-xdocs/      This is the .xml files for building the .html files
-            related to the website and documentation.
+docs/       Velocity Documentation in HTML format.
+docs/api/   Velocity Javadocs.
+examples/   Examples how to use Velocity.
+lib/        Dependencies for building and using Velocity.
+lib/test/   Dependencies needed for the various unit tests.
+src/        This is where all of the source code is located.
+test/       Contains test files needed for the unit tests.
+xdocs/      Here are the .xml files for building the .html files
+            related to the website and documentation. The files
+            located in docs/ have been built from these sources.
+
+Caveat! This is the directory structure of the distribution
+archive. If you checked out the source from the Apache Subversion
+Repository, the directory layout is slightly different.
 
             
 REQUIREMENTS

Modified: velocity/engine/branches/Velocity_1.5_BRANCH/build/build.xml
URL: http://svn.apache.org/viewvc/velocity/engine/branches/Velocity_1.5_BRANCH/build/build.xml?view=diff&rev=500861&r1=500860&r2=500861
==============================================================================
--- velocity/engine/branches/Velocity_1.5_BRANCH/build/build.xml (original)
+++ velocity/engine/branches/Velocity_1.5_BRANCH/build/build.xml Sun Jan 28 11:35:39 2007
@@ -627,7 +627,7 @@
     </copy>
 
     <!-- Add freshly built Java docs -->
-    <copy todir="${dist.dir}/docs/docs/api">
+    <copy todir="${dist.dir}/docs/api">
       <fileset dir="${build.javadoc}">
         <include name="**"/>
       </fileset>
@@ -657,16 +657,15 @@
       </fileset>
     </copy>
 
-    <copy file="${velocity.dir}/LICENSE"
-          tofile="${dist.dir}/LICENSE" />
-
-    <copy file="${velocity.dir}/NOTICE"
-          tofile="${dist.dir}/NOTICE" />
-
-    <copy
-      file="${velocity.dir}/README.txt"
-      tofile="${dist.dir}/README.txt"
-    />
+    <copy todir="${dist.dir}">
+      <fileset dir="${velocity.dir}">
+        <include name="LICENSE" />
+        <include name="NOTICE" />
+        <include name="README.txt" />
+        <include name="CONTRIBUTORS" />
+        <include name="WHY_TWO_JARS.txt" />
+      </fileset>
+    </copy>
 
     <copy
       file="${build.dir}/${final.name}.jar"