2007-01-06 Marek Sieradzki <marek.sieradzki@gmail.com>

        * Makefile, Main.cs: Moved XBuild files to lib/mono/2.0 from
        lib/mono/xbuild.

svn path=/trunk/mcs/; revision=70571

diff --git a/mcs/tools/xbuild/ChangeLog b/mcs/tools/xbuild/ChangeLog
index 7623dc3bf4f8bdaf2b02a3074a67588e78d99268..1dbc10061d4186cdc534129149b1b4e55a7e5f1d 100644 (file)
--- a/mcs/tools/xbuild/ChangeLog
+++ b/mcs/tools/xbuild/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-06  Marek Sieradzki  <marek.sieradzki@gmail.com>
+
+       * Makefile, Main.cs: Moved XBuild files to lib/mono/2.0 from
+       lib/mono/xbuild.
+
 2006-12-19  Marek Sieradzki  <marek.sieradzki@gmail.com>
 
        * Main.cs: Catch InvalidProjectFileException and

diff --git a/mcs/tools/xbuild/Main.cs b/mcs/tools/xbuild/Main.cs
index dc65e8d1fefbf99659bc5957bbe91fea461ded55..4631ae784e980993ce4efcce7122c85cebbe2480 100644 (file)
--- a/mcs/tools/xbuild/Main.cs
+++ b/mcs/tools/xbuild/Main.cs
@@ -57,7 +57,7 @@ namespace Mono.XBuild.CommandLine {
                
                public MainClass ()
                {
-                       binPath = MonoLocationHelper.GetXBuildDir ();
+                       binPath = ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version20);
                        defaultSchema = Path.Combine (binPath, "Microsoft.Build.xsd");
                        parameters = new Parameters (binPath);
                }

diff --git a/mcs/tools/xbuild/Makefile b/mcs/tools/xbuild/Makefile
index 905bdd3882795d749e5d2b22c85811cbbfbed600..ef2566d68e73e67e7af6c3cb0f5d76ac4d8351ce 100644 (file)
--- a/mcs/tools/xbuild/Makefile
+++ b/mcs/tools/xbuild/Makefile
@@ -9,7 +9,7 @@ include ../../build/executable.make
 
 install-local: install-extras
 
-EXTRAS_DIR = $(mono_libdir)/mono/xbuild
+EXTRAS_DIR = $(mono_libdir)/mono/2.0
 install-extras: 
        $(MKINSTALLDIRS) $(DESTDIR)$(EXTRAS_DIR)
        $(INSTALL_DATA) xbuild/xbuild.rsp $(DESTDIR)$(EXTRAS_DIR)

diff --git a/mcs/tools/xbuild/Parameters.cs b/mcs/tools/xbuild/Parameters.cs
index a2b2b4e5c2689b3d9f30032ed10e00759164ff86..4c704007bb6325e4a183b86f6aa1b6bc5fda0281 100644 (file)
--- a/mcs/tools/xbuild/Parameters.cs
+++ b/mcs/tools/xbuild/Parameters.cs
@@ -115,7 +115,7 @@ namespace Mono.XBuild.CommandLine {
                        }
                }
                
-               private void LoadResponseFile (string filename)
+               void LoadResponseFile (string filename)
                {
                        StreamReader sr = null;
                        string line;