refactor: update unarchive logic for Windows and improve tar command handling

Author: mxcl

bin/pkg-build

@@ -55,8 +55,8 @@ async function prep_toolchain() {
     Deno.env.set("PATH", `${bin};${Deno.env.get("PATH")}`);
 
     // bsdtar needs a gzip.exe and I couldn’t figure out how to make a .cmd that worked
-    const gzip = backticks_quiet`pkgx -q +github.com/ebiggers/libdeflate -- where libdeflate-gzip`;
-    new Path(gzip).cp({ to: bin.join("gzip.exe") });
+    // const gzip = backticks_quiet`pkgx -q +github.com/ebiggers/libdeflate -- where libdeflate-gzip`;
+    // new Path(gzip).cp({ to: bin.join("gzip.exe") });
   }
 
   Deno.env.set("PKGX_BIN", bin.string);

brewkit/toolchain/windows/cmake.cmd

@@ -0,0 +1,8 @@
+@echo off
+setlocal
+
+pkgx -q cmake %*
+if %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
+
+endlocal
+exit /b 0

brewkit/unarchive.ts

@@ -8,7 +8,8 @@ export default async function (
 ): Promise<void> {
   console.error("%c+", "color:yellow", "unarchiving:", url);
 
-  if (url.endsWith(".zip")) {
+  // on windows the tar is bsdtar which can extract zip files
+  if (url.endsWith(".zip") && Deno.build.os != "windows") {
     const tmp = new Path(Deno.makeTempFileSync());
     const rsp = await fetch(url);
     if (!rsp.ok) {
@@ -78,7 +79,7 @@ function mktar(url: string, stripComponents: number) {
     const rv = ["pkgx"];
     if (mode == 'xJf') rv.push('+xz');
     if (mode == 'xjf') rv.push('+bzip2');
-    rv.push("bsdtar", mode, "-", `--strip-components=${stripComponents}`);
+    rv.push("--", "tar", mode, "-", `--strip-components=${stripComponents}`);
     return rv;
   }
 }

projects/git-scm.org/build.ts

@@ -1,7 +1,12 @@
 import { BuildOptions, inreplace, Path, run, unarchive } from "brewkit";
 
-export default async function ({ prefix, version, props }: BuildOptions) {
-  await unarchive(`https://mirrors.edge.kernel.org/pub/software/scm/git/git-${version}.tar.gz`);
+export default async function ({ prefix, tag, version, props }: BuildOptions) {
+  // windows fails to unarchive the .tag.gz for some reason
+  const url = Deno.build.os != 'windows'
+    ? `https://mirrors.edge.kernel.org/pub/software/scm/git/git-${version}.tar.gz`
+    : `https://github.com/git-for-windows/git/archive/refs/tags/${tag}.zip`;
+
+  await unarchive(url);
 
   props.join("config.mak").cp({ into: Path.cwd() });
 

projects/git-scm.org/versions.ts

@@ -1,7 +1,12 @@
-import { Range } from "jsr:@std/semver@^1";
-import { github } from "brewkit";
+import { github, Range, SemVer } from "brewkit";
 
 export default async function (constraint: Range) {
+  if (Deno.build.os == 'windows') {
+    return (await github.releases("git-for-windows/git", constraint)).map(({tag_name}) => {
+      const vstr = tag_name.replace(/\.windows\.\d+$/, "");
+      return { tag: tag_name, version: new SemVer(vstr) };
+    });
+  }
   return (await github.tags("git/git")).map((x) => {
     try {
       if (!x.name.startsWith("v") || /-.*$/.test(x.name)) {