Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade to MSVC 2017 (#10437)

Browse Source
pull/10440/head
Mike Kruskal 2 years ago committed by GitHub
parent 6affd51405
commit 7b091c5b2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      appveyor.yml
  2. 8
      kokoro/release/protoc/windows/build.bat

10
appveyor.yml
Unescape View File

@ -3,16 +3,16 @@ configuration:
environment: environment:
matrix: matrix:
# Only test few combinations: "Visual Studio 2015 (14) + Win64/MinGW + Debug + DLL". We can # Only test few combinations: "Visual Studio 2017 (15) + Win64/MinGW + Debug + DLL". We can
# test more combinations but AppVeyor just takes too long to finish (each # test more combinations but AppVeyor just takes too long to finish (each
# combination takes ~15mins). # combination takes ~15mins).
- platform: MinGW - platform: MinGW
language: cpp language: cpp
image: Visual Studio 2015 image: Visual Studio 2017
- platform: Win64 - platform: Win64
language: cpp language: cpp
image: Visual Studio 2015 image: Visual Studio 2017
BUILD_DLL: ON BUILD_DLL: ON
UNICODE: ON UNICODE: ON
@ -35,8 +35,8 @@ install:
before_build: before_build:
- if %platform%==MinGW set generator=MinGW Makefiles - if %platform%==MinGW set generator=MinGW Makefiles
- if %platform%==Win32 set generator=Visual Studio 14 - if %platform%==Win32 set generator=Visual Studio 15
- if %platform%==Win64 set generator=Visual Studio 14 Win64 - if %platform%==Win64 set generator=Visual Studio 15 Win64
- if %platform%==Win32 set vcplatform=Win32 - if %platform%==Win32 set vcplatform=Win32
- if %platform%==Win64 set vcplatform=x64 - if %platform%==Win64 set vcplatform=x64

8
kokoro/release/protoc/windows/build.bat
Unescape View File

@ -1,6 +1,6 @@
set PATH=C:\Program Files (x86)\MSBuild\14.0\bin\;%PATH% set PATH=C:\Program Files (x86)\MSBuild\14.0\bin\;%PATH%
set generator32=Visual Studio 14 set generator32=Visual Studio 15
set generator64=Visual Studio 14 Win64 set generator64=Visual Studio 15 Win64
set vcplatform32=win32 set vcplatform32=win32
set vcplatform64=x64 set vcplatform64=x64
set configuration=Release set configuration=Release
@ -15,13 +15,13 @@ set ABSL_ROOT_DIR=%cd%\third_party\abseil-cpp
mkdir build32 mkdir build32
cd build32 cd build32
cmake -G "%generator32%" -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_SHARED_LIBS=OFF -Dprotobuf_UNICODE=ON ../cmake cmake -G "%generator32%" -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_SHARED_LIBS=OFF -Dprotobuf_UNICODE=ON ..
msbuild protobuf.sln /p:Platform=%vcplatform32% || goto error msbuild protobuf.sln /p:Platform=%vcplatform32% || goto error
cd .. cd ..
mkdir build64 mkdir build64
cd build64 cd build64
cmake -G "%generator64%" -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_SHARED_LIBS=OFF -Dprotobuf_UNICODE=ON ../cmake cmake -G "%generator64%" -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_BUILD_SHARED_LIBS=OFF -Dprotobuf_UNICODE=ON ..
msbuild protobuf.sln /p:Platform=%vcplatform64% || goto error msbuild protobuf.sln /p:Platform=%vcplatform64% || goto error
cd .. cd ..

Write Preview
Loading…
Cancel
Save