didnt

Author: martinzink

bootstrap/.gitignore

@@ -1 +1,3 @@
 venv
+build_environment.bat
+

bootstrap/main.py

@@ -41,6 +41,8 @@
             compiler_override = package_manager.install_compiler()
         else:
             compiler_override = ""
+        package_manager.ensureEnvironment()
+
         cmake_options_for_parsing = " ".join(filter(None, [args.minifi_options, compiler_override]))
         cmake_options_for_cmake = " ".join(filter(None, [args.cmake_options, compiler_override]))
 

bootstrap/package_manager.py

@@ -20,7 +20,11 @@
 from typing import Dict, Set
 
 from distro import distro
+from enum import Enum
 
+class VsWhereLocation(Enum):
+    CHOCO = 1
+    DEFAULT = 2
 
 def _query_yes_no(question: str, no_confirm: bool) -> bool:
     valid = {"yes": True, "y": True, "ye": True, "no": False, "n": False}
@@ -52,6 +56,9 @@ def install(self, dependencies: Dict[str, Set[str]]) -> bool:
 
     def install_compiler(self) -> str:
         raise Exception("NotImplementedException")
+    
+    def ensureEnvironment(self):
+        pass
 
     def _install(self, dependencies: Dict[str, Set[str]], replace_dict: Dict[str, Set[str]], install_cmd: str) -> bool:
         dependencies.update({k: v for k, v in replace_dict.items() if k in dependencies})
@@ -76,6 +83,7 @@ def run_cmd(self, cmd: str) -> bool:
         return result.returncode == 0
 
 
+
 class BrewPackageManager(PackageManager):
     def __init__(self, no_confirm):
         PackageManager.__init__(self, no_confirm)
@@ -174,40 +182,56 @@ def install_compiler(self) -> str:
         return ""
 
 
-def  _get_vs_dev_cmd_path() -> str:
+def  _get_vs_dev_cmd_path(vs_where_location: VsWhereLocation) -> str:
+    if vs_where_location == VsWhereLocation.CHOCO:
+        vs_where_path = "vswhere"
+    else:
+        vs_where_path = "%ProgramFiles(x86)%\\Microsoft Visual Studio\\Installer\\vswhere.exe"
+
     vswhere_results = subprocess.run(
-        "vswhere -products * -property installationPath -requires Microsoft.VisualStudio.Component.VC.ATL",
+        f"{vs_where_path} -products * -property installationPath -requires Microsoft.VisualStudio.Component.VC.ATL -version 17",
         capture_output=True)
 
     for vswhere_result in vswhere_results.stdout.splitlines():
         possible_path = f"{vswhere_result.decode()}\\Common7\\Tools\\VsDevCmd.bat"
         if os.path.exists(possible_path):
             return f'"{possible_path}"'
-    raise Exception("Could not find valid Visual Studio installation")
+    return None
 
 
-def _get_vs_dev_cmd() -> str:
-    vs_dev_path = _get_vs_dev_cmd_path()
-    return f"{vs_dev_path} -arch=x64 -host_arch=x64"
+def _get_vs_dev_cmd(vs_where_location: VsWhereLocation) -> str:
+    vs_dev_path = _get_vs_dev_cmd_path(vs_where_location)
+    return f"{vs_dev_path}"
 
 
-def _get_venv_path():
-    return pathlib.Path(__file__).parent.parent.resolve() / "build"
+def _get_activate_venv_path():
+    return pathlib.Path(__file__).parent.resolve() / "venv" / "Scripts" / "activate.bat"
 
 
-def _minifi_setup_env_str() -> str:
-    return f"""@echo off
+def _minifi_setup_env_str(vs_where_location: VsWhereLocation) -> str:
+    return f"""
 call refreshenv
-call "{_get_vs_dev_cmd()}"
+call {_get_vs_dev_cmd(vs_where_location)}
 setlocal EnableDelayedExpansion
-  set PATH=!PATH:C:\\Strawberry\\c\\bin;=!;C:\Program Files\\NASM;
+  set PATH=!PATH:C:\\Strawberry\\c\\bin;=!;C:\\Program Files\\NASM;
 endlocal & set PATH=%PATH%
 set build_platform=x64
-{_get_venv_path()}
+IF "%VIRTUALENV%"=="" (
+  echo already in venv
+) ELSE (
+  {_get_activate_venv_path()}
+)
+
 """
 
+def _create_minifi_setup_env_batch(vs_where_location: VsWhereLocation) -> str:
+    with open("build_environment.bat","w") as f:
+        f.write(_minifi_setup_env_str(vs_where_location))
+
 
 class ChocolateyPackageManager(PackageManager):
+
+
     def __init__(self, no_confirm):
         PackageManager.__init__(self, no_confirm)
 
@@ -240,20 +264,35 @@ def _get_installed_packages(self) -> Set[str]:
             lines.append("NASM")    # choco doesnt remember NASM
         return set(lines)
 
+    def _acquire_vswhere(self):
+        installed_packages = self._get_installed_packages()
+        if "vswhere" in installed_packages:
+            return VsWhereLocation.CHOCO
+        vswhere_default_path = "%ProgramFiles(x86)%\\Microsoft Visual Studio\\Installer\\vswhere.exe"
+        if os.path.exists(vswhere_default_path):
+            return VsWhereLocation.DEFAULT
+        self.install({"vswhere":{"vswhere"}})
+        return VsWhereLocation.CHOCO
+
+
     def install_compiler(self) -> str:
-        self.install({"visualstudio2022buildtools": {'visualstudio2022buildtools --package-parameters "--wait --quiet '
-                                                     '--add Microsoft.VisualStudio.Workload.VCTools '
-                                                     '--add Microsoft.VisualStudio.Component.VC.ATL '
-                                                     '--includeRecommended"'},
-                      "vswhere": {"vswhere"}})
+        vs_where_loc = self._acquire_vswhere()
+        vs_dev_path = _get_vs_dev_cmd_path(vs_where_loc)
+        if not vs_dev_path:
+            self.install({"visualstudio2022buildtools": {'visualstudio2022buildtools --package-parameters "--wait --quiet '
+                                                         '--add Microsoft.VisualStudio.Workload.VCTools '
+                                                         '--add Microsoft.VisualStudio.Component.VC.ATL '
+                                                         '--includeRecommended"'}})
         return ""
 
     def run_cmd(self, cmd: str) -> bool:
-        cmd_command = f"refreshenv & {_get_vs_dev_cmd()} & set PATH=!PATH:C:\\Strawberry\\c\\bin;=!;C:\\Program Files\\NASM; & {cmd}"
-        cmd_command_list = f'cmd /V:ON /C {cmd_command}'
-        res = subprocess.run(cmd_command_list, check=True, text=True)
+        env_bat_path = pathlib.Path(__file__).parent.resolve() / "build_environment.bat"
+        res = subprocess.run(f"{env_bat_path} & {cmd}", check=True, text=True)
 
         return res.returncode == 0
+    
+    def ensureEnvironment(self):
+        _create_minifi_setup_env_batch(self._acquire_vswhere())
 
 
 def get_package_manager(no_confirm: bool) -> PackageManager:

bootstrap/py_bootstrap.bat

@@ -25,5 +25,5 @@ if exist "%VENV_DIR%" (
     call "%VENV_DIR%\Scripts\activate.bat"
     pip install -r "%SCRIPT_DIR%requirements.txt"
 )
-
 python "%SCRIPT_DIR%main.py"
+deactivate