commit 7add7ec05ea09c1123f1d894f3d668e7aee35bf1
author Ed Willink <ed@willink.me.uk> Mon May 25 11:00:59 2015 +0100
committer Ed Willink <ed@willink.me.uk> Mon May 25 11:25:12 2015 +0100
tree bf546bf74bff5b1b23b4ce1e2d61b65b0b8506e1
parent 0e1a84989d6da794c8dea493ea17335c1d4df225

[releng] Fix generation of Javadoc

releng/org.eclipse.ocl.releng.buckminster/buckminster.cspec

diff --git a/releng/org.eclipse.ocl.releng.buckminster/buckminster.cspec b/releng/org.eclipse.ocl.releng.buckminster/buckminster.cspec
index 3c81486..2c41e5c 100644
--- a/releng/org.eclipse.ocl.releng.buckminster/buckminster.cspec
+++ b/releng/org.eclipse.ocl.releng.buckminster/buckminster.cspec
@@ -9,7 +9,7 @@
             <cs:properties>
                 <cs:property key="checkoutLocation" value="${checkout.location}"/>
                 <cs:property key="mustCreateJavadoc" value="${manage.javadoc}"/>
-                <cs:property key="output" value="${checkout.location}/javadoc/"/>
+                <cs:property key="output" value="${checkout.location}/buildroot/javadoc/"/>
                 <cs:property key="targetPlatform" value="${targetPlatformPath}"/>
             </cs:properties>
         </cs:public>

releng/org.eclipse.ocl.releng.buckminster/scripts/ocl-post-buckminster.sh

diff --git a/releng/org.eclipse.ocl.releng.buckminster/scripts/ocl-post-buckminster.sh b/releng/org.eclipse.ocl.releng.buckminster/scripts/ocl-post-buckminster.sh
index 0330a60..683ddaa 100644
--- a/releng/org.eclipse.ocl.releng.buckminster/scripts/ocl-post-buckminster.sh
+++ b/releng/org.eclipse.ocl.releng.buckminster/scripts/ocl-post-buckminster.sh
@@ -18,8 +18,8 @@
 if [ ${MANAGE_JAVADOC} = "true" ]
 then
   mkdir MDT-OCL.javadoc
-  mv buildroot/buckminster.output/org.eclipse.ocl.releng.buckminster_*-buckminster/javadoc/MDT-OCL-javadoc.zip MDT-OCL.javadoc/MDT-OCL-javadoc.zip
-  rm -rf buildroot/buckminster.output/org.eclipse.ocl.releng.buckminster_*-buckminster/javadoc
+  mv buildroot/javadoc/MDT-OCL-javadoc.zip MDT-OCL.javadoc/MDT-OCL-javadoc.zip
+#  rm -rf buildroot/javadoc
 fi
 
 echo MANAGE_DOC = ${MANAGE_DOC}