From 9da9e8fb7254df1148f9619bec781e52dc954678 Mon Sep 17 00:00:00 2001 From: Daniel Hiltgen Date: Tue, 13 Feb 2024 14:15:51 -0800 Subject: [PATCH] Move Mac App to a new dir --- {app => macapp}/.eslintrc.json | 0 {app => macapp}/.gitignore | 0 {app => macapp}/README.md | 0 {app => macapp}/assets/icon.icns | Bin {app => macapp}/assets/iconDarkTemplate.png | Bin {app => macapp}/assets/iconDarkTemplate@2x.png | Bin {app => macapp}/assets/iconDarkUpdateTemplate.png | Bin .../assets/iconDarkUpdateTemplate@2x.png | Bin {app => macapp}/assets/iconTemplate.png | Bin {app => macapp}/assets/iconTemplate@2x.png | Bin {app => macapp}/assets/iconUpdateTemplate.png | Bin {app => macapp}/assets/iconUpdateTemplate@2x.png | Bin {app => macapp}/forge.config.ts | 0 {app => macapp}/package-lock.json | 0 {app => macapp}/package.json | 0 {app => macapp}/postcss.config.js | 0 {app => macapp}/src/app.css | 0 {app => macapp}/src/app.tsx | 0 {app => macapp}/src/declarations.d.ts | 0 {app => macapp}/src/index.html | 0 {app => macapp}/src/index.ts | 0 {app => macapp}/src/install.ts | 0 {app => macapp}/src/ollama.svg | 0 {app => macapp}/src/preload.ts | 0 {app => macapp}/src/renderer.tsx | 0 {app => macapp}/tailwind.config.js | 0 {app => macapp}/tsconfig.json | 0 {app => macapp}/webpack.main.config.ts | 0 {app => macapp}/webpack.plugins.ts | 0 {app => macapp}/webpack.renderer.config.ts | 0 {app => macapp}/webpack.rules.ts | 0 scripts/build_darwin.sh | 8 ++++---- 32 files changed, 4 insertions(+), 4 deletions(-) rename {app => macapp}/.eslintrc.json (100%) rename {app => macapp}/.gitignore (100%) rename {app => macapp}/README.md (100%) rename {app => macapp}/assets/icon.icns (100%) rename {app => macapp}/assets/iconDarkTemplate.png (100%) rename {app => macapp}/assets/iconDarkTemplate@2x.png (100%) rename {app => macapp}/assets/iconDarkUpdateTemplate.png (100%) rename {app => macapp}/assets/iconDarkUpdateTemplate@2x.png (100%) rename {app => macapp}/assets/iconTemplate.png (100%) rename {app => macapp}/assets/iconTemplate@2x.png (100%) rename {app => macapp}/assets/iconUpdateTemplate.png (100%) rename {app => macapp}/assets/iconUpdateTemplate@2x.png (100%) rename {app => macapp}/forge.config.ts (100%) rename {app => macapp}/package-lock.json (100%) rename {app => macapp}/package.json (100%) rename {app => macapp}/postcss.config.js (100%) rename {app => macapp}/src/app.css (100%) rename {app => macapp}/src/app.tsx (100%) rename {app => macapp}/src/declarations.d.ts (100%) rename {app => macapp}/src/index.html (100%) rename {app => macapp}/src/index.ts (100%) rename {app => macapp}/src/install.ts (100%) rename {app => macapp}/src/ollama.svg (100%) rename {app => macapp}/src/preload.ts (100%) rename {app => macapp}/src/renderer.tsx (100%) rename {app => macapp}/tailwind.config.js (100%) rename {app => macapp}/tsconfig.json (100%) rename {app => macapp}/webpack.main.config.ts (100%) rename {app => macapp}/webpack.plugins.ts (100%) rename {app => macapp}/webpack.renderer.config.ts (100%) rename {app => macapp}/webpack.rules.ts (100%) diff --git a/app/.eslintrc.json b/macapp/.eslintrc.json similarity index 100% rename from app/.eslintrc.json rename to macapp/.eslintrc.json diff --git a/app/.gitignore b/macapp/.gitignore similarity index 100% rename from app/.gitignore rename to macapp/.gitignore diff --git a/app/README.md b/macapp/README.md similarity index 100% rename from app/README.md rename to macapp/README.md diff --git a/app/assets/icon.icns b/macapp/assets/icon.icns similarity index 100% rename from app/assets/icon.icns rename to macapp/assets/icon.icns diff --git a/app/assets/iconDarkTemplate.png b/macapp/assets/iconDarkTemplate.png similarity index 100% rename from app/assets/iconDarkTemplate.png rename to macapp/assets/iconDarkTemplate.png diff --git a/app/assets/iconDarkTemplate@2x.png b/macapp/assets/iconDarkTemplate@2x.png similarity index 100% rename from app/assets/iconDarkTemplate@2x.png rename to macapp/assets/iconDarkTemplate@2x.png diff --git a/app/assets/iconDarkUpdateTemplate.png b/macapp/assets/iconDarkUpdateTemplate.png similarity index 100% rename from app/assets/iconDarkUpdateTemplate.png rename to macapp/assets/iconDarkUpdateTemplate.png diff --git a/app/assets/iconDarkUpdateTemplate@2x.png b/macapp/assets/iconDarkUpdateTemplate@2x.png similarity index 100% rename from app/assets/iconDarkUpdateTemplate@2x.png rename to macapp/assets/iconDarkUpdateTemplate@2x.png diff --git a/app/assets/iconTemplate.png b/macapp/assets/iconTemplate.png similarity index 100% rename from app/assets/iconTemplate.png rename to macapp/assets/iconTemplate.png diff --git a/app/assets/iconTemplate@2x.png b/macapp/assets/iconTemplate@2x.png similarity index 100% rename from app/assets/iconTemplate@2x.png rename to macapp/assets/iconTemplate@2x.png diff --git a/app/assets/iconUpdateTemplate.png b/macapp/assets/iconUpdateTemplate.png similarity index 100% rename from app/assets/iconUpdateTemplate.png rename to macapp/assets/iconUpdateTemplate.png diff --git a/app/assets/iconUpdateTemplate@2x.png b/macapp/assets/iconUpdateTemplate@2x.png similarity index 100% rename from app/assets/iconUpdateTemplate@2x.png rename to macapp/assets/iconUpdateTemplate@2x.png diff --git a/app/forge.config.ts b/macapp/forge.config.ts similarity index 100% rename from app/forge.config.ts rename to macapp/forge.config.ts diff --git a/app/package-lock.json b/macapp/package-lock.json similarity index 100% rename from app/package-lock.json rename to macapp/package-lock.json diff --git a/app/package.json b/macapp/package.json similarity index 100% rename from app/package.json rename to macapp/package.json diff --git a/app/postcss.config.js b/macapp/postcss.config.js similarity index 100% rename from app/postcss.config.js rename to macapp/postcss.config.js diff --git a/app/src/app.css b/macapp/src/app.css similarity index 100% rename from app/src/app.css rename to macapp/src/app.css diff --git a/app/src/app.tsx b/macapp/src/app.tsx similarity index 100% rename from app/src/app.tsx rename to macapp/src/app.tsx diff --git a/app/src/declarations.d.ts b/macapp/src/declarations.d.ts similarity index 100% rename from app/src/declarations.d.ts rename to macapp/src/declarations.d.ts diff --git a/app/src/index.html b/macapp/src/index.html similarity index 100% rename from app/src/index.html rename to macapp/src/index.html diff --git a/app/src/index.ts b/macapp/src/index.ts similarity index 100% rename from app/src/index.ts rename to macapp/src/index.ts diff --git a/app/src/install.ts b/macapp/src/install.ts similarity index 100% rename from app/src/install.ts rename to macapp/src/install.ts diff --git a/app/src/ollama.svg b/macapp/src/ollama.svg similarity index 100% rename from app/src/ollama.svg rename to macapp/src/ollama.svg diff --git a/app/src/preload.ts b/macapp/src/preload.ts similarity index 100% rename from app/src/preload.ts rename to macapp/src/preload.ts diff --git a/app/src/renderer.tsx b/macapp/src/renderer.tsx similarity index 100% rename from app/src/renderer.tsx rename to macapp/src/renderer.tsx diff --git a/app/tailwind.config.js b/macapp/tailwind.config.js similarity index 100% rename from app/tailwind.config.js rename to macapp/tailwind.config.js diff --git a/app/tsconfig.json b/macapp/tsconfig.json similarity index 100% rename from app/tsconfig.json rename to macapp/tsconfig.json diff --git a/app/webpack.main.config.ts b/macapp/webpack.main.config.ts similarity index 100% rename from app/webpack.main.config.ts rename to macapp/webpack.main.config.ts diff --git a/app/webpack.plugins.ts b/macapp/webpack.plugins.ts similarity index 100% rename from app/webpack.plugins.ts rename to macapp/webpack.plugins.ts diff --git a/app/webpack.renderer.config.ts b/macapp/webpack.renderer.config.ts similarity index 100% rename from app/webpack.renderer.config.ts rename to macapp/webpack.renderer.config.ts diff --git a/app/webpack.rules.ts b/macapp/webpack.rules.ts similarity index 100% rename from app/webpack.rules.ts rename to macapp/webpack.rules.ts diff --git a/scripts/build_darwin.sh b/scripts/build_darwin.sh index 381bcba5..2daf4c8d 100755 --- 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