AuroraMiddleware/fmtlegacy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Try to work around an issue with msbuild caused by Appveyor update

Browse Source
This commit is contained in:
vitaut 2015-06-27 08:38:26 -07:00
parent ba09c1b56e
commit 279749168a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
support/appveyor-build.py
View File

@ -6,15 +6,19 @@ from subprocess import check_call
build = os.environ['BUILD'] build = os.environ['BUILD']
config = os.environ['CONFIG'] config = os.environ['CONFIG']
path = os.environ['PATH']
cmake_command = ['cmake', '-DFMT_PEDANTIC=ON', '-DCMAKE_BUILD_TYPE=' + config] cmake_command = ['cmake', '-DFMT_PEDANTIC=ON', '-DCMAKE_BUILD_TYPE=' + config]
if build == 'mingw': if build == 'mingw':
cmake_command.append('-GMinGW Makefiles') cmake_command.append('-GMinGW Makefiles')
build_command = ['mingw32-make', '-j4'] build_command = ['mingw32-make', '-j4']
test_command = ['mingw32-make', 'test'] test_command = ['mingw32-make', 'test']
# Remove the path to Git bin directory from $PATH because it breaks MinGW config. # Remove the path to Git bin directory from $PATH because it breaks MinGW config.
path = os.environ['PATH'].replace(r'C:\Program Files (x86)\Git\bin', '') path = path.replace(r'C:\Program Files (x86)\Git\bin', '')
os.environ['PATH'] = path + r';C:\MinGW\bin' os.environ['PATH'] = path + r';C:\MinGW\bin'
else: else:
# Add MSBuild 14.0 to PATH as described in
# http://help.appveyor.com/discussions/problems/2229-v140-not-found-on-vs2105rc.
os.environ['PATH'] = r'C:\Program Files (x86)\MSBuild\14.0\Bin;' + path
build_command = ['msbuild', '/m:4', '/p:Config=' + config, 'FORMAT.sln'] build_command = ['msbuild', '/m:4', '/p:Config=' + config, 'FORMAT.sln']
test_command = ['msbuild', 'RUN_TESTS.vcxproj'] test_command = ['msbuild', 'RUN_TESTS.vcxproj']