Beta version 3.0.2: Fix Windows build scripts.

This commit is contained in:
John Preston 2021-09-10 14:33:47 +03:00
parent 453954f901
commit fd288fbdfd
2 changed files with 10 additions and 5 deletions

View File

@ -95,12 +95,12 @@ if %Build64% neq 0 (
set "UpdateFile=tx64upd%AppVersion%" set "UpdateFile=tx64upd%AppVersion%"
set "SetupFile=tsetup-x64.%AppVersionStrFull%.exe" set "SetupFile=tsetup-x64.%AppVersionStrFull%.exe"
set "PortableFile=tportable-x64.%AppVersionStrFull%.zip" set "PortableFile=tportable-x64.%AppVersionStrFull%.zip"
set "DumpSymsPath=%SolutionPath%\..\..\Libraries\win64\breakpad\src\tools\windows\dump_syms\Release\dump_syms.exe" set "DumpSymsPath=%SolutionPath%\..\..\Libraries\win64\breakpad\src\out\Release_x64\dump_syms.exe"
) else ( ) else (
set "UpdateFile=tupdate%AppVersion%" set "UpdateFile=tupdate%AppVersion%"
set "SetupFile=tsetup.%AppVersionStrFull%.exe" set "SetupFile=tsetup.%AppVersionStrFull%.exe"
set "PortableFile=tportable.%AppVersionStrFull%.zip" set "PortableFile=tportable.%AppVersionStrFull%.zip"
set "DumpSymsPath=%SolutionPath%\..\..\Libraries\breakpad\src\tools\windows\dump_syms\Release\dump_syms.exe" set "DumpSymsPath=%SolutionPath%\..\..\Libraries\breakpad\src\out\Release\dump_syms.exe"
) )
set "ReleasePath=%SolutionPath%\Release" set "ReleasePath=%SolutionPath%\Release"
set "DeployPath=%ReleasePath%\deploy\%AppVersionStrMajor%\%AppVersionStrFull%" set "DeployPath=%ReleasePath%\deploy\%AppVersionStrMajor%\%AppVersionStrFull%"

View File

@ -592,15 +592,20 @@ depends:patches/breakpad.diff
git apply ../patches/breakpad.diff git apply ../patches/breakpad.diff
git clone https://github.com/google/googletest src/testing git clone https://github.com/google/googletest src/testing
win: win:
if "%X8664%" equ "x64" (
set "FolderPostfix=_x64"
) else (
set "FolderPostfix="
)
cd src\\client\\windows cd src\\client\\windows
gyp --no-circular-check breakpad_client.gyp --format=ninja gyp --no-circular-check breakpad_client.gyp --format=ninja
cd ..\\.. cd ..\\..
ninja -C out/Debug common crash_generation_client exception_handler ninja -C out/Debug%FolderPostfix% common crash_generation_client exception_handler
ninja -C out/Release common crash_generation_client exception_handler ninja -C out/Release%FolderPostfix% common crash_generation_client exception_handler
cd tools\\windows\\dump_syms cd tools\\windows\\dump_syms
gyp dump_syms.gyp --format=ninja gyp dump_syms.gyp --format=ninja
cd ..\\..\\.. cd ..\\..\\..
ninja -C out/Release dump_syms ninja -C out/Release%FolderPostfix% dump_syms
mac: mac:
git clone https://chromium.googlesource.com/linux-syscall-support src/third_party/lss git clone https://chromium.googlesource.com/linux-syscall-support src/third_party/lss
cd src/third_party/lss cd src/third_party/lss