Mercurial Repositories > PyInstaller Interface / file comparison
comparison: PluginPyInstaller.py
PluginPyInstaller.py
- changeset 2
- 5109c484bc49
- parent 1
- f7788bc8c08d
- child 3
- eb2d30b4d34e
equal
deleted
inserted
replaced
| 1:f7788bc8c08d | 2:5109c484bc49 |
|---|---|
| 118 exes.append(exe) | 118 exes.append(exe) |
| 119 except (WindowsError, OSError): # __IGNORE_WARNING__ | 119 except (WindowsError, OSError): # __IGNORE_WARNING__ |
| 120 pass | 120 pass |
| 121 return exes | 121 return exes |
| 122 | 122 |
| 123 versionSuffixes = ["", "-32", "-64"] | |
| 123 for minorVersion in minorVersions: | 124 for minorVersion in minorVersions: |
| 124 versionStr = '{0}.{1}'.format(majorVersion, minorVersion) | 125 for versionSuffix in versionSuffixes: |
| 125 exePath = getExePath( | 126 versionStr = '{0}.{1}{2}'.format(majorVersion, minorVersion, |
| 126 winreg.HKEY_CURRENT_USER, | 127 versionSuffix) |
| 127 winreg.KEY_WOW64_32KEY | winreg.KEY_READ, versionStr) | 128 exePaths = getExePath( |
| 128 if exePath is not None: | |
| 129 executables.add(exePath) | |
| 130 | |
| 131 exePath = getExePath( | |
| 132 winreg.HKEY_LOCAL_MACHINE, | |
| 133 winreg.KEY_WOW64_32KEY | winreg.KEY_READ, versionStr) | |
| 134 if exePath is not None: | |
| 135 executables.add(exePath) | |
| 136 | |
| 137 # Even on Intel 64-bit machines it's 'AMD64' | |
| 138 if platform.machine() == 'AMD64': | |
| 139 exePath = getExePath( | |
| 140 winreg.HKEY_CURRENT_USER, | 129 winreg.HKEY_CURRENT_USER, |
| 141 winreg.KEY_WOW64_64KEY | winreg.KEY_READ, versionStr) | 130 winreg.KEY_WOW64_32KEY | winreg.KEY_READ, versionStr) |
| 142 if exePath is not None: | 131 for exePath in exePaths: |
| 143 executables.add(exePath) | 132 executables.add(exePath) |
| 144 | 133 |
| 145 exePath = getExePath( | 134 exePaths = getExePath( |
| 146 winreg.HKEY_LOCAL_MACHINE, | 135 winreg.HKEY_LOCAL_MACHINE, |
| 147 winreg.KEY_WOW64_64KEY | winreg.KEY_READ, versionStr) | 136 winreg.KEY_WOW64_32KEY | winreg.KEY_READ, versionStr) |
| 148 if exePath is not None: | 137 for exePath in exePaths: |
| 149 executables.add(exePath) | 138 executables.add(exePath) |
| 139 | |
| 140 # Even on Intel 64-bit machines it's 'AMD64' | |
| 141 if platform.machine() == 'AMD64': | |
| 142 exePaths = getExePath( | |
| 143 winreg.HKEY_CURRENT_USER, | |
| 144 winreg.KEY_WOW64_64KEY | winreg.KEY_READ, versionStr) | |
| 145 for exePath in exePaths: | |
| 146 executables.add(exePath) | |
| 147 | |
| 148 exePaths = getExePath( | |
| 149 winreg.HKEY_LOCAL_MACHINE, | |
| 150 winreg.KEY_WOW64_64KEY | winreg.KEY_READ, versionStr) | |
| 151 for exePath in exePaths: | |
| 152 executables.add(exePath) | |
| 150 else: | 153 else: |
| 151 # | 154 # |
| 152 # Linux, Unix ... | 155 # Linux, Unix ... |
| 153 pyinstallerScripts = ['pyinstaller', 'pyi-makespec'] | 156 pyinstallerScripts = ['pyinstaller', 'pyi-makespec'] |
| 154 ## scriptSuffixes = [""] | 157 ## scriptSuffixes = [""] |
