Migrated gyp for breakpad to upstream in prepare script on macOS.

This commit is contained in:
23rd 2022-09-29 13:32:17 +03:00 committed by John Preston
parent 2a6e2fa353
commit 5b1a9fb3e1

View file

@ -82,6 +82,7 @@ environment = {
'USED_PREFIX': usedPrefix, 'USED_PREFIX': usedPrefix,
'ROOT_DIR': rootDir, 'ROOT_DIR': rootDir,
'LIBS_DIR': libsDir, 'LIBS_DIR': libsDir,
'THIRDPARTY_DIR': thirdPartyDir,
'SPECIAL_TARGET': 'win' if win32 else 'win64' if win64 else 'mac', 'SPECIAL_TARGET': 'win' if win32 else 'win64' if win64 else 'mac',
'X8664': 'x86' if win32 else 'x64', 'X8664': 'x86' if win32 else 'x64',
'WIN32X64': 'Win32' if win32 else 'x64', 'WIN32X64': 'Win32' if win32 else 'x64',
@ -446,8 +447,10 @@ win:
depends:patches/gyp.diff depends:patches/gyp.diff
git apply $LIBS_DIR/patches/gyp.diff git apply $LIBS_DIR/patches/gyp.diff
mac: mac:
python3 -m pip install --ignore-installed git+https://github.com/desktop-app/gyp-next@main python3 -m pip install ^
mkdir gyp --ignore-installed ^
--target=$THIRDPARTY_DIR/gyp ^
git+https://chromium.googlesource.com/external/gyp@master
""", 'ThirdParty') """, 'ThirdParty')
stage('yasm', """ stage('yasm', """
@ -1033,6 +1036,7 @@ depends:patches/breakpad.diff
cd src/third_party/lss cd src/third_party/lss
git checkout e1e7b0ad8e git checkout e1e7b0ad8e
cd ../../build cd ../../build
PYTHONPATH=$THIRDPARTY_DIR/gyp
python3 gyp_breakpad python3 gyp_breakpad
cd ../processor cd ../processor
xcodebuild -project processor.xcodeproj -target minidump_stackwalk -configuration Release build xcodebuild -project processor.xcodeproj -target minidump_stackwalk -configuration Release build