diff --git a/.gitignore b/.gitignore index 0ac2ce4..dedd4c0 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,6 @@ android/keystore.properties /target /.cargo/ /app/src/main/jniLibs -/macos/Grim.app/Contents/MacOS/grim-bin -/macos/cert.pem +/scripts/macos/Grim.app/Contents/MacOS/grim-bin +/scripts/macos/cert.pem .intentionally-empty-file.o \ No newline at end of file diff --git a/macos/Grim.app/Contents/Info.plist b/scripts/macos/Grim.app/Contents/Info.plist similarity index 96% rename from macos/Grim.app/Contents/Info.plist rename to scripts/macos/Grim.app/Contents/Info.plist index 4f2065c..6e61fd5 100644 --- a/macos/Grim.app/Contents/Info.plist +++ b/scripts/macos/Grim.app/Contents/Info.plist @@ -18,7 +18,7 @@ AppIcon CFBundleIdentifier - mw.grin.macos + mw.gri.macos CFBundleInfoDictionaryVersion 6.0 diff --git a/macos/Grim.app/Contents/Resources/AppIcon.icns b/scripts/macos/Grim.app/Contents/Resources/AppIcon.icns similarity index 100% rename from macos/Grim.app/Contents/Resources/AppIcon.icns rename to scripts/macos/Grim.app/Contents/Resources/AppIcon.icns diff --git a/macos/Grim.app/Contents/_CodeSignature/CodeResources b/scripts/macos/Grim.app/Contents/_CodeSignature/CodeResources similarity index 100% rename from macos/Grim.app/Contents/_CodeSignature/CodeResources rename to scripts/macos/Grim.app/Contents/_CodeSignature/CodeResources diff --git a/scripts/release_macos.sh b/scripts/release_macos.sh index 0420860..3a48464 100755 --- a/scripts/release_macos.sh +++ b/scripts/release_macos.sh @@ -31,13 +31,15 @@ cd .. cargo install cargo-zigbuild cargo zigbuild --release --target ${arch} rm .intentionally-empty-file.o -yes | cp -rf target/${arch}/release/grim macos/Grim.app/Contents/MacOS/grim-bin +yes | cp -rf target/${arch}/release/grim scripts/macos/Grim.app/Contents/MacOS/grim-bin ### Sign .app before distribution: ### rcodesign generate-self-signed-certificate -### rcodesign sign --pem-file test.pem macos/Grim.app +### rcodesign sign --pem-file test.pem scripts/macos/Grim.app # Create release package FILE_NAME=Grim-0.1.0-macos-$1.zip -zip ${FILE_NAME} target/${arch}/release/grim macos/Grim.app -mv -f ${FILE_NAME} target/${arch}/release +rm target/${arch}/release/${FILE_NAME} +cd scripts/macos +zip -r ${FILE_NAME} Grim.app +mv ${FILE_NAME} ../../target/${arch}/release \ No newline at end of file