eric: comparison install.py

-:d85fadb263a0
+:1b8381afe38f
 distDir = None
 apisDir = None
 doCleanup = True
 doCompile = True
 cfg = {}
-progLanguages = ["Python", "Ruby"]
+progLanguages = ["Python", "Ruby", "QSS"]
 sourceDir = "eric"
 configName = 'eric5config.py'
 defaultMacAppBundleName = "eric5.app"
 macAppBundleName = "eric5.app"
+macAppBundlePath = "/Applications"
 macPythonExe = "{0}/Resources/Python.app/Contents/MacOS/Python".format(
 sys.exec_prefix)
 # Define blacklisted versions of the prerequisites
 BlackLists = {
 """
 Display a usage message and exit.
 @param rcode the return code passed back to the calling process.
 """
-global progName, modDir, distDir, apisDir, macAppBundleName
+global progName, modDir, distDir, apisDir
-global macPythonExe
+global macAppBundleName, macAppBundlePath, macPythonExe
 print()
 print("Usage:")
 if sys.platform == "darwin":
 print("    {0} [-chxz] [-a dir] [-b dir] [-d dir] [-f file] [-i dir]"
 print("    -i dir    temporary install prefix")
 print("              (default: {0})".format(distDir))
 if sys.platform == "darwin":
 print("    -m name   name of the Mac app bundle")
 print("              (default: {0})".format(macAppBundleName))
+print("    -n path   path of the directory the Mac app bundle will")
+print("              be created in")
+print("              (default: {0}".format(macAppBundlePath))
 print("    -p python name of the python executable")
 print("              (default: {0})".format(macPythonExe))
 print("    -x        don't perform dependency checks (use on your own"
 " risk)")
 print("    -c        don't cleanup old installation first")
 pdir = os.path.join(cfg['mdir'], "eric5plugins")
 fname = os.path.join(pdir, "__init__.py")
 if not os.path.exists(fname):
 if not os.path.exists(pdir):
-os.mkdir(pdir,  0o755)
+os.mkdir(pdir, 0o755)
 f = open(fname, "w")
 f.write(
 '''# -*- coding: utf-8 -*-
 """
 def cleanUp():
 """
 Uninstall the old eric files.
 """
-global macAppBundleName, platBinDir
+global macAppBundleName, macAppBundlePath, platBinDir
 try:
 from eric5config import getConfig
 except ImportError:
 # eric5 wasn't installed previously
 if sys.platform == "darwin":
 # delete the Mac app bundle
 if os.path.exists("/Developer/Applications/Eric5"):
 shutil.rmtree("/Developer/Applications/Eric5")
+try:
+macAppBundlePath = getConfig("macAppBundlePath")
+macAppBundleName = getConfig("macAppBundleName")
+except AttributeError:
+macAppBundlePath = "/Applications"
+macAppBundleName = "eric5.app"
 if os.path.exists("/Applications/" + macAppBundleName):
 shutil.rmtree("/Applications/" + macAppBundleName)
+bundlePath = os.path.join(macAppBundlePath, macAppBundleName)
+if os.path.exists(bundlePath):
+shutil.rmtree(bundlePath)
 except (IOError, OSError) as msg:
 sys.stderr.write(
 'Error: {0}\nTry install with admin rights.\n'.format(msg))
 exit(7)
 Create a Mac application bundle.
 @param pydir the name of the directory where the Python script will
 eventually be installed (string)
 """
-global cfg, sourceDir, macAppBundleName, macPythonExe
+global cfg, sourceDir, macAppBundleName, macPythonExe, macAppBundlePath
-dirs = {"contents": "/Applications/{0}/Contents/".format(macAppBundleName),
+dirs = {
-"exe": "/Applications/{0}/Contents/MacOS".format(macAppBundleName),
+"contents": "{0}/{1}/Contents/".format(
-"icns": "/Applications/{0}/Contents/Resources".format(
+macAppBundlePath, macAppBundleName),
-macAppBundleName)}
+"exe": "{0}/{1}/Contents/MacOS".format(
+macAppBundlePath, macAppBundleName),
+"icns": "{0}/{1}/Contents/Resources".format(
+macAppBundlePath, macAppBundleName)
+}
 os.makedirs(dirs["contents"])
-os.mkdir(dirs["exe"])
+os.makedirs(dirs["exe"])
-os.mkdir(dirs["icns"])
+os.makedirs(dirs["icns"])
 if macAppBundleName == defaultMacAppBundleName:
 starter = os.path.join(dirs["exe"], "eric")
 os.symlink(macPythonExe, starter)
 else:
 def createConfig():
 """
 Create a config file with the respective config entries.
 """
-global cfg, sourceDir
+global cfg, sourceDir, macAppBundlePath
 apis = []
 for progLanguage in progLanguages:
 for apiName in glob.glob(
 os.path.join(sourceDir, "APIs", progLanguage, "*.api")):
 """    'ericOthersDir': r'{11}',\n"""
 """    'bindir': r'{12}',\n"""
 """    'mdir': r'{13}',\n"""
 """    'apidir': r'{14}',\n"""
 """    'apis': {15},\n"""
+"""    'macAppBundlePath': r'{16}',\n"""
+"""    'macAppBundleName': r'{17}',\n"""
 """}}\n"""
 """\n"""
 """def getConfig(name):\n"""
 """    '''\n"""
 """    Module function to get a configuration value.\n"""
 """        return _pkg_config[name]\n"""
 """    except KeyError:\n"""
 """        pass\n"""
 """\n"""
 """    raise AttributeError('"{{0}}" is not a valid configuration"""
-""" value'.format(name))\n""").format(
+""" value'.format(name))\n"""
+).format(
 cfg['ericDir'], cfg['ericPixDir'], cfg['ericIconDir'],
 cfg['ericDTDDir'], cfg['ericCSSDir'],
 cfg['ericStylesDir'], cfg['ericDocDir'],
 cfg['ericExamplesDir'], cfg['ericTranslationsDir'],
 cfg['ericTemplatesDir'],
 cfg['ericCodeTemplatesDir'], cfg['ericOthersDir'],
 cfg['bindir'], cfg['mdir'],
-cfg['apidir'], apis)
+cfg['apidir'], apis,
+macAppBundlePath, macAppBundleName,
+)
 copyToFile(fn, config)
 def doDependancyChecks():
 """
 """
 import getopt
 # Parse the command line.
 global progName, modDir, doCleanup, doCompile, distDir, cfg, apisDir
-global sourceDir, configName, macAppBundleName, macPythonExe
+global sourceDir, configName
+global macAppBundlePath, macAppBundleName, macPythonExe
 if sys.version_info < (2, 6, 0) or sys.version_info > (3, 9, 9):
 print('Sorry, eric5 requires at least Python 2.6 or '
 'Python 3 for running.')
 exit(5)
 exit(6)
 except:
 cfg = {}
 elif opt == "-m":
 macAppBundleName = arg
+elif opt == "-n":
+macAppBundlePath = arg
 elif opt == "-p":
 macPythonExe = arg
 installFromSource = not os.path.isdir(sourceDir)
 if installFromSource:

Mercurial Repositories > eric / file comparison

comparison: install.py

install.py