update for windows platform

d2learn · Dec 17, 2024 · 2100f3a · 2100f3a
1 parent 269f536
commit 2100f3a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/pkgs/c/cpp.lua b/pkgs/c/cpp.lua
@@ -15,7 +15,7 @@ package = {
 
     xpm = {
         windows = {
-            deps = {"msvc"},
+            deps = {"msvc@2022"},
             ["latest"] = { ref = "msvc" },
             ["msvc"] = {},
         },
@@ -38,7 +38,7 @@ local pkginfo = runtime.get_pkginfo()
 
 function installed()
     if pkginfo.version == "msvc" then
-        return toolchain.load("msvc"):check()
+        return toolchain.load("msvc"):check() == "2022"
     elseif pkginfo.version == "gnu" then
         local output = os.iorun("gcc --version")
         return string.find(output:trim(), "gcc", 1, true) ~= nil

diff --git a/pkgs/m/msvc.lua b/pkgs/m/msvc.lua
@@ -10,19 +10,21 @@ package = {
     keywords = { "msvc", "c++", "c" },
 
     xpm = {
-        deps = { "vs-buildtools@2022" },
         windows = {
+            deps = { "vs-buildtools@2022" },
             ["latest"] = { ref = "2022" },
             ["2022"] = { } -- v143
         },
     }
 }
 
+import("core.tool.toolchain")
+
 -- https://learn.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-build-tools?view=vs-2022
 local msvc_component = "Microsoft.VisualStudio.Component.VC.Tools.x86.x64"
 
 function installed()
-    return toolchain.load("msvc"):check()
+    return toolchain.load("msvc"):check() == "2022"
 end
 
 function install()
@@ -36,6 +38,7 @@ function install()
         -- " --norestart " ..
         " --wait " -- ..
     )
+    return true
 end
 
 function uninstall()
@@ -45,4 +48,5 @@ function uninstall()
         " --passive " ..
         " --wait "
     )
+    return true
 end