diff -r dac33c7fce07 -r e3642a6a1e71 scripts/install.py
--- a/scripts/install.py Sat May 15 19:01:16 2021 +0200
+++ b/scripts/install.py Sat May 15 20:08:03 2021 +0200
@@ -45,9 +45,9 @@
cfg = {}
progLanguages = ["Python", "Ruby", "QSS"]
sourceDir = "eric"
-eric6SourceDir = os.path.join(sourceDir, "eric6")
-configName = 'eric6config.py'
-defaultMacAppBundleName = "eric6.app"
+eric7SourceDir = os.path.join(sourceDir, "eric7")
+configName = 'eric7config.py'
+defaultMacAppBundleName = "eric7.app"
defaultMacAppBundlePath = "/Applications"
defaultMacPythonExe = "{0}/Resources/Python.app/Contents/MacOS/Python".format(
sys.exec_prefix)
@@ -58,7 +58,7 @@
macPythonExe = defaultMacPythonExe
createInstallInfoFile = True
-installInfoName = "eric6install.json"
+installInfoName = "eric7install.json"
installInfo = {}
installCwd = ""
@@ -277,12 +277,12 @@
@param src source file name (string)
@param dst destination file name (string)
"""
- if os.path.exists(os.path.join("eric", "eric6", "UI", "Info.py")):
+ if os.path.exists(os.path.join("eric", "eric7", "UI", "Info.py")):
# Installing from archive
- from eric.eric6.UI.Info import Version
- elif os.path.exists(os.path.join("eric6", "UI", "Info.py")):
+ from eric.eric7.UI.Info import Version
+ elif os.path.exists(os.path.join("eric7", "UI", "Info.py")):
# Installing from source tree
- from eric6.UI.Info import Version
+ from eric7.UI.Info import Version
else:
Version = "Unknown"
@@ -424,7 +424,7 @@
"""
global cfg, distDir
- pdir = os.path.join(cfg['mdir'], "eric6plugins")
+ pdir = os.path.join(cfg['mdir'], "eric7plugins")
fname = os.path.join(pdir, "__init__.py")
if not os.path.exists(fname):
if not os.path.exists(pdir):
@@ -487,7 +487,7 @@
global platBinDir, platBinDirOld
try:
- from eric6config import getConfig
+ from eric7config import getConfig
except ImportError:
# eric wasn't installed previously
return
@@ -506,19 +506,19 @@
# Remove the wrapper scripts
rem_wnames = [
- "eric6_api", "eric6_compare",
- "eric6_configure", "eric6_diff",
- "eric6_doc", "eric6_qregularexpression",
- "eric6_qregexp", "eric6_re",
- "eric6_trpreviewer", "eric6_uipreviewer",
- "eric6_unittest", "eric6",
- "eric6_tray", "eric6_editor",
- "eric6_plugininstall", "eric6_pluginuninstall",
- "eric6_pluginrepository", "eric6_sqlbrowser",
- "eric6_iconeditor", "eric6_snap", "eric6_hexeditor",
- "eric6_browser", "eric6_shell",
+ "eric7_api", "eric7_compare",
+ "eric7_configure", "eric7_diff",
+ "eric7_doc", "eric7_qregularexpression",
+ "eric7_qregexp", "eric7_re",
+ "eric7_trpreviewer", "eric7_uipreviewer",
+ "eric7_unittest", "eric7",
+ "eric7_tray", "eric7_editor",
+ "eric7_plugininstall", "eric7_pluginuninstall",
+ "eric7_pluginrepository", "eric7_sqlbrowser",
+ "eric7_iconeditor", "eric7_snap", "eric7_hexeditor",
+ "eric7_browser", "eric7_shell",
# from Python2 era
- "eric6_webbrowser",
+ "eric7_webbrowser",
]
try:
@@ -532,7 +532,7 @@
os.remove(rwname)
# Cleanup our config file(s)
- for name in ['eric6config.py', 'eric6config.pyc', 'eric6.pth']:
+ for name in ['eric7config.py', 'eric7config.pyc', 'eric7.pth']:
e6cfile = os.path.join(pyModDir, name)
if os.path.exists(e6cfile):
os.remove(e6cfile)
@@ -551,7 +551,7 @@
# Cleanup translations
for name in glob.glob(
- os.path.join(getConfig('ericTranslationsDir'), 'eric6_*.qm')):
+ os.path.join(getConfig('ericTranslationsDir'), 'eric7_*.qm')):
if os.path.exists(name):
os.remove(name)
@@ -565,7 +565,7 @@
os.remove(apiname)
for apiname in glob.glob(
os.path.join(apidir, progLanguage.lower(), "*.bas")):
- if os.path.basename(apiname) != "eric6.bas":
+ if os.path.basename(apiname) != "eric7.bas":
os.remove(apiname)
if sys.platform == "darwin":
@@ -583,32 +583,32 @@
"""
if os.getuid() == 0:
for name in [
- "/usr/share/applications/eric6.desktop",
- "/usr/share/appdata/eric6.appdata.xml",
- "/usr/share/metainfo/eric6.appdata.xml",
- "/usr/share/applications/eric6_browser.desktop",
+ "/usr/share/applications/eric7.desktop",
+ "/usr/share/appdata/eric7.appdata.xml",
+ "/usr/share/metainfo/eric7.appdata.xml",
+ "/usr/share/applications/eric7_browser.desktop",
"/usr/share/pixmaps/eric.png",
"/usr/share/pixmaps/ericWeb.png",
"/usr/share/icons/eric.png",
"/usr/share/icons/ericWeb.png",
# from Python2 era
- "/usr/share/applications/eric6_webbrowser.desktop",
+ "/usr/share/applications/eric7_webbrowser.desktop",
]:
if os.path.exists(name):
os.remove(name)
elif os.getuid() >= 1000:
# it is assumed that user ids start at 1000
for name in [
- "~/.local/share/applications/eric6.desktop",
- "~/.local/share/appdata/eric6.appdata.xml",
- "~/.local/share/metainfo/eric6.appdata.xml",
- "~/.local/share/applications/eric6_browser.desktop",
+ "~/.local/share/applications/eric7.desktop",
+ "~/.local/share/appdata/eric7.appdata.xml",
+ "~/.local/share/metainfo/eric7.appdata.xml",
+ "~/.local/share/applications/eric7_browser.desktop",
"~/.local/share/pixmaps/eric.png",
"~/.local/share/pixmaps/ericWeb.png",
"~/.local/share/icons/eric.png",
"~/.local/share/icons/ericWeb.png",
# from Python2 era
- "/usr/share/applications/eric6_webbrowser.desktop",
+ "/usr/share/applications/eric7_webbrowser.desktop",
]:
path = os.path.expanduser(name)
if os.path.exists(path):
@@ -619,7 +619,7 @@
"""
Uninstall the macOS application bundle.
"""
- from eric6config import getConfig
+ from eric7config import getConfig
try:
macAppBundlePath = getConfig("macAppBundlePath")
macAppBundleName = getConfig("macAppBundleName")
@@ -672,13 +672,13 @@
programsEntry = getWinregEntry(regName, regPath)
if programsEntry:
programsFolder = os.path.normpath(os.path.expandvars(programsEntry))
- eric6EntryPath = os.path.join(programsFolder, windowsProgramsEntry())
- if os.path.exists(eric6EntryPath):
+ eric7EntryPath = os.path.join(programsFolder, windowsProgramsEntry())
+ if os.path.exists(eric7EntryPath):
try:
- shutil.rmtree(eric6EntryPath)
+ shutil.rmtree(eric7EntryPath)
except OSError:
# maybe restrictions prohibited link removal
- print("Could not remove '{0}'.".format(eric6EntryPath))
+ print("Could not remove '{0}'.".format(eric7EntryPath))
def shutilCopy(src, dst, perm=0o644):
@@ -709,15 +709,15 @@
if not os.path.isdir(scriptsDir):
os.mkdir(scriptsDir)
wnames = []
- for name in ["eric6_api", "eric6_doc"]:
+ for name in ["eric7_api", "eric7_doc"]:
wnames.append(createPyWrapper(cfg['ericDir'], name, scriptsDir, False))
- for name in ["eric6_compare", "eric6_configure", "eric6_diff",
- "eric6_editor", "eric6_hexeditor", "eric6_iconeditor",
- "eric6_plugininstall", "eric6_pluginrepository",
- "eric6_pluginuninstall", "eric6_qregularexpression",
- "eric6_re", "eric6_snap", "eric6_sqlbrowser", "eric6_tray",
- "eric6_trpreviewer", "eric6_uipreviewer", "eric6_unittest",
- "eric6_browser", "eric6_shell", "eric6"]:
+ for name in ["eric7_compare", "eric7_configure", "eric7_diff",
+ "eric7_editor", "eric7_hexeditor", "eric7_iconeditor",
+ "eric7_plugininstall", "eric7_pluginrepository",
+ "eric7_pluginuninstall", "eric7_qregularexpression",
+ "eric7_re", "eric7_snap", "eric7_sqlbrowser", "eric7_tray",
+ "eric7_trpreviewer", "eric7_uipreviewer", "eric7_unittest",
+ "eric7_browser", "eric7_shell", "eric7"]:
wnames.append(createPyWrapper(cfg['ericDir'], name, scriptsDir))
# set install prefix, if not None
@@ -745,63 +745,63 @@
# copy the various parts of eric
copyTree(
- eric6SourceDir, cfg['ericDir'],
+ eric7SourceDir, cfg['ericDir'],
['*.py', '*.pyc', '*.pyo', '*.pyw'],
[os.path.join(sourceDir, "Examples"),
os.path.join(sourceDir, ".ropeproject")],
- excludePatterns=["eric6config.py*"])
+ excludePatterns=["eric7config.py*"])
copyTree(
- os.path.join(eric6SourceDir, "Plugins"),
+ os.path.join(eric7SourceDir, "Plugins"),
os.path.join(cfg['ericDir'], "Plugins"),
['*.svgz', '*.svg', '*.png', '*.style', '*.tmpl', '*.txt'])
copyTree(
- os.path.join(eric6SourceDir, "Documentation"),
+ os.path.join(eric7SourceDir, "Documentation"),
cfg['ericDocDir'],
['*.html', '*.qch'])
copyTree(
- os.path.join(eric6SourceDir, "CSSs"),
+ os.path.join(eric7SourceDir, "CSSs"),
cfg['ericCSSDir'],
['*.css'])
copyTree(
- os.path.join(eric6SourceDir, "Styles"),
+ os.path.join(eric7SourceDir, "Styles"),
cfg['ericStylesDir'],
['*.qss', '*.e4h', '*.e6h', '*.ehj'])
copyTree(
- os.path.join(eric6SourceDir, "i18n"),
+ os.path.join(eric7SourceDir, "i18n"),
cfg['ericTranslationsDir'],
['*.qm'])
copyTree(
- os.path.join(eric6SourceDir, "icons"),
+ os.path.join(eric7SourceDir, "icons"),
cfg['ericIconDir'],
['*.svgz', '*.svg', '*.png', 'LICENSE*.*', 'readme.txt'])
copyTree(
- os.path.join(eric6SourceDir, "pixmaps"),
+ os.path.join(eric7SourceDir, "pixmaps"),
cfg['ericPixDir'],
['*.svgz', '*.svg', '*.png', '*.xpm', '*.ico', '*.gif'])
copyTree(
- os.path.join(eric6SourceDir, "DesignerTemplates"),
+ os.path.join(eric7SourceDir, "DesignerTemplates"),
cfg['ericTemplatesDir'],
['*.tmpl'])
copyTree(
- os.path.join(eric6SourceDir, "CodeTemplates"),
+ os.path.join(eric7SourceDir, "CodeTemplates"),
cfg['ericCodeTemplatesDir'],
['*.tmpl'])
# copy some data files needed at various places
copyTree(
- os.path.join(eric6SourceDir, "E5Network", "data"),
+ os.path.join(eric7SourceDir, "E5Network", "data"),
os.path.join(cfg['ericDir'], "E5Network", "data"),
['*.dat', '*.txt'])
copyTree(
- os.path.join(eric6SourceDir, "IconEditor", "cursors"),
+ os.path.join(eric7SourceDir, "IconEditor", "cursors"),
os.path.join(cfg['ericDir'], "IconEditor", "cursors"),
['*.xpm'])
copyTree(
- os.path.join(eric6SourceDir, "UI", "data"),
+ os.path.join(eric7SourceDir, "UI", "data"),
os.path.join(cfg['ericDir'], "UI", "data"),
['*.css'])
copyTree(
- os.path.join(eric6SourceDir, "WebBrowser"),
+ os.path.join(eric7SourceDir, "WebBrowser"),
os.path.join(cfg['ericDir'], "WebBrowser"),
['*.xbel', '*.xml', '*.html', '*.png', '*.gif', '*.js'])
@@ -855,14 +855,14 @@
progLanguage, apidir))
if not os.path.exists(apidir):
os.makedirs(apidir)
- for apiName in glob.glob(os.path.join(eric6SourceDir, "APIs",
+ for apiName in glob.glob(os.path.join(eric7SourceDir, "APIs",
progLanguage, "*.api")):
try:
shutilCopy(apiName, apidir)
except OSError:
print("Could not install '{0}' (no permission)."
.format(apiName))
- for apiName in glob.glob(os.path.join(eric6SourceDir, "APIs",
+ for apiName in glob.glob(os.path.join(eric7SourceDir, "APIs",
progLanguage, "*.bas")):
try:
shutilCopy(apiName, apidir)
@@ -871,14 +871,14 @@
.format(apiName))
if progLanguage == "Python":
# copy Python3 API files to the same destination
- for apiName in glob.glob(os.path.join(eric6SourceDir, "APIs",
+ for apiName in glob.glob(os.path.join(eric7SourceDir, "APIs",
"Python3", "*.api")):
try:
shutilCopy(apiName, apidir)
except OSError:
print("Could not install '{0}' (no permission)."
.format(apiName))
- for apiName in glob.glob(os.path.join(eric6SourceDir, "APIs",
+ for apiName in glob.glob(os.path.join(eric7SourceDir, "APIs",
"Python3", "*.bas")):
if os.path.exists(os.path.join(
apidir, os.path.basename(
@@ -890,14 +890,14 @@
.format(apiName))
# copy MicroPython API files to the same destination
- for apiName in glob.glob(os.path.join(eric6SourceDir, "APIs",
+ for apiName in glob.glob(os.path.join(eric7SourceDir, "APIs",
"MicroPython", "*.api")):
try:
shutilCopy(apiName, apidir)
except OSError:
print("Could not install '{0}' (no permission)."
.format(apiName))
- for apiName in glob.glob(os.path.join(eric6SourceDir, "APIs",
+ for apiName in glob.glob(os.path.join(eric7SourceDir, "APIs",
"MicroPython", "*.bas")):
if os.path.exists(os.path.join(
apidir, os.path.basename(
@@ -934,48 +934,48 @@
if not os.path.exists(dst):
os.makedirs(dst)
shutilCopy(
- os.path.join(eric6SourceDir, "pixmaps", "eric_icon.png"),
+ os.path.join(eric7SourceDir, "pixmaps", "eric_icon.png"),
os.path.join(dst, "eric.png"))
shutilCopy(
- os.path.join(eric6SourceDir, "pixmaps", "ericWeb48_icon.png"),
+ os.path.join(eric7SourceDir, "pixmaps", "ericWeb48_icon.png"),
os.path.join(dst, "ericWeb.png"))
dst = os.path.normpath(
os.path.join(distDir, "usr/share/applications"))
if not os.path.exists(dst):
os.makedirs(dst)
- copyDesktopFile(os.path.join(sourceDir, "linux", "eric6.desktop.in"),
- os.path.join(dst, "eric6.desktop"))
+ copyDesktopFile(os.path.join(sourceDir, "linux", "eric7.desktop.in"),
+ os.path.join(dst, "eric7.desktop"))
copyDesktopFile(
- os.path.join(sourceDir, "linux", "eric6_browser.desktop.in"),
- os.path.join(dst, "eric6_browser.desktop"))
+ os.path.join(sourceDir, "linux", "eric7_browser.desktop.in"),
+ os.path.join(dst, "eric7_browser.desktop"))
dst = os.path.normpath(
os.path.join(distDir, "usr/share/metainfo"))
if not os.path.exists(dst):
os.makedirs(dst)
copyAppStreamFile(
- os.path.join(sourceDir, "linux", "eric6.appdata.xml.in"),
- os.path.join(dst, "eric6.appdata.xml"))
+ os.path.join(sourceDir, "linux", "eric7.appdata.xml.in"),
+ os.path.join(dst, "eric7.appdata.xml"))
elif os.getuid() == 0:
shutilCopy(
- os.path.join(eric6SourceDir, "pixmaps", "eric_icon.png"),
+ os.path.join(eric7SourceDir, "pixmaps", "eric_icon.png"),
"/usr/share/icons/eric.png")
copyDesktopFile(
- os.path.join(sourceDir, "linux", "eric6.desktop.in"),
- "/usr/share/applications/eric6.desktop")
+ os.path.join(sourceDir, "linux", "eric7.desktop.in"),
+ "/usr/share/applications/eric7.desktop")
if os.path.exists("/usr/share/metainfo"):
copyAppStreamFile(
- os.path.join(sourceDir, "linux", "eric6.appdata.xml.in"),
- "/usr/share/metainfo/eric6.appdata.xml")
+ os.path.join(sourceDir, "linux", "eric7.appdata.xml.in"),
+ "/usr/share/metainfo/eric7.appdata.xml")
elif os.path.exists("/usr/share/appdata"):
copyAppStreamFile(
- os.path.join(sourceDir, "linux", "eric6.appdata.xml.in"),
- "/usr/share/appdata/eric6.appdata.xml")
+ os.path.join(sourceDir, "linux", "eric7.appdata.xml.in"),
+ "/usr/share/appdata/eric7.appdata.xml")
shutilCopy(
- os.path.join(eric6SourceDir, "pixmaps", "ericWeb48_icon.png"),
+ os.path.join(eric7SourceDir, "pixmaps", "ericWeb48_icon.png"),
"/usr/share/icons/ericWeb.png")
copyDesktopFile(
- os.path.join(sourceDir, "linux", "eric6_browser.desktop.in"),
- "/usr/share/applications/eric6_browser.desktop")
+ os.path.join(sourceDir, "linux", "eric7_browser.desktop.in"),
+ "/usr/share/applications/eric7_browser.desktop")
elif os.getuid() >= 1000:
# it is assumed, that user ids start at 1000
localPath = os.path.join(os.path.expanduser("~"),
@@ -988,23 +988,23 @@
os.makedirs(directory)
# now copy the files
shutilCopy(
- os.path.join(eric6SourceDir, "pixmaps", "eric_icon.png"),
+ os.path.join(eric7SourceDir, "pixmaps", "eric_icon.png"),
os.path.join(localPath, "icons", "eric.png"))
copyDesktopFile(
- os.path.join(sourceDir, "linux", "eric6.desktop.in"),
- os.path.join(localPath, "applications", "eric6.desktop"))
+ os.path.join(sourceDir, "linux", "eric7.desktop.in"),
+ os.path.join(localPath, "applications", "eric7.desktop"))
copyAppStreamFile(
- os.path.join(sourceDir, "linux", "eric6.appdata.xml.in"),
- os.path.join(localPath, "metainfo", "eric6.appdata.xml"))
+ os.path.join(sourceDir, "linux", "eric7.appdata.xml.in"),
+ os.path.join(localPath, "metainfo", "eric7.appdata.xml"))
copyAppStreamFile(
- os.path.join(sourceDir, "linux", "eric6.appdata.xml.in"),
- os.path.join(localPath, "appdata", "eric6.appdata.xml"))
+ os.path.join(sourceDir, "linux", "eric7.appdata.xml.in"),
+ os.path.join(localPath, "appdata", "eric7.appdata.xml"))
shutilCopy(
- os.path.join(eric6SourceDir, "pixmaps", "ericWeb48_icon.png"),
+ os.path.join(eric7SourceDir, "pixmaps", "ericWeb48_icon.png"),
os.path.join(localPath, "icons", "ericWeb.png"))
copyDesktopFile(
- os.path.join(sourceDir, "linux", "eric6_browser.desktop.in"),
- os.path.join(localPath, "applications", "eric6_browser.desktop"))
+ os.path.join(sourceDir, "linux", "eric7_browser.desktop.in"),
+ os.path.join(localPath, "applications", "eric7_browser.desktop"))
def createWindowsLinks():
@@ -1055,16 +1055,16 @@
programsEntry = getWinregEntry(regName, regPath)
if programsEntry:
programsFolder = os.path.normpath(os.path.expandvars(programsEntry))
- eric6EntryPath = os.path.join(programsFolder, windowsProgramsEntry())
- if not os.path.exists(eric6EntryPath):
+ eric7EntryPath = os.path.join(programsFolder, windowsProgramsEntry())
+ if not os.path.exists(eric7EntryPath):
try:
- os.makedirs(eric6EntryPath)
+ os.makedirs(eric7EntryPath)
except OSError:
# maybe restrictions prohibited link creation
return
for linkName, targetPath, iconPath in windowsDesktopEntries():
- linkPath = os.path.join(eric6EntryPath, linkName)
+ linkPath = os.path.join(eric7EntryPath, linkName)
createWindowsShortcut(linkPath, targetPath, iconPath)
@@ -1096,7 +1096,7 @@
else:
starter = "python{0}".format(sys.version_info.major)
- wname = os.path.join(directories["exe"], "eric6")
+ wname = os.path.join(directories["exe"], "eric7")
# determine entry for DYLD_FRAMEWORK_PATH
dyldLine = ""
@@ -1126,19 +1126,19 @@
'''{0}'''
'''{1}'''
'''exec "{2}" "{3}/{4}.py" "$@"\n'''
- .format(pathLine, dyldLine, starter, pydir, "eric6"))
+ .format(pathLine, dyldLine, starter, pydir, "eric7"))
copyToFile(wname, wrapper)
os.chmod(wname, 0o755) # secok
- shutilCopy(os.path.join(eric6SourceDir, "pixmaps", "eric_2.icns"),
+ shutilCopy(os.path.join(eric7SourceDir, "pixmaps", "eric_2.icns"),
os.path.join(directories["icns"], "eric.icns"))
- if os.path.exists(os.path.join("eric", "eric6", "UI", "Info.py")):
+ if os.path.exists(os.path.join("eric", "eric7", "UI", "Info.py")):
# Installing from archive
- from eric.eric6.UI.Info import Version, CopyrightShort
- elif os.path.exists(os.path.join("eric6", "UI", "Info.py")):
+ from eric.eric7.UI.Info import Version, CopyrightShort
+ elif os.path.exists(os.path.join("eric7", "UI", "Info.py")):
# Installing from source tree
- from eric6.UI.Info import Version, CopyrightShort
+ from eric7.UI.Info import Version, CopyrightShort
else:
Version = "Unknown"
CopyrightShort = "(c) 2002 - 2021 Detlev Offenbach"
@@ -1151,7 +1151,7 @@
'''<plist version="1.0">\n'''
'''<dict>\n'''
''' <key>CFBundleExecutable</key>\n'''
- ''' <string>eric6</string>\n'''
+ ''' <string>eric7</string>\n'''
''' <key>CFBundleIconFile</key>\n'''
''' <string>eric.icns</string>\n'''
''' <key>CFBundleInfoDictionaryVersion</key>\n'''
@@ -1185,7 +1185,7 @@
"""
global modDir, platBinDir, cfg, apisDir, installApis
- ericdir = os.path.join(modDir, "eric6")
+ ericdir = os.path.join(modDir, "eric7")
cfg = {
'ericDir': ericdir,
'ericPixDir': os.path.join(ericdir, "pixmaps"),
@@ -1222,19 +1222,19 @@
if installApis:
for progLanguage in progLanguages:
for apiName in sorted(
- glob.glob(os.path.join(eric6SourceDir, "APIs", progLanguage,
+ glob.glob(os.path.join(eric7SourceDir, "APIs", progLanguage,
"*.api"))):
apis.append(os.path.basename(apiName))
if progLanguage == "Python":
# treat Python3 API files the same as Python API files
for apiName in sorted(
- glob.glob(os.path.join(eric6SourceDir, "APIs", "Python3",
+ glob.glob(os.path.join(eric7SourceDir, "APIs", "Python3",
"*.api"))):
apis.append(os.path.basename(apiName))
# treat MicroPython API files the same as Python API files
for apiName in sorted(
- glob.glob(os.path.join(eric6SourceDir, "APIs",
+ glob.glob(os.path.join(eric7SourceDir, "APIs",
"MicroPython", "*.api"))):
apis.append(os.path.basename(apiName))
@@ -1733,7 +1733,7 @@
Compile the .ui files to Python sources.
"""
from PyQt5.uic import compileUiDir
- compileUiDir(eric6SourceDir, True, __pyName)
+ compileUiDir(eric7SourceDir, True, __pyName)
def prepareInfoFile(fileName):
@@ -1838,11 +1838,11 @@
majorVersion, minorVersion = sys.version_info[:2]
entriesTemplates = [
- ("eric6 (Python {0}.{1}).lnk",
- os.path.join(cfg["bindir"], "eric6.cmd"),
- os.path.join(cfg["ericPixDir"], "eric6.ico")),
- ("eric6 Browser (Python {0}.{1}).lnk",
- os.path.join(cfg["bindir"], "eric6_browse.cmd"),
+ ("eric7 (Python {0}.{1}).lnk",
+ os.path.join(cfg["bindir"], "eric7.cmd"),
+ os.path.join(cfg["ericPixDir"], "eric7.ico")),
+ ("eric7 Browser (Python {0}.{1}).lnk",
+ os.path.join(cfg["bindir"], "eric7_browse.cmd"),
os.path.join(cfg["ericPixDir"], "ericWeb48.ico")),
]
@@ -1860,7 +1860,7 @@
@rtype str
"""
majorVersion, minorVersion = sys.version_info[:2]
- return "eric6 (Python {0}.{1})".format(majorVersion, minorVersion)
+ return "eric7 (Python {0}.{1})".format(majorVersion, minorVersion)
def main(argv):
@@ -1874,7 +1874,7 @@
# Parse the command line.
global progName, modDir, doCleanup, doCompile, distDir, cfg, apisDir
- global sourceDir, eric6SourceDir, configName
+ global sourceDir, eric7SourceDir, configName
global macAppBundlePath, macAppBundleName, macPythonExe
global installApis, doCleanDesktopLinks, yes2All
global createInstallInfoFile, installCwd
@@ -1970,17 +1970,17 @@
if installFromSource:
print("Cleaning up source ...")
sourceDir = os.path.abspath("..")
- eric6SourceDir = os.path.join(sourceDir, "eric6")
- cleanupSource(eric6SourceDir)
+ eric7SourceDir = os.path.join(sourceDir, "eric7")
+ cleanupSource(eric7SourceDir)
print()
if installFromSource:
sourceDir = os.path.abspath("..")
- eric6SourceDir = os.path.join(sourceDir, "eric6")
- configName = os.path.join(eric6SourceDir, "eric6config.py")
+ eric7SourceDir = os.path.join(sourceDir, "eric7")
+ configName = os.path.join(eric7SourceDir, "eric7config.py")
if os.path.exists(os.path.join(sourceDir, ".hg")):
# we are installing from source with repo
- infoName = os.path.join(eric6SourceDir, "UI", "Info.py")
+ infoName = os.path.join(eric7SourceDir, "UI", "Info.py")
prepareInfoFile(infoName)
if len(cfg) == 0:
@@ -2028,21 +2028,21 @@
sys.stdout = io.StringIO()
if distDir:
compileall.compile_dir(
- eric6SourceDir,
+ eric7SourceDir,
ddir=os.path.join(distDir, modDir, cfg['ericDir']),
rx=skipRe,
quiet=True)
py_compile.compile(
configName,
- dfile=os.path.join(distDir, modDir, "eric6config.py"))
+ dfile=os.path.join(distDir, modDir, "eric7config.py"))
else:
compileall.compile_dir(
- eric6SourceDir,
+ eric7SourceDir,
ddir=os.path.join(modDir, cfg['ericDir']),
rx=skipRe,
quiet=True)
py_compile.compile(configName,
- dfile=os.path.join(modDir, "eric6config.py"))
+ dfile=os.path.join(modDir, "eric7config.py"))
sys.stdout = sys.__stdout__
print("\nInstalling eric ...")
res = installEric()
