eric: comparison install.py

-:cfab9cb261d2
+:0f020f39977b
 doCompile = True
 cfg = {}
 progLanguages = ["Python", "Ruby"]
 sourceDir = "eric"
 configName = 'eric5config.py'
+macAppBundleName = "eric5.app"
+macPythonExe = "{0}/Resources/Python.app/Contents/MacOS/Python".format(sys.exec_prefix)
 # Define blacklisted versions of the prerequisites
 BlackLists = {
 "sip": ["4.11", "4.12.3"],
 "PyQt4": ["4.7.5"],
 """
 Display a usage message and exit.
 @param rcode the return code passed back to the calling process.
 """
-global progName, platBinDir, modDir, distDir, apisDir
+global progName, platBinDir, modDir, distDir, apisDir, macAppBundleName
+global macPythonExe
 print()
 print("Usage:")
-print("    {0} [-chxz] [-a dir] [-b dir] [-d dir] [-f file] [-i dir]"\
+if sys.platform == "darwin":
+print("    {0} [-chxz] [-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]"\
+.format(progName))
+else:
+print("    {0} [-chxz] [-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("              (default: {0})".format(modDir))
 print("    -f file   configuration file naming the various installation paths")
 if not sys.platform.startswith("win"):
 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("    -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")
 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")
 def cleanUp():
 """
 Uninstall the old eric files.
 """
+global macAppBundleName
 try:
 from eric5config import getConfig
 except ImportError:
 # eric5 wasn't installed previously
 return
 if sys.platform == "darwin":
 # delete the Mac app bundle
 if os.path.exists("/Developer/Applications/Eric5"):
 shutil.rmtree("/Developer/Applications/Eric5")
-if os.path.exists("/Applications/eric5.app"):
+if os.path.exists("/Applications/" + macAppBundleName):
-shutil.rmtree("/Applications/eric5.app")
+shutil.rmtree("/Applications/" + macAppBundleName)
 except IOError as msg:
 sys.stderr.write('IOError: {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
+global cfg, sourceDir, macAppBundleName, macPythonExe
-dirs = {"contents": "/Applications/eric5.app/Contents/",
+dirs = {"contents": "/Applications/{0}/Contents/".format(macAppBundleName),
-"exe": "/Applications/eric5.app/Contents/MacOS",
+"exe": "/Applications/{0}/Contents/MacOS".format(macAppBundleName),
-"icns": "/Applications/eric5.app/Contents/Resources"}
+"icns": "/Applications/{0}/Contents/Resources".format(macAppBundleName)}
 os.makedirs(dirs["contents"])
 os.mkdir(dirs["exe"])
 os.mkdir(dirs["icns"])
-starter = os.path.join(dirs["exe"], "eric")
+##    starter = os.path.join(dirs["exe"], "eric")
-os.symlink(
+##    os.symlink(macPythonExe, starter)
-"{0}/Resources/Python.app/Contents/MacOS/Python".format(sys.exec_prefix),
+starter = "python3"
-starter)
 wname = os.path.join(dirs["exe"], "eric5")
 path = os.getenv("PATH", "")
 if path:
 pybin = os.path.join(sys.exec_prefix, "bin")
 <key>CFBundleIconFile</key>
 <string>eric.icns</string>
 <key>CFBundleInfoDictionaryVersion</key>
 <string>1.0</string>
 <key>CFBundleName</key>
-<string>eric5</string>
+<string>{0}</string>
 <key>CFBundlePackageType</key>
 <string>APPL</string>
 <key>CFBundleSignature</key>
 <string>????</string>
 <key>CFBundleVersion</key>
 <string>1.0</string>
 </dict>
 </plist>
-'''
+'''.format(macAppBundleName.replace(".app", ""))
 )
 def createInstallConfig():
 """
 """
 import getopt
 # Parse the command line.
 global progName, modDir, doCleanup, doCompile, distDir, cfg, apisDir
-global sourceDir, configName
+global sourceDir, configName, macAppBundleName, macPythonExe
 progName = os.path.basename(argv[0])
 if os.path.dirname(argv[0]):
 os.chdir(os.path.dirname(argv[0]))
 initGlobals()
 try:
 if sys.platform.startswith("win"):
 optlist, args = getopt.getopt(argv[1:], "chxza:b:d:f:")
+elif sys.platform == "darwin":
+optlist, args = getopt.getopt(argv[1:], "chxza:b:d:f:i:m:p:")
 else:
 optlist, args = getopt.getopt(argv[1:], "chxza:b:d:f:i:")
 except getopt.GetoptError:
 usage()
 print("The configuration dictionary in '{0}' is incorrect. Aborting"\
 .format(arg))
 exit(6)
 except:
 cfg = {}
+elif opt == "-m":
+macAppBundleName = arg
+elif opt == "-p":
+macPythonExe = arg
 installFromSource = not os.path.isdir(sourceDir)
 if installFromSource:
 sourceDir = os.path.dirname(__file__) or "."
 configName = os.path.join(sourceDir, "eric5config.py")

Mercurial Repositories > eric / file comparison

comparison: install.py

install.py