thirdpartymirrors/MBHaxe
1
0
Fork 0
mirror of https://github.com/RandomityGuy/MBHaxe.git synced 2025-10-30 08:11:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

build pls

Browse source
This commit is contained in:
RandomityGuy 2023-07-09 23:13:17 +05:30
parent d98632d7e3
commit b935327449
23 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
.circleci/config.yml
View file

@ -34,7 +34,7 @@ jobs:
name: Install Haxe name: Install Haxe
command: | command: |
set -eux set -eux
download_url="https://github.com/HaxeFoundation/haxe/releases/download/4.2.5/haxe-4.2.5-osx.tar.gz" download_url="https://github.com/HaxeFoundation/haxe/releases/download/4.3.1/haxe-4.3.1-osx.tar.gz"
echo "Downloading [$download_url]..." echo "Downloading [$download_url]..."
mkdir /tmp/haxe mkdir /tmp/haxe
curl -fsSL --retry 3 --retry-delay 5 "$download_url" -o /tmp/haxe.tar.gz curl -fsSL --retry 3 --retry-delay 5 "$download_url" -o /tmp/haxe.tar.gz
@ -245,7 +245,7 @@ jobs:
command: | command: |
cd ~/MBHaxe cd ~/MBHaxe
./package-macos.sh v$COMMIT_TAG ./package-macos.sh v$COMMIT_TAG
cd "macos-dist/MarbleBlast Platinum.app/Contents/MacOS" cd "macos-dist/MarbleBlast Ultra.app/Contents/MacOS"
otool -L marblegame otool -L marblegame
cd ../Frameworks cd ../Frameworks
cp /usr/local/lib/{ui.hdll,openal.hdll,fmt.hdll,sdl.hdll,libSDL2-2.0.0.dylib,ssl.hdll,uv.hdll} . cp /usr/local/lib/{ui.hdll,openal.hdll,fmt.hdll,sdl.hdll,libSDL2-2.0.0.dylib,ssl.hdll,uv.hdll} .
@ -269,21 +269,21 @@ jobs:
name: Sign app bundle name: Sign app bundle
command: | command: |
cd ~/MBHaxe/macos-dist cd ~/MBHaxe/macos-dist
xattr -rc "MarbleBlast Platinum.app" xattr -rc "MarbleBlast Ultra.app"
cp "MarbleBlast Platinum.app/Contents/Entitlements.plist" . cp "MarbleBlast Ultra.app/Contents/Entitlements.plist" .
codesign --deep --entitlements Entitlements.plist -fs - "MarbleBlast Platinum.app" codesign --deep --entitlements Entitlements.plist -fs - "MarbleBlast Ultra.app"
- run: - run:
name: ZIP Bundle name: ZIP Bundle
command: | command: |
cd ~/MBHaxe cd ~/MBHaxe
rm -rf "macos-dist/MarbleBlast Platinum.app.in" rm -rf "macos-dist/MarbleBlast Ultra.app.in"
zip -r MBHaxe-Platinum-Mac.zip macos-dist/ zip -r MBHaxe-Ultra-Mac.zip macos-dist/
- run: - run:
name: Upload to Artifact Storage name: Upload to Artifact Storage
command: | command: |
scp -o StrictHostKeyChecking=no -i $KEYPATH -P $PORT ~/MBHaxe/MBHaxe-Platinum-Mac.zip $REMOTEDIR/MBHaxe-Platinum-Mac.zip scp -o StrictHostKeyChecking=no -i $KEYPATH -P $PORT ~/MBHaxe/MBHaxe-Ultra-Mac.zip $REMOTEDIR/MBHaxe-Ultra-Mac.zip
# - store_artifacts: # - store_artifacts:
# path: ~/MBHaxe/MBHaxe-Platinum-Mac.zip # path: ~/MBHaxe/MBHaxe-Platinum-Mac.zip
@ -322,7 +322,7 @@ jobs:
- run: - run:
name: Install Haxe name: Install Haxe
command: | command: |
download_url="https://github.com/HaxeFoundation/haxe/releases/download/4.2.5/haxe-4.2.5-win64.zip" download_url="https://github.com/HaxeFoundation/haxe/releases/download/4.3.1/haxe-4.3.1-win64.zip"
echo "Downloading [$download_url]..." echo "Downloading [$download_url]..."
mkdir /tmp/haxe mkdir /tmp/haxe
curl -fsSL --retry 3 --retry-delay 5 "$download_url" -o /tmp/haxe.zip curl -fsSL --retry 3 --retry-delay 5 "$download_url" -o /tmp/haxe.zip
@ -405,12 +405,12 @@ jobs:
name: Zip bundle name: Zip bundle
command: | command: |
cd ~/project cd ~/project
7z a MBHaxe-Platinum-Win.zip release/ 7z a MBHaxe-Ultra-Win.zip release/
- run: - run:
name: Upload to Artifact Storage name: Upload to Artifact Storage
command: | 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-Ultra-Win.zip $REMOTEDIR/MBHaxe-Ultra-Win.zip
# - store_artifacts: # - store_artifacts:
# path: ~/project/MBHaxe-Platinum-Win.zip # path: ~/project/MBHaxe-Platinum-Win.zip

