Author: borisk
Date: 2006-01-30 06:45:42 -0500 (Mon, 30 Jan 2006)
New Revision: 56242
Added:
trunk/mcs/tools/mono-xmltool/XmlTool.sln
trunk/mcs/tools/mono-xmltool/XmlTool.vmwcsproj
trunk/mcs/tools/mono-xmltool/nunit_transform.xslt
Modified:
trunk/mcs/tools/mono-xmltool/ChangeLog
trunk/mcs/tools/mono-xmltool/xmltool.cs
Log:
Added initial stuff for TARGET_JVM.
Modified: trunk/mcs/tools/mono-xmltool/ChangeLog
===================================================================
--- trunk/mcs/tools/mono-xmltool/ChangeLog 2006-01-30 09:49:49 UTC (rev
56241)
+++ trunk/mcs/tools/mono-xmltool/ChangeLog 2006-01-30 11:45:42 UTC (rev
56242)
@@ -1,3 +1,9 @@
+2006-01-30 Boris Kirzner <[EMAIL PROTECTED]>
+ * xmltool.cs: added #ifdef for features not supported in TARGET_JVM.
+ * XmlTool.sln, XmlTool.vmwcsproj: added project and solution files
+ for TARGET_JVM.
+ * nunit_transform.xslt: added xsl transformation for nunit tests.
+
2006-01-30 Atsushi Enomoto <[EMAIL PROTECTED]>
* xmltool.cs : actually environment variable was not handled.
Added: trunk/mcs/tools/mono-xmltool/XmlTool.sln
===================================================================
--- trunk/mcs/tools/mono-xmltool/XmlTool.sln 2006-01-30 09:49:49 UTC (rev
56241)
+++ trunk/mcs/tools/mono-xmltool/XmlTool.sln 2006-01-30 11:45:42 UTC (rev
56242)
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "XmlTool",
"XmlTool.vmwcsproj", "{087B262E-5E5C-4A82-BDF0-224557BE6696}"
+ ProjectSection(ProjectDependencies) = postProject
+ EndProjectSection
+EndProject
+Global
+ GlobalSection(SolutionConfiguration) = preSolution
+ Debug_Java = Debug_Java
+ Release_Java = Release_Java
+ EndGlobalSection
+ GlobalSection(ProjectConfiguration) = postSolution
+ {087B262E-5E5C-4A82-BDF0-224557BE6696}.Debug_Java.ActiveCfg =
Debug_Java|.NET
+ {087B262E-5E5C-4A82-BDF0-224557BE6696}.Debug_Java.Build.0 =
Debug_Java|.NET
+ {087B262E-5E5C-4A82-BDF0-224557BE6696}.Release_Java.ActiveCfg =
Release_Java|.NET
+ {087B262E-5E5C-4A82-BDF0-224557BE6696}.Release_Java.Build.0 =
Release_Java|.NET
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ EndGlobalSection
+ GlobalSection(ExtensibilityAddIns) = postSolution
+ EndGlobalSection
+EndGlobal
Added: trunk/mcs/tools/mono-xmltool/XmlTool.vmwcsproj
===================================================================
--- trunk/mcs/tools/mono-xmltool/XmlTool.vmwcsproj 2006-01-30 09:49:49 UTC
(rev 56241)
+++ trunk/mcs/tools/mono-xmltool/XmlTool.vmwcsproj 2006-01-30 11:45:42 UTC
(rev 56242)
@@ -0,0 +1,22 @@
+<VisualStudioProject>
+ <CSHARP ProjectType="Local" ProductVersion="7.10.3077"
SchemaVersion="2.0" ProjectGuid="{087B262E-5E5C-4A82-BDF0-224557BE6696}">
+ <Build>
+ <Settings ApplicationIcon=""
AssemblyKeyContainerName="" AssemblyName="xmltool" AssemblyOriginatorKeyFile=""
DefaultClientScript="JScript" DefaultHTMLPageLayout="Grid"
DefaultTargetSchema="IE50" DelaySign="false" OutputType="Exe" PreBuildEvent=""
PostBuildEvent="" RootNamespace="XslTransformer"
RunPostBuildEvent="OnBuildSuccess" StartupObject="">
+ <Config Name="Debug_Java"
AllowUnsafeBlocks="false" BaseAddress="285212672"
CheckForOverflowUnderflow="false" ConfigurationOverrideFile=""
DefineConstants="DEBUG;TRACE;JAVA;TARGET_JVM" DocumentationFile=""
DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false"
NoStdLib="false" NoWarn="1595" Optimize="false" OutputPath="bin\Debug_Java\"
RegisterForComInterop="false" RemoveIntegerChecks="false"
TreatWarningsAsErrors="false" WarningLevel="4"/>
+ <Config Name="Release_Java"
AllowUnsafeBlocks="false" BaseAddress="285212672"
CheckForOverflowUnderflow="false" ConfigurationOverrideFile=""
DefineConstants="TRACE;JAVA" DocumentationFile="" DebugSymbols="false"
FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595"
Optimize="true" OutputPath="bin\Release_Java\" RegisterForComInterop="false"
RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>
+ </Settings>
+ <References>
+ <Reference Name="System" AssemblyName="System"
HintPath="..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"/>
+ <Reference Name="System.Data"
AssemblyName="System.Data"
HintPath="..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"/>
+ <Reference Name="System.Xml"
AssemblyName="System.Xml"
HintPath="..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Xml.dll"/>
+ <Reference Name="rt" AssemblyName="rt"
HintPath="..\..\Program Files\Mainsoft\Visual MainWin for
J2EE\jgac\jre5\rt.dll" Private="False"/>
+ </References>
+ </Build>
+ <Files>
+ <Include>
+ <File RelPath="xmltool.cs" SubType="Code"
BuildAction="Compile"/>
+ </Include>
+ </Files>
+ <UserProperties REFS.JarPath.system="..\..\Program
Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.jar"
REFS.JarPath.system.data="..\..\Program Files\Mainsoft\Visual MainWin for
J2EE\jgac\vmw4j2ee_110\System.Data.jar" REFS.JarPath.system.xml="..\..\Program
Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\System.Xml.jar"
REFS.JarPath.rt="..\..\Program Files\Mainsoft\Visual MainWin for
J2EE\jre5\lib\rt.jar" project.JDKType="1.5.0_05"/>
+ </CSHARP>
+ <VisualMainWin><Project Prop2023="1.5.0_05" Prop2024="" Prop2026=""
Prop2015="" Version="1.7.0" ProjectType="1"/><References/><Configs><Config
Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0" Prop2004="0" Prop2005="0"
Prop2006="" Prop2007="" Prop2008="" Prop2009="" Prop2010="" Prop2011="0"
Prop2012="0" Prop2013="" Prop2014="0" Prop2016="" Prop2027="" Prop2019="0"
Prop2020="285212672" Prop2021="4096" Prop2022="0" Prop2017="0" Prop2018="0"
Name="Debug_Java"/><Config Prop2000="0" Prop2001="0" Prop2002="0" Prop2003="0"
Prop2004="0" Prop2005="0" Prop2006="" Prop2007="" Prop2008="" Prop2009=""
Prop2010="" Prop2011="0" Prop2012="0" Prop2013="" Prop2014="0" Prop2016=""
Prop2027="" Prop2019="0" Prop2020="285212672" Prop2021="4096" Prop2022="0"
Prop2017="0" Prop2018="0"
Name="Release_Java"/></Configs></VisualMainWin></VisualStudioProject>
Added: trunk/mcs/tools/mono-xmltool/nunit_transform.xslt
===================================================================
--- trunk/mcs/tools/mono-xmltool/nunit_transform.xslt 2006-01-30 09:49:49 UTC
(rev 56241)
+++ trunk/mcs/tools/mono-xmltool/nunit_transform.xslt 2006-01-30 11:45:42 UTC
(rev 56242)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+
+<xsl:output method="text" indent="no"/>
+<xsl:strip-space elements="*" />
+
+<xsl:template match="/">
+ <xsl:apply-templates/>
+</xsl:template>
+
+<xsl:template match="//[EMAIL PROTECTED]'False']">
+ <xsl:text>
+ </xsl:text>
+ <xsl:value-of select="@name" />
+</xsl:template>
+
+<xsl:template match="test-results">
+ <xsl:if test="@failures!='0'">
+ <xsl:text>Failures number :</xsl:text>
+ <xsl:value-of select="@failures"/>
+ <xsl:text>
+ Failed tests:</xsl:text>
+ <xsl:apply-templates select="//test-case"/>
+ </xsl:if>
+</xsl:template>
+
+</xsl:stylesheet>
Modified: trunk/mcs/tools/mono-xmltool/xmltool.cs
===================================================================
--- trunk/mcs/tools/mono-xmltool/xmltool.cs 2006-01-30 09:49:49 UTC (rev
56241)
+++ trunk/mcs/tools/mono-xmltool/xmltool.cs 2006-01-30 11:45:42 UTC (rev
56242)
@@ -5,10 +5,11 @@
using System.Xml.Schema;
using System.Xml.Xsl;
using System.Xml.XPath;
+#if !TARGET_JVM
using Commons.Xml.Nvdl;
using Commons.Xml.Relaxng;
using Commons.Xml.Relaxng.Rnc;
-
+#endif
using XSchema = System.Xml.Schema.XmlSchema;
namespace Commons.Xml.Relaxng
@@ -59,6 +60,7 @@
case "--help":
Usage ();
return;
+#if !TARGET_JVM
case "--validate-rnc":
ValidateRelaxngCompact (args);
return;
@@ -68,18 +70,22 @@
case "--validate-nvdl":
ValidateNvdl (args);
return;
+#endif
case "--validate-xsd":
ValidateXsd (args);
return;
+#if !TARGET_JVM
case "--validate":
ValidateAuto (args);
return;
+#endif
case "--transform":
Transform (args);
return;
}
}
+#if !TARGET_JVM
static void ValidateAuto (string [] args)
{
if (args.Length < 1) {
@@ -137,6 +143,7 @@
nvr.Read ();
xtr.Close ();
}
+#endif
static void ValidateXsd (string [] args)
{
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
