eric: comparison install.py

-:f98e1946c74f
+:137370f7114b
 platBinDir = None
 distDir = None
 apisDir = None
 doCleanup = True
 doCompile = True
+includePythonVariant = False
 cfg = {}
 progLanguages = ["Python", "Ruby", "QSS"]
 sourceDir = "eric"
 configName = 'eric5config.py'
 defaultMacAppBundleName = "eric5.app"
 "PyQt4": ["4.9.2", "4.9.3"],
 "QScintilla2": [],
 },
 }
+# Define file name markers for Python variants
+PythonMarkers = {
+2: "_py2",
+3: "_py3",
+}
 def exit(rcode=0):
 """
 Exit the install script.
 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("    {0} [-chxyz] [-a dir] [-b dir] [-d dir] [-f file] [-i dir]"
 " [-m name] [-p python]".format(progName))
 elif sys.platform.startswith("win"):
-print("    {0} [-chxz] [-a dir] [-b dir] [-d dir] [-f file]"
+print("    {0} [-chxyz] [-a dir] [-b dir] [-d dir] [-f file]"
 .format(progName))
 else:
-print("    {0} [-chxz] [-a dir] [-b dir] [-d dir] [-f file] [-i dir]"
+print("    {0} [-chxyz] [-a dir] [-b dir] [-d dir] [-f file] [-i dir]"
 .format(progName))
 print("where:")
 print("    -h        display this help message")
 print("    -a dir    where the API files will be installed")
 if apisDir:
 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("    -c        don't cleanup old installation first")
 print("    -x        don't perform dependency checks (use on your own"
 " risk)")
-print("    -c        don't cleanup old installation first")
+print("    -y        add the Python variant to the executable names")
 print("    -z        don't compile the installed python files")
 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',"
 @param dirName name of the directory to prune (string)
 """
 # step 1: delete all Ui_*.py files without a corresponding
 #         *.ui file
 dirListing = os.listdir(dirName)
-for formName, sourceName in [(f.replace('Ui_',"").replace(".py",".ui"), f)
+for formName, sourceName in [
-for f in dirListing
+(f.replace('Ui_', "").replace(".py", ".ui"), f)
-if fnmatch.fnmatch(f, "Ui_*.py")]:
+for f in dirListing if fnmatch.fnmatch(f, "Ui_*.py")]:
 if not os.path.exists(os.path.join(dirName, formName)):
 os.remove(os.path.join(dirName, sourceName))
 if os.path.exists(os.path.join(dirName, sourceName + "c")):
 os.remove(os.path.join(dirName, sourceName + "c"))
 def cleanUp():
 """
 Uninstall the old eric files.
 """
-global macAppBundleName, macAppBundlePath, platBinDir
+global macAppBundleName, macAppBundlePath, platBinDir, includePythonVariant
 try:
 from eric5config import getConfig
 except ImportError:
 # eric5 wasn't installed previously
 "eric5-unittest", "eric5",
 "eric5-tray", "eric5-editor",
 "eric5-plugininstall", "eric5-pluginuninstall",
 "eric5-pluginrepository", "eric5-sqlbrowser",
 "eric5-webbrowser", "eric5-iconeditor",
+]
+rem_wnames2 = [
 "eric5_api", "eric5_compare",
 "eric5_configure", "eric5_diff",
 "eric5_doc", "eric5_qregularexpression",
 "eric5_qregexp", "eric5_re",
 "eric5_trpreviewer", "eric5_uipreviewer",
 "eric5_plugininstall", "eric5_pluginuninstall",
 "eric5_pluginrepository", "eric5_sqlbrowser",
 "eric5_webbrowser", "eric5_iconeditor",
 "eric5_snap",
 ]