2
index.html
View file

@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>Marble Blast Platinum Haxe Port</title> <title>Marble Blast Ultra Haxe Port</title>
<link rel="shortcut icon" href="./data/icon.png" id="favicon"> <link rel="shortcut icon" href="./data/icon.png" id="favicon">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
<link rel="manifest" href="/data/manifest.json"> <link rel="manifest" href="/data/manifest.json">

BIN
macos-dist/MarbleBlast Platinum.app.in/Contents/Resources/icon.icns
View file

Binary file not shown.

0
macos-dist/MarbleBlast Platinum.app.in/Contents/Entitlements.plist → macos-dist/MarbleBlast Ultra.app.in/Contents/Entitlements.plist
View file

0
macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/SDL.txt → macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/SDL.txt Executable file → Normal file
View file

0
macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/bungee.font.txt → macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/bungee.font.txt Executable file → Normal file
View file

0
macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/gluten.font.txt → macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/gluten.font.txt Executable file → Normal file
View file

0
macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/hashlink.txt → macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/hashlink.txt Executable file → Normal file
View file

0
macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/haxe.txt → macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/haxe.txt Executable file → Normal file
View file

0
macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/heaps.txt → macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/heaps.txt Executable file → Normal file
View file

0
macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/incompetech.txt → macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/incompetech.txt Executable file → Normal file
View file

0
macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/libjpeg-turbo.txt → macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/libjpeg-turbo.txt Executable file → Normal file
View file

0
macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/libogg.txt → macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/libogg.txt Executable file → Normal file
View file

0
macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/libpng.txt → macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/libpng.txt Executable file → Normal file
View file

0
macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/libuv.txt → macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/libuv.txt Executable file → Normal file
View file

0
macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/libvorbis.txt → macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/libvorbis.txt Executable file → Normal file
View file

0
macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/openal.txt → macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/openal.txt Executable file → Normal file
View file

0
macos-dist/MarbleBlast Platinum.app.in/Contents/Frameworks/licenses/zlib.txt → macos-dist/MarbleBlast Ultra.app.in/Contents/Frameworks/licenses/zlib.txt Executable file → Normal file
View file

2
macos-dist/MarbleBlast Platinum.app.in/Contents/Info.plist → macos-dist/MarbleBlast Ultra.app.in/Contents/Info.plist
View file

@ -9,7 +9,7 @@
<key>CFBundleIconFile</key> <key>CFBundleIconFile</key>
<string>icon.icns</string> <string>icon.icns</string>
<key>CFBundleIdentifier</key> <key>CFBundleIdentifier</key>
<string>com.randomityguy.mbhaxe.mbp</string> <string>com.randomityguy.mbhaxe.mbu</string>
<key>CFBundleInfoDictionaryVersion</key> <key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string> <string>6.0</string>
<key>CFBundleName</key> <key>CFBundleName</key>

0
macos-dist/MarbleBlast Platinum.app.in/Contents/MacOS/.gitkeep → macos-dist/MarbleBlast Ultra.app.in/Contents/MacOS/.gitkeep
View file

BIN
macos-dist/MarbleBlast Ultra.app.in/Contents/Resources/icon.icns Normal file
View file

Binary file not shown.

2
macos-dist/README.txt
View file

@ -4,4 +4,4 @@ It will say "Unverified Developer". Go to System Preferences (or System Settings
If you get error saying that the app is "damaged," If you get error saying that the app is "damaged,"
please remove the quarantine flag. please remove the quarantine flag.
sudo xattr -r -d com.apple.quarantine "MarbleBlast Platinum.app" sudo xattr -r -d com.apple.quarantine "MarbleBlast Ultra.app"

6
src/mis/MisParser.hx
View file

@ -48,13 +48,13 @@ class MisParser {
// Read the localization strings // Read the localization strings
var lfile = ResourceLoader.getFileEntry("data/englishStrings.inf"); var lfile = ResourceLoader.getFileEntry("data/englishStrings.inf");
var contents = lfile.entry.getText(); var contents = lfile.entry.getText();
var lines = contents.split('\r\n'); var lines = contents.split('\n');
localizations = []; localizations = [];
var rgx = ~/(\$(?:\w|\d|:)+)\s*=\s*"(.+?)";/g; var rgx = ~/(\$(?:\w|\d|:)+)\s*=\s*"(.+?)";/g;
for (line in lines) { for (line in lines) {
if (rgx.match(line)) { if (rgx.match(line)) {
if (!localizations.exists(rgx.matched(1))) if (!localizations.exists(StringTools.trim(rgx.matched(1))))
localizations.set(rgx.matched(1), rgx.matched(2)); localizations.set(StringTools.trim(rgx.matched(1)), StringTools.trim(rgx.matched(2)));
} }
} }
} }