Fix Mono build issues.

IronLanguages · Feb 6, 2011 · f86f276 · f86f276
1 parent 8036157
commit f86f276
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 23 deletions.
diff --git a/Hosts/IronRuby.Rack/Src/Cassini/Cassini.csproj b/Hosts/IronRuby.Rack/Src/Cassini/Cassini.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(SolutionDir)..\Solutions\Common.proj" />
+  <Import Project="$(ProjectDir)..\..\..\..\Solutions\Common.proj" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

diff --git a/Hosts/IronRuby.Rack/Src/IronRuby.Rack.csproj b/Hosts/IronRuby.Rack/Src/IronRuby.Rack.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(SolutionDir)..\Solutions\Common.proj" />
+  <Import Project="$(ProjectDir)..\..\..\Solutions\Common.proj" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

diff --git a/Languages/Ruby/Ruby/Builtins/RubyEncoding.cs b/Languages/Ruby/Ruby/Builtins/RubyEncoding.cs
@@ -47,13 +47,8 @@ public class RubyEncoding : ISerializable, IExpressionSerializable {
         public const int CodePageBig5 = 950;
         public const int CodePageAscii = 20127;
 
-        // Windows returns 2 EUC-JP encodings (CP 20932 and CP 51932).
-        // It seems CP20932 is closest to the encoding that MRI calls Encoding::EUC_JP,  although the mapping is not exactly the same.
-        // Differences:
-        //                         CP20932   MRI
-        // A1 BD                -> U+2015    U+2014
-        // mapping for many codepoints is undeffined in MRI
-        public const int CodePageEUCJP = 20932;
+        // Windows returns 2 EUC-JP encodings (CP 20932 and CP 51932). Mono implements EUC-JP as 51932 and doesn't support 20932.
+        public const int CodePageEUCJP = 51932;
 
         public const int CodePageUTF7 = 65000;
         public const int CodePageUTF8 = 65001;
@@ -188,7 +183,7 @@ internal sealed class Deserializer : ISerializable, IObjectReference {
 
                 // disambiguates CP 20932 and CP 51932:
                 case RubyEncoding.CodePageEUCJP: return "EUC-JP";
-                case 51932: return "CP51932";
+                case 20932: return "CP20932";
 
                 case 50220: return "ISO-2022-JP";
                 case 50222: return "CP50222";

diff --git a/Languages/Ruby/Tests/Scripts/unit_tests.rb b/Languages/Ruby/Tests/Scripts/unit_tests.rb
@@ -7,10 +7,19 @@ def banner(msg, size=70, char="=")
 
 if ENV['DLR_VM'] && ENV['DLR_VM'].include?("mono")
    exclude = "/exclude"
-   # critical:
-   exclude += " ClrToString1 ClrTypeVariance1 Backtrace7"
-   # failures:
-   exclude += " Interpreter3 MutableString_Reverse Encoding_Host2 Dir1 RegexEncoding2 RegexEncoding2 ClrGenerics3 Scenario_RubyExceptions7 Backtrace1 Backtrace2 Backtrace3 Backtrace4 Backtrace6 Inspect1 RubyHosting5 ClrVisibility1"
+   # critical (https://bugzilla.novell.com/show_bug.cgi?id=6698080):
+   exclude += " InstanceVariables3 Scenario_RubyExceptions12 Scenario_RubyExceptions12A Scenario_RubyExceptions14 Scenario_RubyExceptions15 Scenario_RubyExceptions16 Scenario_RubyRescueStatement1 ExceptionArg1 ExceptionArg2 RescueSplat1 RescueSplat2 RescueSplat3 RescueSplat4 RescueSplat5 Backtrace7"
+
+   # http://bugzilla.novell.com/show_bug.cgi?id=669813
+   exclude += " RegexTransform1"
+
+   # http://bugzilla.novell.com/show_bug.cgi?id=643371
+   exclude += " Scenario_RubyExceptions7 Backtrace2 Backtrace3 Backtrace4 Backtrace6"
+
+   # other failures:
+   exclude += " MutableString_GetHashCode MutableString_ValidEncoding1 Interpreter3 Encoding_Host2 ClrExtensionMethods0 Dlr_RubyObjects"
+
+   flags = ["/verbose"]
 end
 
 ENV['DLR_BIN'] ||= File.join(ENV['DLR_ROOT'], "bin/Debug")

diff --git a/Runtime/Samples/Hosting/Scenarios/Hosting Scenarios.csproj b/Runtime/Samples/Hosting/Scenarios/Hosting Scenarios.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(SolutionDir)..\Solutions\Common.proj" />
+  <Import Project="$(ProjectDir)..\..\..\..\Solutions\Common.proj" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

diff --git a/Runtime/Tests/HostingTest/HostingTest.csproj b/Runtime/Tests/HostingTest/HostingTest.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(SolutionDir)..\Solutions\Common.proj" />
+  <Import Project="$(ProjectDir)..\..\..\Solutions\Common.proj" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

diff --git a/Runtime/Tests/Metadata/Metadata.csproj b/Runtime/Tests/Metadata/Metadata.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(SolutionDir)..\Solutions\Common.proj" />
+  <Import Project="$(ProjectDir)..\..\..\Solutions\Common.proj" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

diff --git a/Runtime/Tests/RowanTest.Common/RowanTest.Common.csproj b/Runtime/Tests/RowanTest.Common/RowanTest.Common.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <Import Project="$(SolutionDir)..\Solutions\Common.proj" />
+  <Import Project="$(ProjectDir)..\..\..\Solutions\Common.proj" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

diff --git a/Runtime/Tests/TestInternalDLR/TestInternalDLR.csproj b/Runtime/Tests/TestInternalDLR/TestInternalDLR.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <Import Project="$(SolutionDir)..\Solutions\Common.proj" />
+  <Import Project="$(ProjectDir)..\..\..\Solutions\Common.proj" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

diff --git a/Solutions/Dlr.sln b/Solutions/Dlr.sln
@@ -106,9 +106,6 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hosting Scenarios", "..\Runtime\Samples\Hosting\Scenarios\Hosting Scenarios.csproj", "{801BAE60-3562-43E1-B33F-6A180D6029E1}"
 EndProject
 Global
-	GlobalSection(TestCaseManagementSettings) = postSolution
-		CategoryFile = Dlr.vsmdi
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		FxCop|Any CPU = FxCop|Any CPU

diff --git a/Test/ClrAssembly/ClrAssembly.csproj b/Test/ClrAssembly/ClrAssembly.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="2.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(SolutionDir)..\Solutions\Common.proj" />
+  <Import Project="$(ProjectDir)..\..\Solutions\Common.proj" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>