dist build fix (docs go before tests, to get the results in the docs)

git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@352376 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index 3ae7a4d7b655d205359a93606f4cb2177c2053b0..e4e1ea941118169585f0695cb88ecef682fbbc88 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -429,7 +429,7 @@ printed.
   <!-- ================================== -->
   
   <target  name="testmodule"   
-           depends="clean, compile, test, jar, docs, metrics, javadocs"
+           depends="clean, docs, compile, test, jar, metrics, javadocs"
            description="Testing that all major targets work; useful before a commit"/>
 
   <!-- ================================== -->

diff --git a/layout.xml b/layout.xml
index bc75e5bf540fef6770233dc34813bd0f1c691d26..08e11921d81da00b58a2834028e409fe2d8a2220 100644 (file)
--- a/layout.xml
+++ b/layout.xml
@@ -64,8 +64,11 @@
   <distributions dir="./dist">
    <source dir="./dist/src"/>
    <bin dir="./dist/bin">
-     <library dir="./dist/bin/lib"/>
-     <documentation dir="./dist/bin/docs"/>
+     <library dir="./dist/bin/lib">
+       <core dir="./dist/bin/lib"/>
+       <optional dir="./dist/bin/lib/optional"/>     
+     </library>
+     <documentation dir="./dist/bin/build/docs"/>
      <info dir="./dist/bin"/>
      <build dir="./dist/bin/build"/>
      <legal dir="./dist/bin/legal"/>