eric: comparison install.py

-:2a11e1b2dcbe
+:3629d88ae235
 platBinDirOld = None
 distDir = None
 apisDir = None
 installApis = True
 doCleanup = True
+doCleanDesktopLinks = False
+forceCleanDesktopLinks = False
 doCompile = True
 includePythonVariant = False
 cfg = {}
 progLanguages = ["Python", "Ruby", "QSS"]
 sourceDir = "eric"
 print()
 print("Usage:")
 if sys.platform == "darwin":
 print("    {0} [-chxyz] [-a dir] [-b dir] [-d dir] [-f file] [-i dir]"
-" [-m name] [-p python] [--pyqt=version]".format(progName))
+" [-m name] [-n path] [-p python] [--no-apis] [--pyqt=version]"
+.format(progName))
 elif sys.platform.startswith(("win", "cygwin")):
 print("    {0} [-chxyz] [-a dir] [-b dir] [-d dir] [-f file]"
-" [--pyqt=version]"
+" [--clean-desktop] [--no-apis] [--pyqt=version]"
 .format(progName))
 else:
 print("    {0} [-chxyz] [-a dir] [-b dir] [-d dir] [-f file] [-i dir]"
-" [--pyqt=version]"
+" [--no-apis] [--pyqt=version]"
 .format(progName))
 print("where:")
 print("    -h, --help display this help message")
 print("    -a dir     where the API files will be installed")
 if apisDir:
 print("               (default: {0})".format(apisDir))
 else:
 print("               (no default value)")
