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

Move Jenkins Linux build to Ubuntu 16.04

Browse Source
This commit is contained in:
Roland Winklmeier
2018-06-16 21:06:48 +02:00
committed by Klaus Basan
parent c7482ebc1a
commit 18b6ee700b
2 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
externals

Submodule externals updated: 0ca4c9257f...2c2b3c472b

9
scripts/jenkins.py
View File

@@ -330,15 +330,6 @@ class LinuxBuilder(Builder):
os.environ['LD_LIBRARY_PATH'] = path.abspath(path.join(self._get_swift_build_path(), 'build', 'out', 'release', 'lib')) os.environ['LD_LIBRARY_PATH'] = path.abspath(path.join(self._get_swift_build_path(), 'build', 'out', 'release', 'lib'))
os.environ['LD_LIBRARY_PATH'] += os.pathsep + path.abspath(path.join(self._get_swift_source_path(), 'lib')) os.environ['LD_LIBRARY_PATH'] += os.pathsep + path.abspath(path.join(self._get_swift_source_path(), 'lib'))
os.environ['LD_LIBRARY_PATH'] += os.pathsep + self._get_externals_path() os.environ['LD_LIBRARY_PATH'] += os.pathsep + self._get_externals_path()
lib_path = path.abspath(path.join(self._get_swift_source_path(), 'lib'))
libssl = path.abspath(path.join(lib_path, 'libssl.so'))
libcrypto = path.abspath(path.join(lib_path, 'libcrypto.so'))
if not os.path.isdir(lib_path):
os.makedirs(lib_path)
if not os.path.exists(libssl):
os.symlink('/usr/lib/x86_64-linux-gnu/libssl.so.1.0.2', libssl)
if not os.path.exists(libcrypto):
os.symlink('/usr/lib/x86_64-linux-gnu/libcrypto.so.1.0.2', libcrypto)
def _get_qmake_spec(self): def _get_qmake_spec(self):
return 'linux-g++' return 'linux-g++'