diff --git a/client-gnome b/client-gnome index 6b2855169a16078fb7062ab5d6bf2305f42cac33..bb6b3f707c9969baa7f4816f55c02245c6c62a79 160000 --- a/client-gnome +++ b/client-gnome @@ -1 +1 @@ -Subproject commit 6b2855169a16078fb7062ab5d6bf2305f42cac33 +Subproject commit bb6b3f707c9969baa7f4816f55c02245c6c62a79 diff --git a/daemon b/daemon index 324d49ce4d04b3067e6f0d2382c4e6dfd385f56b..6a3a9fdd52cf9f46586f66a330ceb5bdf4c95758 160000 --- a/daemon +++ b/daemon @@ -1 +1 @@ -Subproject commit 324d49ce4d04b3067e6f0d2382c4e6dfd385f56b +Subproject commit 6a3a9fdd52cf9f46586f66a330ceb5bdf4c95758 diff --git a/lrc b/lrc index 4381acbf375488f0619056607e90d5ad34655071..564784bb62cc4128a2174d4744d38365d5a52bf4 160000 --- a/lrc +++ b/lrc @@ -1 +1 @@ -Subproject commit 4381acbf375488f0619056607e90d5ad34655071 +Subproject commit 564784bb62cc4128a2174d4744d38365d5a52bf4 diff --git a/scripts/build-windows.py b/scripts/build-windows.py index d8c5139b299ea5dcd76da9ff48e9b24207b27203..2182761efeff0ab669c8e34832ca2a3daf344258 100644 --- a/scripts/build-windows.py +++ b/scripts/build-windows.py @@ -32,7 +32,7 @@ def build_client(parsed_args): execute_cmd('python make-client.py -d') execute_cmd('python make-client.py -b ' + '-t ' + parsed_args.toolset + ' -s ' + parsed_args.sdk + ' -q ' + parsed_args.qtver) - execute_cmd('powershell -ExecutionPolicy Unrestricted -File copy-runtime-files.ps1' + ' "Release" ' + '"' + parsed_args.qtver + '"', True) + execute_cmd('python copy-runtime-files.py -m Release -q ' + parsed_args.qtver, True) def parse_args(): diff --git a/scripts/install.sh b/scripts/install.sh index 132d0f022ff25223a5a7d3afe43becba722d6d16..7ea3c4c189e524034f230ea10220906de6377989 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -195,3 +195,12 @@ else fi make -j"${proc}" make_install "${global}" "${priv_install}" + +# copy runtime files +if [ ${client} = "client-qt" ]; then + if [ -z ${qt5path} ]; then + python ../copy-runtime-files.py + else + python ../copy-runtime-files.py -q ${qt5path} + fi +fi