Commits

Anonymous committed ef0fc1c

WW-565: dist shouldn't include clover or junit output

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk@300e221344d-f017-0410-9bd5-d282ab1896d7

Comments (0)

Files changed (1)

             <include name="*.jar"/>
         </fileset>
     </path>
-    
+
     <path id="jalopy.classpath">
         <fileset dir="lib/build/jalopy">
             <include name="*.jar"/>
     <property name="lib.build" value="${lib}/build"/>
     <property name="lib.optional" value="${lib}/optional"/>
     <property name="lib.editor" value="${lib}/editor"/>
-   
+
     <property name="src" value="src"/>
     <property name="src.java" value="${src}/java"/>
     <property name="src.test" value="${src}/test"/>
     <property name="src.etc" value="${src}/etc"/>
     <property name="src.editor" value="${src}/editor"/>
-   
+
     <property name="build" value="build"/>
     <property name="build.test" value="${build}/test"/>
     <property name="build.java-test" value="${build}/java-test"/>
     </target>
 
     <target name="java">
-		  <mkdir dir="${build.java}"/>
+        <mkdir dir="${build.java}"/>
         <javac srcdir="${src.java}" destdir="${build.java}" classpathref="cp" debug="on"/>
         <copy filtering="no" todir="${build.java}">
             <fileset dir="${src.java}">
             </fileset>
         </copy>
     </target>
-    
-	<target name="ensure-test-name" unless="test">
-    	<fail message="You must run this target with -Dtest=TestName"/>
-	</target>
 
-	<target name="runtest" description="Runs the test you specify on the command line with -Dtest=" depends="java, ensure-test-name">
-    	<junit printsummary="withOutAndErr" fork="yes"> 
+    <target name="ensure-test-name" unless="test">
+        <fail message="You must run this target with -Dtest=TestName"/>
+    </target>
+
+    <target name="runtest" description="Runs the test you specify on the command line with -Dtest=" depends="java, ensure-test-name">
+        <junit printsummary="withOutAndErr" fork="yes">
             <classpath>
                 <pathelement location="${build.test}"/>
                 <pathelement location="${build.java-test}"/>
                 <pathelement location="${src.etc}"/>
                 <path refid="cp"/>
             </classpath>
-        	<formatter type="plain" usefile="false"/>
-        	<batchtest>
-	            <fileset dir="${src.test}">
-    	            <include name="**/${test}.java"/>
-        	    </fileset>
-        	</batchtest>
-    	</junit>
-	</target>
+            <formatter type="plain" usefile="false"/>
+            <batchtest>
+                <fileset dir="${src.test}">
+                    <include name="**/${test}.java"/>
+                </fileset>
+            </batchtest>
+        </junit>
+    </target>
 
     <target name="test" depends="format, java">
         <taskdef resource="clovertasks"/>
         <xelements dest="${build.editor}/META-INF">
             <fileset dir="${src.editor}">
                 <include name="**/*.java"/>
-			    </fileset>
-		  </xelements>
+            </fileset>
+        </xelements>
     </target>
 
     <target name="editor-jar" depends="warn-nojdk14,editor-java,create-xelements" if="jdk14">
         <pathconvert pathsep=" " refid="editor.classpath" property="editor.jar.classpath">
             <map from="${lib.dir}${file.separator}" to="lib${file.separator}"/>
         </pathconvert>
-        
+
         <jar basedir="${build.editor}" jarfile="${build}/${name}-editor-${version}.jar">
             <manifest>
                 <attribute name="Main-Class" value="com.opensymphony.xworkeditor.Application"/>
             footer="&lt;a href=&quot;http://www.opensymphony.com/&quot; target=&quot;_top&quot;&gt;XWork Project Page&lt;/a&gt;"
             use="true"
             verbose="false">
-            <link href="http://java.sun.com/j2se/1.3/docs/api/" />
-            <link href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/" />
+            <link href="http://java.sun.com/j2se/1.3/docs/api/"/>
+            <link href="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
         </javadoc>
     </target>
 
 
         <copy todir="${build.dist}/docs">
             <fileset dir="${src.etc}">
-                <include name="*.dtd"/> 
+                <include name="*.dtd"/>
             </fileset>
         </copy>
 
         </copy>
 
         <copy todir="${build.dist}">
-           <fileset dir="${basedir}">
-              <include name="build.*"/>
-           </fileset>
+            <fileset dir="${basedir}">
+                <include name="build.*"/>
+            </fileset>
         </copy>
 
+        <!-- don't ship with clover and junit docs -->
+        <delete dir="${build.dist}/docs/clover"/>
+        <delete dir="${build.dist}/docs/junit"/>
+
         <!-- copy changelog and README -->
         <tstamp/>
         <copy filtering="on" todir="${build.dist}">