Skip to content

move ".bat" fixed scripts out of make.py #1498

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
Mar 9, 2025
Merged

move ".bat" fixed scripts out of make.py #1498

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
142 changes: 0 additions & 142 deletions make.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,12 +636,6 @@ def _create_initial_batch_scripts(self):
"""
self.create_batch_script("WinPython_PS_Prompt.ps1", ps1_content, replacements=batch_replacements)

cmd_ps_bat_content = r"""@echo off
call "%~dp0env_for_icons.bat"
Powershell.exe -Command "& {Start-Process PowerShell.exe -ArgumentList '-ExecutionPolicy RemoteSigned -noexit -File ""%~dp0WinPython_PS_Prompt.ps1""'}"
"""
self.create_batch_script("cmd_ps.bat", cmd_ps_bat_content, replacements=batch_replacements)


env_for_icons_bat_content = r"""@echo off
call "%~dp0env.bat"
Expand Down Expand Up @@ -703,34 +697,11 @@ def _create_standard_batch_scripts(self):
if self.distribution and (Path(self.distribution.target) / r"lib-python\3\idlelib").is_dir():
batch_replacements.append((r"\Lib\idlelib", r"\lib-python\3\idlelib"))


self.create_batch_script("readme.txt", """These batch files are required to run WinPython icons.
These files should help the user writing his/her own
The environment variables are set-up in 'env.bat' and 'env_for_icons.bat'.""",
)

self.create_batch_script(
"make_winpython_movable.bat",
r"""@echo off
call "%~dp0env.bat"
echo patch pip and current launchers for move

"%WINPYDIR%\python.exe" -c "from winpython import wppm;dist=wppm.Distribution(r'%WINPYDIR%');dist.patch_standard_packages('pip', to_movable=True)"
pause""",
replacements=batch_replacements
)

self.create_batch_script(
"make_winpython_fix.bat",
r"""@echo off
call "%~dp0env.bat"
echo patch pip and current launchers for non-move

"%WINPYDIR%\python.exe" -c "from winpython import wppm;dist=wppm.Distribution(r'%WINPYDIR%');dist.patch_standard_packages('pip', to_movable=False)"
pause""",
replacements=batch_replacements
)

