diff options
author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2015-02-19 21:12:10 +0300 |
---|---|---|
committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2015-02-19 21:23:23 +0300 |
commit | 042a9afd5004700dc20f53dff1525baa4bcfb32d (patch) | |
tree | f173aa64e5b756ded28317e06d3b462a88817ae5 /msvc | |
parent | cfbb82b747328102ba756151eb3d484cb88de81a (diff) |
[genproj] Fix line endings in generated file to be CRLF
The template uses CRLF everywhere, so we should generate the same to avoid mixed line endings.
Diffstat (limited to 'msvc')
-rw-r--r-- | msvc/scripts/genproj.cs | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/msvc/scripts/genproj.cs b/msvc/scripts/genproj.cs index 60b40363962..49967e6eefb 100644 --- a/msvc/scripts/genproj.cs +++ b/msvc/scripts/genproj.cs @@ -688,8 +688,8 @@ class MsbuildGenerator { const string condition_unix = "Condition=\" '$(OS)' != 'Windows_NT' \""; const string condition_windows = "Condition=\" '$(OS)' == 'Windows_NT' \""; prebuild = - " <PreBuildEvent " + condition_unix + ">\n" + prebuild_unix + "\n </PreBuildEvent>\n" + - " <PreBuildEvent " + condition_windows + ">\n" + prebuild_windows + "\n </PreBuildEvent>\n"; + " <PreBuildEvent " + condition_unix + ">" + NewLine + prebuild_unix + NewLine + " </PreBuildEvent>" + NewLine + + " <PreBuildEvent " + condition_windows + ">" + NewLine + prebuild_windows + NewLine + " </PreBuildEvent>" + NewLine; var all_args = new Queue<string []> (); all_args.Enqueue (flags.Split ()); @@ -853,8 +853,8 @@ class MsbuildGenerator { string postbuild_windows = string.Empty; var postbuild = - " <PostBuildEvent " + condition_unix + ">\n" + postbuild_unix + "\n </PostBuildEvent>\n" + - " <PostBuildEvent " + condition_windows + ">\n" + postbuild_windows + "\n </PostBuildEvent>"; + " <PostBuildEvent " + condition_unix + ">" + NewLine + postbuild_unix + NewLine + " </PostBuildEvent>" + NewLine + + " <PostBuildEvent " + condition_windows + ">" + NewLine + postbuild_windows + NewLine + " </PostBuildEvent>"; bool basic_or_build = (library.Contains ("-basic") || library.Contains ("-build")); @@ -866,13 +866,13 @@ class MsbuildGenerator { string strongNameSection = ""; if (StrongNameKeyFile != null){ strongNameSection = String.Format ( - " <PropertyGroup>\n" + - " <SignAssembly>true</SignAssembly>\n" + + " <PropertyGroup>" + NewLine + + " <SignAssembly>true</SignAssembly>" + NewLine + "{1}" + - " </PropertyGroup>\n" + - " <PropertyGroup>\n" + - " <AssemblyOriginatorKeyFile>{0}</AssemblyOriginatorKeyFile>\n" + - " </PropertyGroup>", StrongNameKeyFile, StrongNameDelaySign ? " <DelaySign>true</DelaySign>\n" : ""); + " </PropertyGroup>" + NewLine + + " <PropertyGroup>" + NewLine + + " <AssemblyOriginatorKeyFile>{0}</AssemblyOriginatorKeyFile>" + NewLine + + " </PropertyGroup>", StrongNameKeyFile, StrongNameDelaySign ? " <DelaySign>true</DelaySign>" + NewLine : ""); } Csproj.output = template. Replace ("@SIGNATURE@", strongNameSection). |