mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.0.0.42

Browse Source 
Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
mcs/class/System/Microsoft.VisualBasic/VBCodeCompiler.cs
View File

@ -48,38 +48,6 @@ namespace Microsoft.VisualBasic
{
internal class VBCodeCompiler : VBCodeGenerator, ICodeCompiler
{
static string windowsMonoPath;
static string windowsvbncPath;
static string unixVbncCommand;
static VBCodeCompiler ()
{
if (Path.DirectorySeparatorChar == '\\') {
PropertyInfo gac = typeof (Environment).GetProperty ("GacPath", BindingFlags.Static | BindingFlags.NonPublic);
MethodInfo get_gac = gac.GetGetMethod (true);
string p = Path.GetDirectoryName (
(string) get_gac.Invoke (null, null));
windowsMonoPath = Path.Combine (
Path.GetDirectoryName (
Path.GetDirectoryName (p)),
"bin\\mono.bat");
if (!File.Exists (windowsMonoPath))
windowsMonoPath = Path.Combine (
Path.GetDirectoryName (
Path.GetDirectoryName (p)),
"bin\\mono.exe");
windowsvbncPath =
Path.Combine (p, "2.0\\vbnc.exe");
} else {
var mscorlibPath = new Uri (typeof (object).Assembly.CodeBase).LocalPath;
var unixMcsPath = Path.GetFullPath (Path.Combine (mscorlibPath, "..", "..", "..", "..", "bin", "vbnc"));
if (File.Exists (unixMcsPath))
unixVbncCommand = unixMcsPath;
else
unixVbncCommand = "vbnc";
}
}
public CompilerResults CompileAssemblyFromDom (CompilerParameters options, CodeCompileUnit e)
{
return CompileAssemblyFromDomBatch (options, new CodeCompileUnit[] { e });
@ -248,10 +216,10 @@ namespace Microsoft.VisualBasic
string[] vbnc_output_lines;
// FIXME: these lines had better be platform independent.
if (Path.DirectorySeparatorChar == '\\') {
vbnc.StartInfo.FileName = windowsMonoPath;
vbnc.StartInfo.Arguments = windowsvbncPath + ' ' + BuildArgs (options, fileNames);
vbnc.StartInfo.FileName = MonoToolsLocator.Mono;
vbnc.StartInfo.Arguments = MonoToolsLocator.VBCompiler + ' ' + BuildArgs (options, fileNames);
} else {
vbnc.StartInfo.FileName = "vbnc";
vbnc.StartInfo.FileName = MonoToolsLocator.VBCompiler;
vbnc.StartInfo.Arguments = BuildArgs (options, fileNames);
}
//Console.WriteLine (vbnc.StartInfo.Arguments);
@ -264,7 +232,7 @@ namespace Microsoft.VisualBasic
Win32Exception exc = e as Win32Exception;
if (exc != null) {
throw new SystemException (String.Format ("Error running {0}: {1}", vbnc.StartInfo.FileName,
Win32Exception.W32ErrorMessage (exc.NativeErrorCode)));
Win32Exception.GetErrorMessage (exc.NativeErrorCode)));
}
throw;
}