From 25d23f743ec2e323fa25951fc196ea27bb1795bc Mon Sep 17 00:00:00 2001
From: RecursiveMaple <971499217@qq.com>
Date: Mon, 19 Feb 2024 23:27:56 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E2=9C=A8=20feat(winlib):=20split=20a?=
 =?UTF-8?q?rchs"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit f6f247da8aaa9f0fde1d07519849522cc2ed6775.
---
 .gitignore                       |  1 -
 bucket/winlib-ucrt-llvm-w32.json | 21 ---------------------
 bucket/winlib-ucrt-llvm.json     | 24 ++++++++++++++++++++----
 3 files changed, 20 insertions(+), 26 deletions(-)
 delete mode 100644 bucket/winlib-ucrt-llvm-w32.json

diff --git a/.gitignore b/.gitignore
index b60e65b..c221b4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,4 +3,3 @@
 ._*
 page.html
 checkver-*.html
-.vscode
diff --git a/bucket/winlib-ucrt-llvm-w32.json b/bucket/winlib-ucrt-llvm-w32.json
deleted file mode 100644
index 3dd5960..0000000
--- a/bucket/winlib-ucrt-llvm-w32.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "version": "13.2.0-17.0.6-11.0.1-r5",
-    "description": "WinLibs standalone build of GCC and MinGW-w64 for Windows",
-    "homepage": "https://winlibs.com",
-    "license": "GPL-3.0-or-later,ZPL-2.1,BSD-2-Clause,Watcom-1.0,Apache-2.0",
-    "url": "https://github.com/brechtsanders/winlibs_mingw/releases/download/13.2.0posix-17.0.6-11.0.1-ucrt-r5/winlibs-i686-posix-dwarf-gcc-13.2.0-llvm-17.0.6-mingw-w64ucrt-11.0.1-r5.7z",
-    "hash": "fb0045d2cf391f1e38d364c36374ff4fd366388c1cc373ffb28292564b553080",
-    "extract_dir": "mingw32",
-    "post_install": "Copy-Item \"$dir\\bin\\mingw32-make.exe\" \"$dir\\bin\\make.exe\"",
-    "env_add_path": "bin",
-    "checkver": {
-        "regex": "(?<gcc>[\\d.]+)posix-(?<llvm>[\\d.]+)-(?<mingw>[\\d.]+)-ucrt-r(?<release>\\d+)",
-        "replace": "${gcc}-${llvm}-${mingw}-r${release}"
-    },
-    "autoupdate": {
-        "url": "https://github.com/brechtsanders/winlibs_mingw/releases/download/$matchGccposix-$matchLlvm-$matchMingw-ucrt-r$matchRelease/winlibs-i686-posix-dwarf-gcc-$matchGcc-llvm-$matchLlvm-mingw-w64ucrt-$matchMingw-r$matchRelease.7z",
-        "hash": {
-            "url": "$url.sha256"
-        }
-    }
-}
diff --git a/bucket/winlib-ucrt-llvm.json b/bucket/winlib-ucrt-llvm.json
index 9df8553..e90d8a5 100644
--- a/bucket/winlib-ucrt-llvm.json
+++ b/bucket/winlib-ucrt-llvm.json
@@ -3,9 +3,18 @@
     "description": "WinLibs standalone build of GCC and MinGW-w64 for Windows",
     "homepage": "https://winlibs.com",
     "license": "GPL-3.0-or-later,ZPL-2.1,BSD-2-Clause,Watcom-1.0,Apache-2.0",
-    "url": "https://github.com/brechtsanders/winlibs_mingw/releases/download/13.2.0-17.0.4-11.0.1-msvcrt-r2/winlibs-x86_64-posix-seh-gcc-13.2.0-llvm-17.0.4-mingw-w64msvcrt-11.0.1-r2.7z",
-    "hash": "f44b17498140bce6372949c13f601425985efaef909a10f20d4ece394d62c234",
-    "extract_dir": "mingw64",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/brechtsanders/winlibs_mingw/releases/download/13.2.0-17.0.4-11.0.1-msvcrt-r2/winlibs-x86_64-posix-seh-gcc-13.2.0-llvm-17.0.4-mingw-w64msvcrt-11.0.1-r2.7z",
+            "hash": "f44b17498140bce6372949c13f601425985efaef909a10f20d4ece394d62c234",
+            "extract_dir": "mingw64"
+        },
+        "32bit": {
+            "url": "https://github.com/brechtsanders/winlibs_mingw/releases/download/13.2.0-17.0.4-11.0.1-msvcrt-r2/winlibs-i686-posix-dwarf-gcc-13.2.0-llvm-17.0.4-mingw-w64msvcrt-11.0.1-r2.7z",
+            "hash": "c7286982116132b8f4f4129f49a04455e55f9aadb8025e3f317ba3eb3dd12f8b",
+            "extract_dir": "mingw32"
+        }
+    },
     "post_install": "Copy-Item \"$dir\\bin\\mingw32-make.exe\" \"$dir\\bin\\make.exe\"",
     "env_add_path": "bin",
     "checkver": {
@@ -13,7 +22,14 @@
         "replace": "${gcc}-${llvm}-${mingw}-r${release}"
     },
     "autoupdate": {
-        "url": "https://github.com/brechtsanders/winlibs_mingw/releases/download/$matchGccposix-$matchLlvm-$matchMingw-ucrt-r$matchRelease/winlibs-x86_64-posix-seh-gcc-$matchGcc-llvm-$matchLlvm-mingw-w64ucrt-$matchMingw-r$matchRelease.7z",
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/brechtsanders/winlibs_mingw/releases/download/$matchGccposix-$matchLlvm-$matchMingw-ucrt-r$matchRelease/winlibs-x86_64-posix-seh-gcc-$matchGcc-llvm-$matchLlvm-mingw-w64ucrt-$matchMingw-r$matchRelease.7z"
+            },
+            "32bit": {
+                "url": "https://github.com/brechtsanders/winlibs_mingw/releases/download/$matchGccposix-$matchLlvm-$matchMingw-ucrt-r$matchRelease/winlibs-i686-posix-dwarf-gcc-$matchGcc-llvm-$matchLlvm-mingw-w64ucrt-$matchMingw-r$matchRelease.7z"
+            }
+        },
         "hash": {
             "url": "$url.sha256"
         }