Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlateralusX <lateralusx.github@gmail.com>2019-02-01 15:17:28 +0300
committerlateralusX <lateralusx.github@gmail.com>2019-02-05 20:34:20 +0300
commitdfa2fe6d2b0988bcf66c707dd41c809def4bace0 (patch)
tree5c39c98a1025f58846728e1eb7128301a7b8d409 /msvc/mono.external.targets
parentc39e3e1200121563100fb174ee62166fb46298ed (diff)
Add better support to dynamically setup content of config.h in Windows MSVC builds.
When running tests on CI the runtime is configured from autogen.sh script. When running fullaot there are a couple of features not supported so they are disabled. The problem is that the MSVC Windows builds have its own winconfig.h template, losing all the disabled features from configures config.h. This commit adds support to detect the disable defines from configures config.h if one exists. Since the complexity of this step increases the work previously done in winsetup.bat has been moved into a msbuild target that is used from both within VS build as well as winsetup.bat (there are a couple of other builds using that bat file, so won't remove it). The winconfig.h template we had is quite outdated compared to what’s generated by configure. This commit also updates the winconfig.h to closer match what generated for corresponding mingw build but keep all the Windows specific configurations included in current version.
Diffstat (limited to 'msvc/mono.external.targets')
-rw-r--r--msvc/mono.external.targets2
1 files changed, 1 insertions, 1 deletions
diff --git a/msvc/mono.external.targets b/msvc/mono.external.targets
index 022246be92d..6b732ac35de 100644
--- a/msvc/mono.external.targets
+++ b/msvc/mono.external.targets
@@ -23,7 +23,7 @@
if (File.Exists (ConfFile))
{
var regex = new Regex (ConfRegEx);
- using (StreamReader reader = new StreamReader(ConfFile))
+ using (StreamReader reader = new StreamReader (ConfFile))
{
string line;
while ((line = reader.ReadLine ()) != null)