diff options
author | Bo Yang <paulyang1211@gmail.com> | 2018-02-28 11:07:16 -0800 |
---|---|---|
committer | Bo Yang <paulyang1211@gmail.com> | 2018-03-01 11:10:56 -0800 |
commit | b93dd59d6fe17974f0cc801b85b7ed745b834ab9 (patch) | |
tree | 415f19a3578faa0c812514972a48bc118b49de83 /appveyor.yml | |
parent | 4dcdb6bcb2a7e67afeecea070065c6fdf40ed30b (diff) | |
download | protobuf-b93dd59d6fe17974f0cc801b85b7ed745b834ab9.tar.gz protobuf-b93dd59d6fe17974f0cc801b85b7ed745b834ab9.tar.bz2 protobuf-b93dd59d6fe17974f0cc801b85b7ed745b834ab9.zip |
Fix python 3.5/3.6
Diffstat (limited to 'appveyor.yml')
-rw-r--r-- | appveyor.yml | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/appveyor.yml b/appveyor.yml index 3900829a..0a20275e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,7 +7,6 @@ environment: REPO_DIR: protobuf PACKAGE_NAME: protobuf BUILD_COMMIT: v3.5.1 - PROTOC_VERSION: 3.5.1 MINGW_32: C:\mingw-w64\i686-6.3.0-posix-dwarf-rt_v5-rev1\mingw32\bin MINGW_64: C:\mingw-w64\x86_64-6.3.0-posix-seh-rt_v5-rev1\mingw64\bin BUILD_DLL: OFF @@ -72,12 +71,6 @@ install: - python --version - python -c "import struct; print(struct.calcsize('P') * 8)" - # Install protoc - - curl -L -o protoc-%PROTOC_VERSION%.zip https://github.com/google/protobuf/releases/download/v%PROTOC_VERSION%/protoc-%PROTOC_VERSION%-win32.zip - - 7z x protoc-%PROTOC_VERSION%.zip - - del /Q protoc-%PROTOC_VERSION%.zip - - SET PATH=%cd%\bin;%PATH% - # Install zlib - mkdir zlib - curl -L -o zlib.zip http://www.winimage.com/zLibDll/zlib123dll.zip @@ -89,15 +82,32 @@ install: - del /Q zlib-src.zip before_build: + - if %PYTHON%==C:\Python35 set generator=Visual Studio 14 + - if %PYTHON%==C:\Python35 set vcplatform=Win32 + + - if %PYTHON%==C:\Python35-x64 set generator=Visual Studio 14 Win64 + - if %PYTHON%==C:\Python35-x64 set vcplatform=x64 + + - if %PYTHON%==C:\Python36 set generator=Visual Studio 14 + - if %PYTHON%==C:\Python36 set vcplatform=Win32 + + - if %PYTHON%==C:\Python36-x64 set generator=Visual Studio 14 Win64 + - if %PYTHON%==C:\Python36-x64 set vcplatform=x64 + + - if %PYTHON%==C:\Python27 set MINGW=%MINGW_32% + - if %PYTHON%==C:\Python27-x64 set MINGW=%MINGW_64% + - if %PYTHON%==C:\Python34 set MINGW=%MINGW_32% + - if %PYTHON%==C:\Python34-x64 set MINGW=%MINGW_64% + - if %PYTHON_VERSION%==2.7 set generator=MSYS Makefiles + - if %PYTHON_VERSION%==2.7 set PATH=%MINGW%;%PATH% + - if %PYTHON_VERSION%==2.7 echo [build] > %PYTHON%\Lib\distutils\distutils.cfg + - if %PYTHON_VERSION%==2.7 echo.compiler = mingw32 >> %PYTHON%\Lib\distutils\distutils.cfg + - if %PYTHON_VERSION%==3.4 set generator=MSYS Makefiles - - if %PYTHON_VERSION%==3.5 set generator=Visual Studio 14 - - if %PYTHON_VERSION%==3.6 set generator=Visual Studio 14 - - if %PYTHON_ARCH%==32 set MINGW=%MINGW_32% - - if %PYTHON_ARCH%==64 set MINGW=%MINGW_64% - - set PATH=%MINGW%;%PATH% - - echo [build] > %PYTHON%\Lib\distutils\distutils.cfg - - echo.compiler = mingw32 >> %PYTHON%\Lib\distutils\distutils.cfg + - if %PYTHON_VERSION%==3.4 set PATH=%MINGW%;%PATH% + - if %PYTHON_VERSION%==3.4 echo [build] > %PYTHON%\Lib\distutils\distutils.cfg + - if %PYTHON_VERSION%==3.4 echo.compiler = mingw32 >> %PYTHON%\Lib\distutils\distutils.cfg build_script: - CALL appveyor.bat |