Skip to content

Commit 2c921e2

Browse files
stonebigstonebig
committed
switch remaining launchers to shimmy instead of Nullsoft
1 parent 194d589 commit 2c921e2

File tree

2 files changed

+71
-74
lines changed

2 files changed

+71
-74
lines changed

‎make.py‎

Lines changed: 70 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -851,36 +851,27 @@ def _create_launchers(self):
851851
args=r"",
852852
)
853853

854-
self.create_launcher(
855-
"WinPython Powershell Prompt.exe",
856-
"powershell.ico",
857-
command="$SYSDIR\cmd.exe",
858-
args=r"/k cmd_ps.bat",
859-
)
860-
861-
#not yet: workdirectory = icon directory
862-
# self.create_launcher_shimmy(
863-
# "WinPython Powershell PromptShimmy.exe",
854+
#self.create_launcher(
855+
# "WinPython Powershell Prompt.exe",
864856
# "powershell.ico",
865-
# #command="$SYSDIR\cmd.exe",
866-
# #args=r"/k scripts\\cmd_ps.bat",
867-
# command="scripts\\cmd_ps.bat",
868-
# args=r"",
857+
# command="$SYSDIR\cmd.exe",
858+
# args=r"/k cmd_ps.bat",
869859
#)
870-
871-
self.create_launcher(
872-
"WinPython Terminal.exe",
873-
"terminal.ico",
874-
command="wscript.exe",
875-
args=r"Noshell.vbs WinPython_Terminal.bat",
860+
861+
self.create_launcher_shimmy(
862+
"WinPython Powershell Prompt.exe",
863+
"powershell.ico",
864+
#command="$SYSDIR\cmd.exe",
865+
#args=r"/k scripts\\cmd_ps.bat",
866+
command="scripts\\cmd_ps.bat",
867+
args=r"",
876868
)
877869

878-
#not yet: workdirectory = icon directory
879-
#self.create_launcher_shimmy(
880-
# "WinPython TerminalShimmy.exe",
870+
#self.create_launcher(
871+
# "WinPython Terminal.exe",
881872
# "terminal.ico",
882873
# command="wscript.exe",
883-
# args=r"scripts\\Noshell.vbs scripts\\WinPython_Terminal.bat",
874+
# args=r"Noshell.vbs WinPython_Terminal.bat",
884875
#)
885876

886877
self.create_launcher_shimmy(
@@ -892,59 +883,55 @@ def _create_launchers(self):
892883
args=r"",
893884
)
894885

895-
self.create_launcher(
896-
"IDLE (Python GUI).exe",
897-
"python.ico",
898-
command="wscript.exe",
899-
args=r"Noshell.vbs winidle.bat",
900-
)
901-
902-
#not yet: dos window behind
903-
#self.create_launcher_shimmy(
904-
# "IDLE (Python GUI)Shimmy.exe",
886+
#self.create_launcher(
887+
# "IDLE (Python GUI).exe",
905888
# "python.ico",
906889
# command="wscript.exe",
907-
# args=r"scripts\\Noshell.vbs scripts\\winidle.bat",
908-
#command="scripts\\Noshell.vbs scripts\\winidle.bat",
909-
#args=r"",
890+
# args=r"Noshell.vbs winidle.bat",
910891
#)
911892

912-
self.create_launcher(
913-
"Spyder.exe",
914-
"spyder.ico",
915-
command="wscript.exe",
916-
args=r"Noshell.vbs winspyder.bat",
893+
#dos window behind, but that disappear
894+
895+
self.create_launcher_shimmy(
896+
"IDLE (Python GUI).exe",
897+
"python.ico",
898+
command="Powershell.exe",
899+
args=r"start-process -WindowStyle Hidden './scripts/winidle.bat'",
900+
#command="scripts\\Noshell.vbs scripts\\winidle.bat",
901+
#args=r"",
917902
)
918903

919-
#not yet
920-
#self.create_launcher_shimmy(
921-
# "SpyderShimmy.exe",
904+
#self.create_launcher(
905+
# "Spyder.exe",
922906
# "spyder.ico",
923907
# command="wscript.exe",
924-
# args=r"scripts\\Noshell.vbs scripts\\winspyder.bat",
908+
# args=r"Noshell.vbs winspyder.bat",
925909
#)
926910

927-
self.create_launcher(
928-
"Spyder reset.exe",
929-
"spyder_reset.ico",
930-
command="wscript.exe",
931-
args=r"scripts\\Noshell.vbs scripts\\spyder_reset.bat",
911+
self.create_launcher_shimmy(
912+
"SpyderShimmy.exe",
913+
"spyder.ico",
914+
command="Powershell.exe",
915+
args=r"start-process -WindowStyle Hidden './scripts/winspyder.bat'",
932916
)
933917

934-
#not yet
935-
#self.create_launcher_shimmy(
918+
#self.create_launcher(
936919
# "Spyder reset.exe",
937920
# "spyder_reset.ico",
938921
# command="wscript.exe",
939922
# args=r"scripts\\Noshell.vbs scripts\\spyder_reset.bat",
940923
#)
941924

925+
self.create_launcher_shimmy(
926+
"Spyder resetShimmy.exe",
927+
"spyder_reset.ico",
928+
command="Powershell.exe",
929+
args=r"start-process -WindowStyle Hidden './scripts/spyder_reset.bat",
930+
)
942931

943932
self.create_launcher_shimmy(
944933
"WinPython Control Panel.exe",
945934
"winpython.ico",
946-
# command="wscript.exe",
947-
# args=r"Noshell.vbs wpcp.bat",
948935
#command="$SYSDIR\cmd.exe",
949936
#args=r"/k scripts\\wpcp.bat",
950937
command="scripts\\wpcp.bat",
@@ -953,35 +940,45 @@ def _create_launchers(self):
953940

954941
# Jupyter launchers
955942

956-
# self.create_launcher(
957-
# "IPython Qt Console.exe",
958-
# "ipython.ico",
959-
# command="wscript.exe",
960-
# args=r"Noshell.vbs winqtconsole.bat",
961-
# )
962-
963943
# this one needs a shell to kill fantom processes
964-
self.create_launcher(
944+
self.create_launcher_shimmy(
965945
"Jupyter Notebook.exe",
966946
"jupyter.ico",
967-
command="$SYSDIR\cmd.exe",
968-
args=r"/k winipython_notebook.bat", # like VSCode + Rise way
969-
# args=r'/k winjupyter_nbclassic.bat', # Jupyterlab in classic look
947+
#command="$SYSDIR\cmd.exe",
948+
#args=r"/k winipython_notebook.bat", # like VSCode + Rise way
949+
command="scripts\\winipython_notebook.bat",
950+
args=r"",
970951
)
971952

972-
self.create_launcher(
953+
#self.create_launcher(
954+
# "Jupyter Lab.exe",
955+
# "jupyter.ico",
956+
# command="$SYSDIR\cmd.exe",
957+
# args=r"/k winjupyter_lab.bat",
958+
#)
959+
960+
self.create_launcher_shimmy(
973961
"Jupyter Lab.exe",
974962
"jupyter.ico",
975-
command="$SYSDIR\cmd.exe",
976-
args=r"/k winjupyter_lab.bat",
963+
#command="$SYSDIR\cmd.exe",
964+
#args=r"/k winjupyter_lab.bat",
965+
command="scripts\\winjupyter_lab.bat",
966+
args=r"",
977967
)
978-
968+
979969
# VSCode launcher
970+
#self.create_launcher_shimmy(
971+
# "VS Code.exe",
972+
# "code.ico",
973+
# command="wscript.exe",
974+
# args=r"scripts\\Noshell.vbs scripts\\winvscode.bat",
975+
#)
976+
980977
self.create_launcher_shimmy(
981-
"VS CodeShimmy.exe",
978+
"VS Code.exe",
982979
"code.ico",
983-
command="wscript.exe",
984-
args=r"scripts\\Noshell.vbs scripts\\winvscode.bat",
980+
command="scripts\\winvscode.bat",
981+
args=r"",
985982
)
986983

987984
self._print_done()

‎winpython/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
OTHER DEALINGS IN THE SOFTWARE.
2929
"""
3030

31-
__version__ = '10.0.20240818'
31+
__version__ = '10.1.20240824'
3232
__license__ = __doc__
3333
__project_url__ = 'http://winpython.github.io/'

0 commit comments

Comments
 (0)