Merge pull request #1 from FrankMerriman/main

Resolved missing .dll dependency

Author: the0cp

.github/workflows/build.yml

@@ -149,17 +149,128 @@ jobs:
         shell: bash
         working-directory: aseprite
         run: ninja -C build
-
+        
       - name: Clean Up Build folder
         shell: bash
         working-directory: aseprite/build/bin
         run: find . -mindepth 1 ! \( -name 'aseprite' -o -name 'aseprite.exe' -o -name 'data' -prune \) -exec rm -rf {} +
-
+      
       - name: Make portable zip
         working-directory: aseprite/build/bin
         run: echo '# This file is here so Aseprite behaves as a portable program' > aseprite.ini
+        
+      - name: Download and extract OpenSSL DLLs (Windows)
+        if: runner.os == 'Windows'
+        shell: pwsh
+        working-directory: aseprite/build/bin
+        run: |
+          # Download the zip from https://wiki.overbyte.eu/wiki/index.php/ICS_Download
+          # This binary provider comes from a suggested 3rd party list on the official opensll github
+          Invoke-WebRequest -Uri "https://wiki.overbyte.eu/arch/openssl-1.1.1w-win64.zip" -OutFile dlls.zip
+          
+          # Extract dlls into same path as the .exe
+          Expand-Archive -Path dlls.zip -DestinationPath temp_dlls
+          Copy-Item temp_dlls\libcrypto-1_1-x64.dll .
+          Copy-Item temp_dlls\libssl-1_1-x64.dll .
+
+          # Remove the ssl zip + temp folder from the final release
+          Remove-Item -Recurse -Force temp_dlls
+          Remove-Item dlls.zip
+
+      - name: Create macOS .app bundle
+        if: runner.os == 'macOS'
+        shell: bash
+        working-directory: aseprite/build/bin
+        run: |
+          mkdir -p Aseprite.app/Contents/MacOS
+          mkdir -p Aseprite.app/Contents/Resources
+      
+          # Move the built binary into the app bundle
+          mv aseprite Aseprite.app/Contents/MacOS/
+          mv data Aseprite.app/Contents/Resources/
+          # Don't know if ini is needed on mac
+          mv aseprite.ini Aseprite.app/Contents/Resources/
+
+          # Create app icns
+          mkdir -p Aseprite.iconset
+          for file in Aseprite.app/Contents/Resources/data/icons/ase*.png; do
+              num=$(basename "$file" | grep -E -o "\d+")
+              if (( num % 16 == 0 )); then
+                  cp "$file" "Aseprite.iconset/icon_${num}x${num}.png"
+              fi
+          done
+          iconutil -c icns Aseprite.iconset
+          rm -R Aseprite.iconset
+          mv Aseprite.icns Aseprite.app/Contents/Resources/
+      
+          # Create minimal Info.plist
+          cat > Aseprite.app/Contents/Info.plist <<EOF
+          <?xml version="1.0" encoding="UTF-8"?>
+          <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+          <plist version="1.0">
+          <dict>
+              <key>CFBundleExecutable</key>
+              <string>aseprite</string>
+              <key>CFBundleIdentifier</key>
+              <string>org.aseprite.app</string>
+              <key>CFBundleName</key>
+              <string>Aseprite</string>
+              <key>CFBundleVersion</key>
+              <string>${{ needs.create-release.outputs.release-tag }}</string>
+              <key>CFBundlePackageType</key>
+              <string>APPL</string>
+              <key>CFBundleIconFile</key>
+              <string>Aseprite.icns</string>
+          </dict>
+          </plist>
+          EOF
+
+      - name: Create release (macOS)
+        if: runner.os == 'macOS'
+        shell: bash
+        working-directory: aseprite/build/bin
+        run: |
+          # Create the folder to hold the .app and the helper script
+          mkdir AsepriteBundle
+          mv Aseprite.app AsepriteBundle/
+
+          # Need to overcome mac security for external unsigned apps
+          # https://github.com/electron-userland/electron-builder/issues/8191
+          cat << 'EOF' > AsepriteBundle/README.md
+          # Fixing "damaged and can't be opened" on macOS
+
+          If you see an error saying Aseprite is “damaged and can’t be opened,” this is caused by macOS quarantine flags applied when downloading from the internet.
+          
+          Follow these steps to fix it:
+          
+          1. Open Terminal:
+             - Press Command + Spacebar
+             - Type "Terminal" and press Enter
+          
+          2. In the Terminal window, type the word `cd` followed by a space, then drag the folder containing this app into the Terminal window. This will insert the folder path.
+          
+             Example:
+             cd /Users/yourname/Downloads/AsepriteBundle
+          
+          3. Press Enter
+          
+          4. Copy and paste the following line
+             xattr -rd com.apple.quarantine Aseprite.app
+          
+          5. Press Enter
+          
+          After that, you should be able to double-click Aseprite.app and open it normally.
+          
+          You only need to do this once after downloading.
+
+          EOF
+      
+          # Create the zip, preserving metadata
+          ditto -c -k --sequesterRsrc --keepParent AsepriteBundle Aseprite-${{ needs.create-release.outputs.release-tag }}-${{ runner.os }}.zip
+
 
-      - name: Create release
+      - name: Create release (Linux + Windows)
+        if: runner.os != 'macOS'
         working-directory: aseprite/build/bin
         run: 7z -tzip a Aseprite-${{ needs.create-release.outputs.release-tag }}-${{ runner.os }}.zip *