From 08c991129d7aeaed91dc1ac7f9f63aa9429965cb Mon Sep 17 00:00:00 2001 From: Asher Baker Date: Thu, 19 Jul 2018 17:24:25 +0100 Subject: [PATCH] Build windows breakpad libs as part of pre-setup like linux --- breakpad.bat | 13 ++++++++++++- extension/AMBuilder | 26 -------------------------- 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/breakpad.bat b/breakpad.bat index 4158d1b..0f71096 100644 --- a/breakpad.bat +++ b/breakpad.bat @@ -18,4 +18,15 @@ IF EXIST gyp\NUL GOTO HASGYP git clone --depth=1 --branch=master https://chromium.googlesource.com/external/gyp.git gyp :HASGYP -cd .. +IF EXIST build\NUL GOTO HASBUILD +mkdir build +:HASBUILD +cd build + +..\gyp\gyp.bat --no-circular-check ..\src\src\client\windows\handler\exception_handler.gyp +msbuild ..\src\src\client\windows\handler\exception_handler.sln /m /p:Configuration=Release + +..\gyp\gyp.bat --no-circular-check ..\src\src\client\windows\crash_generation\crash_generation.gyp +msbuild ..\src\src\client\windows\crash_generation\crash_generation.sln /m /p:Configuration=Release + +cd ..\.. diff --git a/extension/AMBuilder b/extension/AMBuilder index aa35c56..b530d35 100644 --- a/extension/AMBuilder +++ b/extension/AMBuilder @@ -9,32 +9,6 @@ def BuildEverything(): if AMBuild.target['platform'] not in ['linux', 'windows']: return - if AMBuild.target['platform'] in ['windows']: - BuildBreakpad() - - BuildExtension(); - -def BuildBreakpad(): - breakpad = AMBuild.AddJob('breakpad') - - if osutil.FileExists(os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'client', 'windows', 'handler', 'Release', 'lib', 'exception_handler.lib')): - return - - gyp = os.path.join(AMBuild.sourceFolder, 'breakpad', 'gyp', 'gyp.bat') - - gyppath = os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'client', 'windows', 'handler', 'exception_handler.gyp') - breakpad.AddCommand(DirectCommand([gyp, '--no-circular-check', gyppath])) - - slnpath = os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'client', 'windows', 'handler', 'exception_handler.sln') - breakpad.AddCommand(DirectCommand(['msbuild', slnpath, '/p:Configuration=Release'])) - - gyppath = os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'client', 'windows', 'crash_generation', 'crash_generation.gyp') - breakpad.AddCommand(DirectCommand([gyp, '--no-circular-check', gyppath])) - - slnpath = os.path.join(AMBuild.sourceFolder, 'breakpad', 'src', 'src', 'client', 'windows', 'crash_generation', 'crash_generation.sln') - breakpad.AddCommand(DirectCommand(['msbuild', slnpath, '/p:Configuration=Release'])) - -def BuildExtension(): compiler = SM.DefaultCompiler() compiler['CXXINCLUDES'].append(os.path.join(AMBuild.sourceFolder, 'extension'))