flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

[CI] Refactoring

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-06-16 21:49:16 +01:00
parent 2b4f10a96d
commit 4a9e222733
2 changed files with 42 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/build.py
View File

@@ -37,6 +37,7 @@ class Builder:
Build processes will be called with the environment modified by this function.
"""
print('Preparing environment ...')
self.make_cmd = self._get_make_cmd()
os.environ['PATH'] += os.pathsep + self._get_qt_binary_path()
self._specific_prepare()
@@ -252,7 +253,6 @@ class Builder:
self.qt_path = path.abspath(self.__config.get(platform.system(), 'qt_path'))
self.dump_syms = path.abspath(self.__config.get(platform.system(), 'dump_syms'))
self.make_cmd = self._get_make_cmd()
self.version = self.__get_swift_version()
def __get_config_file(self):
@@ -412,7 +412,7 @@ def print_help():
'Windows': ['msvc', 'mingw']
}
compiler_help = '|'.join(supported_compilers[platform.system()])
print('build.py -c <config file> -w <32|64> -t <' + compiler_help + '> [-d] [-e <end of life in month>] [-q <extra qmake argument>]')
print('build.py -c <config file> -w <32|64> -t <' + compiler_help + '> [-v] [-d] [-e <end of life in month>] [-q <extra qmake argument>]')
# Entry point if called as a standalone program
@@ -427,12 +427,12 @@ def main(argv):
qmake_args = []
try:
opts, args = getopt.getopt(argv, 'hc:w:t:j:due:q:', ['config=', 'wordsize=', 'toolchain=', 'jobs=', 'dev', 'upload', 'eol', 'qmake-arg='])
opts, args = getopt.getopt(argv, 'hc:w:t:j:due:q:v', ['config=', 'wordsize=', 'toolchain=', 'jobs=', 'dev', 'upload', 'eol', 'qmake-arg=', 'version'])
except getopt.GetoptError:
print_help()
sys.exit(2)
if len(opts) < 2:
if len(opts) == 0:
print_help()
sys.exit(2)
@@ -440,6 +440,9 @@ def main(argv):
if opt == '-h':
print_help()
sys.exit()
elif opt in ('-v', '--version'):
print(Builder(None, None).version)
sys.exit()
elif opt in ('-c', '--config'):
config_file = path.abspath(arg)
if not os.path.exists(config_file):