Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

port build process to python3 #308

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

port build process to python3 #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build_qrc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3

import os
import sys
Expand Down
4 changes: 2 additions & 2 deletions ykman-cli/ykman-cli.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@ 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
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 {
Expand Down
4 changes: 2 additions & 2 deletions ykman-gui/ykman-gui.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 {
Expand Down