From 6ceb6d401e68d3a85cf6ab274c80b0a6fdbc0d74 Mon Sep 17 00:00:00 2001
From: Corentin Le Molgat <corentinl@google.com>
Date: Thu, 19 Jun 2025 14:48:50 +0200
Subject: [PATCH] tools/release: more cleanup

---
 tools/release/build_delivery_linux.sh           |  3 ++-
 tools/release/build_delivery_macos.sh           | 12 +++++++-----
 tools/release/build_delivery_manylinux_amd64.sh |  1 +
 tools/release/build_delivery_manylinux_arm64.sh |  1 +
 tools/release/build_delivery_win.cmd            |  4 ++--
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/tools/release/build_delivery_linux.sh b/tools/release/build_delivery_linux.sh
index 1a9431662a..6c6558f880 100755
--- a/tools/release/build_delivery_linux.sh
+++ b/tools/release/build_delivery_linux.sh
@@ -30,6 +30,7 @@ ${BOLD}DESCRIPTION${RESET}
 
 ${BOLD}OPTIONS${RESET}
 \t-h --help: display this help text
+\tarchive: build all (C++, .Net, Java) archives
 \tdotnet: build all .Net packages
 \tjava: build all Java packages
 \tpython: build all Pyhon packages
@@ -208,7 +209,7 @@ function build_python() {
   command -v python3 | xargs echo "python3: " | tee -a build.log
   python3 -c "import platform as p; print(p.platform())" | tee -a build.log
   python3 -m pip install --upgrade --user --break-system-package pip
-  python3 -m pip install --upgrade --user --break-system-package wheel absl-py mypy mypy-protobuf virtualenv
+  python3 -m pip install --upgrade --user --break-system-package wheel absl-py mypy mypy-protobuf virtualenv "typing-extensions>=4.12"
   echo "check protoc-gen-mypy..."
   command -v protoc-gen-mypy | xargs echo "protoc-gen-mypy: " | tee -a build.log
   protoc-gen-mypy --version | xargs echo "protoc-gen-mypy version: " | tee -a build.log
diff --git a/tools/release/build_delivery_macos.sh b/tools/release/build_delivery_macos.sh
index 72f82ba5e5..f03ddf3577 100755
--- a/tools/release/build_delivery_macos.sh
+++ b/tools/release/build_delivery_macos.sh
@@ -30,6 +30,7 @@ ${BOLD}DESCRIPTION${RESET}
 
 ${BOLD}OPTIONS${RESET}
 \t-h --help: display this help text
+\tarchive: build all (C++, .Net, Java) archives
 \tdotnet: build all .Net packages
 \tjava: build all Java packages
 \tpython: build all Pyhon packages
@@ -291,13 +292,14 @@ function build_python() {
     echo "DONE" | tee -a build.log
 
     if [[ ${PLATFORM} == "x86_64" ]]; then
-      echo -n "  Build all..." | tee -a build.log
-      # on macos X86_64 stubgen will timeout -> need to build 2 times
-      cmake --build "temp_python${PY_VERSION}" -j8 -v || true
+      echo -n "  Build all few times..." | tee -a build.log
+      # on macos X86_64 stubgen will timeout -> need to build few times
+      cmake --build "temp_python${PY_VERSION}" -j4 -v || true
+      sleep 10
+      cmake --build "temp_python${PY_VERSION}" -v || true
       echo "DONE" | tee -a build.log
-      sleep 5
       echo -n "  ReBuild all..." | tee -a build.log
-      cmake --build "temp_python${PY_VERSION}" -j8 -v
+      cmake --build "temp_python${PY_VERSION}" -j4 -v
       echo "DONE" | tee -a build.log
     else
       echo -n "  Build all..." | tee -a build.log
diff --git a/tools/release/build_delivery_manylinux_amd64.sh b/tools/release/build_delivery_manylinux_amd64.sh
index ab0a580856..892745755e 100755
--- a/tools/release/build_delivery_manylinux_amd64.sh
+++ b/tools/release/build_delivery_manylinux_amd64.sh
@@ -30,6 +30,7 @@ ${BOLD}DESCRIPTION${RESET}
 
 ${BOLD}OPTIONS${RESET}
 \t-h --help: display this help text
+\tarchive: build all (C++, .Net, Java) archives
 \tdotnet: build all .Net packages
 \tjava: build all Java packages
 \tpython: build all Pyhon packages
diff --git a/tools/release/build_delivery_manylinux_arm64.sh b/tools/release/build_delivery_manylinux_arm64.sh
index d87d4b7bdf..81961b19d4 100755
--- a/tools/release/build_delivery_manylinux_arm64.sh
+++ b/tools/release/build_delivery_manylinux_arm64.sh
@@ -30,6 +30,7 @@ ${BOLD}DESCRIPTION${RESET}
 
 ${BOLD}OPTIONS${RESET}
 \t-h --help: display this help text
+\tarchive: build all (C++, .Net, Java) archives
 \tdotnet: build all .Net packages
 \tjava: build all Java packages
 \tpython: build all Pyhon packages
diff --git a/tools/release/build_delivery_win.cmd b/tools/release/build_delivery_win.cmd
index d50a83f831..940e0ff7bd 100644
--- a/tools/release/build_delivery_win.cmd
+++ b/tools/release/build_delivery_win.cmd
@@ -93,7 +93,7 @@ echo   help: show this help text (default)
 echo   dotnet: Build dotnet packages
 echo   java: Build java packages
 echo   python: Build python packages
-echo   archive: Build archive
+echo   archive: Build all (C++, .Net, Java) archives
 echo   examples: Build examples archives
 echo   all: build everything
 echo   reset: delete all artifacts and suppress cache file
@@ -284,7 +284,7 @@ FOR %%v IN (9 10 11 12 13) DO (
   echo Check python3.%%v... | tee.exe -a build.log
   which.exe "C:\python3%%v-64\python.exe" || exit 1
   echo "C:\python3%%v-64\python.exe: FOUND" | tee.exe -a build.log
-  C:\python3%%v-64\python.exe -m pip install --upgrade --user absl-py mypy mypy-protobuf protobuf numpy pandas
+  C:\python3%%v-64\python.exe -m pip install --upgrade --user absl-py mypy mypy-protobuf protobuf numpy pandas "typing-extensions>=4.12"
 
   call :subroutine %%v