restore (better) Vscode in /t

stonebig · stonebig · commit 444e9bc4c334 · 2023-08-26T16:58:33.000+02:00
diff --git a/generate_a_winpython_distro.bat b/generate_a_winpython_distro.bat
@@ -46,7 +46,7 @@ echo ------------------
 echo 0.0 Initialize variables  
 echo ------------------
 
-if "%my_release_level%"=="" set my_release_level=b4
+if "%my_release_level%"=="" set my_release_level=b5
 
 set my_basedir=%my_root_dir_for_builds%\bd%my_python_target%
 
@@ -58,10 +58,6 @@ rem  2021-04-22 : path PyPy3 (as we don't try to copy PyPy3.exe to Python.exe)
 if "%target_python_exe%"=="" set target_python_exe=python.exe
 
 
-if %my_python_target%==37 (
-   set my_python_target_release=3712
-   set my_release=1
-)
 if %my_python_target%==38 (
    set my_python_target_release=3812
    set my_release=1
@@ -76,13 +72,11 @@ if %my_python_target%==310 (
    set my_release=2
 )
 
-
 if %my_python_target%==311 (
-   set my_python_target_release=3114
-   set my_release=1
+   set my_python_target_release=3115
+   set my_release=0
 )
 
-
 if %my_python_target%==312 (
    set my_python_target_release=3120
    set my_release=0
diff --git a/make.py b/make.py
@@ -353,7 +353,11 @@ def get_tool_path_dir(relpath):
         if pandocexe is not None:
             pandocver = utils.get_pandoc_version(str(Path(pandocexe).parent))
             installed_tools += [("Pandoc", pandocver)]
- 
+        vscodeexe = get_tool_path_file(r"\t\VSCode\Code.exe")
+        if vscodeexe is not None:
+            installed_tools += [
+                ("VSCode", utils.getFileProperties(vscodeexe)["FileVersion"])
+            ]
         tools = []
         for name, ver in installed_tools:
             metadata = wppm.get_package_metadata("tools.ini", name)
@@ -1831,11 +1835,14 @@ def _create_batch_scripts(self):
 rem launcher for VScode
 call "%~dp0env_for_icons.bat" %*
 rem cd/D "%WINPYWORKDIR1%"
+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" %*
-)
+))
 
 """,
         )
diff --git a/winpython/__init__.py b/winpython/__init__.py
@@ -28,6 +28,6 @@
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '7.0.20230822'
+__version__ = '7.0.20230826'
 __license__ = __doc__
 __project_url__ = 'http://winpython.github.io/'
