From c11fd0ddd039cd8f2896c579c2a32022d28677bb Mon Sep 17 00:00:00 2001
From: Eric Voskuil <eric@voskuil.org>
Date: Fri, 24 Mar 2017 00:39:50 -0700
Subject: [PATCH] Fix up buildbase.bat, VS projects whitespace and remove
 ARM.props (#519)

* Fix invalid stream of Visual Studio DynDebug build logs.

* Remove ARM props file (undergeneralized).

* Clean up white space in Visual Studio *.props files.
---
 builds/msvc/build/buildbase.bat              |  4 ++--
 builds/msvc/properties/ARM.props             | 20 --------------------
 builds/msvc/vs2010/libsodium.import.props    |  2 +-
 builds/msvc/vs2010/libsodium/libsodium.props |  8 ++++----
 builds/msvc/vs2012/libsodium.import.props    |  2 +-
 builds/msvc/vs2012/libsodium/libsodium.props |  8 ++++----
 builds/msvc/vs2013/libsodium.import.props    |  2 +-
 builds/msvc/vs2013/libsodium/libsodium.props |  8 ++++----
 builds/msvc/vs2015/libsodium.import.props    |  2 +-
 builds/msvc/vs2015/libsodium/libsodium.props |  8 ++++----
 builds/msvc/vs2017/libsodium.import.props    |  2 +-
 builds/msvc/vs2017/libsodium/libsodium.props |  8 ++++----
 12 files changed, 27 insertions(+), 47 deletions(-)
 delete mode 100644 builds/msvc/properties/ARM.props

diff --git a/builds/msvc/build/buildbase.bat b/builds/msvc/build/buildbase.bat
index fb8bf640..bfc70556 100644
--- a/builds/msvc/build/buildbase.bat
+++ b/builds/msvc/build/buildbase.bat
@@ -16,7 +16,7 @@ CALL %environment% x86 > nul
 ECHO Platform=x86
 
 ECHO Configuration=DynDebug
-msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=Win32 %solution% > %log%
+msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=Win32 %solution% >> %log%
 IF errorlevel 1 GOTO error
 ECHO Configuration=DynRelease
 msbuild /m /v:n /p:Configuration=DynRelease /p:Platform=Win32 %solution% >> %log%
@@ -38,7 +38,7 @@ CALL %environment% x86_amd64 > nul
 ECHO Platform=x64
 
 ECHO Configuration=DynDebug
-msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=x64 %solution% > %log%
+msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=x64 %solution% >> %log%
 IF errorlevel 1 GOTO error
 ECHO Configuration=DynRelease
 msbuild /m /v:n /p:Configuration=DynRelease /p:Platform=x64 %solution% >> %log%
diff --git a/builds/msvc/properties/ARM.props b/builds/msvc/properties/ARM.props
deleted file mode 100644
index 164b9b1f..00000000
--- a/builds/msvc/properties/ARM.props
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <PropertyGroup>
-    <_PropertySheetDisplayName>ARM Settings</_PropertySheetDisplayName>
-  </PropertyGroup>
-  
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <PreprocessorDefinitions>WIN32;_WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineARM</TargetMachine>
-    </Link>
-    <Lib>
-      <AdditionalOptions>/MACHINE:ARM %(AdditionalOptions)</AdditionalOptions>
-    </Lib>
-  </ItemDefinitionGroup>
-
-</Project>
diff --git a/builds/msvc/vs2010/libsodium.import.props b/builds/msvc/vs2010/libsodium.import.props
index c7b68c90..b3d7e4fd 100644
--- a/builds/msvc/vs2010/libsodium.import.props
+++ b/builds/msvc/vs2010/libsodium.import.props
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <!-- User Interface -->
-  
+
   <ItemGroup Label="BuildOptionsExtension">
     <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
   </ItemGroup>
diff --git a/builds/msvc/vs2010/libsodium/libsodium.props b/builds/msvc/vs2010/libsodium/libsodium.props
index beaa257c..32173c42 100644
--- a/builds/msvc/vs2010/libsodium/libsodium.props
+++ b/builds/msvc/vs2010/libsodium/libsodium.props
@@ -6,15 +6,15 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
   </PropertyGroup>
-  
+
   <!-- User Interface -->
-  
+
   <ItemGroup Label="BuildOptionsExtension">
     <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
   </ItemGroup>
 
   <!-- Configuration -->
-  
+
   <ItemDefinitionGroup>
     <PreBuildEvent>
       <Command>copy "$(BuildRoot)version.h" "$(RepoRoot)src\libsodium\include\sodium\"</Command>
@@ -35,7 +35,7 @@
   <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Will copy $(BuildRoot)version.h -&gt; $(RepoRoot)src\libsodium\include\sodium\version.h" Importance="high"/>
   </Target>
-  
+
   <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Option-amd64asm   : $(Option-amd64asm)" Importance="high"/>
   </Target>
diff --git a/builds/msvc/vs2012/libsodium.import.props b/builds/msvc/vs2012/libsodium.import.props
index c7b68c90..b3d7e4fd 100644
--- a/builds/msvc/vs2012/libsodium.import.props
+++ b/builds/msvc/vs2012/libsodium.import.props
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <!-- User Interface -->
-  
+
   <ItemGroup Label="BuildOptionsExtension">
     <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
   </ItemGroup>
diff --git a/builds/msvc/vs2012/libsodium/libsodium.props b/builds/msvc/vs2012/libsodium/libsodium.props
index beaa257c..32173c42 100644
--- a/builds/msvc/vs2012/libsodium/libsodium.props
+++ b/builds/msvc/vs2012/libsodium/libsodium.props
@@ -6,15 +6,15 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
   </PropertyGroup>
-  
+
   <!-- User Interface -->
-  
+
   <ItemGroup Label="BuildOptionsExtension">
     <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
   </ItemGroup>
 
   <!-- Configuration -->
-  
+
   <ItemDefinitionGroup>
     <PreBuildEvent>
       <Command>copy "$(BuildRoot)version.h" "$(RepoRoot)src\libsodium\include\sodium\"</Command>
@@ -35,7 +35,7 @@
   <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Will copy $(BuildRoot)version.h -&gt; $(RepoRoot)src\libsodium\include\sodium\version.h" Importance="high"/>
   </Target>
-  
+
   <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Option-amd64asm   : $(Option-amd64asm)" Importance="high"/>
   </Target>
diff --git a/builds/msvc/vs2013/libsodium.import.props b/builds/msvc/vs2013/libsodium.import.props
index c7b68c90..b3d7e4fd 100644
--- a/builds/msvc/vs2013/libsodium.import.props
+++ b/builds/msvc/vs2013/libsodium.import.props
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <!-- User Interface -->
-  
+
   <ItemGroup Label="BuildOptionsExtension">
     <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
   </ItemGroup>
diff --git a/builds/msvc/vs2013/libsodium/libsodium.props b/builds/msvc/vs2013/libsodium/libsodium.props
index beaa257c..32173c42 100644
--- a/builds/msvc/vs2013/libsodium/libsodium.props
+++ b/builds/msvc/vs2013/libsodium/libsodium.props
@@ -6,15 +6,15 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
   </PropertyGroup>
-  
+
   <!-- User Interface -->
-  
+
   <ItemGroup Label="BuildOptionsExtension">
     <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
   </ItemGroup>
 
   <!-- Configuration -->
-  
+
   <ItemDefinitionGroup>
     <PreBuildEvent>
       <Command>copy "$(BuildRoot)version.h" "$(RepoRoot)src\libsodium\include\sodium\"</Command>
@@ -35,7 +35,7 @@
   <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Will copy $(BuildRoot)version.h -&gt; $(RepoRoot)src\libsodium\include\sodium\version.h" Importance="high"/>
   </Target>
-  
+
   <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Option-amd64asm   : $(Option-amd64asm)" Importance="high"/>
   </Target>
diff --git a/builds/msvc/vs2015/libsodium.import.props b/builds/msvc/vs2015/libsodium.import.props
index c7b68c90..b3d7e4fd 100644
--- a/builds/msvc/vs2015/libsodium.import.props
+++ b/builds/msvc/vs2015/libsodium.import.props
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <!-- User Interface -->
-  
+
   <ItemGroup Label="BuildOptionsExtension">
     <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
   </ItemGroup>
diff --git a/builds/msvc/vs2015/libsodium/libsodium.props b/builds/msvc/vs2015/libsodium/libsodium.props
index beaa257c..32173c42 100644
--- a/builds/msvc/vs2015/libsodium/libsodium.props
+++ b/builds/msvc/vs2015/libsodium/libsodium.props
@@ -6,15 +6,15 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
   </PropertyGroup>
-  
+
   <!-- User Interface -->
-  
+
   <ItemGroup Label="BuildOptionsExtension">
     <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
   </ItemGroup>
 
   <!-- Configuration -->
-  
+
   <ItemDefinitionGroup>
     <PreBuildEvent>
       <Command>copy "$(BuildRoot)version.h" "$(RepoRoot)src\libsodium\include\sodium\"</Command>
@@ -35,7 +35,7 @@
   <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Will copy $(BuildRoot)version.h -&gt; $(RepoRoot)src\libsodium\include\sodium\version.h" Importance="high"/>
   </Target>
-  
+
   <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Option-amd64asm   : $(Option-amd64asm)" Importance="high"/>
   </Target>
diff --git a/builds/msvc/vs2017/libsodium.import.props b/builds/msvc/vs2017/libsodium.import.props
index c7b68c90..b3d7e4fd 100644
--- a/builds/msvc/vs2017/libsodium.import.props
+++ b/builds/msvc/vs2017/libsodium.import.props
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <!-- User Interface -->
-  
+
   <ItemGroup Label="BuildOptionsExtension">
     <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
   </ItemGroup>
diff --git a/builds/msvc/vs2017/libsodium/libsodium.props b/builds/msvc/vs2017/libsodium/libsodium.props
index beaa257c..32173c42 100644
--- a/builds/msvc/vs2017/libsodium/libsodium.props
+++ b/builds/msvc/vs2017/libsodium/libsodium.props
@@ -6,15 +6,15 @@
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <RunCodeAnalysis>false</RunCodeAnalysis>
   </PropertyGroup>
-  
+
   <!-- User Interface -->
-  
+
   <ItemGroup Label="BuildOptionsExtension">
     <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
   </ItemGroup>
 
   <!-- Configuration -->
-  
+
   <ItemDefinitionGroup>
     <PreBuildEvent>
       <Command>copy "$(BuildRoot)version.h" "$(RepoRoot)src\libsodium\include\sodium\"</Command>
@@ -35,7 +35,7 @@
   <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Will copy $(BuildRoot)version.h -&gt; $(RepoRoot)src\libsodium\include\sodium\version.h" Importance="high"/>
   </Target>
-  
+
   <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
     <Message Text="Option-amd64asm   : $(Option-amd64asm)" Importance="high"/>
   </Target>