eric: comparison install.py

-:884182bfd25c
+:d8fd663f86ef
 def cleanUpWindowsLinks():
 """
 Clean up the Desktop and Start Menu entries for Windows.
 """
-regPath = r"Software\Microsoft\Windows\CurrentVersion\Explorer" \
+try:
-r"\User Shell Folders"
+from pywintypes import com_error        # __IGNORE_WARNING__
+except ImportError:
+# links were not created by install.py
+return
+regPath = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer" + \
+"\\User Shell Folders"
 # 1. cleanup desktop links
 regName = "Desktop"
-desktopFolder = os.path.normpath(
+desktopEntry = getWinregEntry(regName, regPath)
-os.path.expandvars(getWinregEntry(regName, regPath)))
+if desktopEntry:
-for linkName in windowsDesktopNames():
+desktopFolder = os.path.normpath(os.path.expandvars(desktopEntry))
-linkPath = os.path.join(desktopFolder, linkName)
+for linkName in windowsDesktopNames():
-if os.path.exists(linkPath):
+linkPath = os.path.join(desktopFolder, linkName)
-os.remove(linkPath)
+if os.path.exists(linkPath):
+try:
+os.remove(linkPath)
+except EnvironmentError:
+# maybe restrictions prohibited link removal
+print("Could not remove '{0}'.".format(linkPath))
 # 2. cleanup start menu entry
 regName = "Programs"
-programsFolder = os.path.normpath(
+programsEntry = getWinregEntry(regName, regPath)
-os.path.expandvars(getWinregEntry(regName, regPath)))
+if programsEntry:
-eric6EntryPath = os.path.join(programsFolder, windowsProgramsEntry())
+programsFolder = os.path.normpath(os.path.expandvars(programsEntry))
-if os.path.exists(eric6EntryPath):
+eric6EntryPath = os.path.join(programsFolder, windowsProgramsEntry())
-shutil.rmtree(eric6EntryPath)
+if os.path.exists(eric6EntryPath):
+try:
+shutil.rmtree(eric6EntryPath)
+except EnvironmentError:
+# maybe restrictions prohibited link removal
+print("Could not remove '{0}'.".format(eric6EntryPath))
 def shutilCopy(src, dst, perm=0o644):
 """
 Wrapper function around shutil.copy() to ensure the permissions.
 # Create menu entry for Linux systems
 if sys.platform.startswith("linux"):
 createLinuxSpecifics()
 # Create Desktop and Start Menu entries for Windows systems
-if sys.platform.startswith(("win", "cygwin")):
+elif sys.platform.startswith(("win", "cygwin")):
 createWindowsLinks()
 # Create a Mac application bundle
-if sys.platform == "darwin":
+elif sys.platform == "darwin":
 createMacAppBundle(cfg['ericDir'])
 return 0
 def createWindowsLinks():
 """
 Create Desktop and Start Menu links.
 """
 try:
-from win32com.client import Dispatch
+# check, if pywin32 is available
+from win32com.client import Dispatch    # __IGNORE_WARNING__
 except ImportError:
 print(
 "\nThe Python package 'pywin32' is not installed. Desktop and"
 " Start Menu entries will not be created."
 )
 return
-# TODO: create the windows desktop links and start menu entries
+regPath = "Software\\Microsoft\\Windows\\CurrentVersion\\Explorer" + \
+"\\User Shell Folders"
+# 1. create desktop shortcuts
+regName = "Desktop"
+desktopFolder = os.path.normpath(
+os.path.expandvars(getWinregEntry(regName, regPath)))
+for linkName, targetPath, iconPath in windowsDesktopEntries():
+linkPath = os.path.join(desktopFolder, linkName)
+createWindowsShortcut(linkPath, targetPath, iconPath)
+# 2. create start menu entry and shortcuts
+regName = "Programs"
+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):
+try:
+os.makedirs(eric6EntryPath)
+except EnvironmentError:
+# maybe restrictions prohibited link creation
+return
+for linkName, targetPath, iconPath in windowsDesktopEntries():
+linkPath = os.path.join(eric6EntryPath, linkName)
+createWindowsShortcut(linkPath, targetPath, iconPath)
 def createMacAppBundle(pydir):
 """
 Create a Mac application bundle.
 @param path registry path of the variable
 @type str
 @return value of requested registry variable
 @rtype any
 """
-# From http://stackoverflow.com/a/35286642
+try:
-import winreg
+import _winreg as winreg
+except ImportError:
+try:
+import winreg
+except ImportError:
+return None
 try:
 registryKey = winreg.OpenKey(winreg.HKEY_CURRENT_USER, path, 0,
 winreg.KEY_READ)
 value, _ = winreg.QueryValueEx(registryKey, name)
 winreg.CloseKey(registryKey)
 return value
 except WindowsError:
 return None
+def createWindowsShortcut(linkPath, targetPath, iconPath):
+"""
+Create Windows shortcut.
+@param linkPath path of the shortcut file
+@type str
+@param targetPath path the shortcut shall point to
+@type str
+@param iconPath path of the icon file
+@type str
+"""
+from win32com.client import Dispatch
+from pywintypes import com_error
+try:
+shell = Dispatch('WScript.Shell')
+shortcut = shell.CreateShortCut(linkPath)
+shortcut.Targetpath = targetPath
+shortcut.WorkingDirectory = os.path.dirname(targetPath)
+shortcut.IconLocation = iconPath
+shortcut.save()
+except com_error:
+# maybe restrictions prohibited link creation
+pass
 def windowsDesktopNames():
 """
 Function to generate the link names for the Windows Desktop.
 @return list of desktop link names
 @rtype list of str
 """
+return [e[0] for e in windowsDesktopEntries()]
+def windowsDesktopEntries():
+"""
+Function to generate data for the Windows Desktop links.
+@return list of tuples containing the desktop link name,
+the link target and the icon target
+@rtype list of tuples of (str, str, str)
+"""
+global cfg, includePythonVariant
+if includePythonVariant:
+marker = PythonMarkers[sys.version_info.major]
+else:
+marker = ""
 majorVersion, minorVersion = sys.version_info[:2]
-linkTemplates = [
+entriesTemplates = [
-"eric6 (Python {0}.{1}).lnk",
+("eric6 (Python {0}.{1}).lnk",
-"eric6 Browser (Python {0}.{1}).lnk",
+os.path.join(cfg["bindir"], "eric6" + marker + ".cmd"),
+os.path.join(cfg["ericPixDir"], "eric6.ico")),
 ]
+if sys.version_info.major == 2:
-return [l.format(majorVersion, minorVersion) for l in linkTemplates]
+entriesTemplates.append((
+"eric6 Browser (Python {0}.{1}).lnk",
+os.path.join(cfg["bindir"], "eric6_webbrowser" + marker + ".cmd"),
+os.path.join(cfg["ericPixDir"], "ericWeb48.ico")
+))
+else:
+entriesTemplates.append((
+"eric6 Browser (Python {0}.{1}).lnk",
+os.path.join(cfg["bindir"], "eric6_browser" + marker + ".cmd"),
+os.path.join(cfg["ericPixDir"], "ericWeb48.ico")
+))
+return [
+(e[0].format(majorVersion, minorVersion), e[1], e[2])
+for e in entriesTemplates
+]
 def windowsProgramsEntry():
 """
 Function to generate the name of the Start Menu top entry.

Mercurial Repositories > eric / file comparison

comparison: install.py

install.py