Skip to content

Commit 284234c

Browse files
committed
Re-add downloading of absl
1 parent 6d68cb5 commit 284234c

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

buildscripts/make_dependencies.bat

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@rem set PROTOBUF_VER=21.7
22
set PROTOBUF_VER=22.5
3+
set ABSL_VERSION=20230125.4
34
set CMAKE_NAME=cmake-3.26.3-windows-x86_64
45

56
if not exist "protobuf-%PROTOBUF_VER%\build\Release\" (
@@ -24,6 +25,11 @@ set PATH=%PATH%;%cd%\%CMAKE_NAME%\bin
2425
powershell -command "$ErrorActionPreference = 'stop'; & { [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; iwr https://github.com/google/protobuf/releases/download/v%PROTOBUF_VER%/protobuf-%PROTOBUF_VER%.zip -OutFile protobuf.zip }" || exit /b 1
2526
powershell -command "$ErrorActionPreference = 'stop'; & { Add-Type -AssemblyName System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::ExtractToDirectory('protobuf.zip', '.') }" || exit /b 1
2627
del protobuf.zip
28+
powershell -command "$ErrorActionPreference = 'stop'; & { [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; iwr https://github.com/abseil/abseil-cpp/archive/refs/tags/%ABSL_VERSION%.zip -OutFile absl.zip }" || exit /b 1
29+
powershell -command "$ErrorActionPreference = 'stop'; & { Add-Type -AssemblyName System.IO.Compression.FileSystem; [System.IO.Compression.ZipFile]::ExtractToDirectory('absl.zip', '.') }" || exit /b 1
30+
del absl.zip
31+
rmdir protobuf-%PROTOBUF_VER%\third_party\abseil-cpp
32+
rename abseil-cpp-%ABSL_VERSION% protobuf-%PROTOBUF_VER%\third_party\abseil-cpp
2733
mkdir protobuf-%PROTOBUF_VER%\build
2834
pushd protobuf-%PROTOBUF_VER%\build
2935

buildscripts/make_dependencies.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
set -evux -o pipefail
55

66
PROTOBUF_VERSION=22.5
7+
ABSL_VERSION=20230125.4
78

89
# ARCH is x86_64 bit unless otherwise specified.
910
ARCH="${ARCH:-x86_64}"
@@ -30,6 +31,9 @@ if [ -f ${INSTALL_DIR}/bin/protoc ]; then
3031
else
3132
if [[ ! -d "protobuf-${PROTOBUF_VERSION}" ]]; then
3233
curl -Ls "https://github.com/google/protobuf/releases/download/v${PROTOBUF_VERSION}/protobuf-${PROTOBUF_VERSION}.tar.gz" | tar xz
34+
curl -Ls "https://github.com/abseil/abseil-cpp/archive/refs/tags/${ABSL_VERSION}.tar.gz" | tar xz
35+
rmdir "protobuf-$PROTOBUF_VERSION/third_party/abseil-cpp"
36+
mv "abseil-cpp-$ABSL_VERSION" "protobuf-$PROTOBUF_VERSION/third_party/abseil-cpp"
3337
fi
3438
# the same source dir is used for 32 and 64 bit builds, so we need to clean stale data first
3539
rm -rf "$DOWNLOAD_DIR/protobuf-${PROTOBUF_VERSION}/build"

0 commit comments

Comments
 (0)