[packages,Gcc,4.8] Fixed error messages on mismatched Gcc versions

markfinal · markfinal · commit 7bd242da7475 · 2015-09-21T12:36:34.000+01:00
diff --git a/packages/Gcc-4.8/bam/Scripts/MetaData.cs b/packages/Gcc-4.8/bam/Scripts/MetaData.cs
@@ -88,11 +88,11 @@ public void
             var gccVersion = this.Meta["GccVersion"] as string[];
             if (System.Convert.ToInt32(gccVersion[0]) != (int)this.Meta["ExpectedMajorVersion"])
             {
-                throw new Bam.Core.Exception ("{0} reports version {1}", gccLocation, gccVersion.ToString ());
+                throw new Bam.Core.Exception("{0} reports version {1}. Expected {2}.{3}", gccLocation, System.String.Join(".", gccVersion), this.Meta["ExpectedMajorVersion"], this.Meta["ExpectedMinorVersion"]);
             }
-            if (System.Convert.ToInt32 (gccVersion[1]) != (int)this.Meta["ExpectedMinorVersion"])
+            if (System.Convert.ToInt32(gccVersion[1]) != (int)this.Meta["ExpectedMinorVersion"])
             {
-                throw new Bam.Core.Exception ("{0} reports version {1}", gccLocation, gccVersion.ToString ());
+                throw new Bam.Core.Exception("{0} reports version {1}. Expected {2}.{3}", gccLocation, System.String.Join(".", gccVersion), this.Meta["ExpectedMajorVersion"], this.Meta["ExpectedMinorVersion"]);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -88,11 +88,11 @@ public void`
`88`	`88`	`var gccVersion = this.Meta["GccVersion"] as string[];`
`89`	`89`	`if (System.Convert.ToInt32(gccVersion[0]) != (int)this.Meta["ExpectedMajorVersion"])`
`90`	`90`	`{`
`91`		`- throw new Bam.Core.Exception ("{0} reports version {1}", gccLocation, gccVersion.ToString ());`
	`91`	`+ throw new Bam.Core.Exception("{0} reports version {1}. Expected {2}.{3}", gccLocation, System.String.Join(".", gccVersion), this.Meta["ExpectedMajorVersion"], this.Meta["ExpectedMinorVersion"]);`
`92`	`92`	`}`
`93`		`- if (System.Convert.ToInt32 (gccVersion[1]) != (int)this.Meta["ExpectedMinorVersion"])`
	`93`	`+ if (System.Convert.ToInt32(gccVersion[1]) != (int)this.Meta["ExpectedMinorVersion"])`
`94`	`94`	`{`
`95`		`- throw new Bam.Core.Exception ("{0} reports version {1}", gccLocation, gccVersion.ToString ());`
	`95`	`+ throw new Bam.Core.Exception("{0} reports version {1}. Expected {2}.{3}", gccLocation, System.String.Join(".", gccVersion), this.Meta["ExpectedMajorVersion"], this.Meta["ExpectedMinorVersion"]);`
`96`	`96`	`}`
`97`	`97`	`}`
`98`	`98`