From 6d3152a98aa59d6a5d54aa68e744e2fbd8b9dc7f Mon Sep 17 00:00:00 2001 From: Hernan Martinez Date: Fri, 26 Apr 2024 23:35:16 -0600 Subject: [PATCH] Use architecture specific folders in installer script --- app/ollama.iss | 4 ++-- scripts/build_windows.ps1 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/ollama.iss b/app/ollama.iss index 2c6de90f..9dc61abb 100644 --- a/app/ollama.iss +++ b/app/ollama.iss @@ -88,8 +88,8 @@ DialogFontSize=12 [Files] Source: ".\app.exe"; DestDir: "{app}"; DestName: "{#MyAppExeName}" ; Flags: ignoreversion 64bit Source: "..\ollama.exe"; DestDir: "{app}"; Flags: ignoreversion 64bit -Source: "..\dist\windows-amd64\*.dll"; DestDir: "{app}"; Flags: ignoreversion 64bit -Source: "..\dist\windows-amd64\ollama_runners\*"; DestDir: "{app}\ollama_runners"; Flags: ignoreversion 64bit recursesubdirs +Source: "..\dist\windows-{#ARCH}\*.dll"; DestDir: "{app}"; Flags: ignoreversion 64bit +Source: "..\dist\windows-{#ARCH}\ollama_runners\*"; DestDir: "{app}\ollama_runners"; Flags: ignoreversion 64bit recursesubdirs Source: "..\dist\ollama_welcome.ps1"; DestDir: "{app}"; Flags: ignoreversion Source: ".\assets\app.ico"; DestDir: "{app}"; Flags: ignoreversion #if DirExists("..\dist\windows-amd64\rocm") diff --git a/scripts/build_windows.ps1 b/scripts/build_windows.ps1 index d0fb4db5..60de0307 100644 --- a/scripts/build_windows.ps1 +++ b/scripts/build_windows.ps1 @@ -129,9 +129,9 @@ function buildInstaller() { cd "${script:SRC_DIR}\app" $env:PKG_VERSION=$script:PKG_VERSION if ("${env:KEY_CONTAINER}") { - & "${script:INNO_SETUP_DIR}\ISCC.exe" /SMySignTool="${script:SignTool} sign /fd sha256 /t http://timestamp.digicert.com /f ${script:OLLAMA_CERT} /csp `$qGoogle Cloud KMS Provider`$q /kc ${env:KEY_CONTAINER} `$f" .\ollama.iss + & "${script:INNO_SETUP_DIR}\ISCC.exe" /DARCH=$script:TARGET_ARCH /SMySignTool="${script:SignTool} sign /fd sha256 /t http://timestamp.digicert.com /f ${script:OLLAMA_CERT} /csp `$qGoogle Cloud KMS Provider`$q /kc ${env:KEY_CONTAINER} `$f" .\ollama.iss } else { - & "${script:INNO_SETUP_DIR}\ISCC.exe" .\ollama.iss + & "${script:INNO_SETUP_DIR}\ISCC.exe" /DARCH=$script:TARGET_ARCH .\ollama.iss } if ($LASTEXITCODE -ne 0) { exit($LASTEXITCODE)} }