E572 Revert "restore VScode on /t option" · winpython/winpython@c3cb08b · GitHub
[go: up one dir, main page]
Skip to content

Commit c3cb08b

Browse files
stonebigstonebig
committed
Revert "restore VScode on /t option"
This reverts commit 767728e.
1 parent 767728e commit c3cb08b

File tree

3 files changed

+11
-45
lines changed

3 files changed

+11
-45
lines changed

‎__init__.py‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎generate_a_winpython_distro.bat‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ echo ------------------
4646
echo 0.0 Initialize variables
4747
echo ------------------
4848

49-
if "%my_release_level%"=="" set my_release_level=b5
49+
if "%my_release_level%"=="" set my_release_level=b4
5050

5151
set my_basedir=%my_root_dir_for_builds%\bd%my_python_target%
5252

@@ -58,6 +58,10 @@ rem 2021-04-22 : path PyPy3 (as we don't try to copy PyPy3.exe to Python.exe)
5858
if "%target_python_exe%"=="" set target_python_exe=python.exe
5959

6060

61+
if %my_python_target%==37 (
62+
set my_python_target_release=3712
63+
set my_release=1
64+
)
6165
if %my_python_target%==38 (
6266
set my_python_target_release=3812
6367
set my_release=1
@@ -72,11 +76,13 @@ if %my_python_target%==310 (
7276
set my_release=2
7377
)
7478

79+
7580
if %my_python_target%==311 (
76-
set my_python_target_release=3115
77-
set my_release=0
81+
set my_python_target_release=3114
82+
set my_release=1
7883
)
7984

85+
8086
if %my_python_target%==312 (
8187
set my_python_target_release=3120
8288
set my_release=0

‎make.py‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -353,11 +353,7 @@ def get_tool_path_dir(relpath):
353353
if pandocexe is not None:
354354
pandocver = utils.get_pandoc_version(str(Path(pandocexe).parent))
355355
installed_tools += [("Pandoc", pandocver)]
356-
vscodeexe = get_tool_path_file(r"\t\VSCode\Code.exe")
357-
if vscodeexe is not None:
358-
installed_tools += [
359-
("VSCode", utils.getFileProperties(vscodeexe)["FileVersion"])
360-
]
356+
361357
tools = []
362358
for name, ver in installed_tools:
363359
metadata = wppm.get_package_metadata("tools.ini", name)
@@ -1835,14 +1831,11 @@ def _create_batch_scripts(self):
18351831
rem launcher for VScode
18361832
call "%~dp0env_for_icons.bat" %*
18371833
rem cd/D "%WINPYWORKDIR1%"
1838-
if exist "%WINPYDIR%\..\t\vscode\code.exe" (
1839-
"%WINPYDIR%\..\t\vscode\code.exe" %*
1840-
) else (
18411834
if exist "%LOCALAPPDATA%\Programs\Microsoft VS Code\code.exe" (
18421835
"%LOCALAPPDATA%\Programs\Microsoft VS Code\code.exe" %*
18431836
) else (
18441837
"code.exe" %*
1845-
))
1838+
)
18461839
18471840
""",
18481841
)

0 commit comments

Comments
 (0)
0