From 9a80b582191ad224657ef965b3a31771488480dc Mon Sep 17 00:00:00 2001
From: Glatzemann <glatzemann@users.noreply.github.com>
Date: Mon, 20 Feb 2012 08:59:13 +0000
Subject: [PATCH] Improved error handling of StockShaderCodeGenerator tool
 (sscg).

---
 Tools/StockShaderCodeGenerator/Compiler.cs            |  4 +++-
 Tools/StockShaderCodeGenerator/Program.cs             | 11 ++++++++---
 .../Properties/AssemblyInfo.cs                        |  6 +++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Tools/StockShaderCodeGenerator/Compiler.cs b/Tools/StockShaderCodeGenerator/Compiler.cs
index b77514ac..2ecd0756 100644
--- a/Tools/StockShaderCodeGenerator/Compiler.cs
+++ b/Tools/StockShaderCodeGenerator/Compiler.cs
@@ -61,7 +61,7 @@ namespace StockShaderCodeGenerator
 {
     public static class Compiler
     {
-        public static void GenerateShaders()
+        public static bool GenerateShaders()
         {
             Console.WriteLine("generating shaders...");
 
@@ -87,12 +87,14 @@ namespace StockShaderCodeGenerator
                 {
                     s.ShaderCompiled = false;
                     Console.WriteLine("--> error occured while compiling shader: {0}", ex.Message);
+                    return false;
                 }
 
                 Configuration.Shaders[i] = s;
             }
 
             Console.WriteLine("finished generating shaders...");
+            return true;
         }
 
         private static Byte[] CompileShader(string RenderSystem, string sourceCode)
diff --git a/Tools/StockShaderCodeGenerator/Program.cs b/Tools/StockShaderCodeGenerator/Program.cs
index 6446b845..4c1636dc 100644
--- a/Tools/StockShaderCodeGenerator/Program.cs
+++ b/Tools/StockShaderCodeGenerator/Program.cs
@@ -81,9 +81,14 @@ namespace StockShaderCodeGenerator
 
             if (Configuration.ConfigurationValid)
             {
-                Compiler.GenerateShaders();
-
-                CodeGenerator.Generate();
+                if (Compiler.GenerateShaders())
+                {
+                    CodeGenerator.Generate();
+                }
+                else
+                {
+                    Console.WriteLine("error while compiling shaders. Code generation skipped...");
+                }
             }
 
 //#if DEBUG
diff --git a/Tools/StockShaderCodeGenerator/Properties/AssemblyInfo.cs b/Tools/StockShaderCodeGenerator/Properties/AssemblyInfo.cs
index cc7ec5cb..aa22406c 100644
--- a/Tools/StockShaderCodeGenerator/Properties/AssemblyInfo.cs
+++ b/Tools/StockShaderCodeGenerator/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("ANX Developer Team")]
 [assembly: AssemblyProduct("StockShaderCodeGenerator")]
-[assembly: AssemblyCopyright("Copyright © ANX Developer Team 2011")]
+[assembly: AssemblyCopyright("Copyright © ANX Developer Team 2011, 2012")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.8.1.*")]
-[assembly: AssemblyFileVersion("0.8.1.0")]
+[assembly: AssemblyVersion("0.8.2.*")]
+[assembly: AssemblyFileVersion("0.8.2.0")]