Skip to content

switch remaining launchers to shimmy instead of Nullsoft #1377

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stonebig merged 1 commit into from
Aug 24, 2024
Merged

switch remaining launchers to shimmy instead of Nullsoft #1377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
143 changes: 70 additions & 73 deletions make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,36 +851,27 @@ def _create_launchers(self):
args=r"",
)

self.create_launcher(
"WinPython Powershell Prompt.exe",
"powershell.ico",
command="$SYSDIR\cmd.exe",
args=r"/k cmd_ps.bat",
)

#not yet: workdirectory = icon directory
# self.create_launcher_shimmy(
# "WinPython Powershell PromptShimmy.exe",
#self.create_launcher(
# "WinPython Powershell Prompt.exe",
# "powershell.ico",
# #command="$SYSDIR\cmd.exe",
# #args=r"/k scripts\\cmd_ps.bat",
# command="scripts\\cmd_ps.bat",
# args=r"",
# command="$SYSDIR\cmd.exe",
# args=r"/k cmd_ps.bat",
#)

self.create_launcher(
"WinPython Terminal.exe",
"terminal.ico",
command="wscript.exe",
args=r"Noshell.vbs WinPython_Terminal.bat",

self.create_launcher_shimmy(
"WinPython Powershell Prompt.exe",
"powershell.ico",
#command="$SYSDIR\cmd.exe",
#args=r"/k scripts\\cmd_ps.bat",
command="scripts\\cmd_ps.bat",
args=r"",
)

#not yet: workdirectory = icon directory
#self.create_launcher_shimmy(
# "WinPython TerminalShimmy.exe",
#self.create_launcher(
# "WinPython Terminal.exe",
# "terminal.ico",
# command="wscript.exe",
# args=r"scripts\\Noshell.vbs scripts\\WinPython_Terminal.bat",
# args=r"Noshell.vbs WinPython_Terminal.bat",
#)

self.create_launcher_shimmy(
Expand All @@ -892,59 +883,55 @@ def _create_launchers(self):
args=r"",
)

self.create_launcher(
"IDLE (Python GUI).exe",
"python.ico",
command="wscript.exe",
args=r"Noshell.vbs winidle.bat",
)

#not yet: dos window behind
#self.create_launcher_shimmy(
# "IDLE (Python GUI)Shimmy.exe",
#self.create_launcher(
# "IDLE (Python GUI).exe",
# "python.ico",
# command="wscript.exe",
# args=r"scripts\\Noshell.vbs scripts\\winidle.bat",
#command="scripts\\Noshell.vbs scripts\\winidle.bat",
#args=r"",
# args=r"Noshell.vbs winidle.bat",
#)

self.create_launcher(
"Spyder.exe",
"spyder.ico",
command="wscript.exe",
args=r"Noshell.vbs winspyder.bat",
#dos window behind, but that disappear

self.create_launcher_shimmy(
"IDLE (Python GUI).exe",
"python.ico",
command="Powershell.exe",
args=r"start-process -WindowStyle Hidden './scripts/winidle.bat'",
#command="scripts\\Noshell.vbs scripts\\winidle.bat",
#args=r"",
)

#not yet
#self.create_launcher_shimmy(
# "SpyderShimmy.exe",
#self.create_launcher(
# "Spyder.exe",
# "spyder.ico",
# command="wscript.exe",
# args=r"scripts\\Noshell.vbs scripts\\winspyder.bat",
# args=r"Noshell.vbs winspyder.bat",
#)

self.create_launcher(
"Spyder reset.exe",
"spyder_reset.ico",
command="wscript.exe",
args=r"scripts\\Noshell.vbs scripts\\spyder_reset.bat",
self.create_launcher_shimmy(
"SpyderShimmy.exe",
"spyder.ico",
command="Powershell.exe",
args=r"start-process -WindowStyle Hidden './scripts/winspyder.bat'",
)

#not yet
#self.create_launcher_shimmy(
#self.create_launcher(
# "Spyder reset.exe",
# "spyder_reset.ico",
# command="wscript.exe",
# args=r"scripts\\Noshell.vbs scripts\\spyder_reset.bat",
#)

self.create_launcher_shimmy(
"Spyder resetShimmy.exe",
"spyder_reset.ico",
command="Powershell.exe",
args=r"start-process -WindowStyle Hidden './scripts/spyder_reset.bat",
)

self.create_launcher_shimmy(
"WinPython Control Panel.exe",
"winpython.ico",
# command="wscript.exe",
# args=r"Noshell.vbs wpcp.bat",
#command="$SYSDIR\cmd.exe",
#args=r"/k scripts\\wpcp.bat",
command="scripts\\wpcp.bat",
Expand All @@ -953,35 +940,45 @@ def _create_launchers(self):

# Jupyter launchers

# self.create_launcher(
# "IPython Qt Console.exe",
# "ipython.ico",
# command="wscript.exe",
# args=r"Noshell.vbs winqtconsole.bat",
# )

# this one needs a shell to kill fantom processes
self.create_launcher(
self.create_launcher_shimmy(
"Jupyter Notebook.exe",
"jupyter.ico",
command="$SYSDIR\cmd.exe",
args=r"/k winipython_notebook.bat", # like VSCode + Rise way
# args=r'/k winjupyter_nbclassic.bat', # Jupyterlab in classic look
#command="$SYSDIR\cmd.exe",
#args=r"/k winipython_notebook.bat", # like VSCode + Rise way
command="scripts\\winipython_notebook.bat",
args=r"",
)

self.create_launcher(
#self.create_launcher(
# "Jupyter Lab.exe",
# "jupyter.ico",
# command="$SYSDIR\cmd.exe",
# args=r"/k winjupyter_lab.bat",
#)

self.create_launcher_shimmy(
"Jupyter Lab.exe",
"jupyter.ico",
command="$SYSDIR\cmd.exe",
args=r"/k winjupyter_lab.bat",
#command="$SYSDIR\cmd.exe",
#args=r"/k winjupyter_lab.bat",
command="scripts\\winjupyter_lab.bat",
args=r"",
)

# VSCode launcher
#self.create_launcher_shimmy(
# "VS Code.exe",
# "code.ico",
# command="wscript.exe",
# args=r"scripts\\Noshell.vbs scripts\\winvscode.bat",
#)

self.create_launcher_shimmy(
"VS CodeShimmy.exe",
"VS Code.exe",
"code.ico",
command="wscript.exe",
args=r"scripts\\Noshell.vbs scripts\\winvscode.bat",
command="scripts\\winvscode.bat",
args=r"",
)

self._print_done()
Expand Down
2 changes: 1 addition & 1 deletion winpython/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,6 @@
OTHER DEALINGS IN THE SOFTWARE.
"""

__version__ = '10.0.20240818'
__version__ = '10.1.20240824'
__license__ = __doc__
__project_url__ = 'http://winpython.github.io/'