Changeset 1936Tweet

Timestamp:

Sep 20, 2012, 3:30:53 PM (7 years ago)

Author:

sam

Message:

vslol: more robust error checking.

Location:

trunk/tools/vslol

Files:

• AssemblyInfo.cs (modified) (2 diffs)
• MenuGenerateCompilers.cs (modified) (5 diffs)
• source.extension.vsixmanifest (modified) (1 diff)

trunk/tools/vslol/AssemblyInfo.cs

@@ -5 +5 @@
 
 [assembly: AssemblyTitle("VsLol")]
-[assembly: AssemblyDescription("VsSDK reference sample for Menus and Commands")]
+[assembly: AssemblyDescription("Lol Engine Productivity Tools")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Lol")]
@@ -21 +21 @@
 [assembly: Guid("58968f91-edb8-4a4c-9f4f-ba39fdb4a21a")]
 
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.0.1")]
+[assembly: AssemblyFileVersion("1.0.0.1")]

trunk/tools/vslol/MenuGenerateCompilers.cs

@@ -95 +95 @@
             cmd.WriteToOutputPane("------ Build started: Generating Compilers ------\n");
 
-            int scanner_count = 0, parser_count = 0;
+            int scanner_count = 0, parser_count = 0, error_count = 0;
 
             foreach (Project project in cmd.projects)
             {
-                cmd.WriteToOutputPane("Project " + project.FullName + "\n");
+                cmd.WriteToOutputPane("Project " + project.Name + "\n");
 
                 string project_path = Path.GetDirectoryName(project.FullName);
@@ -129 +129 @@
                     if (item.Name.EndsWith("-scanner.l"))
                     {
-                        cmd.WriteToOutputPane("   flex.exe " + filename + "\n");
+                        cmd.WriteToOutputPane("flex.exe " + filename + "\n");
 
                         string basename = Path.GetFileName(filename.Substring(0, filename.LastIndexOf("-scanner.l")));
-                        cmd.Run(project_path,
-                                flex_path + "\\bin\\flex.exe",
-                                "-v -o "
-                                 + "generated/" + basename + "-scanner.cpp "
-                                 + filename,
-                                "");
+                        if (!cmd.Run(project_path,
+                                     flex_path + "\\bin\\flex.exe",
+                                     "-v -o "
+                                      + "generated/" + basename + "-scanner.cpp "
+                                      + filename,
+                                     ""))
+                            ++error_count;
 
                         ++scanner_count;
@@ -144 +145 @@
                     if (item.Name.EndsWith("-parser.y"))
                     {
-                        cmd.WriteToOutputPane("   bison.exe " + filename + "\n");
+                        cmd.WriteToOutputPane("bison.exe " + filename + "\n");
 
                         string basename = Path.GetFileName(filename.Substring(0, filename.LastIndexOf("-parser.y")));
-                        cmd.Run(project_path,
-                                bison_path + "\\bin\\bison.exe",
-                                "-v -o "
-                                 + "generated/" + basename + "-parser.cpp "
-                                 + "--defines=generated/" + basename + "-parser.h "
-                                 + "-d "
-                                 + "-b "
-                                 + "generated/" + basename + " "
-                                 + filename,
-                                "BISON_PKGDATADIR=" + bison_path + "\\share\\bison");
+                        if (!cmd.Run(project_path,
+                                     bison_path + "\\bin\\bison.exe",
+                                     "-v -o "
+                                      + "generated/" + basename + "-parser.cpp "
+                                      + "--defines=generated/" + basename + "-parser.h "
+                                      + "-d "
+                                      + "-b "
+                                      + "generated/" + basename + " "
+                                      + filename,
+                                     "BISON_PKGDATADIR=" + bison_path + "\\share\\bison"))
+                            ++error_count;
 
                         ++parser_count;
@@ -163 +165 @@
             }
 
-            cmd.WriteToOutputPane(string.Format("========== Done. {0} scanner(s), {1} parser(s) ==========\n",
-                                  scanner_count, parser_count));
-        }
-
-        void Run(string directory, string executable, string arguments, string env)
+            cmd.WriteToOutputPane(string.Format("========== Done: {0} scanner(s), {1} parser(s), {2} error(s) ==========\n",
+                                  scanner_count, parser_count, error_count));
+        }
+
+        bool Run(string directory, string executable, string arguments, string env)
         {
             System.Diagnostics.Process p = new System.Diagnostics.Process();
@@ -194 +196 @@
                 WriteToOutputPane(output);
                 if (p.ExitCode != 0)
+                {
                     WriteToOutputPane("Error: " + executable + " exited with code " + p.ExitCode + "\n");
+                    return false;
+                }
             }
             catch (Exception e)
             {
                 WriteToOutputPane("Error: failed to launch " + executable + "\n");
-            }
+                return false;
+            }
+
+            return true;
         }
 

trunk/tools/vslol/source.extension.vsixmanifest

@@ -4 +4 @@
     <Name>VsLol</Name>
     <Author>Lol</Author>
-    <Version>0.0</Version>
-    <Description xml:space="preserve">Lol Engine productivity tools.</Description>
+    <Version>1.0.0.1</Version>
+    <Description xml:space="preserve">Lol Engine Productivity Tools.</Description>
     <Locale>1033</Locale>
     <InstalledByMsi>false</InstalledByMsi>