From a58366e2f1ef121ea9cc0dc64eb54440f34df928 Mon Sep 17 00:00:00 2001
From: ardocrat <ardocrat@proton.me>
Date: Thu, 20 Jun 2024 13:27:14 +0300
Subject: [PATCH] build: remove cargo-bundle fields, move platforms out of
 scripts dir

---
 .gitignore                                         |   6 +++---
 Cargo.toml                                         |  13 -------------
 {scripts/linux => linux}/Grim.AppDir/.DirIcon      |   0
 {scripts/linux => linux}/Grim.AppDir/grim.desktop  |   0
 {scripts/linux => linux}/Grim.AppDir/grim.png      | Bin
 .../macos => macos}/Grim.app/Contents/Info.plist   |   0
 .../Grim.app/Contents/Resources/AppIcon.icns       | Bin
 .../Grim.app/Contents/_CodeSignature/CodeResources |   0
 scripts/release_linux.sh                           |   4 ++--
 scripts/release_macos.sh                           |   8 ++++----
 10 files changed, 9 insertions(+), 22 deletions(-)
 rename {scripts/linux => linux}/Grim.AppDir/.DirIcon (100%)
 rename {scripts/linux => linux}/Grim.AppDir/grim.desktop (100%)
 rename {scripts/linux => linux}/Grim.AppDir/grim.png (100%)
 rename {scripts/macos => macos}/Grim.app/Contents/Info.plist (100%)
 rename {scripts/macos => macos}/Grim.app/Contents/Resources/AppIcon.icns (100%)
 rename {scripts/macos => macos}/Grim.app/Contents/_CodeSignature/CodeResources (100%)

diff --git a/.gitignore b/.gitignore
index 54d662c..8115a35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,7 @@ android/keystore.properties
 target
 .cargo/
 app/src/main/jniLibs
-scripts/macos/Grim.app/Contents/MacOS/grim-bin
-scripts/macos/cert.pem
-scripts/linux/Grim.AppDir/AppRun
+macos/Grim.app/Contents/MacOS/grim-bin
+macos/cert.pem
+linux/Grim.AppDir/AppRun
 .intentionally-empty-file.o
\ No newline at end of file
diff --git a/Cargo.toml b/Cargo.toml
index 8814a69..3d74509 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,19 +9,6 @@ keywords = [ "crypto", "grin", "mimblewimble" ]
 edition = "2021"
 build = "src/build/build.rs"
 
-[package.metadata.bundle]
-name = "Grim"
-identifier = "mw.gri"
-icon = ["img/icon.png"]
-version = "0.1.0"
-resources = ["img"]
-category = "Finance"
-short_description = "Cross-platform GUI for Grin."
-long_description = """
-Cross-platform GUI for Grin on Rust with focus on usability and availability to be used by anyone, anywhere.
-"""
-deb_depends = ["libssl-dev", "pkg-config"]
-
 [lib]
 name="grim"
 
diff --git a/scripts/linux/Grim.AppDir/.DirIcon b/linux/Grim.AppDir/.DirIcon
similarity index 100%
rename from scripts/linux/Grim.AppDir/.DirIcon
rename to linux/Grim.AppDir/.DirIcon
diff --git a/scripts/linux/Grim.AppDir/grim.desktop b/linux/Grim.AppDir/grim.desktop
similarity index 100%
rename from scripts/linux/Grim.AppDir/grim.desktop
rename to linux/Grim.AppDir/grim.desktop
diff --git a/scripts/linux/Grim.AppDir/grim.png b/linux/Grim.AppDir/grim.png
similarity index 100%
rename from scripts/linux/Grim.AppDir/grim.png
rename to linux/Grim.AppDir/grim.png
diff --git a/scripts/macos/Grim.app/Contents/Info.plist b/macos/Grim.app/Contents/Info.plist
similarity index 100%
rename from scripts/macos/Grim.app/Contents/Info.plist
rename to macos/Grim.app/Contents/Info.plist
diff --git a/scripts/macos/Grim.app/Contents/Resources/AppIcon.icns b/macos/Grim.app/Contents/Resources/AppIcon.icns
similarity index 100%
rename from scripts/macos/Grim.app/Contents/Resources/AppIcon.icns
rename to macos/Grim.app/Contents/Resources/AppIcon.icns
diff --git a/scripts/macos/Grim.app/Contents/_CodeSignature/CodeResources b/macos/Grim.app/Contents/_CodeSignature/CodeResources
similarity index 100%
rename from scripts/macos/Grim.app/Contents/_CodeSignature/CodeResources
rename to macos/Grim.app/Contents/_CodeSignature/CodeResources
diff --git a/scripts/release_linux.sh b/scripts/release_linux.sh
index 8abca1d..0248296 100755
--- a/scripts/release_linux.sh
+++ b/scripts/release_linux.sh
@@ -22,7 +22,7 @@ cargo install cargo-zigbuild
 cargo zigbuild --release --target ${arch}
 
 # Create AppImage with https://github.com/AppImage/appimagetool
-cp target/${arch}/release/grim scripts/linux/Grim.AppDir/AppRun
+cp target/${arch}/release/grim linux/Grim.AppDir/AppRun
 rm target/${arch}/release/*.AppImage
-appimagetool scripts/linux/Grim.AppDir
+appimagetool linux/Grim.AppDir
 mv *.AppImage target/${arch}/release/Grim-0.1.0-linux-$1.AppImage
\ No newline at end of file
diff --git a/scripts/release_macos.sh b/scripts/release_macos.sh
index 1e9a68f..b8a2d39 100755
--- a/scripts/release_macos.sh
+++ b/scripts/release_macos.sh
@@ -31,15 +31,15 @@ cd ..
 cargo install cargo-zigbuild
 cargo zigbuild --release --target ${arch}
 rm .intentionally-empty-file.o
-yes | cp -rf target/${arch}/release/grim scripts/macos/Grim.app/Contents/MacOS/grim-bin
+yes | cp -rf target/${arch}/release/grim macos/Grim.app/Contents/MacOS/grim-bin
 
 ### Sign .app before distribution:
 ### rcodesign generate-self-signed-certificate
-### rcodesign sign --pem-file cert.pem scripts/macos/Grim.app
+### rcodesign sign --pem-file cert.pem macos/Grim.app
 
 # Create release package
 FILE_NAME=Grim-0.1.0-macos-$1.zip
 rm target/${arch}/release/${FILE_NAME}
-cd scripts/macos
+cd macos
 zip -r ${FILE_NAME} Grim.app
-mv ${FILE_NAME} ../../target/${arch}/release
\ No newline at end of file
+mv ${FILE_NAME} ../target/${arch}/release
\ No newline at end of file