You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2009/09/25 22:24:14 UTC

svn commit: r818993 - in /incubator/uima/sandbox/trunk: SandboxDistr/pom.xml SandboxDocs/sandbox_build.xml

Author: schor
Date: Fri Sep 25 20:24:13 2009
New Revision: 818993

URL: http://svn.apache.org/viewvc?rev=818993&view=rev
Log:
UIMA-1591 better copying of generated docs, and impl clean for this

Modified:
    incubator/uima/sandbox/trunk/SandboxDistr/pom.xml
    incubator/uima/sandbox/trunk/SandboxDocs/sandbox_build.xml

Modified: incubator/uima/sandbox/trunk/SandboxDistr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/pom.xml?rev=818993&r1=818992&r2=818993&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/pom.xml (original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/pom.xml Fri Sep 25 20:24:13 2009
@@ -335,6 +335,22 @@
                 </configuration>
                 <goals><goal>run</goal></goals>
               </execution>
+              
+              <execution>
+                <id>CleanDocs</id>
+                <phase>clean</phase>
+                <configuration>
+                  <tasks>
+                    <delete quiet="true" failOnError="false">
+                      <!-- just remove the files, keep the directories, because
+                           these are checked into SVN and it can't handle the removal
+                           of the directory .svn files-->
+                      <fileset dir="docs" includes="**" excludes="**/.svn/**/*"/>
+                    </delete> 
+                  </tasks>
+                </configuration>
+                <goals><goal>run</goal></goals>
+              </execution>
             </executions>
           </plugin>
           

Modified: incubator/uima/sandbox/trunk/SandboxDocs/sandbox_build.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDocs/sandbox_build.xml?rev=818993&r1=818992&r2=818993&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDocs/sandbox_build.xml (original)
+++ incubator/uima/sandbox/trunk/SandboxDocs/sandbox_build.xml Fri Sep 25 20:24:13 2009
@@ -35,11 +35,7 @@
   <import file="${basedir}/../uima-docbook-tool/build/build-docbook.xml"/>  
   
 	<target name="copyDocs" depends="all">
-    <delete dir="${doc.target.dir}" quiet="true"/>
-		<mkdir dir="${doc.target.dir}"/>
-		<mkdir dir="${doc.target.dir}/html"/>
-		<mkdir dir="${doc.target.dir}/pdf"/>
-					
+    					
 		<!-- copy HTML documentation -->
 		<copy todir="${doc.target.dir}/html">
 			<fileset dir="${target.dir}/" includes="images/**,${book_name}/**" excludes="**/*.pdf*"/>
@@ -51,9 +47,13 @@
 		</copy>
     
     <!-- copy to source dir to save for website use -->
-    <!-- delete dir="${basedir}/docs"/ -->  <!-- dangerous? -->
-    <copy todir="${basedir}">
-      <fileset dir="${basedir}/target/bin/${artifactId}" includes="docs/**"/>
+    <!-- note: the form where the todir is just the basedir, and the
+               fileset dir is one dir level higher and
+               there is an include="docs/**" seems to fail to
+               copy the some files.  The form below seems to work better. 
+               Don't know why, but I think there's some interaction with SVN. -->
+    <copy todir="${basedir}/docs">
+      <fileset dir="${basedir}/target/bin/${artifactId}/docs"/>
     </copy>
     
     <!-- copy to pear -->