Appveyor: Swap to xenia-build and only build the projects we need.

This commit is contained in:
Dr. Chat 2016-06-12 20:05:58 -05:00
parent 61cfc787f2
commit eb7b80bf7c
2 changed files with 28 additions and 19 deletions

View File

@ -62,13 +62,13 @@ configuration:
#- Checked #- Checked
- Release - Release
build: #build:
parallel: true # enable MSBuild parallel builds # parallel: true # enable MSBuild parallel builds
project: build\xenia.sln # path to Visual Studio solution or project # project: build\xenia.sln # path to Visual Studio solution or project
#
# MSBuild verbosity level # # MSBuild verbosity level
#verbosity: quiet|minimal|normal|detailed # #verbosity: quiet|minimal|normal|detailed
verbosity: minimal # verbosity: minimal
# scripts to run before build # scripts to run before build
#before_build: #before_build:
@ -79,8 +79,9 @@ after_build:
- 7z a xenia-%appveyor_repo_branch%-%appveyor_repo_commit%.zip LICENSE %APPVEYOR_BUILD_FOLDER%\build\bin\Windows\Release\xenia.exe %APPVEYOR_BUILD_FOLDER%\build\bin\Windows\Release\xenia.pdb - 7z a xenia-%appveyor_repo_branch%-%appveyor_repo_commit%.zip LICENSE %APPVEYOR_BUILD_FOLDER%\build\bin\Windows\Release\xenia.exe %APPVEYOR_BUILD_FOLDER%\build\bin\Windows\Release\xenia.pdb
# to run your custom scripts instead of automatic MSBuild # to run your custom scripts instead of automatic MSBuild
#build_script: # We also compile the tests here instead of later on.
# - cmd: tools\buildbot\build.bat build_script:
- cmd: xb.bat build --config=release --target=src\xenia-app --target=tests\xenia-cpu-ppc-tests
# to disable automatic builds # to disable automatic builds
#build: off #build: off

View File

@ -293,6 +293,7 @@ def get_clang_format_binary():
A path to the clang-format executable. A path to the clang-format executable.
""" """
attempts = [ attempts = [
'C:\\Program Files\\LLVM\\bin\\clang-format.exe',
'C:\\Program Files (x86)\\LLVM\\bin\\clang-format.exe', 'C:\\Program Files (x86)\\LLVM\\bin\\clang-format.exe',
'clang-format-3.8', 'clang-format-3.8',
'clang-format', 'clang-format',
@ -574,17 +575,24 @@ class BaseBuildCommand(Command):
print('') print('')
print('- building (%s):%s...' % ( print('- building (%s):%s...' % (
'all' if not len(args['target']) else ' '.join(args['target']), 'all' if not len(args['target']) else ', '.join(args['target']),
args['config'])) args['config']))
if sys.platform == 'win32': if sys.platform == 'win32':
result = shell_call([ targets = None
'devenv', if len(args['target']):
'/nologo', targets = '/t:' + ';'.join(target + (':Rebuild' if args['force'] else '')
for target in args['target'])
else:
targets = '/t:Rebuild' if args['force'] else None
result = subprocess.call([
'msbuild',
'build/xenia.sln', 'build/xenia.sln',
'/rebuild' if args['force'] else '/build', '/nologo',
args['config'], '/m',
] + [('/project ', target) for target in args['target']] + '/v:m',
pass_args, throw_on_error=False) '/p:Configuration=' + args['config'],
] + ([targets] if targets is not None else []) + pass_args, shell=False)
elif sys.platform == 'darwin': elif sys.platform == 'darwin':
# TODO(benvanik): other platforms. # TODO(benvanik): other platforms.
print('ERROR: don\'t know how to build on this platform.') print('ERROR: don\'t know how to build on this platform.')
@ -592,11 +600,11 @@ class BaseBuildCommand(Command):
# TODO(benvanik): allow gcc? # TODO(benvanik): allow gcc?
os.environ['CXX'] = 'clang++-3.8' os.environ['CXX'] = 'clang++-3.8'
os.environ['CC'] = 'clang-3.8' os.environ['CC'] = 'clang-3.8'
result = shell_call([ result = subprocess.call([
'make', 'make',
'-Cbuild/', '-Cbuild/',
'config=%s_linux' % (args['config']), 'config=%s_linux' % (args['config']),
] + pass_args + args['target'], throw_on_error=False) ] + pass_args + args['target'], shell=False)
print('') print('')
if result != 0: if result != 0:
print('ERROR: build failed with one or more errors.') print('ERROR: build failed with one or more errors.')