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.
7 years ago · c11fd0ddd0
12 changed files with 27 additions and 47 deletions
--- 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%
--- a/builds/msvc/properties/ARM.props
+++ b/builds/msvc/properties/ARM.props
@ -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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>