app: add code for macOS and Windows apps under 'app' (#12933)

* app: add code for macOS and Windows apps under 'app'

* app: add readme

* app: windows and linux only for now

* ci: fix ui CI validation

---------

Co-authored-by: jmorganca <jmorganca@gmail.com>

scripts/build_darwin.sh

@@ -1,16 +1,33 @@
 #!/bin/sh
 
+# Note: 
+#  While testing, if you double-click on the Ollama.app 
+#  some state is left on MacOS and subsequent attempts
+#  to build again will fail with:
+#
+#    hdiutil: create failed - Operation not permitted
+#
+#  To work around, specify another volume name with:
+#
+#    VOL_NAME="$(date)" ./scripts/build_darwin.sh
+#
+VOL_NAME=${VOL_NAME:-"Ollama"}
+export VERSION=${VERSION:-$(git describe --tags --first-parent --abbrev=7 --long --dirty --always | sed -e "s/^v//g")}
+export GOFLAGS="'-ldflags=-w -s \"-X=github.com/ollama/ollama/version.Version=${VERSION#v}\" \"-X=github.com/ollama/ollama/server.mode=release\"'"
+export CGO_CFLAGS="-mmacosx-version-min=14.0"
+export CGO_CXXFLAGS="-mmacosx-version-min=14.0"
+export CGO_LDFLAGS="-mmacosx-version-min=14.0"
+
 set -e
 
 status() { echo >&2 ">>> $@"; }
 usage() {
-    echo "usage: $(basename $0) [build [sign]]"
+    echo "usage: $(basename $0) [build app [sign]]"
     exit 1
 }
 
-export VERSION=${VERSION:-$(git describe --tags --first-parent --abbrev=7 --long --dirty --always | sed -e "s/^v//g")}
-export GOFLAGS="'-ldflags=-w -s \"-X=github.com/ollama/ollama/version.Version=${VERSION#v}\" \"-X=github.com/ollama/ollama/server.mode=release\"'"
-export CGO_CPPFLAGS='-mmacosx-version-min=11.3'
+mkdir -p dist
+
 
 ARCHS="arm64 amd64"
 while getopts "a:h" OPTION; do
@@ -65,15 +82,106 @@ _sign_darwin() {
 }
 
 _build_macapp() {
-    # build and optionally sign the mac app
-    npm install --prefix macapp
-    if [ -n "$APPLE_IDENTITY" ]; then
-        npm run --prefix macapp make:sign
-    else
-        npm run --prefix macapp make
+    if ! command -v npm &> /dev/null; then
+        echo "npm is not installed. Please install Node.js and npm first:"
+        echo "   Visit: https://nodejs.org/"
+        exit 1
     fi
 
-    mv ./macapp/out/make/zip/darwin/universal/Ollama-darwin-universal-$VERSION.zip dist/Ollama-darwin.zip
+    if ! command -v tsc &> /dev/null; then
+        echo "Installing TypeScript compiler..."
+        npm install -g typescript
+    fi
+
+    echo "Installing required Go tools..."
+
+    cd app/ui/app
+    npm install
+    npm run build
+    cd ../../..
+
+    # Build the Ollama.app bundle
+    rm -rf dist/Ollama.app
+    cp -a ./app/darwin/Ollama.app dist/Ollama.app
+
+    # update the modified date of the app bundle to now
+    touch dist/Ollama.app
+
+    go clean -cache
+    GOARCH=amd64 CGO_ENABLED=1 GOOS=darwin go build -o dist/darwin-app-amd64 -ldflags="-s -w -X=github.com/ollama/ollama/app/version.Version=${VERSION}" ./app/cmd/app
+    GOARCH=arm64 CGO_ENABLED=1 GOOS=darwin go build -o dist/darwin-app-arm64 -ldflags="-s -w -X=github.com/ollama/ollama/app/version.Version=${VERSION}" ./app/cmd/app
+    mkdir -p dist/Ollama.app/Contents/MacOS
+    lipo -create -output dist/Ollama.app/Contents/MacOS/Ollama dist/darwin-app-amd64 dist/darwin-app-arm64
+    rm -f dist/darwin-app-amd64 dist/darwin-app-arm64
+
+    # Create a mock Squirrel.framework bundle
+    mkdir -p dist/Ollama.app/Contents/Frameworks/Squirrel.framework/Versions/A/Resources/
+    cp -a dist/Ollama.app/Contents/MacOS/Ollama dist/Ollama.app/Contents/Frameworks/Squirrel.framework/Versions/A/Squirrel
+    ln -s ../Squirrel dist/Ollama.app/Contents/Frameworks/Squirrel.framework/Versions/A/Resources/ShipIt
+    cp -a ./app/cmd/squirrel/Info.plist dist/Ollama.app/Contents/Frameworks/Squirrel.framework/Versions/A/Resources/Info.plist
+    ln -s A dist/Ollama.app/Contents/Frameworks/Squirrel.framework/Versions/Current
+    ln -s Versions/Current/Resources dist/Ollama.app/Contents/Frameworks/Squirrel.framework/Resources
+    ln -s Versions/Current/Squirrel dist/Ollama.app/Contents/Frameworks/Squirrel.framework/Squirrel
+
+    # Update the version in the Info.plist
+    plutil -replace CFBundleShortVersionString -string "$VERSION" dist/Ollama.app/Contents/Info.plist
+    plutil -replace CFBundleVersion -string "$VERSION" dist/Ollama.app/Contents/Info.plist
+
+    # Setup the ollama binaries
+    mkdir -p dist/Ollama.app/Contents/Resources
+    if [ -d dist/darwin-amd64 ]; then
+        lipo -create -output dist/Ollama.app/Contents/Resources/ollama dist/darwin-amd64/ollama dist/darwin-arm64/ollama
+        cp dist/darwin-amd64/lib/ollama/*.so dist/darwin-amd64/lib/ollama/*.dylib dist/Ollama.app/Contents/Resources/
+    else
+        cp -a dist/darwin/ollama dist/Ollama.app/Contents/Resources/ollama
+        cp dist/darwin/*.so dist/darwin/*.dylib dist/Ollama.app/Contents/Resources/
+    fi
+    chmod a+x dist/Ollama.app/Contents/Resources/ollama
+
+    # Sign
+    if [ -n "$APPLE_IDENTITY" ]; then
+        codesign -f --timestamp -s "$APPLE_IDENTITY" --identifier ai.ollama.ollama --options=runtime dist/Ollama.app/Contents/Resources/ollama
+        for lib in dist/Ollama.app/Contents/Resources/*.so dist/Ollama.app/Contents/Resources/*.dylib ; do
+            codesign -f --timestamp -s "$APPLE_IDENTITY" --identifier ai.ollama.ollama --options=runtime ${lib}
+        done
+        codesign -f --timestamp -s "$APPLE_IDENTITY" --identifier com.electron.ollama --deep --options=runtime dist/Ollama.app
+    fi
+
+    rm -f dist/Ollama-darwin.zip
+    ditto -c -k --keepParent dist/Ollama.app dist/Ollama-darwin.zip
+    (cd dist/Ollama.app/Contents/Resources/; tar -cf - ollama *.so *.dylib) | gzip -9vc > dist/ollama-darwin.tgz
+
+    # Notarize and Staple
+    if [ -n "$APPLE_IDENTITY" ]; then
+        $(xcrun -f notarytool) submit dist/Ollama-darwin.zip --wait --timeout 10m --apple-id "$APPLE_ID" --password "$APPLE_PASSWORD" --team-id "$APPLE_TEAM_ID"
+        rm -f dist/Ollama-darwin.zip
+        $(xcrun -f stapler) staple dist/Ollama.app
+        ditto -c -k --keepParent dist/Ollama.app dist/Ollama-darwin.zip
+
+        rm -f dist/Ollama.dmg
+
+        (cd dist && ../scripts/create-dmg.sh \
+            --volname "${VOL_NAME}" \
+            --volicon ../app/darwin/Ollama.app/Contents/Resources/icon.icns \
+            --background ../app/assets/background.png \
+            --window-pos 200 120 \
+            --window-size 800 400 \
+            --icon-size 128 \
+            --icon "Ollama.app" 200 190 \
+            --hide-extension "Ollama.app" \
+            --app-drop-link 600 190 \
+            --text-size 12 \
+            "Ollama.dmg" \
+            "Ollama.app" \
+        ; )
+        rm -f dist/rw*.dmg
+
+        codesign -f --timestamp -s "$APPLE_IDENTITY" --identifier ai.ollama.ollama --options=runtime dist/Ollama.dmg
+        $(xcrun -f notarytool) submit dist/Ollama.dmg --wait --timeout 10m --apple-id "$APPLE_ID" --password "$APPLE_PASSWORD" --team-id "$APPLE_TEAM_ID"
+        $(xcrun -f stapler) staple dist/Ollama.dmg
+    else
+        echo "WARNING: Code signing disabled, this bundle will not work for upgrade testing"
+    fi
 }
 
 if [ "$#" -eq 0 ]; then
@@ -87,7 +195,7 @@ for CMD in "$@"; do
     case $CMD in
         build) _build_darwin ;;
         sign) _sign_darwin ;;
-        macapp) _build_macapp ;;
+        app) _build_macapp ;;
         *) usage ;;
     esac
 done