From 7cdc5a25ba90c5ae3e530bbae44fa2eb1f9fc6df Mon Sep 17 00:00:00 2001 From: arvidn Date: Thu, 20 Aug 2015 00:38:46 +0200 Subject: [PATCH 1/2] attempt to use newer visual studio version (and older) --- appveyor.yml | 132 +++++++++++++++++++++++++++------------------------ 1 file changed, 70 insertions(+), 62 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 90e0b3e4f..a9214f1e4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,62 +1,70 @@ -version: 1.0.{build} -branches: - only: - - master -os: Windows Server 2012 R2 -clone_depth: 1 -environment: - matrix: - - variant: test_debug - compiler: msvc - linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"' - - variant: test_barebones - compiler: msvc - linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"' - - variant: test_release - compiler: msvc - linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"' - -# mingw and boost.random don't like each other. Comment this back in once there -# is support - -# - variant: test_debug -# compiler: gcc -# linkflags: '"-LC:\\OpenSSL-Win32\\lib"' - -install: -- git submodule update --init --recursive -- set ROOT_DIRECTORY=%CD% -- cd %ROOT_DIRECTORY% -- if not exist c:\OpenSSL-Win32\nul ( - appveyor DownloadFile https://strcpy.net/packages/Win32OpenSSL-1_0_2a.exe - && Win32OpenSSL-1_0_2a.exe /silent /verysilent /sp- /suppressmsgboxes ) -- copy c:\OpenSSL-Win32\ssleay32.dll %WINDIR%\system32 -- copy c:\OpenSSL-Win32\libeay32.dll %WINDIR%\system32 -- cd %ROOT_DIRECTORY% -- set BOOST_ROOT=c:\Libraries\boost -- set BOOST_BUILD_PATH=%BOOST_ROOT%\tools\build -- echo %BOOST_ROOT% -- echo %BOOST_BUILD_PATH% -- set PATH=%PATH%;%BOOST_BUILD_PATH%\src\engine\bin.ntx86 -- 'echo using msvc : 12.0 ; >%HOMEDRIVE%%HOMEPATH%\user-config.jam' -- echo using gcc ; >>%HOMEDRIVE%%HOMEPATH%\user-config.jam -- type %HOMEDRIVE%%HOMEPATH%\user-config.jam -- cd %ROOT_DIRECTORY% -- set PATH=%PATH%;c:\Mingw\bin -- g++ --version -- python --version -- echo %ROOT_DIRECTORY% -cache: -- C:\OpenSSL-Win32 -build_script: -- cd %ROOT_DIRECTORY%\examples -- b2.exe --hash -j2 %compiler% variant=%variant% linkflags=%linkflags% include="C:\\OpenSSL-Win32\\include" warnings=off -- cd %ROOT_DIRECTORY%\test -- b2.exe --hash -j2 win-tests %compiler% variant=%variant% link=shared linkflags=%linkflags% include="C:\\OpenSSL-Win32\\include" warnings=off -- cd %ROOT_DIRECTORY%\bindings\python -- b2.exe --hash -j2 %compiler% variant=%variant% linkflags=%linkflags% include="C:\\OpenSSL-Win32\\include" warnings=off stage_module -- python test.py -- if %variant% == "test_debug" ( - cd %ROOT_DIRECTORY%\simulation - && b2.exe --hash -j2 crypto=built-in warnings=off %compiler% ) - +version: 1.0.{build} +branches: + only: + - master +os: Visual Studio 2015 +clone_depth: 1 +environment: + matrix: + - variant: test_debug + compiler: msvc-12.0 + linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"' + - variant: test_debug + compiler: msvc-10.0 + linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"' + - variant: test_debug + compiler: msvc-14.0 + linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"' + - variant: test_barebones + compiler: msvc-12.0 + linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"' + - variant: test_release + compiler: msvc-12.0 + linkflags: '"/LIBPATH:C:\\OpenSSL-Win32\\lib"' + +# mingw and boost.random don't like each other. Comment this back in once there +# is support + +# - variant: test_debug +# compiler: gcc +# linkflags: '"-LC:\\OpenSSL-Win32\\lib"' + +install: +- git submodule update --init --recursive +- set ROOT_DIRECTORY=%CD% +- cd %ROOT_DIRECTORY% +- if not exist c:\OpenSSL-Win32\nul ( + appveyor DownloadFile https://strcpy.net/packages/Win32OpenSSL-1_0_2a.exe + && Win32OpenSSL-1_0_2a.exe /silent /verysilent /sp- /suppressmsgboxes ) +- copy c:\OpenSSL-Win32\ssleay32.dll %WINDIR%\system32 +- copy c:\OpenSSL-Win32\libeay32.dll %WINDIR%\system32 +- cd %ROOT_DIRECTORY% +- set BOOST_ROOT=c:\Libraries\boost +- set BOOST_BUILD_PATH=%BOOST_ROOT%\tools\build +- echo %BOOST_ROOT% +- echo %BOOST_BUILD_PATH% +- set PATH=%PATH%;%BOOST_BUILD_PATH%\src\engine\bin.ntx86 +- 'echo using msvc : 10.0 ; >%HOMEDRIVE%%HOMEPATH%\user-config.jam' +- 'echo using msvc : 12.0 ; >>%HOMEDRIVE%%HOMEPATH%\user-config.jam' +- 'echo using msvc : 14.0 ; >>%HOMEDRIVE%%HOMEPATH%\user-config.jam' +- echo using gcc ; >>%HOMEDRIVE%%HOMEPATH%\user-config.jam +- type %HOMEDRIVE%%HOMEPATH%\user-config.jam +- cd %ROOT_DIRECTORY% +- set PATH=%PATH%;c:\Mingw\bin +- g++ --version +- python --version +- echo %ROOT_DIRECTORY% +cache: +- C:\OpenSSL-Win32 +build_script: +- cd %ROOT_DIRECTORY%\examples +- b2.exe --hash -j2 %compiler% variant=%variant% linkflags=%linkflags% include="C:\\OpenSSL-Win32\\include" warnings=off +- cd %ROOT_DIRECTORY%\test +- b2.exe --hash -j2 win-tests %compiler% variant=%variant% link=shared linkflags=%linkflags% include="C:\\OpenSSL-Win32\\include" warnings=off +- cd %ROOT_DIRECTORY%\bindings\python +- b2.exe --hash -j2 %compiler% variant=%variant% linkflags=%linkflags% include="C:\\OpenSSL-Win32\\include" warnings=off stage_module +- python test.py +- if %variant% == "test_debug" ( + cd %ROOT_DIRECTORY%\simulation + && b2.exe --hash -j2 crypto=built-in warnings=off %compiler% ) + From 0de5cf8adc6297bdb18d155af4f49b79ecfbaa46 Mon Sep 17 00:00:00 2001 From: arvidn Date: Thu, 20 Aug 2015 02:21:39 +0200 Subject: [PATCH 2/2] attempt to fix windows build --- test/test_direct_dht.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_direct_dht.cpp b/test/test_direct_dht.cpp index 70829b4a1..14aec8a11 100644 --- a/test/test_direct_dht.cpp +++ b/test/test_direct_dht.cpp @@ -48,7 +48,7 @@ struct test_plugin : plugin { virtual void register_dht_extensions(dht_extensions_t& ext) { - ext.push_back(std::make_pair("test_good", &good_response)); + ext.push_back(dht_extensions_t::value_type("test_good", &good_response)); } static bool good_response(udp::endpoint const& source