mirror of
https://github.com/overte-org/overte.git
synced 2025-08-08 21:17:01 +02:00
Merge pull request #53 from daleglass/remove_deprecated_linux_distribution
Add support for Ubuntu 19.10, modernize vcpkg
This commit is contained in:
commit
9fb3662dce
3 changed files with 26 additions and 8 deletions
|
@ -63,9 +63,9 @@ sudo apt-get install libasound2 libxmu-dev libxi-dev freeglut3-dev libasound2-de
|
||||||
```bash
|
```bash
|
||||||
sudo apt-get -y install libpulse0 libnss3 libnspr4 libfontconfig1 libxcursor1 libxcomposite1 libxtst6 libxslt1.1
|
sudo apt-get -y install libpulse0 libnss3 libnspr4 libfontconfig1 libxcursor1 libxcomposite1 libxtst6 libxslt1.1
|
||||||
```
|
```
|
||||||
1. Install Python 3:
|
1. Install Python 3 and required packages
|
||||||
```bash
|
```bash
|
||||||
sudo apt-get install python3.6
|
sudo apt-get install python3 python3-distro
|
||||||
```
|
```
|
||||||
1. Install node, required to build the jsdoc documentation
|
1. Install node, required to build the jsdoc documentation
|
||||||
```bash
|
```bash
|
||||||
|
|
|
@ -118,6 +118,6 @@ def downloadAndExtract(url, destPath, hash=None, hasher=hashlib.sha512(), isZip=
|
||||||
zip.extractall(destPath)
|
zip.extractall(destPath)
|
||||||
else:
|
else:
|
||||||
# Extract the archive
|
# Extract the archive
|
||||||
with tarfile.open(tempFileName, 'r:gz') as tgz:
|
with tarfile.open(tempFileName, 'r:*') as tgz:
|
||||||
tgz.extractall(destPath)
|
tgz.extractall(destPath)
|
||||||
os.remove(tempFileName)
|
os.remove(tempFileName)
|
||||||
|
|
|
@ -9,6 +9,7 @@ import tempfile
|
||||||
import json
|
import json
|
||||||
import xml.etree.ElementTree as ET
|
import xml.etree.ElementTree as ET
|
||||||
import functools
|
import functools
|
||||||
|
import distro
|
||||||
from os import path
|
from os import path
|
||||||
|
|
||||||
print = functools.partial(print, flush=True)
|
print = functools.partial(print, flush=True)
|
||||||
|
@ -286,15 +287,32 @@ endif()
|
||||||
elif platform.system() == 'Darwin':
|
elif platform.system() == 'Darwin':
|
||||||
url = self.assets_url + '/dependencies/vcpkg/qt5-install-5.12.3-macos.tar.gz%3FversionId=bLAgnoJ8IMKpqv8NFDcAu8hsyQy3Rwwz'
|
url = self.assets_url + '/dependencies/vcpkg/qt5-install-5.12.3-macos.tar.gz%3FversionId=bLAgnoJ8IMKpqv8NFDcAu8hsyQy3Rwwz'
|
||||||
elif platform.system() == 'Linux':
|
elif platform.system() == 'Linux':
|
||||||
if platform.linux_distribution()[1][:3] == '16.':
|
dist = distro.linux_distribution()
|
||||||
url = self.assets_url + '/dependencies/vcpkg/qt5-install-5.12.3-ubuntu-16.04-with-symbols.tar.gz'
|
|
||||||
elif platform.linux_distribution()[1][:3] == '18.':
|
if distro.id() == 'ubuntu':
|
||||||
url = self.assets_url + '/dependencies/vcpkg/qt5-install-5.12.3-ubuntu-18.04.tar.gz'
|
u_major = int( distro.major_version() )
|
||||||
|
u_minor = int( distro.minor_version() )
|
||||||
|
|
||||||
|
if u_major == 16:
|
||||||
|
url = self.assets_url + '/dependencies/vcpkg/qt5-install-5.12.3-ubuntu-16.04-with-symbols.tar.gz'
|
||||||
|
elif u_major == 18:
|
||||||
|
url = self.assets_url + '/dependencies/vcpkg/qt5-install-5.12.3-ubuntu-18.04.tar.gz'
|
||||||
|
elif u_major == 19 and u_minor == 10:
|
||||||
|
url = self.assets_url + '/dependencies/vcpkg/qt5-install-5.12.6-ubuntu-19.10.tar.xz'
|
||||||
|
elif u_major > 18 and ( u_major != 19 and u_minor != 4):
|
||||||
|
print("We don't support " + distro.name(pretty=True) + " yet. Perhaps consider helping us out?")
|
||||||
|
else:
|
||||||
|
print("Sorry, " + distro.name(pretty=True) + " is old and won't be officially supported. Please consider upgrading.");
|
||||||
else:
|
else:
|
||||||
print('UNKNOWN LINUX VERSION!!!')
|
print("Sorry, " + distro.name(pretty=True) + " is not supported. Please consider helping us out.")
|
||||||
|
print("It's also possible to build Qt for your distribution, please see the documentation at:")
|
||||||
|
print("https://github.com/kasenvr/project-athena/tree/kasen/core/tools/qt-builder")
|
||||||
return;
|
return;
|
||||||
else:
|
else:
|
||||||
print('UNKNOWN OPERATING SYSTEM!!!')
|
print('UNKNOWN OPERATING SYSTEM!!!')
|
||||||
|
print("System : " + platform.system())
|
||||||
|
print("Architecture: " + platform.architecture())
|
||||||
|
print("Machine : " + platform.machine())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
print('Extracting ' + url + ' to ' + dest)
|
print('Extracting ' + url + ' to ' + dest)
|
||||||
|
|
Loading…
Reference in a new issue