Skip to content
Snippets Groups Projects
Commit 1b259070 authored by Andreas Traczyk's avatar Andreas Traczyk
Browse files

qmake: fix for qt version and lrc path

Also configures an install prefix.

Gitlab: #581
Change-Id: Ia7496d0c8e27fa8174a797a3ab62384c13dce774
parent 1f91576a
No related branches found
No related tags found
No related merge requests found
...@@ -81,22 +81,18 @@ unix { ...@@ -81,22 +81,18 @@ unix {
TARGET = jami-qt TARGET = jami-qt
TEMPLATE = app TEMPLATE = app
QT += quick quickwidgets widgets xml multimedia multimediawidgets network webenginewidgets svg quickcontrols2 webengine webenginecore sql dbus QT += quick quickwidgets widgets xml multimedia multimediawidgets network \
webenginewidgets svg quickcontrols2 webengine webenginecore sql dbus
#check Qt version # Maj/min versions can be checked(if needed) using:
QT_VERSION = $$[QT_VERSION] # equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 12) {}
QT_VERSION = $$split(QT_VERSION, ".") versionAtLeast(QT_VERSION, 5.12.0) {
QT_VER_MAJ = $$member(QT_VERSION, 0)
QT_VER_MIN = $$member(QT_VERSION, 1)
lessThan(QT_VER_MIN, 12) {
QMAKE_CXXFLAGS += -std=c++17
}
greaterThan(QT_VER_MIN, 12) | equals(QT_VER_MIN, 12) {
CONFIG += c++17 CONFIG += c++17
} else {
QMAKE_CXXFLAGS += -std=c++17
} }
isEmpty(LRC) { LRC=../../install/lrc/ } isEmpty(LRC) { LRC=$$PWD/../install/lrc/ }
INCLUDEPATH += $${LRC}/include/libringclient INCLUDEPATH += $${LRC}/include/libringclient
INCLUDEPATH += $${LRC}/include INCLUDEPATH += $${LRC}/include
...@@ -104,6 +100,10 @@ unix { ...@@ -104,6 +100,10 @@ unix {
LIBS += -L$${LRC}/lib -lringclient LIBS += -L$${LRC}/lib -lringclient
LIBS += -lqrencode LIBS += -lqrencode
isEmpty(PREFIX) { PREFIX = /tmp/$${TARGET}/bin }
target.path = $$PREFIX/bin
INSTALLS += target
} }
# Input # Input
...@@ -147,6 +147,7 @@ HEADERS += ./src/smartlistmodel.h \ ...@@ -147,6 +147,7 @@ HEADERS += ./src/smartlistmodel.h \
./src/videoformatfpsmodel.h \ ./src/videoformatfpsmodel.h \
./src/videoformatresolutionmodel.h \ ./src/videoformatresolutionmodel.h \
./src/audiomanagerlistmodel.h ./src/audiomanagerlistmodel.h
SOURCES += ./src/bannedlistmodel.cpp \ SOURCES += ./src/bannedlistmodel.cpp \
./src/accountlistmodel.cpp \ ./src/accountlistmodel.cpp \
./src/runguard.cpp \ ./src/runguard.cpp \
...@@ -182,5 +183,6 @@ SOURCES += ./src/bannedlistmodel.cpp \ ...@@ -182,5 +183,6 @@ SOURCES += ./src/bannedlistmodel.cpp \
./src/videoformatfpsmodel.cpp \ ./src/videoformatfpsmodel.cpp \
./src/videoformatresolutionmodel.cpp \ ./src/videoformatresolutionmodel.cpp \
./src/audiomanagerlistmodel.cpp ./src/audiomanagerlistmodel.cpp
RESOURCES += ./ressources.qrc \ RESOURCES += ./ressources.qrc \
./qml.qrc ./qml.qrc
...@@ -11,7 +11,7 @@ import re ...@@ -11,7 +11,7 @@ import re
# vs help # vs help
win_sdk_default = '10.0.16299.0' win_sdk_default = '10.0.16299.0'
win_toolset_default = 'v141' win_toolset_default = 'v142'
vs_where_path = os.path.join( vs_where_path = os.path.join(
os.environ['ProgramFiles(x86)'], 'Microsoft Visual Studio', 'Installer', 'vswhere.exe' os.environ['ProgramFiles(x86)'], 'Microsoft Visual Studio', 'Installer', 'vswhere.exe'
...@@ -19,6 +19,7 @@ vs_where_path = os.path.join( ...@@ -19,6 +19,7 @@ vs_where_path = os.path.join(
host_is_64bit = (False, True)[platform.machine().endswith('64')] host_is_64bit = (False, True)[platform.machine().endswith('64')]
def execute_cmd(cmd, with_shell=False, env_vars={}): def execute_cmd(cmd, with_shell=False, env_vars={}):
if(bool(env_vars)): if(bool(env_vars)):
p = subprocess.Popen(cmd, shell=with_shell, p = subprocess.Popen(cmd, shell=with_shell,
...@@ -29,6 +30,7 @@ def execute_cmd(cmd, with_shell=False, env_vars={}): ...@@ -29,6 +30,7 @@ def execute_cmd(cmd, with_shell=False, env_vars={}):
_, _ = p.communicate() _, _ = p.communicate()
return p.returncode return p.returncode
def getLatestVSVersion(): def getLatestVSVersion():
args = [ args = [
'-latest', '-latest',
...@@ -52,7 +54,8 @@ def findVSLatestDir(): ...@@ -52,7 +54,8 @@ def findVSLatestDir():
'-property installationPath' '-property installationPath'
] ]
cmd = [vs_where_path] + args cmd = [vs_where_path] + args
output = subprocess.check_output(' '.join(cmd)).decode('utf-8', errors='ignore') output = subprocess.check_output(
' '.join(cmd)).decode('utf-8', errors='ignore')
if output: if output:
return output.splitlines()[0] return output.splitlines()[0]
else: else:
...@@ -76,6 +79,7 @@ def getVSEnv(arch='x64', platform='', version=''): ...@@ -76,6 +79,7 @@ def getVSEnv(arch='x64', platform='', version=''):
out = stdout.decode('utf-8', errors='ignore').split("\r\n")[5:-1] out = stdout.decode('utf-8', errors='ignore').split("\r\n")[5:-1]
return dict(s.split('=', 1) for s in out) return dict(s.split('=', 1) for s in out)
def getVSEnvCmd(arch='x64', platform='', version=''): def getVSEnvCmd(arch='x64', platform='', version=''):
vcEnvInit = [findVSLatestDir() + r'\VC\Auxiliary\Build\"vcvarsall.bat'] vcEnvInit = [findVSLatestDir() + r'\VC\Auxiliary\Build\"vcvarsall.bat']
if platform != '': if platform != '':
...@@ -87,6 +91,7 @@ def getVSEnvCmd(arch='x64', platform='', version=''): ...@@ -87,6 +91,7 @@ def getVSEnvCmd(arch='x64', platform='', version=''):
vcEnvInit = 'call \"' + ' '.join(vcEnvInit) vcEnvInit = 'call \"' + ' '.join(vcEnvInit)
return vcEnvInit return vcEnvInit
def build_project(msbuild, msbuild_args, proj, env_vars): def build_project(msbuild, msbuild_args, proj, env_vars):
args = [] args = []
args.extend(msbuild_args) args.extend(msbuild_args)
...@@ -97,6 +102,7 @@ def build_project(msbuild, msbuild_args, proj, env_vars): ...@@ -97,6 +102,7 @@ def build_project(msbuild, msbuild_args, proj, env_vars):
print("Build failed when building ", proj) print("Build failed when building ", proj)
sys.exit(1) sys.exit(1)
def replace_vs_prop(filename, prop, val): def replace_vs_prop(filename, prop, val):
p = re.compile(r'(?s)<' + prop + r'\s?.*?>(.*?)<\/' + prop + r'>') p = re.compile(r'(?s)<' + prop + r'\s?.*?>(.*?)<\/' + prop + r'>')
val = r'<' + prop + r'>' + val + r'</' + prop + r'>' val = r'<' + prop + r'>' + val + r'</' + prop + r'>'
...@@ -104,6 +110,7 @@ def replace_vs_prop(filename, prop, val): ...@@ -104,6 +110,7 @@ def replace_vs_prop(filename, prop, val):
for line in file: for line in file:
print(re.sub(p, val, line), end='') print(re.sub(p, val, line), end='')
def deps(arch, toolset, qtver): def deps(arch, toolset, qtver):
print('Deps Qt Client Release|' + arch) print('Deps Qt Client Release|' + arch)
...@@ -117,11 +124,13 @@ def deps(arch, toolset, qtver): ...@@ -117,11 +124,13 @@ def deps(arch, toolset, qtver):
print("Git clone failed when cloning from https://github.com/BlueDragon747/qrencode-win32.git") print("Git clone failed when cloning from https://github.com/BlueDragon747/qrencode-win32.git")
sys.exit(1) sys.exit(1)
if(execute_cmd("cd qrencode-win32 && git checkout d6495a2aa74d058d54ae0f1b9e9e545698de66ce && " + apply_cmd + ' ..\\qrencode-win32.patch', True)): if(execute_cmd("cd qrencode-win32 && git checkout d6495a2aa74d058d54ae0f1b9e9e545698de66ce && " + apply_cmd + ' ..\\qrencode-win32.patch', True)):
print("Qrencode-win32 set up error") print("qrencode-win32 set up error")
sys.exit(1) sys.exit(1)
print('Building qrcodelib') print('Building qrcodelib')
build(arch, '', '', 'Release-Lib', '\\qrencode-win32\\qrencode-win32\\vc8\\qrcodelib\\qrcodelib.vcxproj', qtver, False) build(arch, '', '', 'Release-Lib',
'\\qrencode-win32\\qrencode-win32\\vc8\\qrcodelib\\qrcodelib.vcxproj', qtver, False)
def build(arch, toolset, sdk_version, config_str, project_path_under_current_path, qtver, force_option=True): def build(arch, toolset, sdk_version, config_str, project_path_under_current_path, qtver, force_option=True):
configuration_type = 'StaticLibrary' configuration_type = 'StaticLibrary'
...@@ -190,6 +199,7 @@ def build(arch, toolset, sdk_version, config_str, project_path_under_current_pat ...@@ -190,6 +199,7 @@ def build(arch, toolset, sdk_version, config_str, project_path_under_current_pat
build_project(msbuild, msbuild_args, qt_client_proj_path, vs_env_vars) build_project(msbuild, msbuild_args, qt_client_proj_path, vs_env_vars)
def parse_args(): def parse_args():
ap = argparse.ArgumentParser(description="Windows Jami-lrc build tool") ap = argparse.ArgumentParser(description="Windows Jami-lrc build tool")
ap.add_argument( ap.add_argument(
...@@ -237,13 +247,17 @@ def main(): ...@@ -237,13 +247,17 @@ def main():
deps(parsed_args.arch, parsed_args.toolset, parsed_args.qtver) deps(parsed_args.arch, parsed_args.toolset, parsed_args.qtver)
if parsed_args.build: if parsed_args.build:
build(parsed_args.arch, parsed_args.toolset, parsed_args.sdk, 'Release', '\\jami-qt.vcxproj', parsed_args.qtver) build(parsed_args.arch, parsed_args.toolset, parsed_args.sdk,
'Release', '\\jami-qt.vcxproj', parsed_args.qtver)
if parsed_args.beta: if parsed_args.beta:
build(parsed_args.arch, parsed_args.toolset, parsed_args.sdk, 'Beta', '\\jami-qt.vcxproj', parsed_args.qtver) build(parsed_args.arch, parsed_args.toolset, parsed_args.sdk,
'Beta', '\\jami-qt.vcxproj', parsed_args.qtver)
if parsed_args.releasecompile: if parsed_args.releasecompile:
build(parsed_args.arch, parsed_args.toolset, parsed_args.sdk, 'ReleaseCompile', '\\jami-qt.vcxproj', parsed_args.qtver) build(parsed_args.arch, parsed_args.toolset, parsed_args.sdk,
'ReleaseCompile', '\\jami-qt.vcxproj', parsed_args.qtver)
if __name__ == '__main__': if __name__ == '__main__':
main() main()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment