cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix up buildbase.bat, VS projects whitespace and remove ARM.props (#519)

Browse Source 
* Fix invalid stream of Visual Studio DynDebug build logs.

* Remove ARM props file (undergeneralized).

* Clean up white space in Visual Studio *.props files.
This commit is contained in:
Eric Voskuil 2017-03-24 00:39:50 -07:00 committed by Frank Denis
parent 528abd8bc9
commit c11fd0ddd0
12 changed files with 27 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builds/msvc/build/buildbase.bat
View File

@ -16,7 +16,7 @@ CALL %environment% x86 > nul
ECHO Platform=x86 ECHO Platform=x86
ECHO Configuration=DynDebug 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 IF errorlevel 1 GOTO error
ECHO Configuration=DynRelease ECHO Configuration=DynRelease
msbuild /m /v:n /p:Configuration=DynRelease /p:Platform=Win32 %solution% >> %log% 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 Platform=x64
ECHO Configuration=DynDebug 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 IF errorlevel 1 GOTO error
ECHO Configuration=DynRelease ECHO Configuration=DynRelease
msbuild /m /v:n /p:Configuration=DynRelease /p:Platform=x64 %solution% >> %log% msbuild /m /v:n /p:Configuration=DynRelease /p:Platform=x64 %solution% >> %log%

20
builds/msvc/properties/ARM.props
View File

@ -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>

2
builds/msvc/vs2010/libsodium.import.props
View File

@ -6,7 +6,7 @@
</PropertyGroup> </PropertyGroup>
<!-- User Interface --> <!-- User Interface -->
<ItemGroup Label="BuildOptionsExtension"> <ItemGroup Label="BuildOptionsExtension">
<PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" /> <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
</ItemGroup> </ItemGroup>

8
builds/msvc/vs2010/libsodium/libsodium.props
View File

@ -6,15 +6,15 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>false</RunCodeAnalysis> <RunCodeAnalysis>false</RunCodeAnalysis>
</PropertyGroup> </PropertyGroup>
<!-- User Interface --> <!-- User Interface -->
<ItemGroup Label="BuildOptionsExtension"> <ItemGroup Label="BuildOptionsExtension">
<PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" /> <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
</ItemGroup> </ItemGroup>
<!-- Configuration --> <!-- Configuration -->
<ItemDefinitionGroup> <ItemDefinitionGroup>
<PreBuildEvent> <PreBuildEvent>
<Command>copy "$(BuildRoot)version.h" "$(RepoRoot)src\libsodium\include\sodium\"</Command> <Command>copy "$(BuildRoot)version.h" "$(RepoRoot)src\libsodium\include\sodium\"</Command>
@ -35,7 +35,7 @@
<Target Name="CustomInfo" BeforeTargets="PrepareForBuild"> <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
<Message Text="Will copy $(BuildRoot)version.h -&gt; $(RepoRoot)src\libsodium\include\sodium\version.h" Importance="high"/> <Message Text="Will copy $(BuildRoot)version.h -&gt; $(RepoRoot)src\libsodium\include\sodium\version.h" Importance="high"/>
</Target> </Target>
<Target Name="OptionInfo" BeforeTargets="PrepareForBuild"> <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
<Message Text="Option-amd64asm : $(Option-amd64asm)" Importance="high"/> <Message Text="Option-amd64asm : $(Option-amd64asm)" Importance="high"/>
</Target> </Target>

2
builds/msvc/vs2012/libsodium.import.props
View File

@ -6,7 +6,7 @@
</PropertyGroup> </PropertyGroup>
<!-- User Interface --> <!-- User Interface -->
<ItemGroup Label="BuildOptionsExtension"> <ItemGroup Label="BuildOptionsExtension">
<PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" /> <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
</ItemGroup> </ItemGroup>

8
builds/msvc/vs2012/libsodium/libsodium.props
View File

@ -6,15 +6,15 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>false</RunCodeAnalysis> <RunCodeAnalysis>false</RunCodeAnalysis>
</PropertyGroup> </PropertyGroup>
<!-- User Interface --> <!-- User Interface -->
<ItemGroup Label="BuildOptionsExtension"> <ItemGroup Label="BuildOptionsExtension">
<PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" /> <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
</ItemGroup> </ItemGroup>
<!-- Configuration --> <!-- Configuration -->
<ItemDefinitionGroup> <ItemDefinitionGroup>
<PreBuildEvent> <PreBuildEvent>
<Command>copy "$(BuildRoot)version.h" "$(RepoRoot)src\libsodium\include\sodium\"</Command> <Command>copy "$(BuildRoot)version.h" "$(RepoRoot)src\libsodium\include\sodium\"</Command>
@ -35,7 +35,7 @@
<Target Name="CustomInfo" BeforeTargets="PrepareForBuild"> <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
<Message Text="Will copy $(BuildRoot)version.h -&gt; $(RepoRoot)src\libsodium\include\sodium\version.h" Importance="high"/> <Message Text="Will copy $(BuildRoot)version.h -&gt; $(RepoRoot)src\libsodium\include\sodium\version.h" Importance="high"/>
</Target> </Target>
<Target Name="OptionInfo" BeforeTargets="PrepareForBuild"> <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
<Message Text="Option-amd64asm : $(Option-amd64asm)" Importance="high"/> <Message Text="Option-amd64asm : $(Option-amd64asm)" Importance="high"/>
</Target> </Target>

2
builds/msvc/vs2013/libsodium.import.props
View File

@ -6,7 +6,7 @@
</PropertyGroup> </PropertyGroup>
<!-- User Interface --> <!-- User Interface -->
<ItemGroup Label="BuildOptionsExtension"> <ItemGroup Label="BuildOptionsExtension">
<PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" /> <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
</ItemGroup> </ItemGroup>

8
builds/msvc/vs2013/libsodium/libsodium.props
View File

@ -6,15 +6,15 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>false</RunCodeAnalysis> <RunCodeAnalysis>false</RunCodeAnalysis>
</PropertyGroup> </PropertyGroup>
<!-- User Interface --> <!-- User Interface -->
<ItemGroup Label="BuildOptionsExtension"> <ItemGroup Label="BuildOptionsExtension">
<PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" /> <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
</ItemGroup> </ItemGroup>
<!-- Configuration --> <!-- Configuration -->
<ItemDefinitionGroup> <ItemDefinitionGroup>
<PreBuildEvent> <PreBuildEvent>
<Command>copy "$(BuildRoot)version.h" "$(RepoRoot)src\libsodium\include\sodium\"</Command> <Command>copy "$(BuildRoot)version.h" "$(RepoRoot)src\libsodium\include\sodium\"</Command>
@ -35,7 +35,7 @@
<Target Name="CustomInfo" BeforeTargets="PrepareForBuild"> <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
<Message Text="Will copy $(BuildRoot)version.h -&gt; $(RepoRoot)src\libsodium\include\sodium\version.h" Importance="high"/> <Message Text="Will copy $(BuildRoot)version.h -&gt; $(RepoRoot)src\libsodium\include\sodium\version.h" Importance="high"/>
</Target> </Target>
<Target Name="OptionInfo" BeforeTargets="PrepareForBuild"> <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
<Message Text="Option-amd64asm : $(Option-amd64asm)" Importance="high"/> <Message Text="Option-amd64asm : $(Option-amd64asm)" Importance="high"/>
</Target> </Target>

2
builds/msvc/vs2015/libsodium.import.props
View File

@ -6,7 +6,7 @@
</PropertyGroup> </PropertyGroup>
<!-- User Interface --> <!-- User Interface -->
<ItemGroup Label="BuildOptionsExtension"> <ItemGroup Label="BuildOptionsExtension">
<PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" /> <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
</ItemGroup> </ItemGroup>

8
builds/msvc/vs2015/libsodium/libsodium.props
View File

@ -6,15 +6,15 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>false</RunCodeAnalysis> <RunCodeAnalysis>false</RunCodeAnalysis>
</PropertyGroup> </PropertyGroup>
<!-- User Interface --> <!-- User Interface -->
<ItemGroup Label="BuildOptionsExtension"> <ItemGroup Label="BuildOptionsExtension">
<PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" /> <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
</ItemGroup> </ItemGroup>
<!-- Configuration --> <!-- Configuration -->
<ItemDefinitionGroup> <ItemDefinitionGroup>
<PreBuildEvent> <PreBuildEvent>
<Command>copy "$(BuildRoot)version.h" "$(RepoRoot)src\libsodium\include\sodium\"</Command> <Command>copy "$(BuildRoot)version.h" "$(RepoRoot)src\libsodium\include\sodium\"</Command>
@ -35,7 +35,7 @@
<Target Name="CustomInfo" BeforeTargets="PrepareForBuild"> <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
<Message Text="Will copy $(BuildRoot)version.h -&gt; $(RepoRoot)src\libsodium\include\sodium\version.h" Importance="high"/> <Message Text="Will copy $(BuildRoot)version.h -&gt; $(RepoRoot)src\libsodium\include\sodium\version.h" Importance="high"/>
</Target> </Target>
<Target Name="OptionInfo" BeforeTargets="PrepareForBuild"> <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
<Message Text="Option-amd64asm : $(Option-amd64asm)" Importance="high"/> <Message Text="Option-amd64asm : $(Option-amd64asm)" Importance="high"/>
</Target> </Target>

2
builds/msvc/vs2017/libsodium.import.props
View File

@ -6,7 +6,7 @@
</PropertyGroup> </PropertyGroup>
<!-- User Interface --> <!-- User Interface -->
<ItemGroup Label="BuildOptionsExtension"> <ItemGroup Label="BuildOptionsExtension">
<PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" /> <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libsodium.import.xml" />
</ItemGroup> </ItemGroup>

8
builds/msvc/vs2017/libsodium/libsodium.props
View File

@ -6,15 +6,15 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>false</RunCodeAnalysis> <RunCodeAnalysis>false</RunCodeAnalysis>
</PropertyGroup> </PropertyGroup>
<!-- User Interface --> <!-- User Interface -->
<ItemGroup Label="BuildOptionsExtension"> <ItemGroup Label="BuildOptionsExtension">
<PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" /> <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
</ItemGroup> </ItemGroup>
<!-- Configuration --> <!-- Configuration -->
<ItemDefinitionGroup> <ItemDefinitionGroup>
<PreBuildEvent> <PreBuildEvent>
<Command>copy "$(BuildRoot)version.h" "$(RepoRoot)src\libsodium\include\sodium\"</Command> <Command>copy "$(BuildRoot)version.h" "$(RepoRoot)src\libsodium\include\sodium\"</Command>
@ -35,7 +35,7 @@
<Target Name="CustomInfo" BeforeTargets="PrepareForBuild"> <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
<Message Text="Will copy $(BuildRoot)version.h -&gt; $(RepoRoot)src\libsodium\include\sodium\version.h" Importance="high"/> <Message Text="Will copy $(BuildRoot)version.h -&gt; $(RepoRoot)src\libsodium\include\sodium\version.h" Importance="high"/>
</Target> </Target>
<Target Name="OptionInfo" BeforeTargets="PrepareForBuild"> <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
<Message Text="Option-amd64asm : $(Option-amd64asm)" Importance="high"/> <Message Text="Option-amd64asm : $(Option-amd64asm)" Importance="high"/>
</Target> </Target>