From a591374fce64c647342f2a099154f1635d9053a6 Mon Sep 17 00:00:00 2001 From: stonebig Date: Tue, 18 Oct 2016 22:57:38 +0200 Subject: [PATCH] provide no-directory_changing scripts --- make.py | 37 ++++++++++++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/make.py b/make.py index 1c2a0106..0795230e 100644 --- a/make.py +++ b/make.py @@ -506,11 +506,11 @@ def _create_launchers(self): # workdir='$EXEDIR\scripts') self.create_launcher('IDLEX (Python GUI).exe', 'python.ico', command='wscript.exe', - args= r'Noshell.vbs IDLEX.bat') + args= r'Noshell.vbs winidlex.bat') self.create_launcher('Spyder.exe', 'spyder.ico', command='wscript.exe', - args=r'Noshell.vbs spyder.bat') + args=r'Noshell.vbs winspyder.bat') self.create_launcher('Spyder reset.exe', 'spyder_reset.ico', command='wscript.exe', @@ -532,12 +532,12 @@ def _create_launchers(self): # Jupyter launchers self.create_launcher('IPython Qt Console.exe', 'ipython.ico', command='wscript.exe', - args=r'Noshell.vbs qtconsole.bat') + args=r'Noshell.vbs winqtconsole.bat') # this one needs a shell to kill fantom processes self.create_launcher('Jupyter Notebook.exe', 'jupyter.ico', command='$SYSDIR\cmd.exe', - args=r'/k ipython_notebook.bat') + args=r'/k winipython_notebook.bat') self._print_done() @@ -889,7 +889,6 @@ def _create_batch_scripts(self): self.create_batch_script('idlex.bat',r"""@echo off call "%~dp0env_for_icons.bat" -cd/D "%WINPYWORKDIR%" rem backward compatibility for non-IDLEX users if exist "%WINPYDIR%\scripts\idlex.pyw" ( "%WINPYDIR%\python.exe" "%WINPYDIR%\scripts\idlex.pyw" %* @@ -898,10 +897,25 @@ def _create_batch_scripts(self): ) """) + self.create_batch_script('winidlex.bat',r"""@echo off +call "%~dp0env_for_icons.bat" +cd/D "%WINPYWORKDIR%" +rem backward compatibility for non-IDLEX users +if exist "%WINPYDIR%\scripts\idlex.pyw" ( + "%WINPYDIR%\python.exe" "%WINPYDIR%\scripts\idlex.pyw" %* +) else ( + "%WINPYDIR%\python.exe" "%WINPYDIR%\Lib\idlelib\idle.pyw" %* +) +""") self.create_batch_script('spyder.bat',r"""@echo off call "%~dp0env_for_icons.bat" cd/D "%WINPYWORKDIR%" "%WINPYDIR%\scripts\spyder.exe" %* +""") + self.create_batch_script('winspyder.bat',r"""@echo off +call "%~dp0env_for_icons.bat" +cd/D "%WINPYWORKDIR%" +"%WINPYDIR%\scripts\spyder.exe" %* """) self.create_batch_script('spyder_reset.bat',r"""@echo off @@ -914,6 +928,12 @@ def _create_batch_scripts(self): call "%~dp0env_for_icons.bat" cd/D "%WINPYWORKDIR%" "%WINPYDIR%\scripts\jupyter-notebook.exe" %* +""") + + self.create_batch_script('winipython_notebook.bat',r"""@echo off +call "%~dp0env_for_icons.bat" +cd/D "%WINPYWORKDIR%" +"%WINPYDIR%\scripts\jupyter-notebook.exe" %* """) self.create_batch_script('qtconsole.bat',r"""@echo off @@ -922,6 +942,13 @@ def _create_batch_scripts(self): "%WINPYDIR%\scripts\jupyter-qtconsole.exe" %* """) + + self.create_batch_script('winqtconsole.bat',r"""@echo off +call "%~dp0env_for_icons.bat" +cd/D "%WINPYWORKDIR%" +"%WINPYDIR%\scripts\jupyter-qtconsole.exe" %* +""") + self.create_batch_script('qtdemo.bat',r"""@echo off call "%~dp0env_for_icons.bat" cd/D "%WINPYWORKDIR%"