[commit] r2157 - in trunk/SDK/DotNet/CSharpComponentWizard/Templates: . CSharpAddon CSharpInterpreter

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri Mar  1 10:05:28 2013
New Revision: 2157

Log:
META-665 Console.Clear() may fail if output is redirected to a file (or maybe if there is no console

Modified:
   trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon.zip
   trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon/GMEConsole.cs
   trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter.zip
   trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/GMEConsole.cs
   trunk/SDK/DotNet/CSharpComponentWizard/Templates/rezip.sh

Modified: trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon.zip
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon/GMEConsole.cs
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon/GMEConsole.cs	Fri Mar  1 10:04:45 2013	(r2156)
+++ trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpAddon/GMEConsole.cs	Fri Mar  1 10:05:28 2013	(r2157)
@@ -83,7 +83,13 @@
             if (gme != null)
                 gme.ConsoleClear();
             else
-                System.Console.Clear();
+                try
+                {
+                    System.Console.Clear();
+                }
+                catch (IOException) // fails if the console is redirected to a file
+                {
+                }
         }
 
 

Modified: trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter.zip
==============================================================================
Binary file (source and/or target). No diff available.

Modified: trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/GMEConsole.cs
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/GMEConsole.cs	Fri Mar  1 10:04:45 2013	(r2156)
+++ trunk/SDK/DotNet/CSharpComponentWizard/Templates/CSharpInterpreter/GMEConsole.cs	Fri Mar  1 10:05:28 2013	(r2157)
@@ -83,7 +83,13 @@
             if (gme != null)
                 gme.ConsoleClear();
             else
-                System.Console.Clear();
+                try
+                {
+                    System.Console.Clear();
+                }
+                catch (IOException) // fails if the console is redirected to a file
+                {
+                }
         }
 
 

Modified: trunk/SDK/DotNet/CSharpComponentWizard/Templates/rezip.sh
==============================================================================
--- trunk/SDK/DotNet/CSharpComponentWizard/Templates/rezip.sh	Fri Mar  1 10:04:45 2013	(r2156)
+++ trunk/SDK/DotNet/CSharpComponentWizard/Templates/rezip.sh	Fri Mar  1 10:05:28 2013	(r2157)
@@ -1 +1,12 @@
-rm *zip ;  ( cd CSharpInterpreter && /cygdrive/c/Program\ Files/7-Zip/7z.exe a -x\!.svn -r ../CSharpInterpreter.zip * )  && ( cd CSharpAddon/ && /cygdrive/c/Program\ Files/7-Zip/7z.exe a -x\!.svn -r ../CSharpAddon.zip * )
+
+seven_z=7z
+UNAME_S=$(uname -s)
+if [ ${UNAME_S:0:6} == "CYGWIN" ]; then
+ seven_z=/cygdrive/c/Program\ Files/7-Zip/7z.exe
+fi
+if [ ${UNAME_S:0:7} == "MINGW32" ]; then
+ seven_z=/c/Program\ Files/7-Zip/7z.exe
+fi
+
+rm *zip
+( cd CSharpInterpreter && "$seven_z" a -x\!.svn -r ../CSharpInterpreter.zip * ) && ( cd CSharpAddon/ && "$seven_z" a -x\!.svn -r ../CSharpAddon.zip * )