eric: comparison install.py

-:e60ea6cb8e11
+:3d4277929fb3
 """
 Display a usage message and exit.
 @param rcode the return code passed back to the calling process.
 """
-global progName, platBinDir, modDir, distDir, apisDir, macAppBundleName
+global progName, modDir, distDir, apisDir, macAppBundleName
 global macPythonExe
 print()
 print("Usage:")
 if sys.platform == "darwin":
 platBinDir = "/usr/local/bin"
 modDir = distutils.sysconfig.get_python_lib(True)
 pyModDir = modDir
-try:
+pyqtDataDir = os.path.join(modDir, "PyQt4")
-from PyQt4 import pyqtconfig
+if os.path.exists(os.path.join(pyqtDataDir, "qsci")):
-pyqtDataDir = pyqtconfig._pkg_config["pyqt_mod_dir"]
+# it's the installer
-if os.path.exists(os.path.join(pyqtDataDir, "qsci")):
+qtDataDir = pyqtDataDir
-# it's the installer
+else:
-qtDataDir = pyqtDataDir
+try:
-else:
+from PyQt4.QtCore import QLibraryInfo
-qtDataDir = pyqtconfig._pkg_config["qt_data_dir"]
+qtDataDir = QLibraryInfo.location(QLibraryInfo.DataPath)
-except (AttributeError, ImportError):
+except ImportError:
 qtDataDir = None
 if qtDataDir:
 apisDir = os.path.join(qtDataDir, "qsci", "api")
 else:
 apisDir = None
 if sys.platform.startswith("win"):
 wname = wfile + ".bat"
 if isGuiScript:
 wrapper = \
 '''@echo off\n''' \
-'''set PYDIR=%~dp0\n''' \
+'''start "" "{2}\\pythonw.exe"''' \
-'''start "" "%PYDIR%\\pythonw.exe"''' \
 ''' "{0}\\{1}.pyw"''' \
-''' %1 %2 %3 %4 %5 %6 %7 %8 %9\n'''.format(pydir, wfile)
+''' %1 %2 %3 %4 %5 %6 %7 %8 %9\n'''.format(pydir, wfile, sys.exec_prefix)
 else:
 wrapper = \
 '''@"{0}\\python" "{1}\\{2}.py"''' \
 ''' %1 %2 %3 %4 %5 %6 %7 %8 %9\n'''.format(
-platBinDir, pydir, wfile)
+sys.exec_prefix, pydir, wfile)
 # Mac OS X
 elif sys.platform == "darwin":
+pyexec = "{0}/bin/pythonw3".format(sys.exec_prefix)
+if not os.path.exists(pyexec):
+pyexec = "{0}/bin/python3".format(sys.exec_prefix)
 wname = wfile
 wrapper = \
 '''#!/bin/sh
-exec "{0}/bin/pythonw3" "{1}/{2}.py" "$@"
+exec "{0}" "{1}/{2}.py" "$@"
-'''.format(sys.exec_prefix, pydir, wfile)
+'''.format(pyexec, pydir, wfile)
 # *nix systems
 else:
 wname = wfile
 wrapper = \
 def cleanUp():
 """
 Uninstall the old eric files.
 """
-global macAppBundleName
+global macAppBundleName, platBinDir
 try:
 from eric5config import getConfig
 except ImportError:
 # eric5 wasn't installed previously
 "eric5_snap",
 ]
 try:
 for rem_wname in rem_wnames:
-rwname = wrapperName(getConfig('bindir'), rem_wname)
+for d in [platBinDir, getConfig('bindir')]:
-if os.path.exists(rwname):
+rwname = wrapperName(d, rem_wname)
-os.remove(rwname)
+if os.path.exists(rwname):
+os.remove(rwname)
 # Cleanup our config file(s)
 for name in ['eric5config.py', 'eric5config.pyc', 'eric5.pth']:
 e5cfile = os.path.join(pyModDir, name)
 if os.path.exists(e5cfile):
 os.remove(configName)
 except EnvironmentError:
 pass
 # cleanup old installation
+print("Cleaning up old installation ...")
 try:
 if doCleanup:
 if distDir:
 shutil.rmtree(distDir, True)
 else:
 except (IOError, OSError) as msg:
 sys.stderr.write('Error: {0}\nTry install as root.\n'.format(msg))
 exit(7)
 # Create a config file and delete the default one
+print("\nCreating configuration file ...")
 createConfig()
 # Compile .ui files
-print("Compiling user interface files...")
+print("\nCompiling user interface files ...")
 # step 1: remove old Ui_*.py files
 for root, _, files in os.walk(sourceDir):
 for file in [f for f in files if fnmatch.fnmatch(f, 'Ui_*.py')]:
 os.remove(os.path.join(root, file))
 # step 2: compile the forms
 compileUiFiles()
 if doCompile:
-print("\nCompiling source files...")
+print("\nCompiling source files ...")
 if distDir:
 compileall.compile_dir(sourceDir,
 ddir=os.path.join(distDir, modDir, cfg['ericDir']),
 rx=re.compile(r"DebugClients[\\/]Python[\\/]|UtilitiesPython2[\\/]"),
 quiet=True)

Mercurial Repositories > eric / file comparison

comparison: install.py

install.py