Move Mac App to a new dir

2024-02-13 14:15:51 -08:00 · 2024-02-13 14:15:51 -08:00 · 9da9e8fb72
commit 9da9e8fb72
parent 42e77e2a69
32 changed files with 4 additions and 4 deletions
--- a/macapp/.eslintrc.json
+++ b/macapp/.eslintrc.json
--- a/macapp/.gitignore
+++ b/macapp/.gitignore
--- a/macapp/README.md
+++ b/macapp/README.md
--- a/macapp/assets/icon.icns
+++ b/macapp/assets/icon.icns
--- a/macapp/assets/iconDarkTemplate.png
+++ b/macapp/assets/iconDarkTemplate.png
--- a/macapp/assets/iconDarkTemplate@2x.png
+++ b/macapp/assets/iconDarkTemplate@2x.png
--- a/macapp/assets/iconDarkUpdateTemplate.png
+++ b/macapp/assets/iconDarkUpdateTemplate.png
--- a/macapp/assets/iconDarkUpdateTemplate@2x.png
+++ b/macapp/assets/iconDarkUpdateTemplate@2x.png
--- a/macapp/assets/iconTemplate.png
+++ b/macapp/assets/iconTemplate.png
--- a/macapp/assets/iconTemplate@2x.png
+++ b/macapp/assets/iconTemplate@2x.png
--- a/macapp/assets/iconUpdateTemplate.png
+++ b/macapp/assets/iconUpdateTemplate.png
--- a/macapp/assets/iconUpdateTemplate@2x.png
+++ b/macapp/assets/iconUpdateTemplate@2x.png
--- a/macapp/forge.config.ts
+++ b/macapp/forge.config.ts
--- a/macapp/package-lock.json
+++ b/macapp/package-lock.json
--- a/macapp/package.json
+++ b/macapp/package.json
--- a/macapp/postcss.config.js
+++ b/macapp/postcss.config.js
--- a/macapp/src/app.css
+++ b/macapp/src/app.css
--- a/macapp/src/app.tsx
+++ b/macapp/src/app.tsx
--- a/macapp/src/declarations.d.ts
+++ b/macapp/src/declarations.d.ts
--- a/macapp/src/index.html
+++ b/macapp/src/index.html
--- a/macapp/src/index.ts
+++ b/macapp/src/index.ts
--- a/macapp/src/install.ts
+++ b/macapp/src/install.ts
--- a/macapp/src/ollama.svg
+++ b/macapp/src/ollama.svg
--- a/macapp/src/preload.ts
+++ b/macapp/src/preload.ts
--- a/macapp/src/renderer.tsx
+++ b/macapp/src/renderer.tsx
--- a/macapp/tailwind.config.js
+++ b/macapp/tailwind.config.js
--- a/macapp/tsconfig.json
+++ b/macapp/tsconfig.json
--- a/macapp/webpack.main.config.ts
+++ b/macapp/webpack.main.config.ts
--- a/macapp/webpack.plugins.ts
+++ b/macapp/webpack.plugins.ts
--- a/macapp/webpack.renderer.config.ts
+++ b/macapp/webpack.renderer.config.ts
--- a/macapp/webpack.rules.ts
+++ b/macapp/webpack.rules.ts
--- a/scripts/build_darwin.sh
+++ b/scripts/build_darwin.sh
@ -24,13 +24,13 @@ fi
 chmod +x dist/ollama

 # build and optionally sign the mac app
-npm install --prefix app
+npm install --prefix macapp
 if [ -n "$APPLE_IDENTITY" ]; then
-    npm run --prefix app make:sign
+    npm run --prefix macapp make:sign
 else 
-    npm run --prefix app make
+    npm run --prefix macapp make
 fi
-cp app/out/make/zip/darwin/universal/Ollama-darwin-universal-$VERSION.zip dist/Ollama-darwin.zip
+cp macapp/out/make/zip/darwin/universal/Ollama-darwin-universal-$VERSION.zip dist/Ollama-darwin.zip

 # sign the binary and rename it
 if [ -n "$APPLE_IDENTITY" ]; then