changes

.vscode/tasks.json

@@ -1,52 +0,0 @@
-{
-  "version": "2.0.0",
-  "tasks": [
-    {
-      "type": "process",
-      "label": "Install Dependencies",
-      "command": "scripts/all-dependencies.sh",
-      "windows": {
-        "command": "scripts/all-dependencies.ps1",
-      },
-      "icon": {
-        "id": "arrow-down",
-      },
-      "options": {
-        "cwd": "${workspaceFolder}",
-      },
-    },
-    {
-      "type": "process",
-      "label": "Setup Environment",
-      "dependsOn": ["Install Dependencies"],
-      "command": "scripts/setup.sh",
-      "windows": {
-        "command": "scripts/setup.ps1",
-      },
-      "icon": {
-        "id": "check",
-      },
-      "options": {
-        "cwd": "${workspaceFolder}",
-      },
-    },
-    {
-      "type": "process",
-      "label": "Build Bun",
-      "dependsOn": ["Setup Environment"],
-      "command": "bun",
-      "args": ["run", "build"],
-      "icon": {
-        "id": "gear",
-      },
-      "options": {
-        "cwd": "${workspaceFolder}",
-      },
-      "isBuildCommand": true,
-      "runOptions": {
-        "instanceLimit": 1,
-        "reevaluateOnRerun": true,
-      },
-    },
-  ],
-}

cmake/Globals.cmake

@@ -575,14 +575,6 @@ function(register_repository)
     set(GIT_PATH ${VENDOR_PATH}/${GIT_NAME})
   endif()
 
-  if(GIT_COMMIT)
-    set(GIT_REF ${GIT_COMMIT})
-  elseif(GIT_TAG)
-    set(GIT_REF refs/tags/${GIT_TAG})
-  else()
-    set(GIT_REF refs/heads/${GIT_BRANCH})
-  endif()
-
   set(GIT_EFFECTIVE_OUTPUTS)
   foreach(output ${GIT_OUTPUTS})
     list(APPEND GIT_EFFECTIVE_OUTPUTS ${GIT_PATH}/${output})
@@ -597,7 +589,9 @@ function(register_repository)
       ${CMAKE_COMMAND}
         -DGIT_PATH=${GIT_PATH}
         -DGIT_REPOSITORY=${GIT_REPOSITORY}
-        -DGIT_REF=${GIT_REF}
+        -DGIT_BRANCH=${GIT_BRANCH}
+        -DGIT_TAG=${GIT_TAG}
+        -DGIT_COMMIT=${GIT_COMMIT}
         -DGIT_NAME=${GIT_NAME}
         -P ${CWD}/cmake/scripts/GitClone.cmake
     OUTPUTS

cmake/scripts/GitClone.cmake

@@ -43,7 +43,6 @@ file(GLOB_RECURSE GIT_PATCH_PATHS ${CMAKE_SOURCE_DIR}/patches/${GIT_NAME}/*)
 list(LENGTH GIT_PATCH_PATHS GIT_PATCH_COUNT)
 
 if(GIT_PATCH_COUNT GREATER 0)
-  message(STATUS "Found ${GIT_PATCH_COUNT} patches")
   find_program(GIT_PROGRAM git REQUIRED)
 
   foreach(GIT_PATCH ${GIT_PATCH_PATHS})
@@ -67,7 +66,7 @@ if(GIT_PATCH_COUNT GREATER 0)
           GIT_PATCH_ERROR
       )
 
-      if(GIT_PATCH_ERROR)
+      if(GIT_PATCH_ERROR AND NOT GIT_PATCH_ERROR MATCHES "cleanly")
         file(REMOVE_RECURSE ${GIT_PATH})
         message(FATAL_ERROR "Failed to apply patch: ${GIT_PATCH_ERROR}")
       endif()

cmake/targets/BuildBun.cmake

@@ -62,8 +62,6 @@ register_command(
     ${BUN_ZIG_IDENTIFIER_SOURCES}
   OUTPUTS
     ${BUN_ZIG_IDENTIFIER_OUTPUTS}
-  TARGETS
-    clone-zig
 )
 
 set(BUN_ERROR_SOURCE ${CWD}/packages/bun-error)
@@ -549,8 +547,6 @@ register_command(
   SOURCES
     ${BUN_ZIG_SOURCES}
     ${BUN_ZIG_GENERATED_SOURCES}
-  TARGETS
-    clone-zig
 )
 
 set_property(TARGET bun-zig PROPERTY JOB_POOL compile_pool)