From f6ce42245d2352278ad873184adf4690ccb704ee Mon Sep 17 00:00:00 2001 From: Florian Schlichting Date: Tue, 9 Nov 2021 22:36:22 +0800 Subject: [PATCH] port build process to python3 --- build_qrc.py | 2 +- ykman-cli/ykman-cli.pro | 4 ++-- ykman-gui/ykman-gui.pro | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build_qrc.py b/build_qrc.py index 01b754f7..537c895a 100755 --- a/build_qrc.py +++ b/build_qrc.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 import os import sys diff --git a/ykman-cli/ykman-cli.pro b/ykman-cli/ykman-cli.pro index bd941d73..b6fbfbce 100644 --- a/ykman-cli/ykman-cli.pro +++ b/ykman-cli/ykman-cli.pro @@ -6,7 +6,7 @@ CONFIG -= app_bundle TEMPLATE = app SOURCES += main.cpp -buildqrc.commands = python ../build_qrc.py ${QMAKE_FILE_IN} +buildqrc.commands = python3 ../build_qrc.py ${QMAKE_FILE_IN} buildqrc.input = QRC_JSON buildqrc.output = ${QMAKE_FILE_IN_BASE}.qrc buildqrc.variable_out = RESOURCES @@ -14,7 +14,7 @@ QMAKE_STRIPFLAGS_LIB += --strip-unneeded QMAKE_EXTRA_COMPILERS += buildqrc QRC_JSON = resources.json # Generate first time -system(python ../build_qrc.py resources.json) +system(python3 ../build_qrc.py resources.json) # Install python dependencies with pip for win and mac mac|win32 { diff --git a/ykman-gui/ykman-gui.pro b/ykman-gui/ykman-gui.pro index 232c7c60..b259d54f 100644 --- a/ykman-gui/ykman-gui.pro +++ b/ykman-gui/ykman-gui.pro @@ -14,7 +14,7 @@ DEFINES += APP_VERSION=\\\"1.2.4\\\" message(Version of this build: $$VERSION) -buildqrc.commands = python ../build_qrc.py ${QMAKE_FILE_IN} +buildqrc.commands = python3 ../build_qrc.py ${QMAKE_FILE_IN} buildqrc.input = QRC_JSON buildqrc.output = ${QMAKE_FILE_IN_BASE}.qrc buildqrc.variable_out = RESOURCES @@ -25,7 +25,7 @@ QMAKE_EXTRA_COMPILERS += buildqrc QRC_JSON = resources.json # Generate first time -system(python ../build_qrc.py resources.json) +system(python3 ../build_qrc.py resources.json) # Install python dependencies with pip on mac and win win32|macx {