Skip to content

[pull] main from google:main #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Nov 5, 2025
Merged

[pull] main from google:main #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac0ce8b
Disable BinExport's Binary Ninja build targets during build
cblichmann Nov 5, 2025
a474e89
Temporarily disable code-signing
cblichmann Nov 5, 2025
5c2bb58
macOS: Update internal build scripts to CMake 4.1.2
cblichmann Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 7 additions & 5 deletions kokoro/deb/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions kokoro/macos/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading