diff options
| author | Miguel de Icaza <miguel@gnome.org> | 2009-05-02 19:30:28 +0400 |
|---|---|---|
| committer | Miguel de Icaza <miguel@gnome.org> | 2009-05-02 19:30:28 +0400 |
| commit | 7aedd3b0cf715aee9141877be8bf5506e438b92d (patch) | |
| tree | 9cd25b1f74996c322ca20c544cd26cd6f8a63f63 /msvc | |
| parent | 69fa7e57bbd9850d140263763a598d9b2802048f (diff) | |
This now builds System.Xml-basic
svn path=/trunk/mono/; revision=133390
Diffstat (limited to 'msvc')
| -rw-r--r-- | msvc/scripts/System.Xml.pre | 12 | ||||
| -rw-r--r-- | msvc/scripts/genproj.cs | 8 | ||||
| -rw-r--r-- | msvc/scripts/prepare.cs | 5 |
3 files changed, 18 insertions, 7 deletions
diff --git a/msvc/scripts/System.Xml.pre b/msvc/scripts/System.Xml.pre index fb83aba1693..01d437a4ab9 100644 --- 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
-echo #define XSLT_PATTERN > Mono.Xml.Xsl/PatternParser.cs
-..\..\jay\jay.exe -ct < ..\..\jay\skeleton.cs Mono.Xml.Xsl/PatternParser.jay >> Mono.Xml.Xsl/PatternParser.cs
-echo #define XSLT_PATTERN > Mono.Xml.Xsl/PatternTokenizer.cs
-type System.Xml.XPath/Tokenizer.cs >> Mono.Xml.Xsl/PatternTokenizer.cs
-..\..\..\mono\msvc\scripts\prepare . +$(ProjectDir)\..\..\..\mono\msvc\scripts\prepare.exe $(ProjectDir)..\..
+$(ProjectDir)\..\..\jay\jay.exe -ct < $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\System.Xml.XPath\Parser.jay > $(ProjectDir)\System.Xml.XPath\Parser.cs
+echo #define XSLT_PATTERN > $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs
+$(ProjectDir)\..\..\jay\jay.exe -ct < $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Mono.Xml.Xsl\PatternParser.jay >> $(ProjectDir)\Mono.Xml.Xsl\PatternParser.cs
+echo #define XSLT_PATTERN > $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs
+type $(ProjectDir)\System.Xml.XPath\Tokenizer.cs >> $(ProjectDir)\Mono.Xml.Xsl\PatternTokenizer.cs
\ No newline at end of file diff --git a/msvc/scripts/genproj.cs b/msvc/scripts/genproj.cs index 08a9da8d488..20dd34e8f55 100644 --- 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 2e43b85b62e..3dc3b3cd47a 100644 --- 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"))); |