Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 04:37:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Allow build on both Ubuntu 16.04 (Jenkins) and 18.04

Browse source
This commit is contained in:
NissimHadar 2019-05-03 20:37:40 -07:00
parent 604f506dec
commit 80bf1e592d
2 changed files with 31 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
hifi_vcpkg.py
View file

@ -241,17 +241,25 @@ endif()
def installQt(self): def installQt(self):
if not os.path.isdir(os.path.join(self.path, 'installed', 'qt5-install')): if not os.path.isdir(os.path.join(self.path, 'installed', 'qt5-install')):
print ("Downloading Qt from AWS ") print ('Downloading Qt from AWS')
dest = os.path.join(self.path, 'installed') dest = os.path.join(self.path, 'installed')
if platform.system() == 'Windows': if platform.system() == 'Windows':
url = "https://hifi-qa.s3.amazonaws.com/qt5/Windows/qt5-install.tar.gz" url = 'https://hifi-qa.s3.amazonaws.com/qt5/Windows/qt5-install.tar.gz'
elif platform.system() == 'Darwin': elif platform.system() == 'Darwin':
url = "https://hifi-qa.s3.amazonaws.com/qt5/Mac/qt5-install.tar.gz" url = 'https://hifi-qa.s3.amazonaws.com/qt5/Mac/qt5-install.tar.gz'
elif platform.system() == 'Linux': elif platform.system() == 'Linux':
url = "https://hifi-qa.s3.amazonaws.com/qt5/Ubuntu/qt5-install.tar.gz" if (platform.linux_distribution()[1] == '16.04':
self.vcpkgUrl = 'https://hifi-qa.s3.amazonaws.com/qt5/Ubuntu/16.04/qt5-install.tar.gz'
print("Extracting " + url + " to " + dest) elif platform.linux_distribution()[1] == '18.04':
self.vcpkgUrl = "https://hifi-qa.s3.amazonaws.com/qt5/Ubuntu/18.04/qt5-install.tar.gz"
else:
print('UNKNOWN LINUX VERSION!!!')
else:
print('UNKNOWN OPERATING SYSTEM!!!')
print('Extracting ' + url + ' to ' + dest)
hifi_utils.downloadAndExtract(url, dest) hifi_utils.downloadAndExtract(url, dest)
else: else:
print ("Qt has already been downloaded") print ('Qt has already been downloaded')

19
tools/qt-builder/README.md
View file

@ -96,6 +96,8 @@ Verify again
`sudo apt-get install libdbus-glib-1-dev -y` `sudo apt-get install libdbus-glib-1-dev -y`
1. nss (needed for qtwebengine) 1. nss (needed for qtwebengine)
`sudo apt-get install libnss3-dev -y` `sudo apt-get install libnss3-dev -y`
1. Add the following line to *.bash_profile* (otherwise fonts will not be displayed)
`export QT_QPA_FONTDIR=/usr/share/fonts/truetype/dejavu/`
### Mac ### Mac
1. git >= 1.6 1. git >= 1.6
Check if needed `git --version` Check if needed `git --version`
@ -112,7 +114,7 @@ The build is performed in the qt5-build folder.
Build products are installed to the qt5-install folder. Build products are installed to the qt5-install folder.
Before running configure, make sure that the qt5-build folder is empty. Before running configure, make sure that the qt5-build folder is empty.
**Only run the patches once!!!** **Only run the git patches once!!!**
### Windows ### Windows
Before building, verify that **HIFI_VCPKG_BASE_VERSION** points to a *vcpkg* folder containing *packages\openssl-windows_x64-windows*. Before building, verify that **HIFI_VCPKG_BASE_VERSION** points to a *vcpkg* folder containing *packages\openssl-windows_x64-windows*.
If not, follow https://github.com/highfidelity/vcpkg to install *vcpkg* and then *openssl*. If not, follow https://github.com/highfidelity/vcpkg to install *vcpkg* and then *openssl*.
@ -164,8 +166,12 @@ Upload qt5-install.tar.gz to https://hifi-qa.s3.amazonaws.com/qt5/Windows/
`mkdir qt5-build` `mkdir qt5-build`
`cd qt5-build` `cd qt5-build`
*Ubuntu 16.04*
`../qt5/configure -opensource -confirm-license -platform linux-g++-64 -qt-zlib -qt-libjpeg -qt-libpng -qt-xcb -qt-freetype -qt-pcre -qt-harfbuzz -nomake examples -nomake tests -skip qttranslations -skip qtserialport -skip qt3d -skip qtlocation -skip qtwayland -skip qtsensors -skip qtgamepad -skip qtspeech -skip qtcharts -skip qtmacextras -skip qtvirtualkeyboard -skip qtpurchasing -skip qtdatavis3d -no-warnings-are-errors -no-pch -no-egl -no-icu -prefix ../qt5-install` `../qt5/configure -opensource -confirm-license -platform linux-g++-64 -qt-zlib -qt-libjpeg -qt-libpng -qt-xcb -qt-freetype -qt-pcre -qt-harfbuzz -nomake examples -nomake tests -skip qttranslations -skip qtserialport -skip qt3d -skip qtlocation -skip qtwayland -skip qtsensors -skip qtgamepad -skip qtspeech -skip qtcharts -skip qtmacextras -skip qtvirtualkeyboard -skip qtpurchasing -skip qtdatavis3d -no-warnings-are-errors -no-pch -no-egl -no-icu -prefix ../qt5-install`
#### Make
*Ubuntu 18.04*
`../qt5/configure -opensource -confirm-license -platform linux-g++-64 -qt-zlib -qt-libjpeg -qt-libpng -qt-xcb -qt-freetype -qt-pcre -qt-harfbuzz -nomake examples -nomake tests -skip qttranslations -skip qtserialport -skip qt3d -skip qtlocation -skip qtwayland -skip qtsensors -skip qtgamepad -skip qtspeech -skip qtcharts -skip qtmacextras -skip qtvirtualkeyboard -skip qtpurchasing -skip qtdatavis3d -no-warnings-are-errors -no-pch -prefix ../qt5-install`
#### Make
`make` `make`
`make install` `make install`
#### Fixing #### Fixing
@ -185,8 +191,13 @@ Upload qt5-install.tar.gz to https://hifi-qa.s3.amazonaws.com/qt5/Windows/
`filename.add("qt5-install", os.path.basename("qt5-install"))` `filename.add("qt5-install", os.path.basename("qt5-install"))`
`exit()` `exit()`
1. Upload qt5-install.tar.gz to https://hifi-qa.s3.amazonaws.com/qt5/Ubuntu/ *Ubuntu 16.04*
### Mac 1. Upload qt5-install.tar.gz to https://hifi-qa.s3.amazonaws.com/qt5/Ubuntu/16.04
*Ubuntu 16.04*
1. Upload qt5-install.tar.gz to https://hifi-qa.s3.amazonaws.com/qt5/Ubuntu/18.04
1. ### Mac
#### Preparing source files #### Preparing source files
git clone --recursive git://code.qt.io/qt/qt5.git -b 5.12.3 --single-branch git clone --recursive git://code.qt.io/qt/qt5.git -b 5.12.3 --single-branch