From 2accebd60db320cfb8d49a5a87d656a59eae286d Mon Sep 17 00:00:00 2001
From: Ming Rui Zhang <mingrui.zhang@savoirfairelinux.com>
Date: Thu, 17 Dec 2020 11:37:34 -0500
Subject: [PATCH] build: use the new py script for copy runtime files on
client-qt side
Change-Id: Ide3c5fcc8d261c3a517c07501019166b7dad45c8
---
scripts/build-windows.py | 2 +-
scripts/install.sh | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/scripts/build-windows.py b/scripts/build-windows.py
index d8c5139b..2182761e 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 132d0f02..08780d7e 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -195,3 +195,6 @@ else
fi
make -j"${proc}"
make_install "${global}" "${priv_install}"
+
+# copy runtime files
+python ../copy-runtime-files.py -q ${qt5path}
--
GitLab