From 1d56c974d3d092a62a041e20d307d7630500c90e Mon Sep 17 00:00:00 2001 From: Sebastien Vincent Date: Wed, 9 Aug 2017 22:08:18 +0200 Subject: [PATCH] Updates dependencies in teapot and compile with VS 2017 on Windows. --- .party | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.party b/.party index 7b254bee..11c714bd 100644 --- a/.party +++ b/.party @@ -11,8 +11,8 @@ Attendee('iconv', filter='msvc').add_source('folder://third-party/source/libicon Attendee('iconv').add_build('msvc-x86', environment='system', filter='msvc-x86', prefix='x86') Attendee('iconv').get_build('msvc-x86').commands = [ - r'msbuild libiconv.sln /p:Platformtoolset={{msvc_toolset}} /p:Configuration=ReleaseStatic /p:Platform="Win32"', - r'msbuild libiconv.sln /p:Platformtoolset={{msvc_toolset}} /p:Configuration=DebugStatic /p:Platform="Win32"', + r'msbuild libiconv.sln /p:Platformtoolset={{msvc_toolset}} /p:WindowsTargetPlatformVersion=10.0.15063.0 /p:WindowsTargetPlatformVersion=10.0.15063.0 /p:Configuration=ReleaseStatic /p:Platform="Win32"', + r'msbuild libiconv.sln /p:Platformtoolset={{msvc_toolset}} /p:WindowsTargetPlatformVersion=10.0.15063.0 /p:WindowsTargetPlatformVersion=10.0.15063.0 /p:Configuration=DebugStatic /p:Platform="Win32"', r'md {{prefix}}\Release\lib || echo', r'md {{prefix}}\Release\include || echo', r'md {{prefix}}\Debug\lib || echo', @@ -25,8 +25,8 @@ Attendee('iconv').get_build('msvc-x86').commands = [ Attendee('iconv').add_build('msvc-x64', environment='system', filter='msvc-x64', prefix='x64') Attendee('iconv').get_build('msvc-x64').commands = [ - r'msbuild libiconv.sln /p:Platformtoolset={{msvc_toolset}} /p:Configuration=ReleaseStatic /p:Platform="x64"', - r'msbuild libiconv.sln /p:Platformtoolset={{msvc_toolset}} /p:Configuration=DebugStatic /p:Platform="x64"', + r'msbuild libiconv.sln /p:Platformtoolset={{msvc_toolset}} /p:WindowsTargetPlatformVersion=10.0.15063.0 /p:Configuration=ReleaseStatic /p:Platform="x64"', + r'msbuild libiconv.sln /p:Platformtoolset={{msvc_toolset}} /p:WindowsTargetPlatformVersion=10.0.15063.0 /p:Configuration=DebugStatic /p:Platform="x64"', r'md {{prefix}}\Release\lib || echo', r'md {{prefix}}\Release\include || echo', r'md {{prefix}}\Debug\lib || echo', @@ -39,8 +39,8 @@ Attendee('iconv').get_build('msvc-x64').commands = [ # boost Attendee('boost', filter=~f('linux')) -Attendee('boost').add_source('http://sourceforge.net/projects/boost/files/boost/1.63.0/boost_1_63_0.tar.bz2/download', filter=~f('windows'), mimetype='application/x-bzip2') -Attendee('boost').add_source('http://sourceforge.net/projects/boost/files/boost/1.63.0/boost_1_63_0.zip/download', filter='windows', mimetype='application/zip') +Attendee('boost').add_source('http://sourceforge.net/projects/boost/files/boost/1.64.0/boost_1_64_0.tar.bz2/download', filter=~f('windows'), mimetype='application/x-bzip2') +Attendee('boost').add_source('http://sourceforge.net/projects/boost/files/boost/1.64.0/boost_1_64_0.zip/download', filter='windows', mimetype='application/zip') Attendee('boost').add_build('osx', environment='system', filter='darwin') Attendee('boost').get_build('osx').commands = [ @@ -70,7 +70,7 @@ Attendee('boost').get_build('msvc-x64').commands = [ # OpenSSL Attendee('openssl', filter=~f('linux')) -Attendee('openssl').add_source('http://www.openssl.org/source/openssl-1.0.2g.tar.gz') +Attendee('openssl').add_source('http://www.openssl.org/source/openssl-1.0.2l.tar.gz') Attendee('openssl').add_build('osx', environment='system', filter='darwin') Attendee('openssl').get_build('osx').commands = [ @@ -79,7 +79,7 @@ Attendee('openssl').get_build('osx').commands = [ 'make install', ] -Attendee('openssl').add_post_unpack_command(r'xcopy {{root}}\third-party\patches\openssl1.0.2g\* . /S /Y', filter='windows') +#Attendee('openssl').add_post_unpack_command(r'xcopy {{root}}\third-party\patches\openssl1.0.2g\* . /S /Y', filter='windows') Attendee('openssl').add_build('msvc-x86', environment='system', filter='msvc-x86', prefix='x86/Release') Attendee('openssl').get_build('msvc-x86').commands = [ @@ -122,8 +122,8 @@ Attendee('openssl').get_build('msvc-x64-debug').commands = [ # cURL Attendee('curl', filter=~f('linux')) -Attendee('curl').add_source('http://curl.askapache.com/download/curl-7.45.0.zip', filter='windows', mimetype='application/zip') -Attendee('curl').add_source('http://curl.askapache.com/download/curl-7.45.0.tar.bz2', filter=~f('windows'), mimetype='application/x-bzip2') +Attendee('curl').add_source('http://curl.askapache.com/download/curl-7.55.0.zip', filter='windows', mimetype='application/zip') +Attendee('curl').add_source('http://curl.askapache.com/download/curl-7.55.0.tar.bz2', filter=~f('windows'), mimetype='application/x-bzip2') Attendee('curl').depends_on('openssl') @@ -136,16 +136,16 @@ Attendee('curl').get_build('osx').commands = [ Attendee('curl').add_build('msvc-x86', environment='system', filter='msvc-x86', prefix='x86', subdir='winbuild') Attendee('curl').get_build('msvc-x86').commands = [ - r'nmake /f Makefile.vc mode=static VC=12 WITH_DEVEL={{prefix}} DEBUG=no GEN_PDB=yes MACHINE=x86', - r'xcopy ..\\builds\libcurl-vc12-x86-release-static-ipv6-sspi-winssl {{prefix}}\Release\ /S /Y', - r'nmake /f Makefile.vc mode=static VC=12 WITH_DEVEL={{prefix}} DEBUG=yes GEN_PDB=yes MACHINE=x86', - r'xcopy ..\\builds\libcurl-vc12-x86-debug-static-ipv6-sspi-winssl {{prefix}}\Debug\ /S /Y', + r'nmake /f Makefile.vc mode=static VC=15 WITH_DEVEL={{prefix}} DEBUG=no GEN_PDB=yes MACHINE=x86', + r'xcopy ..\\builds\libcurl-vc15-x86-release-static-ipv6-sspi-winssl {{prefix}}\Release\ /S /Y', + r'nmake /f Makefile.vc mode=static VC=15 WITH_DEVEL={{prefix}} DEBUG=yes GEN_PDB=yes MACHINE=x86', + r'xcopy ..\\builds\libcurl-vc15-x86-debug-static-ipv6-sspi-winssl {{prefix}}\Debug\ /S /Y', ] Attendee('curl').add_build('msvc-x64', environment='system', filter='msvc-x64', prefix='x64', subdir='winbuild') Attendee('curl').get_build('msvc-x64').commands = [ - r'nmake /f Makefile.vc mode=static VC=12 WITH_DEVEL={{prefix}} DEBUG=no GEN_PDB=yes MACHINE=x64', - r'xcopy ..\builds\libcurl-vc12-x64-release-static-ipv6-sspi-winssl {{prefix}}\Release\ /S /Y', - r'nmake /f Makefile.vc mode=static VC=12 WITH_DEVEL={{prefix}} DEBUG=yes GEN_PDB=yes MACHINE=x64', - r'xcopy ..\builds\libcurl-vc12-x64-debug-static-ipv6-sspi-winssl {{prefix}}\Debug\ /S /Y', + r'nmake /f Makefile.vc mode=static VC=15 WITH_DEVEL={{prefix}} DEBUG=no GEN_PDB=yes MACHINE=x64', + r'xcopy ..\builds\libcurl-vc15-x64-release-static-ipv6-sspi-winssl {{prefix}}\Release\ /S /Y', + r'nmake /f Makefile.vc mode=static VC=15 WITH_DEVEL={{prefix}} DEBUG=yes GEN_PDB=yes MACHINE=x64', + r'xcopy ..\builds\libcurl-vc15-x64-debug-static-ipv6-sspi-winssl {{prefix}}\Debug\ /S /Y', ]