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

Update jenkins script for Qt 5.12

Browse Source
This commit is contained in:
Mat Sutcliffe
2018-12-21 14:23:14 +00:00
parent 9f7e5bba5a
commit f923cd0cf7
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/jenkins.cfg
View File

@@ -1,5 +1,5 @@
[General] [General]
qt_version: 5.9.6 qt_version: 5.12.0
datastore_version: 0.7.0 datastore_version: 0.7.0
[Windows] [Windows]

11
scripts/jenkins.py
View File

@@ -264,7 +264,7 @@ class Builder:
class MSVCBuilder(Builder): class MSVCBuilder(Builder):
def _specific_prepare(self): def _specific_prepare(self):
os.environ['PATH'] += os.pathsep + self._get_externals_path() os.environ['PATH'] += os.pathsep + self._get_externals_path() #TODO still needed? we copy externals anyway
os.environ['PATH'] += os.pathsep + 'C:/Program Files/7-Zip' os.environ['PATH'] += os.pathsep + 'C:/Program Files/7-Zip'
if self.word_size == '32': if self.word_size == '32':
vs_env = get_vs_env('VS2017', 'x86') vs_env = get_vs_env('VS2017', 'x86')
@@ -274,18 +274,13 @@ class MSVCBuilder(Builder):
os.environ.update(vs_env) os.environ.update(vs_env)
def _get_qmake_spec(self): def _get_qmake_spec(self):
return 'win32-msvc2015' return 'win32-msvc'
def _get_make_cmd(self): def _get_make_cmd(self):
return path.abspath(path.join(self._get_qtcreator_path(), 'jom.exe')) return path.abspath(path.join(self._get_qtcreator_path(), 'jom.exe'))
def _get_qt_component(self): def _get_qt_component(self):
if self.word_size == '32': return 'msvc2017'
return 'msvc2015'
elif self.word_size == '64':
return 'msvc2017'
else:
raise RuntimeError('Illegal word size!')
def __init__(self, config_file, word_size): def __init__(self, config_file, word_size):
Builder.__init__(self, config_file, word_size) Builder.__init__(self, config_file, word_size)