From 6b496ae413f66bedf096d9a137f2ef79a3fa34f3 Mon Sep 17 00:00:00 2001
From: Louis <louis@jan.ai>
Date: Mon, 7 Jul 2025 18:27:45 +0700
Subject: [PATCH] fix: build issues

---
 .devcontainer/buildAppImage.sh                |  2 +-
 .../template-tauri-build-linux-x64.yml        |  2 +-
 src-tauri/capabilities/default.json           | 38 +------------------
 src-tauri/tauri.bundle.windows.nsis.template  | 10 +----
 src-tauri/tauri.conf.json                     |  6 +--
 5 files changed, 5 insertions(+), 53 deletions(-)

diff --git a/.devcontainer/buildAppImage.sh b/.devcontainer/buildAppImage.sh
index efb963d5a..627dcece9 100644
--- a/.devcontainer/buildAppImage.sh
+++ b/.devcontainer/buildAppImage.sh
@@ -8,7 +8,7 @@ mkdir -p "$TAURI_TOOLKIT_PATH"
 wget https://github.com/linuxdeploy/linuxdeploy/releases/download/1-alpha-20250213-2/linuxdeploy-x86_64.AppImage -O "$TAURI_TOOLKIT_PATH/linuxdeploy-x86_64.AppImage"
 chmod +x "$TAURI_TOOLKIT_PATH/linuxdeploy-x86_64.AppImage"
 
-jq '.bundle.resources = ["resources/pre-install/**/*"] | .bundle.externalBin = ["binaries/cortex-server", "resources/bin/uv"]' ./src-tauri/tauri.conf.json > /tmp/tauri.conf.json
+jq '.bundle.resources = ["resources/pre-install/**/*"] | .bundle.externalBin = ["resources/bin/uv"]' ./src-tauri/tauri.conf.json > /tmp/tauri.conf.json
 mv /tmp/tauri.conf.json ./src-tauri/tauri.conf.json         
 
 make build-tauri
diff --git a/.github/workflows/template-tauri-build-linux-x64.yml b/.github/workflows/template-tauri-build-linux-x64.yml
index 303b00109..4357babcb 100644
--- a/.github/workflows/template-tauri-build-linux-x64.yml
+++ b/.github/workflows/template-tauri-build-linux-x64.yml
@@ -104,7 +104,7 @@ jobs:
         run: |
           echo "Version: ${{ inputs.new_version }}"
           # Update tauri.conf.json
-          jq --arg version "${{ inputs.new_version }}" '.version = $version | .bundle.createUpdaterArtifacts = true | .bundle.resources = ["resources/pre-install/**/*"] | .bundle.externalBin = ["binaries/cortex-server", "resources/bin/uv"]' ./src-tauri/tauri.conf.json > /tmp/tauri.conf.json
+          jq --arg version "${{ inputs.new_version }}" '.version = $version | .bundle.createUpdaterArtifacts = true | .bundle.resources = ["resources/pre-install/**/*"] | .bundle.externalBin = [ "resources/bin/uv"]' ./src-tauri/tauri.conf.json > /tmp/tauri.conf.json
           mv /tmp/tauri.conf.json ./src-tauri/tauri.conf.json         
           if [ "${{ inputs.channel }}" != "stable" ]; then
             jq '.bundle.linux.deb.files = {"usr/bin/bun": "resources/bin/bun",
diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json
index 76c9bc567..3d9f98178 100644
--- a/src-tauri/capabilities/default.json
+++ b/src-tauri/capabilities/default.json
@@ -37,43 +37,7 @@
     },
     {
       "identifier": "shell:allow-execute",
-      "allow": [
-        {
-          "args": [
-            "--start-server",
-            {
-              "validator": "\\S+"
-            },
-            "--port",
-            {
-              "validator": "\\S+"
-            },
-            "--config_file_path",
-            {
-              "validator": "\\S+"
-            },
-            "--data_folder_path",
-            {
-              "validator": "\\S+"
-            },
-            "--cors",
-            {
-              "validator": "\\S+"
-            },
-            "--allowed_origins",
-            {
-              "validator": "\\S+"
-            },
-            "config",
-            "--api_keys",
-            {
-              "validator": "\\S+"
-            }
-          ],
-          "name": "binaries/cortex-server",
-          "sidecar": true
-        }
-      ]
+      "allow": []
     },
     {
       "identifier": "opener:allow-open-url",
diff --git a/src-tauri/tauri.bundle.windows.nsis.template b/src-tauri/tauri.bundle.windows.nsis.template
index e991d62f7..e6bdd8117 100644
--- a/src-tauri/tauri.bundle.windows.nsis.template
+++ b/src-tauri/tauri.bundle.windows.nsis.template
@@ -636,15 +636,7 @@ Section Install
     SetOutPath "$INSTDIR\binaries\engines"
     File /nonfatal /a /r "D:\a\jan\jan\src-tauri\binaries\engines\"
     SetOutPath $INSTDIR
-    File /a "/oname=cublas64_12.dll" "D:\a\jan\jan\src-tauri\binaries\cublas64_12.dll"
-    File /a "/oname=cublasLt64_12.dll" "D:\a\jan\jan\src-tauri\binaries\cublasLt64_12.dll"
-    File /a "/oname=cudart64_12.dll" "D:\a\jan\jan\src-tauri\binaries\cudart64_12.dll"
-    File /a "/oname=msvcp140.dll" "D:\a\jan\jan\src-tauri\binaries\msvcp140.dll"
-    File /a "/oname=vcomp140.dll" "D:\a\jan\jan\src-tauri\binaries\vcomp140.dll"
-    File /a "/oname=msvcp140_codecvt_ids.dll" "D:\a\jan\jan\src-tauri\binaries\msvcp140_codecvt_ids.dll"
-    File /a "/oname=vcruntime140_1.dll" "D:\a\jan\jan\src-tauri\binaries\vcruntime140_1.dll"
-    File /a "/oname=vcruntime140.dll" "D:\a\jan\jan\src-tauri\binaries\vcruntime140.dll"
-    File /a "/oname=vulkan-1.dll" "D:\a\jan\jan\src-tauri\binaries\vulkan-1.dll"
+    File /a "/oname=vulkan-1.dll" "D:\a\jan\jan\src-tauri\resources\lib\vulkan-1.dll"
     SetOutPath "$INSTDIR\resources\pre-install"
     File /nonfatal /a /r "D:\a\jan\jan\src-tauri\resources\pre-install\"
     SetOutPath $INSTDIR
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index fbd131ffa..590919cc3 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -85,11 +85,7 @@
       "icons/icon.icns",
       "icons/icon.ico"
     ],
-    "resources": [
-      "resources/pre-install/**/*",
-      "resources/lib/",
-      "binaries/**/*"
-    ],
+    "resources": ["resources/**/*", "binaries/**/*"],
     "externalBin": ["resources/bin/bun", "resources/bin/uv"],
     "linux": {
       "appimage": {