premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #220 from arvidn/appveyor-python-package 

make appveyor build the python binding installer for windows
This commit is contained in:
Arvid Norberg 2015-10-12 21:23:36 -04:00
parent ee58035d9d 81ee9d5d4e
commit 1c99b210bb
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
appveyor.yml
View File

@ -22,6 +22,7 @@ environment:
linkflags: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"' linkflags: '"/LIBPATH:C:\\openssl-1.0.1p-vs2013\\lib64"'
include: '"c:\\openssl-1.0.1p-vs2013\\include"' include: '"c:\\openssl-1.0.1p-vs2013\\include"'
- variant: test_debug - variant: test_debug
python_package: 1
compiler: msvc-10.0 compiler: msvc-10.0
linkflags: '"/LIBPATH:C:\\openssl-1.0.1p-vs2010\\lib"' linkflags: '"/LIBPATH:C:\\openssl-1.0.1p-vs2010\\lib"'
include: '"c:\\openssl-1.0.1p-vs2010\\include"' include: '"c:\\openssl-1.0.1p-vs2010\\include"'
@ -95,30 +96,41 @@ install:
- set PATH=%PATH%;%BOOST_BUILD_PATH%\src\engine\bin.ntx86 - set PATH=%PATH%;%BOOST_BUILD_PATH%\src\engine\bin.ntx86
- 'echo using msvc : 10.0 ; >%HOMEDRIVE%%HOMEPATH%/user-config.jam' - 'echo using msvc : 10.0 ; >%HOMEDRIVE%%HOMEPATH%/user-config.jam'
- 'echo using msvc : 12.0 ; >>%HOMEDRIVE%%HOMEPATH%/user-config.jam' - 'echo using msvc : 12.0 ; >>%HOMEDRIVE%%HOMEPATH%/user-config.jam'
- 'echo using msvc : 9.0 ; >>%HOMEDRIVE%%HOMEPATH%/user-config.jam'
- type %HOMEDRIVE%%HOMEPATH%\user-config.jam - type %HOMEDRIVE%%HOMEPATH%\user-config.jam
- cd %ROOT_DIRECTORY% - cd %ROOT_DIRECTORY%
- set PATH=%PATH%;c:\Mingw\bin - set PATH=%PATH%;c:\Mingw\bin
- g++ --version - g++ --version
- python --version - python --version
- echo %ROOT_DIRECTORY% - echo %ROOT_DIRECTORY%
cache: cache:
- openssl-1.0.1p-vs2010.7z - openssl-1.0.1p-vs2010.7z
- openssl-1.0.1p-vs2013.7z - openssl-1.0.1p-vs2013.7z
- openssl-1.0.1p-vs2015.7z - openssl-1.0.1p-vs2015.7z
build_script: build_script:
- if not defined x64 (
cd %ROOT_DIRECTORY%\examples
& b2.exe --hash -j2 %compiler% variant=%variant% linkflags=%linkflags% include=%include% link=shared
& cd %ROOT_DIRECTORY%\bindings\python
& b2.exe --hash -j2 %compiler% stage_module install-dependencies=on variant=%variant% libtorrent-link=shared linkflags=%linkflags% include=%include%
& python test.py
& if defined python_package ( python setup.py --bjam bdist_msi )
)
test_script:
- cd %ROOT_DIRECTORY%\test - cd %ROOT_DIRECTORY%\test
- if defined x64 ( - if defined x64 (
b2.exe --hash -j2 address-model=64 win-tests %compiler% variant=%variant% link=shared linkflags=%linkflags% include=%include% b2.exe --hash -j2 address-model=64 win-tests %compiler% variant=%variant% link=shared linkflags=%linkflags% include=%include%
) else ( ) else (
b2.exe --hash -j2 address-model=32 win-tests %compiler% variant=%variant% link=shared linkflags=%linkflags% include=%include% b2.exe --hash -j2 address-model=32 win-tests %compiler% variant=%variant% link=shared linkflags=%linkflags% include=%include%
& cd %ROOT_DIRECTORY%\examples
& b2.exe --hash -j2 %compiler% variant=%variant% linkflags=%linkflags% include=%include% link=shared
& cd %ROOT_DIRECTORY%\bindings\python
& b2.exe --hash -j2 %compiler% stage_module install-dependencies=on variant=%variant% libtorrent-link=shared linkflags=%linkflags% include=%include%
& python test.py
) )
- if defined sim ( - if defined sim (
cd %ROOT_DIRECTORY%\simulation cd %ROOT_DIRECTORY%\simulation
& b2.exe --hash -j2 link=shared crypto=built-in %compiler% & b2.exe --hash -j2 link=shared crypto=built-in %compiler%
) )
artifacts:
- path: bindings\python\dist\*.msi
name: python-binding-win32

2
include/libtorrent/aux_/session_impl.hpp
View File

@ -1161,7 +1161,7 @@ namespace libtorrent
// *glares at gcc* // *glares at gcc*
struct extention_dht_query struct extention_dht_query
{ {
uint8_t query_len; boost::uint8_t query_len;
boost::array<char, max_dht_query_length> query; boost::array<char, max_dht_query_length> query;
dht_extension_handler_t handler; dht_extension_handler_t handler;
}; };