-print("    --noapis   don't install API files")
+print("    --no-apis  don't install API files")
 print("    -b dir     where the binaries will be installed")
 print("               (default: {0})".format(platBinDir))
 print("    -d dir     where eric6 python files will be installed")
 print("               (default: {0})".format(modDir))
 print("    -f file    configuration file naming the various installation"
 print("               be created in")
 print("               (default: {0})".format(macAppBundlePath))
 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")):
+("    --clean-desktop delete desktop links before installation")
 print("    -x         don't perform dependency checks (use on your own"
 " risk)")
 print("    -y         add the Python variant to the executable names")
 print("    -z         don't compile the installed python files")
 print("    --pyqt=version version of PyQt to be used (one of 4 or 5)")
 def cleanUpWindowsLinks():
 """
 Clean up the Desktop and Start Menu entries for Windows.
 """
+global doCleanDesktopLinks, forceCleanDesktopLinks
 try:
 from pywintypes import com_error        # __IGNORE_WARNING__
 except ImportError:
 # links were not created by install.py
 return
 regPath = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer" + \
 "\\User Shell Folders"
-# 1. cleanup desktop links
+if doCleanDesktopLinks or forceCleanDesktopLinks:
-regName = "Desktop"
+# 1. cleanup desktop links
-desktopEntry = getWinregEntry(regName, regPath)
+regName = "Desktop"
-if desktopEntry:
+desktopEntry = getWinregEntry(regName, regPath)
-desktopFolder = os.path.normpath(os.path.expandvars(desktopEntry))
+if desktopEntry:
-for linkName in windowsDesktopNames():
+desktopFolder = os.path.normpath(os.path.expandvars(desktopEntry))
-linkPath = os.path.join(desktopFolder, linkName)
+for linkName in windowsDesktopNames():
-if os.path.exists(linkPath):
+linkPath = os.path.join(desktopFolder, linkName)
-try:
+if os.path.exists(linkPath):
-os.remove(linkPath)
+try:
-except EnvironmentError:
+os.remove(linkPath)
-# maybe restrictions prohibited link removal
+except EnvironmentError:
-print("Could not remove '{0}'.".format(linkPath))
+# maybe restrictions prohibited link removal
+print("Could not remove '{0}'.".format(linkPath))
 # 2. cleanup start menu entry
 regName = "Programs"
 programsEntry = getWinregEntry(regName, regPath)
 if programsEntry:
 os.chmod(wname, 0o755)
 shutilCopy(os.path.join(sourceDir, "pixmaps", "eric_2.icns"),
 os.path.join(dirs["icns"], "eric.icns"))
+if os.path.exists(os.path.join("eric", "UI", "Info.py")):
+# Installing from archive
+from eric.UI.Info import Version, CopyrightShort
+elif os.path.exists(os.path.join("UI", "Info.py")):
+# Installing from source tree
+from UI.Info import Version, CopyrightShort
+else:
+Version = "Unknown"
+CopyrightShort = "(c) 2002 - 2019 Detlev Offenbach"
 copyToFile(
 os.path.join(dirs["contents"], "Info.plist"),
 '''<?xml version="1.0" encoding="UTF-8"?>\n'''
 '''<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"\n'''
 '''          "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n'''
 '''    <key>CFBundleExecutable</key>\n'''
 '''    <string>eric6</string>\n'''
 '''    <key>CFBundleIconFile</key>\n'''
 '''    <string>eric.icns</string>\n'''
 '''    <key>CFBundleInfoDictionaryVersion</key>\n'''
-'''    <string>1.0</string>\n'''
+'''    <string>{1}</string>\n'''
 '''    <key>CFBundleName</key>\n'''
 '''    <string>{0}</string>\n'''
 '''    <key>CFBundleDisplayName</key>\n'''
 '''    <string>{0}</string>\n'''
 '''    <key>CFBundlePackageType</key>\n'''
 '''    <string>APPL</string>\n'''
 '''    <key>CFBundleSignature</key>\n'''
-'''    <string>????</string>\n'''
+'''    <string>ERIC-IDE</string>\n'''
 '''    <key>CFBundleVersion</key>\n'''
-'''    <string>1.0</string>\n'''
+'''    <string>{1}</string>\n'''
+'''    <key>CFBundleGetInfoString</key>\n'''
+'''    <string>{1}, {2}</string>\n'''
 '''    <key>CFBundleIdentifier</key>\n'''
 '''    <string>org.python-projects.eric-ide</string>\n'''
 '''</dict>\n'''
-'''</plist>\n'''.format(macAppBundleName.replace(".app", "")))
+'''</plist>\n'''.format(
+macAppBundleName.replace(".app", ""),
+Version.split(None, 1)[0],
+CopyrightShort))
 def createInstallConfig():
 """
 Create the installation config dictionary.
 if pyqtVariant != "PyQt4":
 try:
 from PyQt5 import QtWebEngineWidgets    # __IGNORE_WARNING__
 except ImportError as msg:
-installed = pipInstall(
+from PyQt5.QtCore import PYQT_VERSION
-"PyQtWebEngine",
+if PYQT_VERSION >= 0x50c00:
-"PyQtWebEngine could not be detected.\nError: {0}".format(msg)
+# PyQt 5.12 separated QtWebEngine into a separate wheel
-)
+installed = pipInstall(
+"PyQtWebEngine",
+"PyQtWebEngine could not be detected.\nError: {0}"
+.format(msg)
+)
 try:
 if pyqtVariant == "PyQt4":
 from PyQt4 import Qsci      # __IGNORE_WARNING__
 else:
 qtMajor = int(qVersion().split('.')[0])
 qtMinor = int(qVersion().split('.')[1])
 print("Qt Version: {0}".format(qVersion().strip()))
 if qtMajor < 4 or \
 (qtMajor == 4 and qtMinor < 8) or \
-(qtMajor == 5 and qtMinor < 3):
+(qtMajor == 5 and qtMinor < 6):
 print('Sorry, you must have Qt version 4.8.0 or better or')
-print('5.3.0 or better.')
+print('5.6.0 or better.')
 exit(2)
 # check version of sip
 try:
 try:
 pat = int(pat)
 if major < 4 or \
 (major == 4 and minor < 10) or \
 (major == 5 and minor < 3):
 print('Sorry, you must have PyQt 4.10.0 or better or')
-print('PyQt 5.3.0 or better or'
+print('PyQt 5.6.0 or better or'
 ' a recent snapshot release.')
 exit(4)
 # check for blacklisted versions
 for vers in BlackLists[pyqtVariant] + PlatformBlackLists[pyqtVariant]:
 if vers == pyqtVersion:
 # Parse the command line.
 global progName, modDir, doCleanup, doCompile, distDir, cfg, apisDir
 global sourceDir, configName, includePythonVariant
 global macAppBundlePath, macAppBundleName, macPythonExe
-global pyqtVariant, pyqtOverride, installApis
+global pyqtVariant, pyqtOverride, installApis, doCleanDesktopLinks
 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)
 if arg not in ["4", "5"]:
 print("Invalid PyQt version given; should be 4 or 5. Aborting")
 exit(6)
 pyqtVariant = "PyQt{0}".format(arg)
 pyqtOverride = True
-elif "--noapis":
+elif opt == "--no-apis":
 installApis = False
+elif opt == "--clean-desktop":
+doCleanDesktopLinks = True
 infoName = ""
 installFromSource = not os.path.isdir(sourceDir)
 # check dependencies

Mercurial Repositories > eric / file comparison

comparison: install.py

install.py