# HG changeset patch
# User Simon Howkins <simonh@symbian.org>
# Date 1278432123 -3600
# Node ID 08f7282dae54d1141b4b43337c4ee7af6b275808
# Parent  b15dfb01fee64673b7152bfb793c91a54caa6e43
Improved hg tagging automation to deal with the unfortunate situation of a package overwriting it's own source files during the build.

diff -r b15dfb01fee6 -r 08f7282dae54 common/templates/tag-hg-code.ant.xml.ftl
--- a/common/templates/tag-hg-code.ant.xml.ftl	Tue Jul 06 16:30:27 2010 +0100
+++ b/common/templates/tag-hg-code.ant.xml.ftl	Tue Jul 06 17:02:03 2010 +0100
@@ -61,6 +61,8 @@
 				<arg value="-i"/>
 				<arg value="${pkg_detail.dst}"/>
 			</exec>
+			<!-- Remove any '+' on the end of the hash (indicating that the package overwrote some of its own source files during the build) -->
+			<propertyregex property="hash12.${count}" override="true" input="${dollar}{hash12.${count}}" regexp="\+$" replace=""/>
 			<!-- Get the full hash id -->
 			<exec executable="hg" dir="${ant['build.drive']}${pkg_detail.dst}" outputproperty="hash40.${count}" logError="true">
 				<arg value="log"/>