diff -r 872e0741e5cb -r 803a7a85b071 scripts/install.py
--- a/scripts/install.py Mon Sep 26 14:13:44 2022 +0200
+++ b/scripts/install.py Mon Sep 26 14:20:25 2022 +0200
@@ -41,7 +41,7 @@
forceCleanDesktopLinks = False
doCompile = True
yes2All = False
-ignorePyqt6Tools = False
+withPyqt6Tools = False
verbose = False
cfg = {}
progLanguages = ["Python", "Ruby", "QSS"]
@@ -162,15 +162,16 @@
print(" -p python path of the python executable")
print(" (default: {0})".format(macPythonExe))
print(" -c don't cleanup old installation first")
- if sys.platform.startswith(("win", "cygwin")):
- print(" --clean-desktop delete desktop links before installation")
- print(" --no-info don't create the install info file")
- print(" --no-tools don't install qt6-applications")
print(" -v, --verbose print some more information")
print(" -x don't perform dependency checks (use on your own" " risk)")
print(" -z don't compile the installed python files")
print(" --yes answer 'yes' to all questions")
print()
+ if sys.platform.startswith(("win", "cygwin")):
+ print(" --clean-desktop delete desktop links before installation")
+ print(" --no-info don't create the install info file")
+ print(" --with-tools don't install qt6-applications")
+ print()
print("The file given to the -f option must be valid Python code" " defining a")
print(
"dictionary called 'cfg' with the keys 'ericDir', 'ericPixDir',"
@@ -1783,7 +1784,7 @@
"pyenchant": ("enchant", ""),
"wheel": ("wheel", ""),
}
- if not ignorePyqt6Tools:
+ if withPyqt6Tools:
optionalModulesList["qt6-applications"] = ("qt6_applications", "")
# check mandatory PyQt6 modules
@@ -2138,7 +2139,7 @@
global macAppBundlePath, macAppBundleName, macPythonExe
global installApis, doCleanDesktopLinks, yes2All
global createInstallInfoFile, installCwd
- global ignorePyqt6Tools
+ global withPyqt6Tools
global verbose
if sys.version_info < (3, 7, 0) or sys.version_info > (3, 99, 99):
@@ -2223,8 +2224,8 @@
doCleanDesktopLinks = True
elif opt == "--yes":
yes2All = True
- elif opt == "--no-tools":
- ignorePyqt6Tools = True
+ elif opt == "--with-tools":
+ withPyqt6Tools = True
elif opt == "--no-info":
createInstallInfoFile = False
elif opt in ["-v", "--verbose"]:
