Author: andrews
Date: 2005-11-14 11:30:01 -0500 (Mon, 14 Nov 2005)
New Revision: 53023
Modified:
trunk/mcs/class/System.XML/Assembly/AssemblyInfo.cs
trunk/mcs/class/System.XML/Assembly/ChangeLog
trunk/mcs/class/System.XML/ChangeLog
trunk/mcs/class/System.XML/net_1_1_java_System.Xml.dll.exclude.sources
trunk/mcs/class/System.XML/net_1_1_java_System.Xml.dll.sources
Log:
few fixes to make sys.xml compile on new GH build system
Modified: trunk/mcs/class/System.XML/Assembly/AssemblyInfo.cs
===================================================================
--- trunk/mcs/class/System.XML/Assembly/AssemblyInfo.cs 2005-11-14 16:29:18 UTC
(rev 53022)
+++ trunk/mcs/class/System.XML/Assembly/AssemblyInfo.cs 2005-11-14 16:30:01 UTC
(rev 53023)
@@ -48,13 +48,16 @@
[assembly: AssemblyCopyright("(c) 2003 Various Authors")]
[assembly: AssemblyTrademark("")]
+#if !TARGET_JVM
[assembly: CLSCompliant(true)]
+#endif
[assembly: AssemblyDefaultAlias("System.Xml.dll")]
[assembly: AssemblyInformationalVersion("0.0.0.1")]
[assembly: NeutralResourcesLanguage("en-US")]
[assembly: ComVisible(false)]
[assembly: AllowPartiallyTrustedCallers]
-
+#if !TARGET_JVM
[assembly: AssemblyDelaySign(true)]
[assembly: AssemblyKeyFile("../ecma.pub")]
+#endif
Modified: trunk/mcs/class/System.XML/Assembly/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/Assembly/ChangeLog 2005-11-14 16:29:18 UTC
(rev 53022)
+++ trunk/mcs/class/System.XML/Assembly/ChangeLog 2005-11-14 16:30:01 UTC
(rev 53023)
@@ -1,3 +1,7 @@
+2005-11-14 Andrew Skiba <[EMAIL PROTECTED]>
+
+ * AssemblyInfo.cs: ifdef attributes not supported by GrassHopper
+
2004-11-04 Raja R Harinath <[EMAIL PROTECTED]>
* AssemblyInfo.cs [BOOTSTRAP_NET_2_0]: Set version to 2.0.3600.0.
Modified: trunk/mcs/class/System.XML/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/ChangeLog 2005-11-14 16:29:18 UTC (rev
53022)
+++ trunk/mcs/class/System.XML/ChangeLog 2005-11-14 16:30:01 UTC (rev
53023)
@@ -1,5 +1,10 @@
2005-11-14 Andrew Skiba <[EMAIL PROTECTED]>
+ * net_1_1_java_System.Xml.dll.exclude.sources,
+ net_1_1_java_System.dll.sources: fix filename
+
+2005-11-14 Andrew Skiba <[EMAIL PROTECTED]>
+
* Makefile: add java build profile
* System.Xml.vmwcsproj: replace XmlNodeReader.cs with XmlNodeReader2.cs
and XslDecimalFormat.cs with XslDecimalFormat.jvm.cs
Modified: trunk/mcs/class/System.XML/net_1_1_java_System.Xml.dll.exclude.sources
===================================================================
--- trunk/mcs/class/System.XML/net_1_1_java_System.Xml.dll.exclude.sources
2005-11-14 16:29:18 UTC (rev 53022)
+++ trunk/mcs/class/System.XML/net_1_1_java_System.Xml.dll.exclude.sources
2005-11-14 16:30:01 UTC (rev 53023)
@@ -2,3 +2,4 @@
System.Xml.Serialization/MapCodeGenerator.cs
System.Xml.Serialization/SoapCodeExporter.cs
System.Xml.Serialization/XmlCodeExporter.cs
+Mono.Xml.Xsl/XslDecimalFormat.cs
Modified: trunk/mcs/class/System.XML/net_1_1_java_System.Xml.dll.sources
===================================================================
--- trunk/mcs/class/System.XML/net_1_1_java_System.Xml.dll.sources
2005-11-14 16:29:18 UTC (rev 53022)
+++ trunk/mcs/class/System.XML/net_1_1_java_System.Xml.dll.sources
2005-11-14 16:30:01 UTC (rev 53023)
@@ -1,2 +1,2 @@
#include System.Xml.dll.sources
-Mono.Xml.Xsl/XslDecimalFormatting.jvm.cs
+Mono.Xml.Xsl/XslDecimalFormat.jvm.cs
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
