eric: comparison install.py

-:16d9ef6e6e89
+:f6ba54e022fa
 @param rcode the return code passed back to the calling process.
 """
 global progName, modDir, distDir, apisDir
 global macAppBundleName, macAppBundlePath, macPythonExe
+global pyqtVariant
 print()
 print("Usage:")
 if sys.platform == "darwin":
 print("    {0} [-chxyz] [-a dir] [-b dir] [-d dir] [-f file] [-i dir]"
-" [-m name] [-p python]".format(progName))
+" [-m name] [-p python] [--pyqt=version]".format(progName))
 elif sys.platform.startswith("win"):
 print("    {0} [-chxyz] [-a dir] [-b dir] [-d dir] [-f file]"
+" [--pyqt=version]"
 .format(progName))
 else:
 print("    {0} [-chxyz] [-a dir] [-b dir] [-d dir] [-f file] [-i dir]"
+" [--pyqt=version]"
 .format(progName))
 print("where:")
-print("    -h        display this help message")
+print("    -h, --help display this help message")
-print("    -a dir    where the API files will be installed")
+print("    -a dir     where the API files will be installed")
 if apisDir:
-print("              (default: {0})".format(apisDir))
+print("               (default: {0})".format(apisDir))
 else:
-print("              (no default value)")
+print("               (no default value)")
-print("    -b dir    where the binaries will be installed")
+print("    -b dir     where the binaries will be installed")
-print("              (default: {0})".format(platBinDir))
+print("               (default: {0})".format(platBinDir))
-print("    -d dir    where eric6 python files will be installed")
+print("    -d dir     where eric6 python files will be installed")
-print("              (default: {0})".format(modDir))
+print("               (default: {0})".format(modDir))
-print("    -f file   configuration file naming the various installation"
+print("    -f file    configuration file naming the various installation"
 " paths")
 if not sys.platform.startswith("win"):
-print("    -i dir    temporary install prefix")
+print("    -i dir     temporary install prefix")
-print("              (default: {0})".format(distDir))
+print("               (default: {0})".format(distDir))
 if sys.platform == "darwin":
-print("    -m name   name of the Mac app bundle")
+print("    -m name    name of the Mac app bundle")
-print("              (default: {0})".format(macAppBundleName))
+print("               (default: {0})".format(macAppBundleName))
-print("    -n path   path of the directory the Mac app bundle will")
+print("    -n path    path of the directory the Mac app bundle will")
-print("              be created in")
+print("               be created in")
-print("              (default: {0}".format(macAppBundlePath))
+print("               (default: {0})".format(macAppBundlePath))
-print("    -p python name of the python executable")
+print("    -p python  name of the python executable")
-print("              (default: {0})".format(macPythonExe))
+print("               (default: {0})".format(macPythonExe))
-print("    -c        don't cleanup old installation first")
+print("    -c         don't cleanup old installation first")
-print("    -x        don't perform dependency checks (use on your own"
+print("    -x         don't perform dependency checks (use on your own"
 " risk)")
-print("    -y        add the Python variant to the executable names")
+print("    -y         add the Python variant to the executable names")
-print("    -z        don't compile the installed python files")
+print("    -z         don't compile the installed python files")
+print("    --pyqt=version version of PyQt to be used (one of 4 or 5)")
+print("                   (default: {0})".format(pyqtVariant[-1]))
 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',"
 " 'ericIconDir',")
 except EnvironmentError:
 print("Could not install '{0}'.".format(apiName))
 # create menu entry for Linux systems
 if sys.platform.startswith("linux"):
-# TODO: respect Python variant
 if includePythonVariant:
 marker = PythonMarkers[sys.version_info.major]
 else:
 marker = ""
 if pyqtVariant == "PyQt4":
 try:
 from PyQt4.QtCore import qVersion
 except ImportError as msg:
-print('Sorry, please install PyQt5 or PyQt4.')
+print('Sorry, please install PyQt4.')
 print('Error: {0}'.format(msg))
 exit(1)
 print("Found PyQt4")
 else:
 try:
 from PyQt5.QtCore import qVersion
 except ImportError as msg:
-print('Sorry, please install PyQt5 or PyQt4.')
+print('Sorry, please install PyQt5.')
 print('Error: {0}'.format(msg))
 exit(1)
 print("Found PyQt5")
 try:
 # Parse the command line.
 global progName, modDir, doCleanup, doCompile, distDir, cfg, apisDir
 global sourceDir, configName, includePythonVariant
 global macAppBundlePath, macAppBundleName, macPythonExe
+global pyqtVariant
 if sys.version_info < (2, 7, 0) or sys.version_info > (3, 9, 9):
 print('Sorry, eric6 requires at least Python 2.7 or '
 'Python 3 for running.')
 exit(5)
 determinePyQtVariant()
 initGlobals()
 try:
 if sys.platform.startswith("win"):
-optlist, args = getopt.getopt(argv[1:], "chxyza:b:d:f:")
+optlist, args = getopt.getopt(
+argv[1:], "chxyza:b:d:f:", ["help", "pyqt="])
 elif sys.platform == "darwin":
-optlist, args = getopt.getopt(argv[1:], "chxyza:b:d:f:i:m:n:p:")
+optlist, args = getopt.getopt(
+argv[1:], "chxyza:b:d:f:i:m:n:p:", ["help", "pyqt="])
 else:
-optlist, args = getopt.getopt(argv[1:], "chxyza:b:d:f:i:")
+optlist, args = getopt.getopt(
-except getopt.GetoptError:
+argv[1:], "chxyza:b:d:f:i:", ["help", "pyqt="])
+except getopt.GetoptError as err:
+print(err)
 usage()
 global platBinDir
 depChecks = True
 for opt, arg in optlist:
-if opt == "-h":
+if opt in ["-h", "--help"]:
 usage(0)
 elif opt == "-a":
 apisDir = arg
 elif opt == "-b":
 platBinDir = arg
 macAppBundleName = arg
 elif opt == "-n":
 macAppBundlePath = arg
 elif opt == "-p":
 macPythonExe = arg
+elif opt == "--pyqt":
+if arg not in ["4", "5"]:
+print("Invalid PyQt version given; should be 4 or 5. Aborting")
+exit(6)
+pyqtVariant = "PyQt{0}".format(arg)
 installFromSource = not os.path.isdir(sourceDir)
 if installFromSource:
 sourceDir = os.path.dirname(__file__) or "."
 configName = os.path.join(sourceDir, "eric6config.py")

Mercurial Repositories > eric / file comparison

comparison: install.py

install.py