2008-08-26 Miguel de Icaza <miguel@novell.com>

	* New console features are used by gmcs.exe, but since we only
	build gmcs.exe with the bootstrap corlib, we need to ensure all
	the new stuff is included in BOOTSTRAP_NET_2_0

svn path=/trunk/mcs/; revision=111669

diff --git a/mcs/class/corlib/System/CStreamReader.cs b/mcs/class/corlib/System/CStreamReader.cs
index 2785ce14cdddb824e1bac50e96c0f66145e4a7d9..148c63b2c81b6d46977719358cd1810546eedb20 100644 (file)
--- a/mcs/class/corlib/System/CStreamReader.cs
+++ b/mcs/class/corlib/System/CStreamReader.cs
@@ -29,7 +29,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_0 && !NET_2_1
+#if (NET_2_0 || BOOTSTRAP_NET_2_0) && !NET_2_1
 using System.Text;
 using System.Runtime.InteropServices;
 

diff --git a/mcs/class/corlib/System/CStreamWriter.cs b/mcs/class/corlib/System/CStreamWriter.cs
index a50e4aba09a2b00ea2c83e34457fbf881f520595..e023554acae81872e6ad1881863b07da64c65b92 100644 (file)
--- a/mcs/class/corlib/System/CStreamWriter.cs
+++ b/mcs/class/corlib/System/CStreamWriter.cs
@@ -31,7 +31,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_0 && !NET_2_1
+#if (NET_2_0 || BOOTSTRAP_NET_2_0) && !NET_2_1
 using System;
 using System.Text;
 

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index 76c2fdf71bf023d15491331865152ee987fff080..22fee7e7ed6ec8184f28ca638f3daa0e85b4cfc9 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-26  Miguel de Icaza  <miguel@novell.com>
+
+       * New console features are used by gmcs.exe, but since we only
+       build gmcs.exe with the bootstrap corlib, we need to ensure all
+       the new stuff is included in BOOTSTRAP_NET_2_0
+
 2008-08-26  Robert Jordan  <robertj@gmx.net>
 
        * AppDomain.cs (get_Evidence): Fix endless recursion exposed

diff --git a/mcs/class/corlib/System/Console.cs b/mcs/class/corlib/System/Console.cs
index f6e666f0bf83ead0a637465ac15021ce100f3ed6..ec9effd876a7ca46b197bade338eebf48971b7eb 100644 (file)
--- a/mcs/class/corlib/System/Console.cs
+++ b/mcs/class/corlib/System/Console.cs
@@ -28,6 +28,9 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
+#if NET_2_0 || BOOTSTRAP_NET_2_0
+#define NET2_API
+#endif
 
 using System.IO;
 using System.Runtime.CompilerServices;
@@ -38,7 +41,7 @@ using System.Text;
 namespace System
 {
        public
-#if NET_2_0
+#if NET2_API
        static
 #else
        sealed
@@ -71,7 +74,7 @@ namespace System
 
                static Console ()
                {
-#if !NET_2_0 || NET_2_1
+#if !NET2_API || NET_2_1
                        Encoding inputEncoding;
                        Encoding outputEncoding;
 #endif
@@ -108,7 +111,7 @@ namespace System
                        ((StreamWriter)stderr).AutoFlush = true;
                        stderr = TextWriter.Synchronized (stderr, true);
 
-#if NET_2_0 && !NET_2_1
+#if NET2_API && !NET_2_1
                        if (!Environment.IsRunningOnWindows && ConsoleDriver.IsConsole) {
                                StreamWriter w = new CStreamWriter (OpenStandardOutput (0), outputEncoding);
                                w.AutoFlush = true;
@@ -121,7 +124,7 @@ namespace System
                                stdout = TextWriter.Synchronized (stdout, true);
                                stdin = new UnexceptionalStreamReader (OpenStandardInput (0), inputEncoding);
                                stdin = TextReader.Synchronized (stdin);
-#if NET_2_0 && !NET_2_1
+#if NET2_API && !NET_2_1
                        }
 #endif
 
@@ -130,7 +133,7 @@ namespace System
                        GC.SuppressFinalize (stdin);
                }
 
-#if !NET_2_0
+#if !NET2_API
                private Console ()
                {
                }
@@ -459,7 +462,7 @@ namespace System
                }
 #endif
 
-#if NET_2_0 && !NET_2_1
+#if NET2_API && !NET_2_1
                public static int Read ()
                {
                        if ((stdin is CStreamReader) && ConsoleDriver.IsConsole) {
@@ -490,7 +493,7 @@ namespace System
 
 #endif
 
-#if NET_2_0 && !NET_2_1
+#if NET2_API && !NET_2_1
                // FIXME: Console should use these encodings when changed
                static Encoding inputEncoding;
                static Encoding outputEncoding;

diff --git a/mcs/class/corlib/System/ConsoleCancelEventArgs.cs b/mcs/class/corlib/System/ConsoleCancelEventArgs.cs
index ba477fe6a4b61080cc4d54ccf1e71457b61bd61c..e342a2c5aaf70237a7faf14c17194bc310c41b29 100644 (file)
--- a/mcs/class/corlib/System/ConsoleCancelEventArgs.cs
+++ b/mcs/class/corlib/System/ConsoleCancelEventArgs.cs
@@ -27,7 +27,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_0
+#if NET_2_0 || BOOTSTRAP_NET_2_0
 namespace System {
        [Serializable]
        public sealed class ConsoleCancelEventArgs : EventArgs {

diff --git a/mcs/class/corlib/System/ConsoleCancelEventHandler.cs b/mcs/class/corlib/System/ConsoleCancelEventHandler.cs
index bac56d76f56b90656013d7e29b10daa368725640..9c5ab6a0199b5baa91bddee4690edeb209c12df5 100644 (file)
--- a/mcs/class/corlib/System/ConsoleCancelEventHandler.cs
+++ b/mcs/class/corlib/System/ConsoleCancelEventHandler.cs
@@ -27,7 +27,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_0
+#if NET_2_0 || BOOTSTRAP_NET_2_0
 namespace System {
        public delegate void ConsoleCancelEventHandler (object sender, ConsoleCancelEventArgs e);
 }

diff --git a/mcs/class/corlib/System/ConsoleColor.cs b/mcs/class/corlib/System/ConsoleColor.cs
index 83d234c4b07f4b57edb9d060c04c91dffcda8afc..813e175ddf47475501787d89557167268105e3bb 100644 (file)
--- a/mcs/class/corlib/System/ConsoleColor.cs
+++ b/mcs/class/corlib/System/ConsoleColor.cs
@@ -27,7 +27,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_0
+#if NET_2_0 || BOOTSTRAP_NET_2_0
 namespace System {
        [Serializable]
        public enum ConsoleColor {

diff --git a/mcs/class/corlib/System/ConsoleDriver.cs b/mcs/class/corlib/System/ConsoleDriver.cs
index 5b093f9461174984a90746bff1c8477fb401cd12..50ea05122767e77eccedae6041c71ffc39f0b6d7 100644 (file)
--- a/mcs/class/corlib/System/ConsoleDriver.cs
+++ b/mcs/class/corlib/System/ConsoleDriver.cs
@@ -27,7 +27,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_0 && !NET_2_1
+#if (NET_2_0||BOOTSTRAP_NET_2_0) && !NET_2_1
 using System.IO;
 using System.Runtime.CompilerServices;
 

diff --git a/mcs/class/corlib/System/ConsoleKey.cs b/mcs/class/corlib/System/ConsoleKey.cs
index 5c71b8c6adade8ee0c56183a76ab560378475b3a..5fb42311d16c96933c7f979f278dee474065c1e0 100644 (file)
--- a/mcs/class/corlib/System/ConsoleKey.cs
+++ b/mcs/class/corlib/System/ConsoleKey.cs
@@ -27,7 +27,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_0
+#if NET_2_0 || BOOTSTRAP_NET_2_0
 namespace System {
 
        [Serializable]

diff --git a/mcs/class/corlib/System/ConsoleKeyInfo.cs b/mcs/class/corlib/System/ConsoleKeyInfo.cs
index 2aba6cff133106d61402a99d81578cf31a707db8..7455965799b938273cc6248eb444c21a65ae91dc 100644 (file)
--- a/mcs/class/corlib/System/ConsoleKeyInfo.cs
+++ b/mcs/class/corlib/System/ConsoleKeyInfo.cs
@@ -27,7 +27,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_0
+#if NET_2_0 || BOOTSTRAP_NET_2_0
 namespace System {
        [Serializable]
        public struct ConsoleKeyInfo {

diff --git a/mcs/class/corlib/System/ConsoleModifiers.cs b/mcs/class/corlib/System/ConsoleModifiers.cs
index 24468198638fe1669890a35b8fe1bfe22e58f2ff..a457aa30981ac19a8af0a5285eab0b8fc181c6a3 100644 (file)
--- a/mcs/class/corlib/System/ConsoleModifiers.cs
+++ b/mcs/class/corlib/System/ConsoleModifiers.cs
@@ -27,7 +27,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_0
+#if NET_2_0 || BOOTSTRAP_NET_2_0
 namespace System {
        [Flags]
        [Serializable]

diff --git a/mcs/class/corlib/System/ConsoleSpecialKey.cs b/mcs/class/corlib/System/ConsoleSpecialKey.cs
index bc6b08a7e447a55c3a3cb4fa927114b0e27830ae..fd939fd0fd17912c9eb1a9473ef7dc4cc3c90093 100644 (file)
--- a/mcs/class/corlib/System/ConsoleSpecialKey.cs
+++ b/mcs/class/corlib/System/ConsoleSpecialKey.cs
@@ -27,7 +27,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_0
+#if NET_2_0 || BOOTSTRAP_NET_2_0
 namespace System {
        [Serializable]
        public enum ConsoleSpecialKey {

diff --git a/mcs/class/corlib/System/IConsoleDriver.cs b/mcs/class/corlib/System/IConsoleDriver.cs
index a503f2121af78c7bab1b2fd87566a0af62b5f0ec..6810ba3076542487a94e1dac2b55743462428300 100644 (file)
--- a/mcs/class/corlib/System/IConsoleDriver.cs
+++ b/mcs/class/corlib/System/IConsoleDriver.cs
@@ -26,7 +26,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_0
+#if NET_2_0 || BOOTSTRAP_NET_2_0
 namespace System {
        interface IConsoleDriver {
                ConsoleColor BackgroundColor { get; set; }

diff --git a/mcs/class/corlib/System/KnownTerminals.cs b/mcs/class/corlib/System/KnownTerminals.cs
index baeebddcbad07addb47278a46a8527b0e068c5ae..ebbcd70025212c9cfa6a6e4e51e3b7f01a668eec 100644 (file)
--- a/mcs/class/corlib/System/KnownTerminals.cs
+++ b/mcs/class/corlib/System/KnownTerminals.cs
@@ -71,7 +71,7 @@
 // }
 //
 
-#if NET_2_0
+#if NET_2_0  || BOOTSTRAP_NET_2_0
 namespace System
 {
        static class KnownTerminals

diff --git a/mcs/class/corlib/System/NullConsoleDriver.cs b/mcs/class/corlib/System/NullConsoleDriver.cs
index 01a4e9bf8cf3e86c28707fb6377c5e5fe613a9ea..b80919bc16796e96763860a330a76702deea3eaf 100644 (file)
--- a/mcs/class/corlib/System/NullConsoleDriver.cs
+++ b/mcs/class/corlib/System/NullConsoleDriver.cs
@@ -26,7 +26,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_0 && !NET_2_1
+#if (NET_2_0 || BOOTSTRAP_NET_2_0) && !NET_2_1
 using System.Runtime.InteropServices;
 using System.Text;
 namespace System {

diff --git a/mcs/class/corlib/System/TermInfoBooleans.cs b/mcs/class/corlib/System/TermInfoBooleans.cs
index 52e656e419a5b43ece650bf791c68870c2dbb0bd..de28ec9e123f7dd6b5644e867c8e80f480c71abf 100644 (file)
--- a/mcs/class/corlib/System/TermInfoBooleans.cs
+++ b/mcs/class/corlib/System/TermInfoBooleans.cs
@@ -27,7 +27,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_0
+#if NET_2_0 || BOOTSTRAP_NET_2_0
 
 // These values are taken from 'man 5 terminfo' and /usr/include/term.h.
 // They are the indexes for the boolean capabilities in a terminfo file.

diff --git a/mcs/class/corlib/System/TermInfoDriver.cs b/mcs/class/corlib/System/TermInfoDriver.cs
index c9eaad85aac50e28c23e055db41819f95b182088..6e1e560c7180b57ba60d513dc52fd89b5d25f3da 100644 (file)
--- a/mcs/class/corlib/System/TermInfoDriver.cs
+++ b/mcs/class/corlib/System/TermInfoDriver.cs
@@ -27,7 +27,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_0 && !NET_2_1
+#if (NET_2_0||BOOTSTRAP_NET_2_0) && !NET_2_1
 //#define DEBUG
 using System.Collections;
 using System.IO;
@@ -37,7 +37,7 @@ namespace System {
        class TermInfoDriver : IConsoleDriver {
                /* Do not rename this field, its looked up from the runtime */
                static bool need_window_dimensions = true;
-               
+               static uint flag = 0xdeadbeef;
                static string [] locations = { "/etc/terminfo", "/usr/share/terminfo", "/usr/lib/terminfo" };
 
                TermInfoReader reader;

diff --git a/mcs/class/corlib/System/TermInfoNumbers.cs b/mcs/class/corlib/System/TermInfoNumbers.cs
index 03f45527d8d782afc80053ccac903fea94caa3cf..32abf6940a77e0a0c04bfaa11e6f197d52d9d43a 100644 (file)
--- a/mcs/class/corlib/System/TermInfoNumbers.cs
+++ b/mcs/class/corlib/System/TermInfoNumbers.cs
@@ -27,7 +27,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_0 && !NET_2_1
+#if (NET_2_0 || BOOTSTRAP_NET_2_0) && !NET_2_1
 
 // These values are taken from 'man 5 terminfo' and /usr/include/term.h.
 // They are the indexes for the numeric capabilities in a terminfo file.

diff --git a/mcs/class/corlib/System/TermInfoReader.cs b/mcs/class/corlib/System/TermInfoReader.cs
index d0e0734d9309a3d8051e91660394bd620b19c9bb..67bcf2ab0993a0865188f0f84fd82623c8a57838 100644 (file)
--- a/mcs/class/corlib/System/TermInfoReader.cs
+++ b/mcs/class/corlib/System/TermInfoReader.cs
@@ -27,7 +27,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_0 && !NET_2_1
+#if (NET_2_0 || BOOTSTRAP_NET_2_0) && !NET_2_1
 using System.IO;
 using System.Text;
 namespace System {

diff --git a/mcs/class/corlib/System/TermInfoStrings.cs b/mcs/class/corlib/System/TermInfoStrings.cs
index a62457f641945eec978e0e7826c6f09ffd246e29..a8fcd16bdeb0a452488193f237f405c05ffb53b4 100644 (file)
--- a/mcs/class/corlib/System/TermInfoStrings.cs
+++ b/mcs/class/corlib/System/TermInfoStrings.cs
@@ -27,7 +27,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_0 && !NET_2_1
+#if (NET_2_0 || BOOTSTRAP_NET_2_0) && !NET_2_1
 
 // These values are taken from 'man 5 terminfo' and /usr/include/term.h.
 // They are the indexes for the string capabilities in a terminfo file.

diff --git a/mcs/class/corlib/System/WindowsConsoleDriver.cs b/mcs/class/corlib/System/WindowsConsoleDriver.cs
index 92a8be2743c58d1fb6350d60e1e1a5423667d853..23c21e86635f9185747df77e651f1c5ebda52435 100644 (file)
--- a/mcs/class/corlib/System/WindowsConsoleDriver.cs
+++ b/mcs/class/corlib/System/WindowsConsoleDriver.cs
@@ -26,7 +26,7 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_2_0 && !NET_2_1
+#if (NET_2_0||BOOTSTRAP_NET_2_0) && !NET_2_1
 using System.Runtime.InteropServices;
 using System.Text;
 namespace System {