From 0bed0f69325176bf535c8d97cc59ac2b53016f2b Mon Sep 17 00:00:00 2001 From: Adam Tunnic Date: Sun, 13 Jun 2021 03:24:26 +0700 Subject: [PATCH] Update Makefile and provide already-compiled versions of the storyboards. The removes the requirement of having PojavLauncher already installed. --- Makefile | 57 +++++++++--------- Natives/en.lproj/InfoPlist.strings | 2 +- .../01J-lp-oVM-view-Ze5-6b-2t3.nib | Bin 0 -> 4041 bytes .../LaunchScreen.storyboardc/Info.plist | Bin 0 -> 258 bytes .../UIViewController-01J-lp-oVM.nib | Bin 0 -> 896 bytes .../MinecraftSurface.storyboardc/2-view-3.nib | Bin 0 -> 1923 bytes .../MinecraftSurface.storyboardc/Info.plist | Bin 0 -> 209 bytes .../MinecraftSurfaceVC.nib | Bin 0 -> 958 bytes 8 files changed, 30 insertions(+), 29 deletions(-) create mode 100644 Natives/en.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib create mode 100644 Natives/en.lproj/LaunchScreen.storyboardc/Info.plist create mode 100644 Natives/en.lproj/LaunchScreen.storyboardc/UIViewController-01J-lp-oVM.nib create mode 100644 Natives/en.lproj/MinecraftSurface.storyboardc/2-view-3.nib create mode 100644 Natives/en.lproj/MinecraftSurface.storyboardc/Info.plist create mode 100644 Natives/en.lproj/MinecraftSurface.storyboardc/MinecraftSurfaceVC.nib diff --git a/Makefile b/Makefile index e035790c..10cddd65 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ native: cd build; \ wget https://github.com/leetal/ios-cmake/raw/master/ios.toolchain.cmake &> /dev/null; \ cmake .. -G Xcode -DCMAKE_TOOLCHAIN_FILE=ios.toolchain.cmake -DDEPLOYMENT_TARGET="12.0" -DENABLE_ARC=TRUE -DENABLE_VISIBILITY=FALSE -DPLATFORM=OS64 -DENABLE_BITCODE=FALSE -DENABLE_STRICT_TRY_COMPILE=FALSE -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_REQUIRED="NO" -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGNING_ALLOWED=NO -DCMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY=""; \ - cmake --build . --config Release --target pojavexec PojavLauncher; \ + cmake --build . --config Release --target pojavexec PojavLauncher || exit 1; \ cd ../..; \ elif [ '$(IOS)' = '1' ]; then \ cd Natives; \ @@ -48,26 +48,26 @@ native: input_bridge_v3.c \ utils.c \ \ - -DGLES_TESTZ -DUSE_EGLZ; \ - ldid -S../entitlements.xml PojavLauncher; \ - ldid -S../entitlements.xml libpojavexec.dylib; \ + -DGLES_TESTZ -DUSE_EGLZ || exit 1; \ + ldid -S../entitlements.xml PojavLauncher || exit 1; \ + ldid -S../entitlements.xml libpojavexec.dylib || exit 1; \ fi - @echo 'Finished build task - Native' + @echo 'Finished build task - native application' java: @echo 'Starting build task - Java application' @if [ '$(IOS)' != '1' ]; then \ cd JavaApp; \ chmod +x gradlew; \ - ./gradlew clean build; \ + ./gradlew clean build || exit 1; \ cd ..; \ elif [ '$(IOS)' = '1' ]; then \ cd JavaApp; \ shopt -s globstar; \ mkdir -p local_out/classes; \ - /usr/lib/jvm/java-16-openjdk/bin/javac -cp "libs/*" -d local_out/classes src/main/java/**/*.java; \ + /usr/lib/jvm/java-16-openjdk/bin/javac -cp "libs/*" -d local_out/classes src/main/java/**/*.java || exit 1; \ cd local_out/classes; \ - /usr/lib/jvm/java-16-openjdk/bin/jar -c -f ../launcher.jar *; \ + /usr/lib/jvm/java-16-openjdk/bin/jar -c -f ../launcher.jar * || exit 1; \ fi @echo 'Finished build task - JavaApp' @@ -75,9 +75,9 @@ extras: @echo 'Starting build task - Extras' @if [ '$(IOS)' != '1' ]; then \ mkdir -p Natives/build/Release-iphoneos/PojavLauncher.app/Base.lproj; \ - xcrun actool Natives/Assets.xcassets --compile Natives/resources --platform iphoneos --minimum-deployment-target 12.0 --app-icon AppIcon --output-partial-info-plist /dev/null; \ - ibtool --compile Natives/build/Release-iphoneos/PojavLauncher.app/Base.lproj/MinecraftSurface.storyboardc Natives/en.lproj/MinecraftSurface.storyboard; \ - ibtool --compile Natives/build/Release-iphoneos/PojavLauncher.app/Base.lproj/LaunchScreen.storyboardc Natives/en.lproj/LaunchScreen.storyboard; \ + xcrun actool Natives/Assets.xcassets --compile Natives/resources --platform iphoneos --minimum-deployment-target 12.0 --app-icon AppIcon --output-partial-info-plist /dev/null || exit 1; \ + ibtool --compile Natives/build/Release-iphoneos/PojavLauncher.app/Base.lproj/MinecraftSurface.storyboardc Natives/en.lproj/MinecraftSurface.storyboard || exit 1; \ + ibtool --compile Natives/build/Release-iphoneos/PojavLauncher.app/Base.lproj/LaunchScreen.storyboardc Natives/en.lproj/LaunchScreen.storyboard || exit 1; \ elif [ '$(IOS)' = '1' ]; then \ echo 'Due to the required tools not being available, you cannot compile the extras for PojavLauncher with an iOS device.'; \ fi @@ -86,36 +86,37 @@ extras: package: @echo 'Starting build task - Packaging' @if [ '$(IOS)' != '1' ]; then \ - cp -R Natives/resources/* Natives/build/Release-iphoneos/PojavLauncher.app/; \ - cp Natives/build/Release-iphoneos/libpojavexec.dylib Natives/build/Release-iphoneos/PojavLauncher.app/Frameworks/; \ + cp -R Natives/resources/* Natives/build/Release-iphoneos/PojavLauncher.app/ || exit 1; \ + cp Natives/build/Release-iphoneos/libpojavexec.dylib Natives/build/Release-iphoneos/PojavLauncher.app/Frameworks/ || exit 1; \ mkdir Natives/build/Release-iphoneos/PojavLauncher.app/libs; \ - cp JavaApp/build/libs/PojavLauncher.jar Natives/build/Release-iphoneos/PojavLauncher.app/libs/launcher.jar; \ - cp -R JavaApp/libs/* Natives/build/Release-iphoneos/PojavLauncher.app/libs/; \ + cp JavaApp/build/libs/PojavLauncher.jar Natives/build/Release-iphoneos/PojavLauncher.app/libs/launcher.jar || exit 1; \ + cp -R JavaApp/libs/* Natives/build/Release-iphoneos/PojavLauncher.app/libs/ || exit 1; \ mkdir -p packages/pojavlauncher_iphoneos-arm/{Applications,var/mobile/Documents/minecraft,var/mobile/Documents/.pojavlauncher}; \ - sudo chown 501:501 packages/pojavlauncher_iphoneos-arm/var/mobile/Documents/*; \ + sudo chown 501:501 packages/pojavlauncher_iphoneos-arm/var/mobile/Documents/* || exit 1; \ cp -R Natives/build/Release-iphoneos/PojavLauncher.app packages/pojavlauncher_iphoneos-arm/Applications; \ cp -R DEBIAN packages/pojavlauncher_iphoneos-arm/DEBIAN; \ - ldid -Sentitlements.xml packages/pojavlauncher_iphoneos-arm/Applications/PojavLauncher.app; \ - fakeroot dpkg-deb -b packages/pojavlauncher_iphoneos-arm; \ + ldid -Sentitlements.xml packages/pojavlauncher_iphoneos-arm/Applications/PojavLauncher.app || exit 1; \ + fakeroot dpkg-deb -b packages/pojavlauncher_iphoneos-arm || exit 1; \ elif [ '$(IOS)' = '1' ]; then \ mkdir -p Natives/build; \ mkdir -p Natives/build/Release-iphoneos; \ mkdir -p Natives/build/Release-iphoneos/PojavLauncher.app; \ mkdir -p Natives/build/Release-iphoneos/PojavLauncher.app/Frameworks; \ - cp -R /Applications/PojavLauncher.app/Base.lproj Natives/build/Release-iphoneos/PojavLauncher.app/Base.lproj; \ - cp -R Natives/PojavLauncher Natives/build/Release-iphoneos/PojavLauncher.app/PojavLauncher; \ - cp -R Natives/Info.plist Natives/build/Release-iphoneos/PojavLauncher.app/Info.plist;\ - cp -R Natives/PkgInfo Natives/build/Release-iphoneos/PojavLauncher.app/PkgInfo; \ - cp -R Natives/libpojavexec.dylib Natives/build/Release-iphoneos/PojavLauncher.app/Frameworks/libpojavexec.dylib; \ - cp -R Natives/resources/* Natives/build/Release-iphoneos/PojavLauncher.app/; \ - cp -R JavaApp/libs Natives/build/Release-iphoneos/PojavLauncher.app/libs; \ - cp JavaApp/local_out/launcher.jar Natives/build/Release-iphoneos/PojavLauncher.app/libs/; \ + mkdir -p Natives/build/Release-iphoneos/PojavLauncher.app/Base.lproj; \ + cp -R Natives/en.lproj/*.storyboardc Natives/build/Release-iphoneos/PojavLauncher.app/Base.lproj/ || exit 1; \ + cp -R Natives/PojavLauncher Natives/build/Release-iphoneos/PojavLauncher.app/PojavLauncher || exit 1; \ + cp -R Natives/Info.plist Natives/build/Release-iphoneos/PojavLauncher.app/Info.plist || exit 1;\ + cp -R Natives/PkgInfo Natives/build/Release-iphoneos/PojavLauncher.app/PkgInfo || exit 1; \ + cp -R Natives/libpojavexec.dylib Natives/build/Release-iphoneos/PojavLauncher.app/Frameworks/libpojavexec.dylib || exit 1; \ + cp -R Natives/resources/* Natives/build/Release-iphoneos/PojavLauncher.app/ || exit 1; \ + cp -R JavaApp/libs Natives/build/Release-iphoneos/PojavLauncher.app/libs || exit 1; \ + cp JavaApp/local_out/launcher.jar Natives/build/Release-iphoneos/PojavLauncher.app/libs/ || exit 1; \ mkdir -p packages/pojavlauncher_iphoneos-arm/{Applications,var/mobile/Documents/minecraft,var/mobile/Documents/.pojavlauncher}; \ sudo chown 501:501 packages/pojavlauncher_iphoneos-arm/var/mobile/Documents/*; \ cp -R Natives/build/Release-iphoneos/PojavLauncher.app packages/pojavlauncher_iphoneos-arm/Applications; \ cp -R DEBIAN packages/pojavlauncher_iphoneos-arm/DEBIAN; \ - ldid -Sentitlements.xml packages/pojavlauncher_iphoneos-arm/Applications/PojavLauncher.app; \ - fakeroot dpkg-deb -b packages/pojavlauncher_iphoneos-arm; \ + ldid -Sentitlements.xml packages/pojavlauncher_iphoneos-arm/Applications/PojavLauncher.app || exit 1; \ + fakeroot dpkg-deb -b packages/pojavlauncher_iphoneos-arm || exit 1; \ fi @echo 'Finished build task - Packaging' diff --git a/Natives/en.lproj/InfoPlist.strings b/Natives/en.lproj/InfoPlist.strings index b92732c7..a7361add 100644 --- a/Natives/en.lproj/InfoPlist.strings +++ b/Natives/en.lproj/InfoPlist.strings @@ -1 +1 @@ -/* Localized versions of Info.plist keys */ +/* Localized versions of Info.plist keys */ \ No newline at end of file diff --git a/Natives/en.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib b/Natives/en.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib new file mode 100644 index 0000000000000000000000000000000000000000..b3414d9726a0c9daa10b078b08e59b04b92b251b GIT binary patch literal 4041 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 literal 0 HcmV?d00001 diff --git a/Natives/en.lproj/MinecraftSurface.storyboardc/2-view-3.nib b/Natives/en.lproj/MinecraftSurface.storyboardc/2-view-3.nib new file mode 100644 index 0000000000000000000000000000000000000000..6fc6983cbe21011269262cb224f9c63d8059c3d6 GIT binary patch literal 1923 zcmZuy%X8aA7~j?wQB>aVH)V!%XXrmbVy6w7I!?xl!;z7#t+Q0tn$;@730d5?affE-v0XK#-2fkg)N!rAo{j}Q0_x--#_fS?(4YT4jnZf4} zLW3|~hjAIkB^X;UIxv1sAoK`4_a8!Nz82M^xmGKvFVw^3puO&QHWnItVY}cZ=X&@{)cUOv{t>nR^6P&`^?&AS|F&EI1tIdI z_JHrVRo`z7`g83IzJD{XXGvj-xTIj?cZg%rS@#;Q-j&P4#UgfLhuDNy)6}_6N**&g zp^iAy%xNgDA$ZnpW{pdQD#z}+RB**9QVX*yUEN?|XRn-MpSLtJLG89js z7VXNk8D@>#XbRp&8OF|rbO@Y~&?ij7Vh-LWmW7?wtZ@~V_zBqG^k9!r>}DySWTxZV zCdWqxiBlRg-5a{Y=?Rz%d3^-C97qv7Z%V6^w35Ly*d8yuhl^a;1?nJdaLs{*<9MWj z8qC7Hp2HSUVo;A2@yaPmZ|8NO?gN6Yo<-U?q}bvxGCml@_;q-U#%z zb4!j6d15fv+tC}#0SiHU4UQ=76y;Uun%FmpBs4z#nz1S6C|mfgBP ze#gi`mMhc&TWL_u8(;_0YWcxXte%K+O!|C$M(4N;5zd$eY%fXQ zk2!{r8q?IXtrU)n*8&i|>=gHIYNC+8(w+gisl5iWrfDF3DL3Ho$`Svi#eND{QklID+ffA@4J$04X*d3pBFq>0%g_bjZogumSdv)lRx)PuH zC|)B&bqyK|`c%6Ba#v|93(7t8#*X$pyncdEYp|oKFpae5K=uI)bkV?pvUl#!M4&du zMl;t$1q%Gon*je~Qi^8PP(DY=+pt=DYgx)Kq+FD8Ne$n;2>;K}d0}`JOs^|D+6!<` zTE44Ygz3C?9^@VE6_ERypkWOi+rOhJuo9^2kQoAm$Sy{08#5@2K3t`XltYQFiIi=m z94LK7Jtn`@UIisv68DBYw=d-yN_J85P#SHb4aDNS=#agdlRC~37nzgtV(GtwYJZ{3bW0*0s zikiL%Wn7(T4YqsD__$f1ZC}Lm$b{ilDwIJ1_Zv0Z0&_ViXHv%F9=EaBi`yKEU{4S% eG4xEfz=#3g3a5m`G{(3D2W6W#X3YwGB+&ox>t$d7 literal 0 HcmV?d00001 diff --git a/Natives/en.lproj/MinecraftSurface.storyboardc/Info.plist b/Natives/en.lproj/MinecraftSurface.storyboardc/Info.plist new file mode 100644 index 0000000000000000000000000000000000000000..3c05c62b951b8f4b936088791ae45e015fa044b7 GIT binary patch literal 209 zcmYc)$jK}&F)+By$i&RT${sJE8tNIAnOg3gpI1_ppOceXM6S{yH+73vvWl3!Grl%H6X;*wgNnVy$elA7WQ)K(dgpP5&J&=)TtjI1~eXi{c= z-bGfncmW~b%)Hd(qQtb4;L@VB#N^a4XRLw(j2!&tDOI(TmNS3>BO`=n;DFLFY9#>H CB0w(y literal 0 HcmV?d00001 diff --git a/Natives/en.lproj/MinecraftSurface.storyboardc/MinecraftSurfaceVC.nib b/Natives/en.lproj/MinecraftSurface.storyboardc/MinecraftSurfaceVC.nib new file mode 100644 index 0000000000000000000000000000000000000000..f7f0f2650160d321d55f4fde40235d01cfbb1313 GIT binary patch literal 958 zcmZ`%$x_=u5LFf@%4FX@gB-{g0D&r19GgPOIgh2bnUokgqcKJ|kH?z;VFMwlkgDVm zs_aDV$5Ou!Q@T+UAyKu zgYHO=RDY~=uJn%5yQ;sZ^+ffjgW>U@d!p1Q-TSQiUk2(_>u;*}UFjc6|5UwSO8-{7 zfwvUXG_BB07zdu8v_%M`z$?=_#6{q}fK)P0B}@2+z^kzOdeSPx7R1&18wh3k60-M} zud$TXV|dMYlynTeU-3O2GY(OW#%;hVUnU}}CsagU1YEKP192L7%i9tJr{@#bDUMl5 zM2$hGoY08z<~#d^WgaFGh~>?e%y9lu;8g`{;&SnYg0Hr4Aq*kKZCK1?wv_M&Yqo`z zVD`d3lz}wI{ZW?T#ufirJ(G|g+axk}=T*vtNq@BLx}Z!N4YUbmmRju-o0;7LD_2Fb z%^*7CWZ0I zJBVXK5D!TSaYWE;PM17F+#%Nyhov4dE>yNp+ZhMsq0RhnVviVKD_g6H`9|UHd5bG7 zhP2w@AP&eAOQP9kc3F*4>P8ad>lg0vx%5k#56FGnH#NgVD%T)wCEPT0EB*^+Uz&={ zIq3%8S{u!`3DvfYLC%ce>|@TnUUv3&PL8d<6lg$ajDHt|pqVBA<@Ws|CXO E3k1+Sz5oCK literal 0 HcmV?d00001