public VsCsproj Csproj;
- public VsCsproj Generate (Dictionary<string,MsbuildGenerator> projects, bool showWarnings = false)
+ public VsCsproj Generate (string library_output, Dictionary<string,MsbuildGenerator> projects, bool showWarnings = false)
{
var generatedProjFile = NativeName (Csproj.csProjFilename);
//Console.WriteLine ("Generating: {0}", generatedProjFile);
}
//
// Prebuild code, might be in inputs, check:
- // inputs/LIBRARY-PROFILE.pre
// inputs/LIBRARY.pre
//
string prebuild = Load (library + ".pre");
int q = library.IndexOf ("-");
if (q != -1)
prebuild = prebuild + Load (library.Substring (0, q) + ".pre");
-
+
if (prebuild.IndexOf ("@MONO@") != -1){
prebuild_unix = prebuild.Replace ("@MONO@", "mono").Replace ("@CAT@", "cat");
prebuild_windows = prebuild.Replace ("@MONO@", "").Replace ("@CAT@", "type");
prebuild_unix = prebuild.Replace ("jay.exe", "jay");
prebuild_windows = prebuild;
}
-
const string condition_unix = "Condition=\" '$(OS)' != 'Windows_NT' \"";
const string condition_windows = "Condition=\" '$(OS)' == 'Windows_NT' \"";
prebuild =
- " <PreBuildEvent " + condition_unix + ">" + NewLine + prebuild_unix + NewLine + " </PreBuildEvent>" + NewLine +
+ " <PreBuildEvent " + condition_unix + ">\n" + prebuild_unix + "\n </PreBuildEvent>" + NewLine +
" <PreBuildEvent " + condition_windows + ">" + NewLine + prebuild_windows + NewLine + " </PreBuildEvent>" + NewLine;
var all_args = new Queue<string []> ();
var resp_file_full = Path.Combine (base_dir, response_file);
extra_args = LoadArgs (resp_file_full);
if (extra_args == null) {
- Console.WriteLine ("Unable to open response file: " + resp_file_full);
+ Console.WriteLine ($"{library_output}: Unable to open response file: {resp_file_full}");
Environment.Exit (1);
}
if (CSCParseOption (f [i], ref f))
continue;
- Console.WriteLine ("Failure with {0}", f [i]);
+ Console.WriteLine ("{library_output}: Failure with {0}", f [i]);
Environment.Exit (1);
}
}
string [] source_files;
- //Console.WriteLine ("Base: {0} res: {1}", base_dir, response);
using (var reader = new StreamReader (NativeName (base_dir + "\\" + response))) {
source_files = reader.ReadToEnd ().Split ();
}
if (embedded_resources.Count > 0) {
resources.AppendFormat (" <ItemGroup>" + NewLine);
foreach (var dk in embedded_resources) {
- resources.AppendFormat (" <EmbeddedResource Include=\"{0}\">" + NewLine, dk.Key);
+ var source = dk.Key;
+ if (source.EndsWith (".resources"))
+ source = source.Replace (".resources", ".resx");
+ Console.WriteLine ("Got {0} -> {1}", dk.Key, source);
+ resources.AppendFormat (" <EmbeddedResource Include=\"{0}\">" + NewLine, source);
resources.AppendFormat (" <LogicalName>{0}</LogicalName>" + NewLine, dk.Value);
resources.AppendFormat (" </EmbeddedResource>" + NewLine);
}
// <Name>System-basic</Name>
//</ProjectReference>
var refdistinct = references.Distinct ();
- foreach (string r in refdistinct) {
+ foreach (string reference in refdistinct) {
- var match = GetMatchingCsproj (r, projects);
+ var match = GetMatchingCsproj (library_output, reference, projects);
if (match != null) {
- AddProjectReference (refs, Csproj, match, r, null);
+ AddProjectReference (refs, Csproj, match, reference, null);
} else {
if (showWarnings){
- Console.WriteLine ("{0}: Could not find a matching project reference for {1}", library, Path.GetFileName (r));
+ Console.WriteLine ("{0}: Could not find a matching project reference for {1}", library, Path.GetFileName (reference));
Console.WriteLine (" --> Adding reference with hintpath instead");
}
- refs.Append (" <Reference Include=\"" + r + "\">" + NewLine);
+ refs.Append (" <Reference Include=\"" + reference + "\">" + NewLine);
refs.Append (" <SpecificVersion>False</SpecificVersion>" + NewLine);
- refs.Append (" <HintPath>" + r + "</HintPath>" + NewLine);
+ refs.Append (" <HintPath>" + reference + "</HintPath>" + NewLine);
refs.Append (" <Private>False</Private>" + NewLine);
refs.Append (" </Reference>" + NewLine);
}
int index = r.IndexOf ('=');
string alias = r.Substring (0, index);
string assembly = r.Substring (index + 1);
- var match = GetMatchingCsproj (assembly, projects, explicitPath: true);
+ var match = GetMatchingCsproj (library_output, assembly, projects, explicitPath: true);
if (match != null) {
AddProjectReference (refs, Csproj, match, r, alias);
} else {
Replace ("@FX_VERSION", fx_version).
Replace ("@ASSEMBLYNAME@", Path.GetFileNameWithoutExtension (output_name)).
Replace ("@OUTPUTDIR@", build_output_dir).
+ Replace ("@OUTPUTSUFFIX@", Path.GetFileName (build_output_dir)).
Replace ("@DEFINECONSTANTS@", defines.ToString ()).
Replace ("@DEBUG@", want_debugging_support ? "true" : "false").
Replace ("@DEBUGTYPE@", want_debugging_support ? "full" : "pdbonly").
return ret;
}
- MsbuildGenerator GetMatchingCsproj (string dllReferenceName, Dictionary<string,MsbuildGenerator> projects, bool explicitPath = false)
+ MsbuildGenerator GetMatchingCsproj (string library_output, string dllReferenceName, Dictionary<string,MsbuildGenerator> projects, bool explicitPath = false)
{
// libDir would be "./../../class/lib/net_4_x for example
// project
- if (!dllReferenceName.EndsWith (".dll"))
+ if (!dllReferenceName.EndsWith (".dll") && !dllReferenceName.EndsWith (".exe"))
dllReferenceName += ".dll";
var probe = Path.GetFullPath (Path.Combine (base_dir, dllReferenceName));
return project.Value;
}
}
- Console.WriteLine ("Did not find referenced {0} with libs={1}", dllReferenceName, String.Join (", ", libs));
+
+ // Last attempt, try to find the library in all the projects
+ foreach (var project in projects) {
+ if (project.Value.AbsoluteLibraryOutput.EndsWith (dllReferenceName))
+ return project.Value;
+
+ }
+ var ljoined = String.Join (", ", libs);
+ Console.WriteLine ($"{library_output}: did not find referenced {dllReferenceName} with libs={ljoined}");
foreach (var p in projects) {
- // Console.WriteLine ("{0}", p.Value.AbsoluteLibraryOutput);
+ Console.WriteLine ("{0}", p.Value.AbsoluteLibraryOutput);
}
return null;
}
string library = project.Attribute ("library").Value;
var profile = project.Element ("profile").Value;
+#if false
// Skip facades for now, the tool doesn't know how to deal with them yet.
if (dir.Contains ("Facades"))
continue;
yield return project;
continue;
}
-
+#endif
//
// Do not do 2.1, it is not working yet
// Do not do basic, as there is no point (requires a system mcs to be installed).
// The next ones are to make debugging easier for now
if (profile == "basic")
continue;
- if (profile != "net_4_x" || library.Contains ("tests"))
- continue;
+ // For now -- problem is, our resolver currently only considers the assembly name, and we ahve
+ // conflicing 2.0 and 2.4 versions so for now, we just skip the nunit20 versions
+ if (dir.Contains ("nunit20"))
+ continue;
+
+#if true
+ if (profile != "net_4_x" || library.Contains ("tests"))
+ continue;
+#endif
+ //Console.WriteLine ("Going to handle {0}", library);
yield return project;
}
}
}
foreach (var project in GetProjects (makefileDeps)){
var library_output = project.Element ("library_output").Value;
+ //Console.WriteLine ("=== {0} ===", library_output);
var gen = projects [library_output];
try {
- var csproj = gen.Generate (projects);
+ var csproj = gen.Generate (library_output, projects);
var csprojFilename = csproj.csProjFilename;
if (!sln_gen.ContainsProjectIdentifier (csproj.library)) {
sln_gen.Add (csproj);
// A few other optional solutions
// Solutions with 'everything' and the most common libraries used in development may be of interest
- //WriteSolution (sln_gen, "mcs_full.sln");
+ //WriteSolution (sln_gen, "./mcs_full.sln");
//WriteSolution (small_full_sln_gen, "small_full.sln");
// The following may be useful if lacking visual studio or MonoDevelop, to bootstrap mono compiler self-hosting
//WriteSolution (basic_sln_gen, "mcs_basic.sln");
projects / mono.git / blobdiff