This now builds System.Xml-basic

svn path=/trunk/mono/; revision=133390

diff --git a/msvc/scripts/System.Xml.pre b/msvc/scripts/System.Xml.pre
index fb83aba1693acaf5c0ee34a9a09179954a45b3de..01d437a4ab90a69c6f238174493e2562c7a4fa74 100644 (file)
--- a/msvc/scripts/System.Xml.pre
+++ b/msvc/scripts/System.Xml.pre
@@ -1,7 +1,7 @@
-..\..\jay\jay.exe -ct < ..\..\jay\skeleton.cs System.Xml.XPath/Parser.jay > System.Xml.XPath/Parser.cs\r
-echo #define XSLT_PATTERN > Mono.Xml.Xsl/PatternParser.cs\r
-..\..\jay\jay.exe -ct < ..\..\jay\skeleton.cs Mono.Xml.Xsl/PatternParser.jay >> Mono.Xml.Xsl/PatternParser.cs\r
-echo #define XSLT_PATTERN > Mono.Xml.Xsl/PatternTokenizer.cs\r
-type System.Xml.XPath/Tokenizer.cs >> Mono.Xml.Xsl/PatternTokenizer.cs\r
-..\..\..\mono\msvc\scripts\prepare .
+$(ProjectDir)\..\..\..\mono\msvc\scripts\prepare.exe $(ProjectDir)..\..\r
+$(ProjectDir)\..\..\jay\jay.exe -ct < $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\System.Xml.XPath\Parser.jay > $(ProjectDir)\System.Xml.XPath\Parser.cs\r
+echo #define XSLT_PATTERN > $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs\r
+$(ProjectDir)\..\..\jay\jay.exe -ct < $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Mono.Xml.Xsl\PatternParser.jay >> $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs\r
+echo #define XSLT_PATTERN > $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs\r
+type $(ProjectDir)\System.Xml.XPath\Tokenizer.cs >> $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs\r
 \r
\ No newline at end of file

diff --git a/msvc/scripts/genproj.cs b/msvc/scripts/genproj.cs
index 08a9da8d4883d6e6c70d0f9224a3f536c95fc1f2..20dd34e8f5550f854d8c97d22d15f2bdc1f30ea2 100644 (file)
--- a/msvc/scripts/genproj.cs
+++ b/msvc/scripts/genproj.cs
@@ -515,7 +515,13 @@ class MsbuildGenerator {
                foreach (string s in source_files){
                        if (s.Length == 0)
                                continue;
-                       sources.Append (String.Format ("   <Compile Include=\"{0}\" />\n", s));
+                       sources.Append (String.Format ("   <Compile Include=\"{0}\" />\n", s.Replace ("/", "\\")));
+               }
+               foreach (string s in built_sources.Split ()){
+                       if (s.Length == 0)
+                               continue;
+                       
+                       sources.Append (String.Format ("   <Compile Include=\"{0}\" />\n", s.Replace ("/", "\\")));
                }
                
                //

diff --git a/msvc/scripts/prepare.cs b/msvc/scripts/prepare.cs
index 2e43b85b62e18998b0c40a4e2feb7e6f185ab96d..3dc3b3cd47ad0cc123cc454ed830044999d96113 100644 (file)
--- a/msvc/scripts/prepare.cs
+++ b/msvc/scripts/prepare.cs
@@ -22,6 +22,11 @@ class Prepare {
        {
                string bdir = args.Length == 0 ? "../../../mcs" : args [0];
 
+               if (!Directory.Exists (Path.Combine(bdir, "class"))){
+                       Console.Error.WriteLine ("The directory {0} does not contain class at {1}", Path.GetFullPath (bdir), Environment.CurrentDirectory);
+                       Environment.Exit (1);
+               }
+               
                Filter (bdir + "/class/System.XML/System.Xml.XPath/Parser.jay",
                        bdir + "/class/System.XML/Mono.Xml.Xsl/PatternParser.jay",
                        (i, o) => o.Write (i.ReadToEnd ().Replace ("%start Expr", "%start Pattern")));