for ini_patch_script in [
("make_working_directory_be_not_winpython.bat", "[active_environment", "[inactive_environment", "[inactive_environment_per_user]", "[active_environment_per_user]"),
("make_working_directory_be_winpython.bat", "[active_environment", "[inactive_environment"),
Expand All @@ -744,119 +715,6 @@ def _create_standard_batch_scripts(self):
content += f""""%PYTHON%" -c "from winpython.utils import patch_sourcefile;patch_sourcefile(r'%~dp0..\\settings\winpython.ini', '{patch2[0]}', '{patch2[1]}' )" """
self.create_batch_script(name, content)


self.create_batch_script("cmd.bat", r"""@echo off
call "%~dp0env_for_icons.bat" %*
cmd.exe /k""", replacements=batch_replacements)

self.create_batch_script("WinPython_Terminal.bat", r"""@echo off
Powershell.exe -Command "& {Start-Process PowerShell.exe -ArgumentList '-ExecutionPolicy RemoteSigned -noexit -File ""%~dp0WinPython_PS_Prompt.ps1""'}"
exit""", replacements=batch_replacements)

self.create_batch_script("python.bat", r"""@echo off
call "%~dp0env_for_icons.bat" %*
"%WINPYDIR%\python.exe" %*""", replacements=batch_replacements)

self.create_batch_script(
"winpython.bat",
r"""@echo off
call "%~dp0env_for_icons.bat" %*
rem backward compatibility for non-ptpython users
if exist "%WINPYDIR%\scripts\ptpython.exe" (
"%WINPYDIR%\scripts\ptpython.exe" %*
) else (
"%WINPYDIR%\python.exe" %*
)""",
replacements=batch_replacements
)

self.create_batch_script(
"winidle.bat",
r"""@echo off
call "%~dp0env_for_icons.bat" %*
"%WINPYDIR%\python.exe" "%WINPYDIR%\Lib\idlelib\idle.pyw" %*""",
replacements=batch_replacements
)

self.create_batch_script(
"winspyder.bat",
r"""@echo off
call "%~dp0env_for_icons.bat" %*
"%WINPYDIR%\scripts\spyder.exe" %* -w "%WINPYWORKDIR1%" """,
)

self.create_batch_script(
"spyder_reset.bat",
r"""@echo off
call "%~dp0env_for_icons.bat"
"%WINPYDIR%\scripts\spyder.exe" --reset %*""",
)

for jupyter_script in [
("winipython_notebook.bat", "jupyter-notebook.exe"),
("winjupyter_lab.bat", "jupyter-lab.exe"),
("winqtconsole.bat", "jupyter-qtconsole.exe"),
]:
name, exe = jupyter_script
self.create_batch_script(name, f"""@echo off
call "%~dp0env_for_icons.bat" %*
"%WINPYDIR%\\scripts\\{exe}" %*""")


self.create_python_launcher_batch(
"register_python.bat",
r'"%WINPYDIR%\Lib\site-packages\winpython\register_python.py"',
working_dir=r'"%WINPYDIR%\Scripts"',
)

self.create_python_launcher_batch(
"unregister_python.bat",
r'"%WINPYDIR%\Lib\site-packages\winpython\unregister_python.py"',
working_dir=r'"%WINPYDIR%\Scripts"',
)

for register_all_script in [
("register_python_for_all.bat", "register_python.bat"),
("unregister_python_for_all.bat", "unregister_python.bat"),
]:
name, base_script = register_all_script
self.create_batch_script(name, f"""@echo off
call "%~dp0env.bat"
call "%~dp0{base_script}" --all""")


self.create_batch_script("wpcp.bat", r"""@echo off
call "%~dp0env_for_icons.bat" %*
cmd.exe /k "echo wppm & wppm" """, replacements=batch_replacements)

self.create_batch_script(
"upgrade_pip.bat",
r"""@echo off
call "%~dp0env.bat"
echo this will upgrade pip with latest version, then patch it for WinPython portability ok ?
pause
"%WINPYDIR%\python.exe" -m pip install --upgrade pip
"%WINPYDIR%\python.exe" -c "from winpython import wppm;dist=wppm.Distribution(r'%WINPYDIR%');dist.patch_standard_packages('pip', to_movable=True)
pause""",
replacements=batch_replacements
)

self.create_batch_script("activate.bat", r"""@echo off
call "%~dp0env.bat" %*""", replacements=batch_replacements)


vscode_bat_content = r"""@echo off
call "%~dp0env_for_icons.bat"
if exist "%WINPYDIR%\..\t\vscode\code.exe" (
"%WINPYDIR%\..\t\vscode\code.exe" %*
) else (
if exist "%LOCALAPPDATA%\Programs\Microsoft VS Code\code.exe" (
"%LOCALAPPDATA%\Programs\Microsoft VS Code\code.exe" %*
) else (
"code.exe" %*
))"""
self.create_batch_script("winvscode.bat", vscode_bat_content)

self._print_action_done()


Expand Down
3 changes: 3 additions & 0 deletions portable/scripts/WinPython_Terminal.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@echo off
Powershell.exe -Command "& {Start-Process PowerShell.exe -ArgumentList '-ExecutionPolicy RemoteSigned -noexit -File ""%~dp0WinPython_PS_Prompt.ps1""'}"
exit
2 changes: 2 additions & 0 deletions portable/scripts/activate.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
@echo off
call "%~dp0env.bat" %*
3 changes: 3 additions & 0 deletions portable/scripts/cmd.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@echo off
call "%~dp0env_for_icons.bat" %*
cmd.exe /k
3 changes: 3 additions & 0 deletions portable/scripts/cmd_ps.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@echo off
call "%~dp0env_for_icons.bat"
Powershell.exe -Command "& {Start-Process PowerShell.exe -ArgumentList '-ExecutionPolicy RemoteSigned -noexit -File ""%~dp0WinPython_PS_Prompt.ps1""'}"
6 changes: 6 additions & 0 deletions portable/scripts/make_winpython_fix.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@echo off
call "%~dp0env.bat"
echo patch pip and current launchers for non-move

"%WINPYDIR%\python.exe" -c "from winpython import wppm;dist=wppm.Distribution(r'%WINPYDIR%');dist.patch_standard_packages('pip', to_movable=False)"
pause
6 changes: 6 additions & 0 deletions portable/scripts/make_winpython_movable.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@echo off
call "%~dp0env.bat"
echo patch pip and current launchers for move

"%WINPYDIR%\python.exe" -c "from winpython import wppm;dist=wppm.Distribution(r'%WINPYDIR%');dist.patch_standard_packages('pip', to_movable=True)"
pause
3 changes: 3 additions & 0 deletions portable/scripts/python.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@echo off
call "%~dp0env_for_icons.bat" %*
"%WINPYDIR%\python.exe" %*
4 changes: 4 additions & 0 deletions portable/scripts/register_python.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@echo off
call "%~dp0env_for_icons.bat"
cd /D "%WINPYDIR%\Scripts"
"%WINPYDIR%\python.exe" "%WINPYDIR%\Lib\site-packages\winpython\register_python.py" %*
3 changes: 3 additions & 0 deletions portable/scripts/register_python_for_all.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@echo off
call "%~dp0env.bat"
call "%~dp0register_python.bat" --all
3 changes: 3 additions & 0 deletions portable/scripts/spyder_reset.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@echo off
call "%~dp0env_for_icons.bat"
"%WINPYDIR%\scripts\spyder.exe" --reset %*
4 changes: 4 additions & 0 deletions portable/scripts/unregister_python.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@echo off
call "%~dp0env_for_icons.bat"
cd /D "%WINPYDIR%\Scripts"
"%WINPYDIR%\python.exe" "%WINPYDIR%\Lib\site-packages\winpython\unregister_python.py" %*
3 changes: 3 additions & 0 deletions portable/scripts/unregister_python_for_all.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@echo off
call "%~dp0env.bat"
call "%~dp0unregister_python.bat" --all
7 changes: 7 additions & 0 deletions portable/scripts/upgrade_pip.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
@echo off
call "%~dp0env.bat"
echo this will upgrade pip with latest version, then patch it for WinPython portability ok ?
pause
"%WINPYDIR%\python.exe" -m pip install --upgrade pip
"%WINPYDIR%\python.exe" -c "from winpython import wppm;dist=wppm.Distribution(r'%WINPYDIR%');dist.patch_standard_packages('pip', to_movable=True)
pause
3 changes: 3 additions & 0 deletions portable/scripts/winidle.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@echo off
call "%~dp0env_for_icons.bat" %*
"%WINPYDIR%\python.exe" "%WINPYDIR%\Lib\idlelib\idle.pyw" %*
3 changes: 3 additions & 0 deletions portable/scripts/winipython_notebook.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@echo off
call "%~dp0env_for_icons.bat" %*
"%WINPYDIR%\scripts\jupyter-notebook.exe" %*
3 changes: 3 additions & 0 deletions portable/scripts/winjupyter_lab.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@echo off
call "%~dp0env_for_icons.bat" %*
"%WINPYDIR%\scripts\jupyter-lab.exe" %*
8 changes: 8 additions & 0 deletions portable/scripts/winpython.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
@echo off
call "%~dp0env_for_icons.bat" %*
rem backward compatibility for non-ptpython users
if exist "%WINPYDIR%\scripts\ptpython.exe" (
"%WINPYDIR%\scripts\ptpython.exe" %*
) else (
"%WINPYDIR%\python.exe" %*
)
3 changes: 3 additions & 0 deletions portable/scripts/winqtconsole.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@echo off
call "%~dp0env_for_icons.bat" %*
"%WINPYDIR%\scripts\jupyter-qtconsole.exe" %*
3 changes: 3 additions & 0 deletions portable/scripts/winspyder.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@echo off
call "%~dp0env_for_icons.bat" %*
"%WINPYDIR%\scripts\spyder.exe" %* -w "%WINPYWORKDIR1%"
10 changes: 10 additions & 0 deletions portable/scripts/winvscode.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
@echo off
call "%~dp0env_for_icons.bat"
if exist "%WINPYDIR%\..\t\vscode\code.exe" (
"%WINPYDIR%\..\t\vscode\code.exe" %*
) else (
if exist "%LOCALAPPDATA%\Programs\Microsoft VS Code\code.exe" (
"%LOCALAPPDATA%\Programs\Microsoft VS Code\code.exe" %*
) else (
"code.exe" %*
))
3 changes: 3 additions & 0 deletions portable/scripts/wpcp.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@echo off
call "%~dp0env_for_icons.bat" %*
cmd.exe /k "echo wppm & wppm"