# HG changeset patch
# User Simon Howkins <simonh@symbian.org>
# Date 1260446519 0
# Node ID 1de547e13d1327163cb57c7489be2d26e0085a2e
# Parent  6b6a916ded0ca8ddb555a8868a9c6e11f28808a4
Updates to make the build environment check more reasonable:

Mercurial v1.3 permitted
The Java compiler is not a showstopping issue
7-zip can be installed in any location
Update to Helium 5
Helium can be installed in PDT 1.*, not necessarily 1.0
Raptor installation path not significant
Update to Raptor 2.9.*
The Raptor patch to update the bundled version of python is no longer relevant

BRAG calculations updated to ignore items not being in the system path, as this just doesn't matter.

Overall effect is that the build environment check should pass on a machine that is able to do a build!

diff -r 6b6a916ded0c -r 1de547e13d13 common/tools/BuildEnv.xml
--- a/common/tools/BuildEnv.xml	Thu Dec 10 11:48:11 2009 +0000
+++ b/common/tools/BuildEnv.xml	Thu Dec 10 12:01:59 2009 +0000
@@ -41,7 +41,7 @@
 		<tool name="Mercurial">
 			<location strict="false" value="C:\Apps\mercurial\hg.exe"/>
 			<verify version="1.2" showstopper="false">
-				<check name="version" execute="%location% version" values="1\.2\.[1-9]" locator="Mercurial Distributed SCM \(version ([0-9\.]*)\)"/>
+				<check name="version" execute="%location% version" values="1\.[23]\.[0-9]" locator="Mercurial Distributed SCM \(version ([0-9\.]*)\)"/>
 			</verify>
 		</tool>
 		<tool name="Python">
@@ -52,7 +52,7 @@
 		</tool>
 		<tool name="Java Compiler">
 			<location strict="false" value="C:\apps\jdk1.6.0_14\bin\javac"/>
-			<verify version="1.6" showstopper="true">
+			<verify version="1.6" showstopper="false">
 				<check var="JAVA_6_HOME" values="jdk1\.6"/>
 				<check name="version" execute="%JAVA_6_HOME%\bin\javac -version" values="1\.6\.[0-9]_[0-9]+" locator="javac (.*)"/>
 			</verify>
@@ -61,9 +61,8 @@
 			</verify>
 		</tool>
 		<tool name="7-Zip">
-			<location strict="false" value="C:\apps\7-zip\7z.exe"/>
 			<verify version="4.65" showstopper="false">
-				<check name="version" execute="%location% -h" values="4\.65" locator="7-Zip (.*)  Copyright"/>
+				<check name="version" execute="7z.exe -h" values="4\.65" locator="7-Zip (.*)  Copyright"/>
 			</verify>
 		</tool>
 		<tool name="PDT Home">
@@ -80,17 +79,15 @@
 		</tool>
 		<tool name="Helium">
 			<location strict="false" value="C:\Symbian\Tools\PDT_1.0\helium\hlm.bat"/>
-			<verify version="4.0 [patched]" showstopper="true">
-				<check var="HELIUM_HOME" values="[CD]:\\Symbian\\Tools\\PDT_1.0\\helium"/>
-				<check name="version" execute="%HELIUM_HOME%\hlm.bat -f %HELIUM_HOME%\build.xml version" values="4\.0" locator="Helium version: ([\d\.]+)"/>
+			<verify version="5.0" showstopper="true">
+				<check var="HELIUM_HOME" values="[CD]:\\Symbian\\Tools\\PDT_1.\d\\helium"/>
+				<check name="version" execute="%HELIUM_HOME%\hlm.bat -f %HELIUM_HOME%\build.xml version" values="5\.\d" locator="Helium version: ([\d\.]+)"/>
 			</verify>
 		</tool>
 		<tool name="Raptor">
 			<location strict="false" value="C:\apps\raptor2.7.2\bin\sbs.bat"/>
-			<verify version="2.7.2 [patched]" showstopper="true">
-				<check var="SBS_HOME" values="apps\\raptor"/>
-				<check name="version" execute="%SBS_HOME%\bin\sbs.bat -version" values="2\.7\.2" locator="sbs version (.*) \["/>
-				<check name="patch" execute="%SBS_HOME%\win32\python252\python.exe -V" values="2\.5\.4"/>
+			<verify version="2.9.*" showstopper="true">
+				<check name="version" execute="%SBS_HOME%\bin\sbs.bat -version" values="2\.9\.\d" locator="sbs version (.*) \["/>
 			</verify>
 		</tool>
 	</context>
diff -r 6b6a916ded0c -r 1de547e13d13 common/tools/brag/rules.BuildEnvironmentCheck.tsv
--- a/common/tools/brag/rules.BuildEnvironmentCheck.tsv	Thu Dec 10 11:48:11 2009 +0000
+++ b/common/tools/brag/rules.BuildEnvironmentCheck.tsv	Thu Dec 10 12:01:59 2009 +0000
@@ -1,3 +1,4 @@
 ^SHOWSTOPPER RAISED:	critical
 ^ERROR:	major
+^WARNING: .+ CANNOT BE FOUND IN THE SYSTEM PATH	ignore
 ^WARNING:	minor