File tree Expand file tree Collapse file tree 4 files changed +7
-7
lines changed Expand file tree Collapse file tree 4 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ cd "%WORKSPACE%"
2525
2626SET TARGET_ARCH = x86_32
2727SET FAIL_ON_WARNINGS = true
28- SET PROTOBUF_VER = 22.5
28+ SET PROTOBUF_VER = 26.1
2929SET PKG_CONFIG_PATH = %ESCWORKSPACE% \\grpc-java-helper32\\protobuf-%PROTOBUF_VER% \\build\\protobuf-%PROTOBUF_VER% \\lib\\pkgconfig
3030SET VC_PROTOBUF_LIBS = /LIBPATH:%ESCWORKSPACE% \\grpc-java-helper32\\protobuf-%PROTOBUF_VER% \\build\\protobuf-%PROTOBUF_VER% \\lib
3131SET VC_PROTOBUF_INCLUDE = %ESCWORKSPACE% \\grpc-java-helper32\\protobuf-%PROTOBUF_VER% \\build\\protobuf-%PROTOBUF_VER% \\include
Original file line number Diff line number Diff line change @@ -24,7 +24,7 @@ cd "%WORKSPACE%"
2424
2525SET TARGET_ARCH = x86_64
2626SET FAIL_ON_WARNINGS = true
27- SET PROTOBUF_VER = 22.5
27+ SET PROTOBUF_VER = 26.1
2828SET PKG_CONFIG_PATH = %ESCWORKSPACE% \\grpc-java-helper64\\protobuf-%PROTOBUF_VER% \\build\\protobuf-%PROTOBUF_VER% \\lib\\pkgconfig
2929SET VC_PROTOBUF_LIBS = /LIBPATH:%ESCWORKSPACE% \\grpc-java-helper64\\protobuf-%PROTOBUF_VER% \\build\\protobuf-%PROTOBUF_VER% \\lib
3030SET VC_PROTOBUF_INCLUDE = %ESCWORKSPACE% \\grpc-java-helper64\\protobuf-%PROTOBUF_VER% \\build\\protobuf-%PROTOBUF_VER% \\include
Original file line number Diff line number Diff line change 11choco install -y pkgconfiglite
22choco install -y openjdk --version=17.0
33set PATH = %PATH% ;" c:\Program Files\OpenJDK\jdk-17\bin"
4- set PROTOBUF_VER = 22.5
5- set ABSL_VERSION = 20230125.4
4+ set PROTOBUF_VER = 26.1
5+ set ABSL_VERSION = 20250127.1
66set CMAKE_NAME = cmake-3.26.3-windows-x86_64
77
88if not exist " protobuf-%PROTOBUF_VER% \build\Release\" (
@@ -51,7 +51,7 @@ for /f "tokens=4 delims=\" %%a in ("%VCINSTALLDIR%") do (
5151for /f " tokens=1 delims=." %%a in (" %VisualStudioVersion% " ) do (
5252 SET visual_studio_major_version = %%a
5353)
54- cmake -Dprotobuf_BUILD_TESTS=OFF -DCMAKE_INSTALL_PREFIX=%cd% \protobuf-%PROTOBUF_VER% -DCMAKE_PREFIX_PATH=%cd% \protobuf-%PROTOBUF_VER% -G " Visual Studio %visual_studio_major_version% %VC_YEAR% " %CMAKE_VSARCH% .. || exit /b 1
54+ cmake -DABSL_MSVC_STATIC_RUNTIME=ON - Dprotobuf_BUILD_TESTS=OFF -DCMAKE_INSTALL_PREFIX=%cd% \protobuf-%PROTOBUF_VER% -DCMAKE_PREFIX_PATH=%cd% \protobuf-%PROTOBUF_VER% -G " Visual Studio %visual_studio_major_version% %VC_YEAR% " %CMAKE_VSARCH% .. || exit /b 1
5555cmake --build . --config Release --target install || exit /b 1
5656popd
5757goto :eof
Original file line number Diff line number Diff line change 33# Build protoc
44set -evux -o pipefail
55
6- PROTOBUF_VERSION=22.5
7- ABSL_VERSION=20230125.4
6+ PROTOBUF_VERSION=26.1
7+ ABSL_VERSION=20250127.1
88CMAKE_VERSION=3.26.3
99
1010# ARCH is x86_64 bit unless otherwise specified.
You can’t perform that action at this time.
0 commit comments