fix for files.count

releng.wtpbuilder/distribution/jsf.site/publish.xml

@@ -90,17 +90,10 @@
 	</target>
 
 	<target name="countFiles">
-		<!--	files.count is a file that should exist in the drop directory with a count of the zip files in the same directory.
+		<!--	
+		files.count is a file that should exist in the drop directory with a count of the zip files in the same directory.
 		It is required to generate a link to the build on the downloads page.
-		Added remove .zip.MD5 - old files before a count
- -->
-		<delete>
-			<fileset dir="${result}" id="id">
-				<include name="*.MD5" />
-			</fileset>
-		</delete>
-
-		<taskdef name="countFiles" classname="org.eclipse.releng.generators.FileCounter" />
+		 -->
 
 		<countFiles sourceDirectory="${result}" filterString=".zip,.tar.gz" outputFile="${result}/files.count" />
 

releng.wtpbuilder/distribution/wtp.site/build.xml

@@ -80,6 +80,11 @@
         <!-- Copy info for build identification -->
         <copy file="${buildDirectory}/buildmachineinfo.properties" tofile="${result}/buildmachineinfo.properties" />
 
+    	<!-- final count files -->
+    	<countBuildFiles sourceDirectory="${buildDirectory}/${buildLabel}"
+                    filterString=".zip,.tar.gz"
+                    outputFile="${buildDirectory}/${buildLabel}/files.count" />
+    	
     </target>
 
 

releng.wtpbuilder/distribution/wtp.site/publish.xml

@@ -325,20 +325,12 @@
     </target>
 
     <target name="countFiles">
-        <!--	files.count is a file that should exist in the drop directory with a count of the zip files in the same directory.
+        <!--	
+        	files.count is a file that should exist in the drop directory with a count of the zip files in the same directory.
             It is required to generate a link to the build on the downloads page.
-            Added remove .zip.MD5 - old files before a count
         -->
-        <delete>
-            <fileset dir="${resultDir}" id="id">
-                <include name="*.MD5" />
-            </fileset>
-        </delete>
-
- <!--       <taskdef name="countFiles"
-                 classname="org.eclipse.wtp.releng.tools.FileCounter" />
--->
-        <countBuildFiles sourceDirectory="${resultDir}"
+
+    	<countBuildFiles sourceDirectory="${resultDir}"
                     filterString=".zip,.tar.gz"
                     outputFile="${resultDir}/files.count" />
 

releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template

@@ -257,7 +257,7 @@ foreach ($compileSummary->summaryItem as $summaryItem) {
                                         echo "<img src=\"http://download.eclipse.org/webtools/downloads/junit_err.gif\"/><font color=\"" . $errorColor . "\">" . $unitTests_grandTotalErrors . "</font>&nbsp;&nbsp;Total: " . $unitTests_grandTotalTests;
                                 }
                                 else {
-                                        echo "<font color=\"orange\">Unit tests are pending</font>";
+                                        echo "<br /><font color=\"orange\">Unit tests are pending</font>";
                                 }
                                 ?> <br />
                                 <a href="compileResults.php">Compile logs: Code Bundles</a> <?php