Author: marek
Date: 2006-07-16 17:16:16 -0400 (Sun, 16 Jul 2006)
New Revision: 62663

Added:
   trunk/mcs/tests/test-525.cs
Modified:
   trunk/mcs/gmcs/ChangeLog
   trunk/mcs/gmcs/driver.cs
   trunk/mcs/mcs/ChangeLog
   trunk/mcs/mcs/driver.cs
Log:
2006-07-16  Marek Safar  <[EMAIL PROTECTED]>

        A fix for #70506
        * driver.cs (MainDriver): When a file extension is missing,
        use a default one.

Modified: trunk/mcs/gmcs/ChangeLog
===================================================================
--- trunk/mcs/gmcs/ChangeLog    2006-07-16 16:25:25 UTC (rev 62662)
+++ trunk/mcs/gmcs/ChangeLog    2006-07-16 21:16:16 UTC (rev 62663)
@@ -1,3 +1,9 @@
+2006-07-16  Marek Safar  <[EMAIL PROTECTED]>
+
+       A fix for #70506
+       * driver.cs (MainDriver): When a file extension is missing,
+       use a default one.
+
 2006-07-15  Marek Safar  <[EMAIL PROTECTED]>
 
        * annonymous.cs (AnonymousMethod.CreateScopeType): Fixed nested type

Modified: trunk/mcs/gmcs/driver.cs
===================================================================
--- trunk/mcs/gmcs/driver.cs    2006-07-16 16:25:25 UTC (rev 62662)
+++ trunk/mcs/gmcs/driver.cs    2006-07-16 21:16:16 UTC (rev 62663)
@@ -1609,10 +1609,13 @@
                                int pos = first_source.LastIndexOf ('.');
 
                                if (pos > 0)
-                                       output_file = first_source.Substring 
(0, pos) + RootContext.TargetExt;
+                                       output_file = first_source.Substring 
(0, pos);
                                else
-                                       output_file = first_source + 
RootContext.TargetExt;
+                                       output_file = first_source;
                        }
+                       
+                       if (!Path.HasExtension (output_file))
+                               output_file += RootContext.TargetExt;
 
                        if (!CodeGen.Init (output_file, output_file, 
want_debugging_support))
                                return false;

Modified: trunk/mcs/mcs/ChangeLog
===================================================================
--- trunk/mcs/mcs/ChangeLog     2006-07-16 16:25:25 UTC (rev 62662)
+++ trunk/mcs/mcs/ChangeLog     2006-07-16 21:16:16 UTC (rev 62663)
@@ -1,3 +1,9 @@
+2006-07-16  Marek Safar  <[EMAIL PROTECTED]>
+
+       A fix for #70506
+       * driver.cs (MainDriver): When a file extension is missing,
+       use a default one.
+
 2006-07-15  Marek Safar  <[EMAIL PROTECTED]>
 
        * annonymous.cs (AnonymousMethod.CreateScopeType): Fixed nested type

Modified: trunk/mcs/mcs/driver.cs
===================================================================
--- trunk/mcs/mcs/driver.cs     2006-07-16 16:25:25 UTC (rev 62662)
+++ trunk/mcs/mcs/driver.cs     2006-07-16 21:16:16 UTC (rev 62663)
@@ -1605,10 +1605,13 @@
                                int pos = first_source.LastIndexOf ('.');
 
                                if (pos > 0)
-                                       output_file = first_source.Substring 
(0, pos) + RootContext.TargetExt;
+                                       output_file = first_source.Substring 
(0, pos);
                                else
-                                       output_file = first_source + 
RootContext.TargetExt;
+                                       output_file = first_source;
                        }
+                       
+                       if (!Path.HasExtension (output_file))
+                               output_file += RootContext.TargetExt;
 
                        if (!CodeGen.Init (output_file, output_file, 
want_debugging_support))
                                return false;

Added: trunk/mcs/tests/test-525.cs
===================================================================
--- trunk/mcs/tests/test-525.cs 2006-07-16 16:25:25 UTC (rev 62662)
+++ trunk/mcs/tests/test-525.cs 2006-07-16 21:16:16 UTC (rev 62663)
@@ -0,0 +1,8 @@
+// Compiler options: -out:test-525
+
+public class C
+{
+       public static void Main ()
+       {
+       }
+}
\ No newline at end of file

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to