update ci and packaging files

.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"
+            xattr -rc "MarbleBlast Gold.app"
-            cp "MarbleBlast Platinum.app/Contents/Entitlements.plist" .
+            cp "MarbleBlast Gold.app/Contents/Entitlements.plist" .
-            codesign --deep --entitlements Entitlements.plist -fs - "MarbleBlast Platinum.app"
+            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
+            create-dmg --dmg-title="Marble Blast Gold" "MarbleBlast Gold.app" || true
-            rm -rf "macos-dist/MarbleBlast Platinum.app.in"
+            rm -rf "macos-dist/MarbleBlast Gold.app.in"
-            mv "marblegame vpipeline.git.tag.dmg" "MBHaxe-Platinum-Mac.dmg"
+            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

macos-dist/MarbleBlast Gold.app.in/Contents/Entitlements.plist

@@ -4,9 +4,5 @@
 <dict>
 	<key>com.apple.security.app-sandbox</key>
 	<false/>
-    <key>com.apple.security.network.client</key>
-    <true/>
-    <key>com.apple.security.network.server</key>
-    <true/>
 </dict>
 </plist>

macos-dist/MarbleBlast Gold.app.in/Contents/Info.plist

@@ -9,7 +9,7 @@
 	<key>CFBundleIconFile</key>
 	<string>icon.icns</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.randomityguy.mbhaxe.mbp</string>
+	<string>com.randomityguy.mbhaxe.mbg</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>@VERSION@</string>
 	<key>CFBundleSignature</key>
-	<string>hxmp</string>
+	<string>hxmg</string>
 	<key>CFBundleVersion</key>
 	<string>@VERSION@</string>
 	<key>NSAppleScriptEnabled</key>

package-macos.sh

@@ -5,21 +5,21 @@ if [ -z "$1" ]; then
 	exit 1
 fi
 
-if [ ! -d "macos-dist/MarbleBlast Platinum.app" ]; then
+if [ ! -d "macos-dist/MarbleBlast Gold.app" ]; then
-	cp -r "macos-dist/MarbleBlast Platinum.app.in" "macos-dist/MarbleBlast Platinum.app" || exit $?
+	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."