From ac0ce8b4393920122fd13c84198ad8270468be5e Mon Sep 17 00:00:00 2001 From: Christian Blichmann Date: Wed, 5 Nov 2025 05:09:33 -0800 Subject: [PATCH 1/3] Disable BinExport's Binary Ninja build targets during build Those targets are not needed to just build the BinDiff binaries. If we ever implement a Binary Ninja plugin for BinDiff itself, we need to re-enable this option. PiperOrigin-RevId: 828419346 Change-Id: Idb2fc9f7118e5a64c6d40d63e279d3a154e84bc8 --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e918c02..582a3ef3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,7 +36,8 @@ set(BINDIFF_SOURCE_DIR "${PROJECT_SOURCE_DIR}" CACHE INTERNAL "" FORCE) set(BINDIFF_BINEXPORT_DIR "${PROJECT_SOURCE_DIR}/../binexport" CACHE PATH "Path to a BinExport source tree") -# Import BinExport targets +# Import targets shared with BinExport +set(BINEXPORT_ENABLE_BINARYNINJA OFF CACHE INTERNAL "" FORCE) add_subdirectory("${BINDIFF_BINEXPORT_DIR}" "_deps/binexport-build" EXCLUDE_FROM_ALL) # CMake settings From a474e894a0ff797c9e19f63582df927f54204fd7 Mon Sep 17 00:00:00 2001 From: Christian Blichmann Date: Wed, 5 Nov 2025 05:31:02 -0800 Subject: [PATCH 2/3] Temporarily disable code-signing Need to migrate to dedicated jobs to do code signing. PiperOrigin-RevId: 828424829 Change-Id: Id71a7debe6c82da884dd97e87600616bc0bfe731 --- kokoro/deb/build.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/kokoro/deb/build.sh b/kokoro/deb/build.sh index 7c5cb2d8..8cfd7661 100755 --- a/kokoro/deb/build.sh +++ b/kokoro/deb/build.sh @@ -94,9 +94,11 @@ popd [ "$1" != "release" ] && exit 0 # Release build, code sign the artifacts -echo "Code signing artifacts..." +# TODO(cblichmann): Re-enable code signing using a separate job. +# echo "Code signing artifacts..." +# +# chmod 777 "${build_dir}" +# chmod 666 "${build_dir}"/*.deb +# /escalated_sign/escalated_sign.py -j /escalated_sign_jobs -t linux_gpg_sign \ +# "${build_dir}/"bindiff_*.deb -chmod 777 "${build_dir}" -chmod 666 "${build_dir}"/*.deb -/escalated_sign/escalated_sign.py -j /escalated_sign_jobs -t linux_gpg_sign \ - "${build_dir}/"bindiff_*.deb From 5c2bb58dc40663a0d336c55120afed9f22cc2bb1 Mon Sep 17 00:00:00 2001 From: Christian Blichmann Date: Wed, 5 Nov 2025 05:38:31 -0800 Subject: [PATCH 3/3] macOS: Update internal build scripts to CMake 4.1.2 PiperOrigin-RevId: 828426970 Change-Id: I3802264474004a0e847c8266911dd9af058f9797 --- kokoro/macos/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kokoro/macos/build.sh b/kokoro/macos/build.sh index e3af005b..6a5a81fe 100755 --- a/kokoro/macos/build.sh +++ b/kokoro/macos/build.sh @@ -20,11 +20,11 @@ mkdir -p "${build_dir}" # Verify/extract dependencies pushd "${KOKORO_GFILE_DIR}" cat << 'EOF' | shasum -c -81db032983a33dbd8da0315df4488e19999ffb63c5a900fb1c0741b14a7b78ef cmake-3.29.3-macos-universal.tar.gz +3be85f5b999e327b1ac7d804cbc9acd767059e9f603c42ec2765f6ab68fbd367 cmake-4.1.2-macos-universal.tar.gz EOF popd tar --strip-components=3 -C "${build_dir}" -xzf \ - "${KOKORO_GFILE_DIR}/cmake-3.29.3-macos-universal.tar.gz" + "${KOKORO_GFILE_DIR}/cmake-4.1.2-macos-universal.tar.gz" export PATH=${build_dir}/bin:${PATH} # Build BinDiff