From cf40509b39cef9d47cfef0f4344c1e465dea89bb Mon Sep 17 00:00:00 2001 From: Ian Bell Date: Thu, 7 May 2020 08:02:41 -0400 Subject: [PATCH] from winbuilds to mingw-x64 --- dev/buildbot/master/master.cfg | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dev/buildbot/master/master.cfg b/dev/buildbot/master/master.cfg index 2f9e8d71..2aea0e1e 100644 --- a/dev/buildbot/master/master.cfg +++ b/dev/buildbot/master/master.cfg @@ -845,16 +845,16 @@ def cmake_slave(mod_name, platform, install = True, cmake_args = [], build_args pre = [] if platform.lower() == 'windows': if mod_name.lower() == 'octave': - pre = ['set','"PATH=%OCTAVE_ROOT%/mingw64/bin;c:/Users/ian/winbuilds/bin;%PATH%"','&&'] + pre = ['set','"PATH=%OCTAVE_ROOT%/mingw64/bin;%MINGW64_BIN%;%PATH%"','&&'] elif mod_name.lower() == 'r': - pre = ['set','"PATH=c:/Users/ian/winbuilds/bin;%PATH%"','&&'] + pre = ['set','"PATH=%MINGW64_BIN%;%PATH%"','&&'] elif 'xtern' in mod_name.lower(): - pre = ['set','"PATH=c:/Users/ian/winbuilds64/bin;%PATH%"','&&'] ## GCC+C++ + pre = ['set','"PATH=%MINGW64_BIN%;%PATH%"','&&'] ## GCC+C++ elif 'shared_library_mingw' in mod_name: if '32' in mod_name: - pre = ['set','"PATH=c:/Users/ian/winbuilds/bin;%PATH%"','&&'] + pre = ['set','"PATH=%MINGW_BIN%;%PATH%"','&&'] else: - pre = ['set','"PATH=c:/Users/ian/winbuilds64/bin;%PATH%"','&&'] + pre = ['set','"PATH=%MINGW64_BIN%;%PATH%"','&&'] factory.addStep(ShellCommand(command=' '.join(pre+["cmake", "..", "-DCOOLPROP_"+mod_name.upper()+"_MODULE=ON","-DBUILD_TESTING=ON"]+cmake_args), env = cmake_env,