Skip to content

Regenerate msvc build artifacts. #161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 23, 2017
Merged

Regenerate msvc build artifacts. #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ before_build:
Write-Host "CTP Compiler Installation Complete." -ForegroundColor Green;

build_script:
- c:\git\libbitcoin-protocol\build.cmd c:\git %PLATFORM% %CONFIGURATION%
- c:\git\libbitcoin-protocol\build.cmd c:\git %PLATFORM% %CONFIGURATION% vs2013
- cd /d %APPVEYOR_BUILD_FOLDER%

test_script:
Expand Down
25 changes: 14 additions & 11 deletions build.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,13 @@ REM #
REM ###########################################################################
@echo off
SETLOCAL ENABLEEXTENSIONS
SET parent=%~dp0
SET path_base=%~1
SET nuget_pkg_path=%~1\..\nuget
SET msbuild_args=/verbosity:minimal /p:Platform=%~2 /p:Configuration=%~3
SET "parent=%~dp0"
SET "path_base=%~1"
SET "nuget_pkg_path=%~1\..\nuget"
SET "msbuild_args=/verbosity:minimal /p:Platform=%~2 /p:Configuration=%~3"
SET "proj_version=%~4"
SET "msbuild_exe=msbuild"
IF EXIST "%~5" SET "msbuild_exe=%~5"

call :pending "Build initialized..."
IF NOT EXIST "%nuget_pkg_path%" (
Expand Down Expand Up @@ -63,10 +66,10 @@ IF %ERRORLEVEL% NEQ 0 (
call :failure "Initializing dependencies %~1 failed."
exit /b 1
)
call cd /d "%path_base%\%~1\builds\msvc\vs2013"
call msbuild %msbuild_args% %~1.sln
call cd /d "%path_base%\%~1\builds\msvc\%proj_version%"
call "%msbuild_exe%" %msbuild_args% %~1.sln
IF %ERRORLEVEL% NEQ 0 (
call :failure "msbuild %msbuild_args% %~1.sln failed."
call :failure "%msbuild_exe% %msbuild_args% %~1.sln failed."
exit /b 1
)
call :success "Building repository %~1 execution complete."
Expand All @@ -80,10 +83,10 @@ IF %ERRORLEVEL% NEQ 0 (
call :failure "Initializing dependencies %~1 failed."
exit /b 1
)
call cd /d "%path_base%\%~1\builds\msvc\vs2013"
call msbuild %msbuild_args% /target:%~1:Rebuild %~1.sln
call cd /d "%path_base%\%~1\builds\msvc\%proj_version%"
call "%msbuild_exe%" %msbuild_args% /target:%~1:Rebuild %~1.sln
IF %ERRORLEVEL% NEQ 0 (
call :failure "msbuildl %msbuild_args% /target:%~1:Rebuild %~1.sln"
call :failure "%msbuild_exe% %msbuild_args% /target:%~1:Rebuild %~1.sln"
exit /b 1
)
call :success "Building repository project %~1 execution complete."
Expand All @@ -92,7 +95,7 @@ exit /b 0

:depends
call :pending "nuget restoring dependencies for %~1..."
call nuget restore "%path_base%\%~1\builds\msvc\vs2013\%~1.sln" -Outputdir "%nuget_pkg_path%"
call nuget restore "%path_base%\%~1\builds\msvc\%proj_version%\%~1.sln" -Outputdir "%nuget_pkg_path%"
IF %ERRORLEVEL% NEQ 0 (
call :failure "nuget restore failed."
exit /b 1
Expand Down
33 changes: 22 additions & 11 deletions builds/msvc/vs2013/libbitcoin-protocol-test/libbitcoin-protocol-test.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2015 libbitcoin-protocol developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
-->
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v120</PlatformToolset>
<ProjectGuid>{C42BE17B-063D-44F1-A5BB-9F8295144B70}</ProjectGuid>
<ProjectName>libbitcoin-protocol-test</ProjectName>
<NuGetPackageImportStamp>30af8e9f</NuGetPackageImportStamp>
</PropertyGroup>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="DebugDEXE|Win32">
Expand Down Expand Up @@ -65,6 +70,7 @@
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\test\converter.cpp" />
<ClCompile Include="..\..\..\..\test\main.cpp" />
<ClCompile Include="..\..\..\..\test\zmq\authenticator.cpp" />
<ClCompile Include="..\..\..\..\test\zmq\certificate.cpp" />
Expand All @@ -73,8 +79,11 @@
<ClCompile Include="..\..\..\..\test\zmq\identifiers.cpp" />
<ClCompile Include="..\..\..\..\test\zmq\message.cpp" />
<ClCompile Include="..\..\..\..\test\zmq\poller.cpp" />
<ClCompile Include="..\..\..\..\test\zmq\worker.cpp" />
<ClCompile Include="..\..\..\..\test\zmq\socket.cpp" />
<ClCompile Include="..\..\..\..\test\zmq\worker.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\test\utility.hpp" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
Expand All @@ -86,15 +95,17 @@
<Import Project="..\..\..\..\..\..\nuget\boost_chrono-vc120.1.57.0.0\build\native\boost_chrono-vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost_chrono-vc120.1.57.0.0\build\native\boost_chrono-vc120.targets')" />
<Import Project="..\..\..\..\..\..\nuget\boost_date_time-vc120.1.57.0.0\build\native\boost_date_time-vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost_date_time-vc120.1.57.0.0\build\native\boost_date_time-vc120.targets')" />
<Import Project="..\..\..\..\..\..\nuget\boost_filesystem-vc120.1.57.0.0\build\native\boost_filesystem-vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost_filesystem-vc120.1.57.0.0\build\native\boost_filesystem-vc120.targets')" />
<Import Project="..\..\..\..\..\..\nuget\boost_iostreams-vc120.1.57.0.0\build\native\boost_iostreams-vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost_iostreams-vc120.1.57.0.0\build\native\boost_iostreams-vc120.targets')" />
<Import Project="..\..\..\..\..\..\nuget\boost_locale-vc120.1.57.0.0\build\native\boost_locale-vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost_locale-vc120.1.57.0.0\build\native\boost_locale-vc120.targets')" />
<Import Project="..\..\..\..\..\..\nuget\boost_log-vc120.1.57.0.0\build\native\boost_log-vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost_log-vc120.1.57.0.0\build\native\boost_log-vc120.targets')" />
<Import Project="..\..\..\..\..\..\nuget\boost_log_setup-vc120.1.57.0.0\build\native\boost_log_setup-vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost_log_setup-vc120.1.57.0.0\build\native\boost_log_setup-vc120.targets')" />
<Import Project="..\..\..\..\..\..\nuget\boost_program_options-vc120.1.57.0.0\build\native\boost_program_options-vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost_program_options-vc120.1.57.0.0\build\native\boost_program_options-vc120.targets')" />
<Import Project="..\..\..\..\..\..\nuget\boost_regex-vc120.1.57.0.0\build\native\boost_regex-vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost_regex-vc120.1.57.0.0\build\native\boost_regex-vc120.targets')" />
<Import Project="..\..\..\..\..\..\nuget\boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets')" />
<Import Project="..\..\..\..\..\..\nuget\boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets')" />
<Import Project="..\..\..\..\..\..\nuget\boost_unit_test_framework-vc120.1.57.0.0\build\native\boost_unit_test_framework-vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost_unit_test_framework-vc120.1.57.0.0\build\native\boost_unit_test_framework-vc120.targets')" />
<Import Project="..\..\..\..\..\..\nuget\libzmq_vc120.4.2.20.1\build\native\libzmq_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\libzmq_vc120.4.2.20.1\build\native\libzmq_vc120.targets')" />
<Import Project="..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.14\build\native\secp256k1_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.14\build\native\secp256k1_vc120.targets')" />
<Import Project="..\..\..\..\..\..\nuget\libzmq_vc120.4.2.30\build\native\libzmq_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\libzmq_vc120.4.2.30\build\native\libzmq_vc120.targets')" />
<Import Project="..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
Expand All @@ -103,22 +114,22 @@
<Error Condition="!Exists('..\..\..\..\..\..\nuget\boost.1.57.0.0\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\boost.1.57.0.0\build\native\boost.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\boost_chrono-vc120.1.57.0.0\build\native\boost_chrono-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\boost_chrono-vc120.1.57.0.0\build\native\boost_chrono-vc120.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\boost_date_time-vc120.1.57.0.0\build\native\boost_date_time-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\boost_date_time-vc120.1.57.0.0\build\native\boost_date_time-vc120.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\boost_filesystem-vc120.1.57.0.0\build\native\boost_filesystem-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\boost_filesystem-vc120.1.57.0.0\build\native\boost_filesystem-vc120.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\boost_iostreams-vc120.1.57.0.0\build\native\boost_iostreams-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\boost_iostreams-vc120.1.57.0.0\build\native\boost_iostreams-vc120.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\boost_locale-vc120.1.57.0.0\build\native\boost_locale-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\boost_locale-vc120.1.57.0.0\build\native\boost_locale-vc120.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\boost_log-vc120.1.57.0.0\build\native\boost_log-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\boost_log-vc120.1.57.0.0\build\native\boost_log-vc120.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\boost_log_setup-vc120.1.57.0.0\build\native\boost_log_setup-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\boost_log_setup-vc120.1.57.0.0\build\native\boost_log_setup-vc120.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\boost_program_options-vc120.1.57.0.0\build\native\boost_program_options-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\boost_program_options-vc120.1.57.0.0\build\native\boost_program_options-vc120.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\boost_regex-vc120.1.57.0.0\build\native\boost_regex-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\boost_regex-vc120.1.57.0.0\build\native\boost_regex-vc120.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\boost_system-vc120.1.57.0.0\build\native\boost_system-vc120.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\boost_thread-vc120.1.57.0.0\build\native\boost_thread-vc120.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\boost_unit_test_framework-vc120.1.57.0.0\build\native\boost_unit_test_framework-vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\boost_unit_test_framework-vc120.1.57.0.0\build\native\boost_unit_test_framework-vc120.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\libzmq_vc120.4.2.20.1\build\native\libzmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\libzmq_vc120.4.2.20.1\build\native\libzmq_vc120.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.14\build\native\secp256k1_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.14\build\native\secp256k1_vc120.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\libzmq_vc120.4.2.30\build\native\libzmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\libzmq_vc120.4.2.30\build\native\libzmq_vc120.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.16\build\native\secp256k1_vc120.targets'))" />
</Target>
<ItemGroup>
<ProjectReference Include="..\libbitcoin-protocol\libbitcoin-protocol.vcxproj">
<Project>{6B94E2A5-C054-4790-963D-A7BE493259B0}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\test\utility.hpp" />
</ItemGroup>
</Project>
</Project>
41 changes: 25 additions & 16 deletions builds/msvc/vs2013/libbitcoin-protocol-test/libbitcoin-protocol-test.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,42 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2015 libbitcoin-protocol developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
-->
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="src">
<UniqueIdentifier>{4d8600cf-1586-49be-abdc-525c227b3a02}</UniqueIdentifier>
<UniqueIdentifier>{C42BE17B-063D-44F1-0000-000000000000}</UniqueIdentifier>
</Filter>
<Filter Include="src\zmq">
<UniqueIdentifier>{be07d12d-9dae-4731-8b0d-acdec8ab7968}</UniqueIdentifier>
<UniqueIdentifier>{C42BE17B-063D-44F1-0000-000000000001}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\test\converter.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\main.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\zmq\context.cpp">
<ClCompile Include="..\..\..\..\test\zmq\authenticator.cpp">
<Filter>src\zmq</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\zmq\frame.cpp">
<ClCompile Include="..\..\..\..\test\zmq\certificate.cpp">
<Filter>src\zmq</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\zmq\message.cpp">
<ClCompile Include="..\..\..\..\test\zmq\context.cpp">
<Filter>src\zmq</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\zmq\poller.cpp">
<ClCompile Include="..\..\..\..\test\zmq\frame.cpp">
<Filter>src\zmq</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\zmq\socket.cpp">
<ClCompile Include="..\..\..\..\test\zmq\identifiers.cpp">
<Filter>src\zmq</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\zmq\authenticator.cpp">
<ClCompile Include="..\..\..\..\test\zmq\message.cpp">
<Filter>src\zmq</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\zmq\certificate.cpp">
<ClCompile Include="..\..\..\..\test\zmq\poller.cpp">
<Filter>src\zmq</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\zmq\identifiers.cpp">
<ClCompile Include="..\..\..\..\test\zmq\socket.cpp">
<Filter>src\zmq</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\zmq\worker.cpp">
Expand All @@ -48,4 +54,7 @@
<Filter>src</Filter>
</ClInclude>
</ItemGroup>
</Project>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
</Project>
15 changes: 11 additions & 4 deletions builds/msvc/vs2013/libbitcoin-protocol-test/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2015 libbitcoin-protocol developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
-->
<packages>
<package id="boost" version="1.57.0.0" targetFramework="Native" />
<package id="boost_chrono-vc120" version="1.57.0.0" targetFramework="Native" />
<package id="boost_date_time-vc120" version="1.57.0.0" targetFramework="Native" />
<package id="boost_filesystem-vc120" version="1.57.0.0" targetFramework="Native" />
<package id="boost_iostreams-vc120" version="1.57.0.0" targetFramework="Native" />
<package id="boost_locale-vc120" version="1.57.0.0" targetFramework="Native" />
<package id="boost_log-vc120" version="1.57.0.0" targetFramework="Native" />
<package id="boost_log_setup-vc120" version="1.57.0.0" targetFramework="Native" />
<package id="boost_program_options-vc120" version="1.57.0.0" targetFramework="Native" />
<package id="boost_regex-vc120" version="1.57.0.0" targetFramework="Native" />
<package id="boost_system-vc120" version="1.57.0.0" targetFramework="Native" />
<package id="boost_thread-vc120" version="1.57.0.0" targetFramework="Native" />
<package id="boost_unit_test_framework-vc120" version="1.57.0.0" targetFramework="Native" />
<package id="libzmq_vc120" version="4.2.20.1" targetFramework="Native" />
<!--<package id="protobuf_vc120" version="2.6.0.1" targetFramework="Native" />-->
<package id="secp256k1_vc120" version="0.1.0.14" targetFramework="Native" />
<package id="libzmq_vc120" version="4.2.30" targetFramework="Native" />
<package id="secp256k1_vc120" version="0.1.0.16" targetFramework="Native" />
</packages>
Loading