Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix compiler build, make sure generated solutions include the actual …

…HintPath so VS does not turn lib/basic/System.dll into GAC system.dll, so pass the entire relative path

svn path=/trunk/mono/; revision=133438
  • Loading branch information...
commit 2602bea5042b359923839f382187d518f7eb5009 1 parent 0dbf004
@migueldeicaza migueldeicaza authored
View
38 msvc/scripts/genproj.cs
@@ -32,22 +32,38 @@ static MsbuildGenerator ()
template = input.ReadToEnd ();
}
}
-
- string base_dir, dir;
- string mcs_topdir, class_dir;
+
+ // The directory as specified in order.xml
+ string dir;
+
+ //
+ // Our base directory, this is relative to our exectution point mono/msvc/scripts
+ string base_dir;
+
+ string mcs_topdir;
+
+ // Class directory, relative to
+ string class_dir;
public MsbuildGenerator (string dir)
{
- mcs_topdir = "..\\";
+ this.dir = dir;
- foreach (char c in dir){
- if (c == '/')
- mcs_topdir = "..\\" + mcs_topdir;
+ if (dir == "mcs"){
+ mcs_topdir = "..\\";
+ class_dir = "..\\class\\";
+ base_dir = "..\\..\\..\\mcs\\mcs";
+ } else {
+ mcs_topdir = "..\\";
+
+ foreach (char c in dir){
+ if (c == '/')
+ mcs_topdir = "..\\" + mcs_topdir;
+ }
+ class_dir = mcs_topdir.Substring (3);
+
+ base_dir = "..\\..\\..\\mcs\\" + dir;
}
- class_dir = mcs_topdir.Substring (3);
-
- this.dir = dir;
- base_dir = "..\\..\\..\\mcs\\" + dir;
}
// Currently used
View
8 msvc/scripts/prepare.cs
@@ -32,12 +32,14 @@ static void Main (string [] args)
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")));
-
+ break;
+
+ case "core":
Filter (bdir + "/build/common/Consts.cs.in",
bdir + "/build/common/Consts.cs",
- (i, o) => o.Write (i.ReadToEnd ().Replace ("@MONO_VERSION@", "Mono-VSBuild")));
+ (i, o) => o.Write (i.ReadToEnd ().Replace ("@MONO_VERSION@", "2.5.0")));
break;
-
+
default:
Console.Error.WriteLine ("Unknonw option to prepare.exe {0}", args [1]);
Environment.Exit (1);
View
1  msvc/setup-solution.bat
@@ -6,6 +6,7 @@ if errorlevel 1 goto error
csc -debug -out:scripts\prepare.exe scripts\prepare.cs
if errorlevel 1 goto error
cd scripts
+prepare.exe ..\\..\\..\\mcs core
if errorlevel 1 goto error
genproj.exe
if errorlevel 1 goto error
Please sign in to comment.
Something went wrong with that request. Please try again.