Merge pull request ccnet#138 from RubenWillems/master

add HtmlReportBuildPlugin to chili mapping
stemarie · Jul 5, 2012 · 5810b5b · 5810b5b
2 parents 87b8120 + 45a0e2c
commit 5810b5b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Tools/docGenerator/Console/ChiliAutomation.cs b/Tools/docGenerator/Console/ChiliAutomation.cs
@@ -327,7 +327,7 @@ private void LoadMapping()
             FileName2ChiliPageNameMapping.Add("cookieStore.wiki", "");
             FileName2ChiliPageNameMapping.Add("farmReportFarmPlugin.wiki", "Farm_Report_Farm_Plugin");
             FileName2ChiliPageNameMapping.Add("finalBuildStatusPlugin.wiki", "Final_Build_Status_Display_Plugin");
-            FileName2ChiliPageNameMapping.Add("htmlReportPlugin.wiki", "");
+            FileName2ChiliPageNameMapping.Add("htmlReportPlugin.wiki", "htmlReportPlugin");
             FileName2ChiliPageNameMapping.Add("latestBuildReportProjectPlugin.wiki", "latestBuildReportProjectPlugin.wiki");
             FileName2ChiliPageNameMapping.Add("multipleXslReportAction.wiki", "Multiple_XSL_Report_Build_Plugin");
             FileName2ChiliPageNameMapping.Add("namedAction.wiki", "");

diff --git a/ccnet.build b/ccnet.build
@@ -37,7 +37,9 @@
 	<property name="assembly.copyright"		readonly="true"		value="Copyright © 2003 - ${datetime::get-year(datetime::now())} ${assembly.company}"  />
 	<property name="assembly.trademark"		readonly="true"		value="" />
 	<property name="assembly.version"		readonly="true"		value="${CCNetLabel}" />
-	<property name="assembly.fileversion"	readonly="true"		value="${CCNetLabel}" />
+	<property name="assembly.fileversion"	readonly="true"		value="${CCNetLabel}" />    
+	<property name="assembly.informationalversion"         unless="${property::exists('LastChangeNumber')}"  value="0000000000000000000000000000000000000000"      />     
+
 
 	<!-- Framework Support
 	http://nant.sourceforge.net/faq.html#framework-support
@@ -97,6 +99,7 @@
 				<attribute type="AssemblyTrademarkAttribute" value="${assembly.trademark}" />
 				<attribute type="AssemblyVersionAttribute" value="${assembly.version}" />
 				<attribute type="AssemblyFileVersionAttribute" value="${assembly.fileversion}" />
+				<attribute type="AssemblyInformationalVersionAttribute" value="Git hash : ${assembly.informationalversion}" />			
 			</attributes>
 		</asminfo>
 	</target>

diff --git a/project/WebDashboard/Dashboard/GenericPlugins/HtmlReportPlugin.cs b/project/WebDashboard/Dashboard/GenericPlugins/HtmlReportPlugin.cs
@@ -28,7 +28,7 @@ namespace ThoughtWorks.CruiseControl.WebDashboard.Dashboard.GenericPlugins
     /// <remarks>
     /// <heading>HTML Source Location</heading>
     /// <para>
-    /// This plug-in can display any file that is in the build folder under artefacts folder for the 
+    /// This plug-in can display any file that is in the build folder under artifacts folder for the 
     /// project. It cannot display files from any other location (for security reasons).
     /// </para>
     /// <para>