+if includePythonVariant:
+marker = PythonMarkers[sys.version_info.major]
+rem_wnames.extend([n + marker for n in rem_wnames2])
+else:
+rem_wnames.extend(rem_wnames2)
 try:
 for rem_wname in rem_wnames:
 for d in [platBinDir, getConfig('bindir')]:
 rwname = wrapperName(d, rem_wname)
 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)
 Actually perform the installation steps.
 @return result code (integer)
 """
 global distDir, doCleanup, cfg, progLanguages, sourceDir, configName
+global includePythonVariant
 # Create the platform specific wrappers.
 wnames = []
-wnames.append(createPyWrapper(cfg['ericDir'], "eric5_api", False))
+if includePythonVariant:
-wnames.append(createPyWrapper(cfg['ericDir'], "eric5_compare"))
+marker = PythonMarkers[sys.version_info.major]
-wnames.append(createPyWrapper(cfg['ericDir'], "eric5_configure"))
+else:
-wnames.append(createPyWrapper(cfg['ericDir'], "eric5_diff"))
+marker = ""
-wnames.append(createPyWrapper(cfg['ericDir'], "eric5_doc", False))
+wnames.append(createPyWrapper(cfg['ericDir'],
-wnames.append(createPyWrapper(cfg['ericDir'], "eric5_editor"))
+"eric5_api" + marker,
-wnames.append(createPyWrapper(cfg['ericDir'], "eric5_iconeditor"))
+False))
-wnames.append(createPyWrapper(cfg['ericDir'], "eric5_plugininstall"))
+wnames.append(createPyWrapper(cfg['ericDir'],
-wnames.append(createPyWrapper(cfg['ericDir'], "eric5_pluginrepository"))
+"eric5_compare" + marker))
-wnames.append(createPyWrapper(cfg['ericDir'], "eric5_pluginuninstall"))
+wnames.append(createPyWrapper(cfg['ericDir'],
-wnames.append(createPyWrapper(cfg['ericDir'], "eric5_qregexp"))
+"eric5_configure" + marker))
-wnames.append(createPyWrapper(cfg['ericDir'], "eric5_qregularexpression"))
+wnames.append(createPyWrapper(cfg['ericDir'],
-wnames.append(createPyWrapper(cfg['ericDir'], "eric5_re"))
+"eric5_diff" + marker))
-wnames.append(createPyWrapper(cfg['ericDir'], "eric5_snap"))
+wnames.append(createPyWrapper(cfg['ericDir'],
-wnames.append(createPyWrapper(cfg['ericDir'], "eric5_sqlbrowser"))
+"eric5_doc" + marker,
-wnames.append(createPyWrapper(cfg['ericDir'], "eric5_tray"))
+False))
-wnames.append(createPyWrapper(cfg['ericDir'], "eric5_trpreviewer"))
+wnames.append(createPyWrapper(cfg['ericDir'],
-wnames.append(createPyWrapper(cfg['ericDir'], "eric5_uipreviewer"))
+"eric5_editor" + marker))
-wnames.append(createPyWrapper(cfg['ericDir'], "eric5_unittest"))
+wnames.append(createPyWrapper(cfg['ericDir'],
-wnames.append(createPyWrapper(cfg['ericDir'], "eric5_webbrowser"))
+"eric5_iconeditor" + marker))
-wnames.append(createPyWrapper(cfg['ericDir'], "eric5"))
+wnames.append(createPyWrapper(cfg['ericDir'],
+"eric5_plugininstall" + marker))
+wnames.append(createPyWrapper(cfg['ericDir'],
+"eric5_pluginrepository" + marker))
+wnames.append(createPyWrapper(cfg['ericDir'],
+"eric5_pluginuninstall" + marker))
+wnames.append(createPyWrapper(cfg['ericDir'],
+"eric5_qregexp" + marker))
+wnames.append(createPyWrapper(cfg['ericDir'],
+"eric5_qregularexpression" + marker))
+wnames.append(createPyWrapper(cfg['ericDir'],
+"eric5_re" + marker))
+wnames.append(createPyWrapper(cfg['ericDir'],
+"eric5_snap" + marker))
+wnames.append(createPyWrapper(cfg['ericDir'],
+"eric5_sqlbrowser" + marker))
+wnames.append(createPyWrapper(cfg['ericDir'],
+"eric5_tray" + marker))
+wnames.append(createPyWrapper(cfg['ericDir'],
+"eric5_trpreviewer" + marker))
+wnames.append(createPyWrapper(cfg['ericDir'],
+"eric5_uipreviewer" + marker))
+wnames.append(createPyWrapper(cfg['ericDir'],
+"eric5_unittest" + marker))
+wnames.append(createPyWrapper(cfg['ericDir'],
+"eric5_webbrowser" + marker))
+wnames.append(createPyWrapper(cfg['ericDir'],
+"eric5" + marker))
 # set install prefix, if not None
 if distDir:
 for key in list(cfg.keys()):
 cfg[key] = os.path.normpath(distDir + os.sep + cfg[key])
 """
 import getopt
 # Parse the command line.
 global progName, modDir, doCleanup, doCompile, distDir, cfg, apisDir
-global sourceDir, configName
+global sourceDir, configName, includePythonVariant
 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.')
 initGlobals()
 try:
 if sys.platform.startswith("win"):
-optlist, args = getopt.getopt(argv[1:], "chxza:b:d:f:")
+optlist, args = getopt.getopt(argv[1:], "chxyza:b:d:f:")
 elif sys.platform == "darwin":
-optlist, args = getopt.getopt(argv[1:], "chxza:b:d:f:i:m:n:p:")
+optlist, args = getopt.getopt(argv[1:], "chxyza:b:d:f:i:m:n:p:")
 else:
-optlist, args = getopt.getopt(argv[1:], "chxza:b:d:f:i:")
+optlist, args = getopt.getopt(argv[1:], "chxyza:b:d:f:i:")
 except getopt.GetoptError:
 usage()
 global platBinDir
 depChecks = False
 elif opt == "-c":
 doCleanup = False
 elif opt == "-z":
 doCompile = False
+elif opt == "-y":
+includePythonVariant = True
 elif opt == "-f":
 try:
 exec(compile(open(arg).read(), arg, 'exec'), globals())
 if len(cfg) != configLength:
 print("The configuration dictionary in '{0}' is incorrect."

Mercurial Repositories > eric / file comparison

comparison: install.py

install.py