Skip to content

Commit

Permalink
Build: include Java 21 runtime for latest snapshot
Browse files Browse the repository at this point in the history
  • Loading branch information
khanhduytran0 committed Apr 4, 2024
1 parent 28df9fc commit 8f08afb
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
12 changes: 12 additions & 0 deletions .github/workflows/development.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,18 @@ jobs:
branch: buildjre17
name: jre17-ios-aarch64

- name: Get JRE21
uses: dawidd6/action-download-artifact@v2
with:
github_token: ${{secrets.GITHUB_TOKEN}}
workflow: build.yml
path: depends
workflow_conclusion: completed
allow_forks: false
repo: PojavLauncherTeam/android-openjdk-build-multiarch
branch: buildjre21
name: jre21-ios-aarch64

- name: Build for ${{ matrix.platform_name }}
env:
password: ${{ secrets.ELLIE_MINI_SECRET }}
Expand Down
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ endif
POJAV_BUNDLE_DIR ?= $(OUTPUTDIR)/PojavLauncher.app
POJAV_JRE8_DIR ?= $(SOURCEDIR)/depends/java-8-openjdk
POJAV_JRE17_DIR ?= $(SOURCEDIR)/depends/java-17-openjdk
POJAV_JRE21_DIR ?= $(SOURCEDIR)/depends/java-21-openjdk

# Function to use later for checking dependencies
METHOD_DEPCHECK = $(shell $(1) >/dev/null 2>&1 && echo 1)
Expand Down Expand Up @@ -287,14 +288,17 @@ jre: native
cd $(SOURCEDIR)/depends; \
$(call METHOD_JAVA_UNPACK,8,'https://nightly.link/PojavLauncherTeam/android-openjdk-build-multiarch/workflows/build/jre8-ios-jitjailed/jre8-ios-aarch64.zip'); \
$(call METHOD_JAVA_UNPACK,17,'https://nightly.link/PojavLauncherTeam/android-openjdk-build-multiarch/workflows/build/buildjre17/jre17-ios-aarch64.zip'); \
$(call METHOD_JAVA_UNPACK,21,'https://nightly.link/PojavLauncherTeam/android-openjdk-build-multiarch/workflows/build/buildjre21/jre21-ios-aarch64.zip'); \
if [ -f "$(ls jre*.tar.xz)" ]; then rm $(SOURCEDIR)/depends/jre*.tar.xz; fi; \
cd $(SOURCEDIR); \
rm -rf $(SOURCEDIR)/depends/java-*-openjdk/{ASSEMBLY_EXCEPTION,bin,include,jre,legal,LICENSE,man,THIRD_PARTY_README,lib/{ct.sym,jspawnhelper,libjsig.dylib,src.zip,tools.jar}}; \
$(call METHOD_DIRCHECK,$(OUTPUTDIR)/java_runtimes); \
cp -R $(POJAV_JRE8_DIR) $(OUTPUTDIR)/java_runtimes; \
cp -R $(POJAV_JRE17_DIR) $(OUTPUTDIR)/java_runtimes; \
cp -R $(POJAV_JRE21_DIR) $(OUTPUTDIR)/java_runtimes; \
cp $(WORKINGDIR)/libawt_xawt.dylib $(OUTPUTDIR)/java_runtimes/java-8-openjdk/lib; \
cp $(WORKINGDIR)/libawt_xawt.dylib $(OUTPUTDIR)/java_runtimes/java-17-openjdk/lib
cp $(WORKINGDIR)/libawt_xawt.dylib $(OUTPUTDIR)/java_runtimes/java-17-openjdk/lib;
cp $(WORKINGDIR)/libawt_xawt.dylib $(OUTPUTDIR)/java_runtimes/java-21-openjdk/lib
echo '[PojavLauncher v$(VERSION)] jre - end'

assets:
Expand Down

0 comments on commit 8f08afb

Please sign in to comment.