Folding build_tools back into the main repo for simplicity.
This commit is contained in:
13
xenia-build
13
xenia-build
@@ -29,7 +29,7 @@ def main():
|
||||
# Augment path to include our fancy things.
|
||||
os.environ['PATH'] += os.pathsep + os.pathsep.join([
|
||||
self_path,
|
||||
os.path.abspath('build_tools/'),
|
||||
os.path.abspath(os.path.join('tools', 'build')),
|
||||
])
|
||||
|
||||
# Check git exists.
|
||||
@@ -90,7 +90,6 @@ def main():
|
||||
sys.exit(return_code)
|
||||
|
||||
|
||||
# TODO(benvanik): move to build_tools utils module.
|
||||
def import_vs_environment():
|
||||
"""Finds the installed Visual Studio version and imports
|
||||
interesting environment variables into os.environ.
|
||||
@@ -296,7 +295,7 @@ def run_premake(target_os, action):
|
||||
"""
|
||||
shell_call([
|
||||
'python',
|
||||
os.path.join('build_tools', 'premake'),
|
||||
os.path.join('tools', 'build', 'premake'),
|
||||
'--file=premake5.lua',
|
||||
'--os=%s' % (target_os),
|
||||
'--cc=clang',
|
||||
@@ -906,7 +905,7 @@ class LintCommand(Command):
|
||||
if os.path.exists(difftemp): os.remove(difftemp)
|
||||
ret = shell_call([
|
||||
'python',
|
||||
'build_tools/third_party/clang-format/git-clang-format',
|
||||
'third_party/clang-format/git-clang-format',
|
||||
'--binary=%s' % (clang_format_binary),
|
||||
'--commit=%s' % ('origin/master' if args['origin'] else 'HEAD'),
|
||||
'--diff',
|
||||
@@ -922,7 +921,7 @@ class LintCommand(Command):
|
||||
print('')
|
||||
shell_call([
|
||||
'python',
|
||||
'build_tools/third_party/clang-format/git-clang-format',
|
||||
'third_party/clang-format/git-clang-format',
|
||||
'--binary=%s' % (clang_format_binary),
|
||||
'--commit=%s' % ('origin/master' if args['origin'] else 'HEAD'),
|
||||
'--diff',
|
||||
@@ -978,7 +977,7 @@ class FormatCommand(Command):
|
||||
print('- git-clang-format')
|
||||
shell_call([
|
||||
'python',
|
||||
'build_tools/third_party/clang-format/git-clang-format',
|
||||
'third_party/clang-format/git-clang-format',
|
||||
'--binary=%s' % (clang_format_binary),
|
||||
'--commit=%s' % ('origin/master' if args['origin'] else 'HEAD'),
|
||||
])
|
||||
@@ -1004,7 +1003,7 @@ class StyleCommand(Command):
|
||||
print('- cpplint [%d files]' % (len(all_files)))
|
||||
ret = shell_call([
|
||||
'python',
|
||||
'build_tools/third_party/google-styleguide/cpplint/cpplint.py',
|
||||
'third_party/google-styleguide/cpplint/cpplint.py',
|
||||
'--output=vs7',
|
||||
'--linelength=80',
|
||||
'--filter=-build/c++11,+build/include_alpha',
|
||||
|
||||
Reference in New Issue
Block a user