diff --git a/DEBIAN/control.development b/DEBIAN/control.development index bf020f9a..a4ce1c13 100644 --- a/DEBIAN/control.development +++ b/DEBIAN/control.development @@ -4,7 +4,7 @@ Maintainer: PojavLauncherTeam Author: DuyKhanhTran Architecture: iphoneos-arm Version: 2.1 -Depends: openjdk-8-jre | openjdk-16-jre | openjdk-8-jdk | openjdk-16-jdk, firmware (>= 12.0), firmware (<< 15.0) +Depends: firmware (>= 12.0), firmware (<< 15.0) Conflicts: pojavlauncher-dev, pojavlauncher-zink, pojavlauncher, net.kdt.pojavlauncher.release, net.kdt.pojavlauncher.release-rootless, net.kdt.pojavlauncher.development-rootless Replaces: pojavlauncher-dev, pojavlauncher Section: Games diff --git a/DEBIAN/control.development-rootless b/DEBIAN/control.development-rootless index f0aa8449..2458fd2e 100644 --- a/DEBIAN/control.development-rootless +++ b/DEBIAN/control.development-rootless @@ -4,7 +4,7 @@ Maintainer: PojavLauncherTeam Author: DuyKhanhTran Architecture: iphoneos-arm64 Version: 2.1 -Depends: openjdk-8-jre | openjdk-16-jre | openjdk-8-jdk | openjdk-16-jdk, firmware (>= 15.0) +Depends: firmware (>= 15.0) Conflicts: pojavlauncher-dev, pojavlauncher-zink, pojavlauncher, net.kdt.pojavlauncher.release, net.kdt.pojavlauncher.release-rootless, net.kdt.pojavlauncher.development Replaces: pojavlauncher-dev, pojavlauncher Section: Games diff --git a/DEBIAN/control.release b/DEBIAN/control.release index 571f5f55..a5754260 100644 --- a/DEBIAN/control.release +++ b/DEBIAN/control.release @@ -4,7 +4,7 @@ Maintainer: PojavLauncherTeam Author: DuyKhanhTran Architecture: iphoneos-arm Version: 2.1 -Depends: openjdk-8-jre | openjdk-16-jre | openjdk-8-jdk | openjdk-16-jdk, firmware (>= 12.0), firmware (<< 15.0) +Depends: firmware (>= 12.0), firmware (<< 15.0) Conflicts: pojavlauncher-dev, pojavlauncher-zink, pojavlauncher, net.kdt.pojavlauncher.release-rootless, net.kdt.pojavlauncher.development, net.kdt.pojavlauncher.development-rootless Replaces: pojavlauncher, pojavlauncher-dev Section: Games diff --git a/DEBIAN/control.release-rootless b/DEBIAN/control.release-rootless index ea2bc6da..abd6fa7b 100644 --- a/DEBIAN/control.release-rootless +++ b/DEBIAN/control.release-rootless @@ -4,7 +4,7 @@ Maintainer: PojavLauncherTeam Author: DuyKhanhTran Architecture: iphoneos-arm Version: 2.1 -Depends: openjdk-8-jre | openjdk-16-jre | openjdk-8-jdk | openjdk-16-jdk, firmware (>= 15.0) +Depends: firmware (>= 15.0) Conflicts: pojavlauncher-dev, pojavlauncher-zink, pojavlauncher, net.kdt.pojavlauncher.release, net.kdt.pojavlauncher.development, net.kdt.pojavlauncher.development-rootless Replaces: pojavlauncher, pojavlauncher-dev Section: Games diff --git a/Makefile b/Makefile index dece94cf..9d0b3680 100644 --- a/Makefile +++ b/Makefile @@ -98,7 +98,8 @@ PACKAGING = \ cp -r $(OUTPUTDIR)/PojavLauncher.app Applications/PojavLauncher.app; \ cp $(SOURCEDIR)/DEBIAN/control.$(1) DEBIAN/control; \ cp $(SOURCEDIR)/DEBIAN/postinst DEBIAN/postinst; \ - ldid -S$(SOURCEDIR)/entitlements.xml Applications/PojavLauncher.app; \ + ldid -S Applications/PojavLauncher.app; \ + ldid -S$(SOURCEDIR)/entitlements.xml Applications/PojavLauncher.app/PojavLauncher; \ cd $(OUTPUTDIR); \ fakeroot dpkg-deb -Zxz -b $(OUTPUTDIR)/net.kdt.pojavlauncher.$(1)_$(VERSION)_iphoneos-arm; \ mkdir -p $(OUTPUTDIR)/net.kdt.pojavlauncher.$(1)-rootless_$(VERSION)_iphoneos-arm64; \ @@ -115,7 +116,8 @@ PACKAGING = \ cp -r $(OUTPUTDIR)/PojavLauncher.app $(IOS15PREF)/Applications/PojavLauncher.app; \ cp -r $(SOURCEDIR)/DEBIAN/control.$(1)-rootless DEBIAN/control; \ cp $(SOURCEDIR)/DEBIAN/postinst DEBIAN/postinst; \ - ldid -S$(SOURCEDIR)/entitlements.xml $(IOS15PREF)/Applications/PojavLauncher.app; \ + ldid -S $(IOS15PREF)/Applications/PojavLauncher.app; \ + ldid -S$(SOURCEDIR)/entitlements.xml $(IOS15PREF)/Applications/PojavLauncher.app/PojavLauncher; \ cd $(OUTPUTDIR); \ fakeroot dpkg-deb -Zxz -b $(OUTPUTDIR)/net.kdt.pojavlauncher.$(1)-rootless_$(VERSION)_iphoneos-arm64 @@ -292,7 +294,40 @@ extras: fi @echo 'Building PojavLauncher $(VERSION) - EXTRAS - End' -deb: native java extras +jre: + @mkdir -p $(SOURCEDIR)/depends; \ + cd $(SOURCEDIR)/depends; \ + if [ ! -f "java-8-openjdk" ] && [ ! -f "$(ls ../jre8-*.tar.xz)" ]; then \ + if [ "$(RUNNER)" != "1" ]; then \ + wget 'https://github.com/PojavLauncherTeam/android-openjdk-build-multiarch/releases/download/jre8-40df388/jre8-arm64-20220811-release.tar.xz' -q --show-progress; \ + fi; \ + mkdir java-8-openjdk && cd java-8-openjdk; \ + tar xvf ../jre8-*.tar.xz; \ + rm ../jre8-*.tar.xz; \ + fi; \ + cd $(SOURCEDIR)/depends; \ + if [ ! -f "java-17-openjdk" ] && [ ! -f "$(ls ../jre17-*.tar.xz)" ]; then \ + if [ "$(RUNNER)" != "1" ]; then \ + wget 'https://github.com/PojavLauncherTeam/android-openjdk-build-multiarch/releases/download/jre17-ca01427/jre17-arm64-20220817-release.tar.xz' -q --show-progress; \ + fi; \ + mkdir java-17-openjdk && cd java-17-openjdk; \ + tar xvf ../jre17-*.tar.xz; \ + rm ../jre17-*.tar.xz; \ + fi; \ + cd ..; \ + mkdir -p $(OUTPUTDIR); \ + cd $(OUTPUTDIR); \ + $(call DIRCHECK,$(OUTPUTDIR)/Payload); \ + cp -R $(POJAV_BUNDLE_DIR) $(OUTPUTDIR)/Payload; \ + $(call DIRCHECK,$(OUTPUTDIR)/Payload/PojavLauncher.app/jvm); \ + cp -R $(POJAV_JRE8_DIR) $(OUTPUTDIR)/Payload/PojavLauncher.app/jvm/; \ + cp -R $(POJAV_JRE17_DIR) $(OUTPUTDIR)/Payload/PojavLauncher.app/jvm/; \ + rm -rf $(OUTPUTDIR)/Payload/PojavLauncher.app/jvm/*/{bin,include,jre,lib/{ct.sym,libjsig.dylib,src.zip,tools.jar}}; \ + cp $(OUTPUTDIR)/Payload/PojavLauncher.app/Frameworks/libawt_xawt.dylib $(OUTPUTDIR)/Payload/PojavLauncher.app/jvm/java-17-openjdk/lib/; \ + cp $(OUTPUTDIR)/Payload/PojavLauncher.app/Frameworks/libawt_xawt.dylib $(OUTPUTDIR)/Payload/PojavLauncher.app/jvm/java-8-openjdk/lib/; \ + rm $(OUTPUTDIR)/Payload/PojavLauncher.app/Frameworks/libawt_*.dylib; \ + +deb: native java extras jre @echo 'Building PojavLauncher $(VERSION) - DEB - Start' @if [ '$(IOS)' = '1' ]; then \ mkdir -p $(WORKINGDIR)/PojavLauncher.app/{Frameworks,Base.lproj}; \ @@ -328,38 +363,6 @@ dsym: deb ipa: dsym echo 'Building PojavLauncher $(VERSION) - IPA - Start' - @mkdir -p $(SOURCEDIR)/depends; \ - cd $(SOURCEDIR)/depends; \ - if [ ! -f "java-8-openjdk/bin/java" ] && [ ! -f "$(ls ../jre8-*.tar.xz)" ]; then \ - if [ "$(RUNNER)" != "1" ]; then \ - wget 'https://github.com/PojavLauncherTeam/android-openjdk-build-multiarch/releases/download/jre8-40df388/jre8-arm64-20220811-release.tar.xz' -q --show-progress; \ - fi; \ - mkdir java-8-openjdk && cd java-8-openjdk; \ - tar xvf ../jre8-*.tar.xz; \ - rm ../jre8-*.tar.xz; \ - fi; \ - cd $(SOURCEDIR)/depends; \ - if [ ! -f "java-17-openjdk/bin/java" ] && [ ! -f "$(ls ../jre17-*.tar.xz)" ]; then \ - if [ "$(RUNNER)" != "1" ]; then \ - wget 'https://github.com/PojavLauncherTeam/android-openjdk-build-multiarch/releases/download/jre17-ca01427/jre17-arm64-20220817-release.tar.xz' -q --show-progress; \ - fi; \ - mkdir java-17-openjdk && cd java-17-openjdk; \ - tar xvf ../jre17-*.tar.xz; \ - rm ../jre17-*.tar.xz; \ - fi; \ - cd ..; \ - mkdir -p $(OUTPUTDIR); \ - cd $(OUTPUTDIR); \ - $(call DIRCHECK,$(OUTPUTDIR)/Payload); \ - cp -R $(POJAV_BUNDLE_DIR) $(OUTPUTDIR)/Payload; \ - $(call DIRCHECK,$(OUTPUTDIR)/Payload/PojavLauncher.app/jvm); \ - cp -R $(POJAV_JRE8_DIR) $(OUTPUTDIR)/Payload/PojavLauncher.app/jvm/; \ - cp -R $(POJAV_JRE17_DIR) $(OUTPUTDIR)/Payload/PojavLauncher.app/jvm/; \ - rm -rf $(OUTPUTDIR)/Payload/PojavLauncher.app/jvm/*/{bin,include,jre,lib/{ct.sym,libjsig.dylib,src.zip,tools.jar}}; \ - cp $(OUTPUTDIR)/Payload/PojavLauncher.app/Frameworks/libawt_xawt.dylib $(OUTPUTDIR)/Payload/PojavLauncher.app/jvm/java-17-openjdk/lib/; \ - cp $(OUTPUTDIR)/Payload/PojavLauncher.app/Frameworks/libawt_xawt.dylib $(OUTPUTDIR)/Payload/PojavLauncher.app/jvm/java-8-openjdk/lib/; \ - rm $(OUTPUTDIR)/Payload/PojavLauncher.app/Frameworks/libawt_*.dylib; \ - ldid -S$(SOURCEDIR)/entitlements_ipa.xml $(OUTPUTDIR)/Payload/PojavLauncher.app/PojavLauncher; \ rm -f $(OUTPUTDIR)/*.ipa; \ cd $(OUTPUTDIR); \ chmod -R 755 Payload; \ diff --git a/entitlements.xml b/entitlements.xml index c6d527b8..07af92f2 100644 --- a/entitlements.xml +++ b/entitlements.xml @@ -1,27 +1,40 @@ + get-task-allow + + com.apple.developer.kernel.extended-virtual-addressing com.apple.developer.kernel.increased-memory-limit - com.apple.private.security.container-required - - com.apple.security.exception.files.absolute-path.read-write - - / - - platform-application - - com.apple.private.skip-library-validation - - get-task-allow - - dynamic-codesigning + + + com.apple.private.mobileinstall.upgrade-enabled com.apple.private.memorystatus + + + com.apple.private.security.no-sandbox + + + + com.apple.private.security.storage.AppDataContainers + + com.apple.private.security.storage.MobileDocuments + + com.apple.security.iokit-user-client-class + + IOSurfaceRootUserClient + AGXDeviceUserClient + AGXSharedUserClient + AGXCommandQueue + AGXDevice + + platform-application + diff --git a/entitlements_ipa.xml b/entitlements_ipa.xml deleted file mode 100644 index 07af92f2..00000000 --- a/entitlements_ipa.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - get-task-allow - - - com.apple.developer.kernel.extended-virtual-addressing - - com.apple.developer.kernel.increased-memory-limit - - - - com.apple.private.mobileinstall.upgrade-enabled - - - - com.apple.private.memorystatus - - - - com.apple.private.security.no-sandbox - - - - com.apple.private.security.storage.AppDataContainers - - com.apple.private.security.storage.MobileDocuments - - com.apple.security.iokit-user-client-class - - IOSurfaceRootUserClient - AGXDeviceUserClient - AGXSharedUserClient - AGXCommandQueue - AGXDevice - - platform-application - - -