Procházet zdrojové kódy

few fixes to make sys.xml compile on new GH build system

svn path=/trunk/mcs/; revision=53023
Andrew Skiba před 20 roky
rodič
revize
b83a8c099f

+ 4 - 1
mcs/class/System.XML/Assembly/AssemblyInfo.cs

@@ -48,13 +48,16 @@ using System.Runtime.InteropServices;
 [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

+ 4 - 0
mcs/class/System.XML/Assembly/ChangeLog

@@ -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.

+ 5 - 0
mcs/class/System.XML/ChangeLog

@@ -1,3 +1,8 @@
+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

+ 1 - 0
mcs/class/System.XML/net_1_1_java_System.Xml.dll.exclude.sources

@@ -2,3 +2,4 @@ Mono.Xml.Xsl/ScriptCompilerInfo.cs
 System.Xml.Serialization/MapCodeGenerator.cs
 System.Xml.Serialization/SoapCodeExporter.cs
 System.Xml.Serialization/XmlCodeExporter.cs
+Mono.Xml.Xsl/XslDecimalFormat.cs

+ 1 - 1
mcs/class/System.XML/net_1_1_java_System.Xml.dll.sources

@@ -1,2 +1,2 @@
 #include System.Xml.dll.sources
-Mono.Xml.Xsl/XslDecimalFormatting.jvm.cs
+Mono.Xml.Xsl/XslDecimalFormat.jvm.cs