diff --git a/.circleci/config.yml b/.circleci/config.yml index 249f24c9..ec1cdce2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -268,7 +268,7 @@ jobs: command: | cd ~/MBHaxe ./package-macos.sh v$COMMIT_TAG - cd "macos-dist/MarbleBlast Platinum.app/Contents/MacOS" + cd "macos-dist/MarbleBlast Gold.app/Contents/MacOS" otool -L marblegame cd ../Frameworks cp /usr/local/lib/{ui.hdll,openal.hdll,fmt.hdll,sdl.hdll,libSDL2-2.0.0.dylib,ssl.hdll,uv.hdll,datachannel.hdll} . @@ -292,27 +292,27 @@ jobs: name: Sign app bundle command: | cd ~/MBHaxe/macos-dist - xattr -rc "MarbleBlast Platinum.app" - cp "MarbleBlast Platinum.app/Contents/Entitlements.plist" . - codesign --deep --entitlements Entitlements.plist -fs - "MarbleBlast Platinum.app" + xattr -rc "MarbleBlast Gold.app" + cp "MarbleBlast Gold.app/Contents/Entitlements.plist" . + codesign --deep --entitlements Entitlements.plist -fs - "MarbleBlast Gold.app" - run: name: ZIP Bundle command: | cd ~/MBHaxe/macos-dist npm install -g create-dmg - create-dmg --dmg-title="Marble Blast Platinum" "MarbleBlast Platinum.app" || true - rm -rf "macos-dist/MarbleBlast Platinum.app.in" - mv "marblegame vpipeline.git.tag.dmg" "MBHaxe-Platinum-Mac.dmg" + create-dmg --dmg-title="Marble Blast Gold" "MarbleBlast Gold.app" || true + rm -rf "macos-dist/MarbleBlast Gold.app.in" + mv "marblegame vpipeline.git.tag.dmg" "MBHaxe-Gold-Mac.dmg" # zip -r MBHaxe-Ultra-Mac.zip macos-dist/ - run: name: Upload to Artifact Storage command: | - scp -o StrictHostKeyChecking=no -i $KEYPATH -P $PORT ~/MBHaxe/macos-dist/MBHaxe-Platinum-Mac.dmg $REMOTEDIR/MBHaxe-Platinum-Mac.dmg + scp -o StrictHostKeyChecking=no -i $KEYPATH -P $PORT ~/MBHaxe/macos-dist/MBHaxe-Gold-Mac.dmg $REMOTEDIR/MBHaxe-Gold-Mac.dmg # - store_artifacts: - # path: ~/MBHaxe/MBHaxe-Platinum-Mac.zip + # path: ~/MBHaxe/MBHaxe-Gold-Mac.zip build-win: executor: @@ -443,14 +443,14 @@ jobs: name: Zip bundle command: | cd ~/project - 7z a MBHaxe-Platinum-Win.zip release/ + 7z a MBHaxe-Gold-Win.zip release/ - run: name: Upload to Artifact Storage command: | - scp -o StrictHostKeyChecking=no -i $KEYPATH -P $PORT ~/project/MBHaxe-Platinum-Win.zip $REMOTEDIR/MBHaxe-Platinum-Win.zip + scp -o StrictHostKeyChecking=no -i $KEYPATH -P $PORT ~/project/MBHaxe-Gold-Win.zip $REMOTEDIR/MBHaxe-Gold-Win.zip # - store_artifacts: - # path: ~/project/MBHaxe-Platinum-Win.zip + # path: ~/project/MBHaxe-Gold-Win.zip # Invoke jobs via workflows diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Entitlements.plist b/macos-dist/MarbleBlast Gold.app.in/Contents/Entitlements.plist similarity index 66% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Entitlements.plist rename to macos-dist/MarbleBlast Gold.app.in/Contents/Entitlements.plist index 6a6864e0..e89b7f32 100644 --- a/macos-dist/MarbleBlast Platinum.app.in/Contents/Entitlements.plist +++ b/macos-dist/MarbleBlast Gold.app.in/Contents/Entitlements.plist @@ -4,9 +4,5 @@ com.apple.security.app-sandbox - com.apple.security.network.client - - com.apple.security.network.server - diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/SDL.txt b/macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/SDL.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/SDL.txt rename to macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/SDL.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/bungee.font.txt b/macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/bungee.font.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/bungee.font.txt rename to macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/bungee.font.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/gluten.font.txt b/macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/gluten.font.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/gluten.font.txt rename to macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/gluten.font.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/hashlink.txt b/macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/hashlink.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/hashlink.txt rename to macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/hashlink.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/haxe.txt b/macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/haxe.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/haxe.txt rename to macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/haxe.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/heaps.txt b/macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/heaps.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/heaps.txt rename to macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/heaps.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/incompetech.txt b/macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/incompetech.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/incompetech.txt rename to macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/incompetech.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/libjpeg-turbo.txt b/macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/libjpeg-turbo.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/libjpeg-turbo.txt rename to macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/libjpeg-turbo.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/libogg.txt b/macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/libogg.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/libogg.txt rename to macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/libogg.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/libpng.txt b/macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/libpng.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/libpng.txt rename to macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/libpng.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/libuv.txt b/macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/libuv.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/libuv.txt rename to macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/libuv.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/libvorbis.txt b/macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/libvorbis.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/libvorbis.txt rename to macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/libvorbis.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/openal.txt b/macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/openal.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/openal.txt rename to macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/openal.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/zlib.txt b/macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/zlib.txt old mode 100755 new mode 100644 similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/zlib.txt rename to macos-dist/MarbleBlast Gold.app.in/Contents/Frameworks/licenses/zlib.txt diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Info.plist b/macos-dist/MarbleBlast Gold.app.in/Contents/Info.plist similarity index 93% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/Info.plist rename to macos-dist/MarbleBlast Gold.app.in/Contents/Info.plist index 1f7073c4..015801b4 100644 --- a/macos-dist/MarbleBlast Platinum.app.in/Contents/Info.plist +++ b/macos-dist/MarbleBlast Gold.app.in/Contents/Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile icon.icns CFBundleIdentifier - com.randomityguy.mbhaxe.mbp + com.randomityguy.mbhaxe.mbg CFBundleInfoDictionaryVersion 6.0 CFBundleName @@ -19,7 +19,7 @@ CFBundleShortVersionString @VERSION@ CFBundleSignature - hxmp + hxmg CFBundleVersion @VERSION@ NSAppleScriptEnabled diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/MacOS/.gitkeep b/macos-dist/MarbleBlast Gold.app.in/Contents/MacOS/.gitkeep similarity index 100% rename from macos-dist/MarbleBlast Platinum.app.in/Contents/MacOS/.gitkeep rename to macos-dist/MarbleBlast Gold.app.in/Contents/MacOS/.gitkeep diff --git a/macos-dist/MarbleBlast Gold.app.in/Contents/Resources/icon.icns b/macos-dist/MarbleBlast Gold.app.in/Contents/Resources/icon.icns new file mode 100644 index 00000000..f9f161fa Binary files /dev/null and b/macos-dist/MarbleBlast Gold.app.in/Contents/Resources/icon.icns differ diff --git a/macos-dist/MarbleBlast Platinum.app.in/Contents/Resources/icon.icns b/macos-dist/MarbleBlast Platinum.app.in/Contents/Resources/icon.icns deleted file mode 100644 index 9915d8c9..00000000 Binary files a/macos-dist/MarbleBlast Platinum.app.in/Contents/Resources/icon.icns and /dev/null differ diff --git a/package-macos.sh b/package-macos.sh index 63f956fc..7671418b 100755 --- a/package-macos.sh +++ b/package-macos.sh @@ -5,21 +5,21 @@ if [ -z "$1" ]; then exit 1 fi -if [ ! -d "macos-dist/MarbleBlast Platinum.app" ]; then - cp -r "macos-dist/MarbleBlast Platinum.app.in" "macos-dist/MarbleBlast Platinum.app" || exit $? +if [ ! -d "macos-dist/MarbleBlast Gold.app" ]; then + cp -r "macos-dist/MarbleBlast Gold.app.in" "macos-dist/MarbleBlast Gold.app" || exit $? else - cp "macos-dist/MarbleBlast Platinum.app.in/Contents/Info.plist" "macos-dist/MarbleBlast Platinum.app/Contents/Info.plist" || exit $? + cp "macos-dist/MarbleBlast Gold.app.in/Contents/Info.plist" "macos-dist/MarbleBlast Gold.app/Contents/Info.plist" || exit $? fi # Replace version string -sed -i "" -e "s/@VERSION@/$1/" "macos-dist/MarbleBlast Platinum.app/Contents/Info.plist" || exit $? +sed -i "" -e "s/@VERSION@/$1/" "macos-dist/MarbleBlast Gold.app/Contents/Info.plist" || exit $? # Copy binary -cp native/marblegame "macos-dist/MarbleBlast Platinum.app/Contents/MacOS/marblegame" || exit $? +cp native/marblegame "macos-dist/MarbleBlast Gold.app/Contents/MacOS/marblegame" || exit $? # Copy data -cp -r data "macos-dist/MarbleBlast Platinum.app/Contents/Resources/" || exit $? +cp -r data "macos-dist/MarbleBlast Gold.app/Contents/Resources/" || exit $? -cd "macos-dist/MarbleBlast Platinum.app/Contents/MacOS/" +cd "macos-dist/MarbleBlast Gold.app/Contents/MacOS/" install_name_tool -change ui.hdll @rpath/ui.hdll \ -change openal.hdll @rpath/openal.hdll \ -change fmt.hdll @rpath/fmt.hdll \ @@ -31,6 +31,6 @@ install_name_tool -change ui.hdll @rpath/ui.hdll \ echo "Tried to update dylib references in executable." echo "Please use otool -L to ensure that the libraries are referenced as @rpath. This is usually an issue with libSDL2-2.0.0.dylib" echo -echo "Please fill macos-dist/MarbleBlast Platinum.app/Contents/Frameworks with the dylibs," +echo "Please fill macos-dist/MarbleBlast Gold.app/Contents/Frameworks with the dylibs," echo "and use install_name_tool to update their IDs to match with marblegame executable."