From c0348dcad6a4e28f19a127e3229f6ea4f160e00f Mon Sep 17 00:00:00 2001 From: Google61 Date: Mon, 19 Apr 2021 22:49:14 +0300 Subject: [PATCH 01/10] Repack JRE as PojavLauncher compatible tarballs --- .github/workflows/build.yml | 46 +++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e34a0cc..c5473a3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,3 +40,49 @@ jobs: with: name: "jre8-debuginfo-${{matrix.arch}}" path: dizout + pojav: + runs-on: ubuntu-20.04 + steps: + - name: Get jre8-aarch32 + uses: actions/download-artifact@v2 + with: + name: jre8-aarch32 + path: pojav + - name: Get jre8-aarch64 + uses: actions/download-artifact@v2 + with: + name: jre8-aarch64 + path: pojav + - name: Get jre8-x86 + uses: actions/download-artifact@v2 + with: + name: jre8-x86 + path: pojav + - name: Get jre8-x86_64 + uses: actions/download-artifact@v2 + with: + name: jre8-x86_64 + path: pojav + - name: Repack JRE + run: | + cd pojav + mkdir work + mkdir work1 + cd work + jrepath=$GITHUB_WORKSPACE/pojav/jre8-pojav + mkdir -p $jrepath + work=$GITHUB_WORKSPACE/jre/work + work1=$GITHUB_WORKSPACE/jre/work1 + makearch () { echo "Making $2..."; cd $work; tar xf $(ls ../jre8-$2-*release.tar.xz) > /dev/null 2>&1; mv bin $work1/; mkdir -p $work1/lib; mv lib/$1 $work1/lib/; mv lib/jexec $work1/lib/; tar cJf bin-$2.tar.xz -C $work1 . > /dev/null 2>&1; mv bin-$2.tar.xz $jrepath/; rm -rf $work/*; rm -rf $work1/*; } + makeuni () { echo "Making universal..."; cd $work; tar xf $(ls ../jre8-arm64-*release.tar.xz) > /dev/null 2>&1; rm -rf bin; rm -rf lib/aarch64; rm lib/jexec; tar cJf universal.tar.xz * > /dev/null 2>&1; mv universal.tar.xz $jrepath/; rm -rf $work/*; } + makeuni + makearch aarch32 arm + makearch aarch64 arm64 + makearch i386 x86 + makearch amd64 x86_64 + echo $GITHUB_SHA>$jrepath/version + - name: Upload artifact + uses: actions/upload-artifact@v2 + with: + name: jre8-pojav + path: pojav/jre8-pojav/* From c2c38c4a57589f8980d2c474d936af3a4c342394 Mon Sep 17 00:00:00 2001 From: Google61 Date: Mon, 19 Apr 2021 22:53:50 +0300 Subject: [PATCH 02/10] Something that I forgot --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c5473a3..73a3b5f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,6 @@ name: Build OpenJDK for Android -on: [push] +on: [push, pull_request, workflow_dispatch] jobs: build: From b01d652f972ffb7b0417cb1d4e5d36ef9b04d174 Mon Sep 17 00:00:00 2001 From: Google61 Date: Mon, 19 Apr 2021 22:57:18 +0300 Subject: [PATCH 03/10] Make 'pojav' job wait 'build' completion --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 73a3b5f..d77ba3a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,6 +41,7 @@ jobs: name: "jre8-debuginfo-${{matrix.arch}}" path: dizout pojav: + needs: build runs-on: ubuntu-20.04 steps: - name: Get jre8-aarch32 From 76229f938cf61a00af7cfaadebcaf8f127070fc0 Mon Sep 17 00:00:00 2001 From: Google61 Date: Mon, 19 Apr 2021 23:27:59 +0300 Subject: [PATCH 04/10] Fix few strings --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d77ba3a..d1357ca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,8 +72,8 @@ jobs: cd work jrepath=$GITHUB_WORKSPACE/pojav/jre8-pojav mkdir -p $jrepath - work=$GITHUB_WORKSPACE/jre/work - work1=$GITHUB_WORKSPACE/jre/work1 + work=$jrepath/../work + work1=$jrepath/../work1 makearch () { echo "Making $2..."; cd $work; tar xf $(ls ../jre8-$2-*release.tar.xz) > /dev/null 2>&1; mv bin $work1/; mkdir -p $work1/lib; mv lib/$1 $work1/lib/; mv lib/jexec $work1/lib/; tar cJf bin-$2.tar.xz -C $work1 . > /dev/null 2>&1; mv bin-$2.tar.xz $jrepath/; rm -rf $work/*; rm -rf $work1/*; } makeuni () { echo "Making universal..."; cd $work; tar xf $(ls ../jre8-arm64-*release.tar.xz) > /dev/null 2>&1; rm -rf bin; rm -rf lib/aarch64; rm lib/jexec; tar cJf universal.tar.xz * > /dev/null 2>&1; mv universal.tar.xz $jrepath/; rm -rf $work/*; } makeuni From e7a61fe1eb6abb4820aa34f1ba7255e5ca25f58d Mon Sep 17 00:00:00 2001 From: Google61 Date: Tue, 20 Apr 2021 00:35:26 +0300 Subject: [PATCH 05/10] Create repackjre.sh --- repackjre.sh | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 repackjre.sh diff --git a/repackjre.sh b/repackjre.sh new file mode 100644 index 0000000..1a240fe --- /dev/null +++ b/repackjre.sh @@ -0,0 +1,35 @@ +## Usage: +## ./repackjre.sh [path_to_normal_jre_tarballs] [output_path] + +# set args +export in="$1" +export out="$2" + +# set working dirs +work="$in/work" +work1="$in/work1" + +# make sure paths exist +mkdir -p $work +mkdir -p $work1 +mkdir -p "$out" + +# here comes a not-so-complicated functions to easily make desired arch +## Usage: makearch [jre_libs_dir_name] [name_in_tarball] +makearch () { echo "Making $2..."; cd "$work"; tar xf $(ls "$in/jre8-$2-*release.tar.xz") > /dev/null 2>&1; mv bin $work1/; mkdir -p $work1/lib; mv lib/$1 $work1/lib/; mv lib/jexec $work1/lib/; tar cJf bin-$2.tar.xz -C $work1 . > /dev/null 2>&1; mv bin-$2.tar.xz "$out/"; rm -rf "$work/*"; rm -rf "$work1/*"; } + +# this one's static +makeuni () { echo "Making universal..."; cd "$work"; tar xf $(ls "$in/jre8-arm64-*release.tar.xz") > /dev/null 2>&1; rm -rf bin; rm -rf lib/aarch64; rm lib/jexec; tar cJf universal.tar.xz * > /dev/null 2>&1; mv universal.tar.xz "$out/"; rm -rf "$work/*"; } + +# now time to use them! +makeuni +makearch aarch32 arm +makearch aarch64 arm64 +makearch i386 x86 +makearch amd64 x86_64 + +# if running under GitHub Actions, write commit sha, else formatted system date +if [ -n "$GITHUB_SHA" ] +$GITHUB_SHA>$out/version +else +date +%Y%m%d>"$out/version" From 59f0806d4ebbbc467a6020cc8ccba939a2d816e3 Mon Sep 17 00:00:00 2001 From: Google61 Date: Tue, 20 Apr 2021 00:42:26 +0300 Subject: [PATCH 06/10] Update build.yml --- .github/workflows/build.yml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d1357ca..504a8c6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -65,23 +65,7 @@ jobs: name: jre8-x86_64 path: pojav - name: Repack JRE - run: | - cd pojav - mkdir work - mkdir work1 - cd work - jrepath=$GITHUB_WORKSPACE/pojav/jre8-pojav - mkdir -p $jrepath - work=$jrepath/../work - work1=$jrepath/../work1 - makearch () { echo "Making $2..."; cd $work; tar xf $(ls ../jre8-$2-*release.tar.xz) > /dev/null 2>&1; mv bin $work1/; mkdir -p $work1/lib; mv lib/$1 $work1/lib/; mv lib/jexec $work1/lib/; tar cJf bin-$2.tar.xz -C $work1 . > /dev/null 2>&1; mv bin-$2.tar.xz $jrepath/; rm -rf $work/*; rm -rf $work1/*; } - makeuni () { echo "Making universal..."; cd $work; tar xf $(ls ../jre8-arm64-*release.tar.xz) > /dev/null 2>&1; rm -rf bin; rm -rf lib/aarch64; rm lib/jexec; tar cJf universal.tar.xz * > /dev/null 2>&1; mv universal.tar.xz $jrepath/; rm -rf $work/*; } - makeuni - makearch aarch32 arm - makearch aarch64 arm64 - makearch i386 x86 - makearch amd64 x86_64 - echo $GITHUB_SHA>$jrepath/version + run: bash "repackjre.sh" $GITHUB_WORKSPACE/pojav $GITHUB_WORKSPACE/pojav/jre8-pojav - name: Upload artifact uses: actions/upload-artifact@v2 with: From 58e9b6dcfa3ef1f3b00766e4c0379ff678091529 Mon Sep 17 00:00:00 2001 From: Google61 Date: Tue, 20 Apr 2021 07:38:58 +0300 Subject: [PATCH 07/10] Update build.yml --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 504a8c6..0d5f294 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,6 +44,8 @@ jobs: needs: build runs-on: ubuntu-20.04 steps: + - name: Checkout repository + uses: actions/checkout@v2 - name: Get jre8-aarch32 uses: actions/download-artifact@v2 with: From 047feff54b155b7e097c5532ec8c81cfb8a61c9d Mon Sep 17 00:00:00 2001 From: Google61 Date: Tue, 20 Apr 2021 09:26:05 +0300 Subject: [PATCH 08/10] Update repackjre.sh --- repackjre.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repackjre.sh b/repackjre.sh index 1a240fe..2f771d0 100644 --- a/repackjre.sh +++ b/repackjre.sh @@ -16,10 +16,10 @@ mkdir -p "$out" # here comes a not-so-complicated functions to easily make desired arch ## Usage: makearch [jre_libs_dir_name] [name_in_tarball] -makearch () { echo "Making $2..."; cd "$work"; tar xf $(ls "$in/jre8-$2-*release.tar.xz") > /dev/null 2>&1; mv bin $work1/; mkdir -p $work1/lib; mv lib/$1 $work1/lib/; mv lib/jexec $work1/lib/; tar cJf bin-$2.tar.xz -C $work1 . > /dev/null 2>&1; mv bin-$2.tar.xz "$out/"; rm -rf "$work/*"; rm -rf "$work1/*"; } +makearch () { echo "Making $2..."; cd "$work"; tar xf $(find "$in" -name jre8-$2-*release.tar.xz) > /dev/null 2>&1; mv bin $work1/; mkdir -p $work1/lib; mv lib/$1 $work1/lib/; mv lib/jexec $work1/lib/; tar cJf bin-$2.tar.xz -C $work1 . > /dev/null 2>&1; mv bin-$2.tar.xz "$out/"; rm -rf "$work/*"; rm -rf "$work1/*"; } # this one's static -makeuni () { echo "Making universal..."; cd "$work"; tar xf $(ls "$in/jre8-arm64-*release.tar.xz") > /dev/null 2>&1; rm -rf bin; rm -rf lib/aarch64; rm lib/jexec; tar cJf universal.tar.xz * > /dev/null 2>&1; mv universal.tar.xz "$out/"; rm -rf "$work/*"; } +makeuni () { echo "Making universal..."; cd "$work"; tar xf $(find "$in" -name jre8-arm64-*release.tar.xz) > /dev/null 2>&1; rm -rf bin; rm -rf lib/aarch64; rm lib/jexec; tar cJf universal.tar.xz * > /dev/null 2>&1; mv universal.tar.xz "$out/"; rm -rf "$work/*"; } # now time to use them! makeuni From 15a57e96533b09f082f7373b64202759db206577 Mon Sep 17 00:00:00 2001 From: Google61 Date: Tue, 20 Apr 2021 10:25:18 +0300 Subject: [PATCH 09/10] Update repackjre.sh --- repackjre.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/repackjre.sh b/repackjre.sh index 2f771d0..47530a6 100644 --- a/repackjre.sh +++ b/repackjre.sh @@ -16,10 +16,10 @@ mkdir -p "$out" # here comes a not-so-complicated functions to easily make desired arch ## Usage: makearch [jre_libs_dir_name] [name_in_tarball] -makearch () { echo "Making $2..."; cd "$work"; tar xf $(find "$in" -name jre8-$2-*release.tar.xz) > /dev/null 2>&1; mv bin $work1/; mkdir -p $work1/lib; mv lib/$1 $work1/lib/; mv lib/jexec $work1/lib/; tar cJf bin-$2.tar.xz -C $work1 . > /dev/null 2>&1; mv bin-$2.tar.xz "$out/"; rm -rf "$work/*"; rm -rf "$work1/*"; } +makearch () { echo "Making $2..."; cd "$work"; tar xf $(find "$in" -name jre8-$2-*release.tar.xz) > /dev/null 2>&1; mv bin "$work1"/; mkdir -p "$work1"/lib; mv lib/$1 "$work1"/lib/; mv lib/jexec "$work1"/lib/; tar cJf bin-$2.tar.xz -C "$work1" . > /dev/null 2>&1; mv bin-$2.tar.xz "$out"/; rm -rf "$work"/*; rm -rf "$work1"/*; } # this one's static -makeuni () { echo "Making universal..."; cd "$work"; tar xf $(find "$in" -name jre8-arm64-*release.tar.xz) > /dev/null 2>&1; rm -rf bin; rm -rf lib/aarch64; rm lib/jexec; tar cJf universal.tar.xz * > /dev/null 2>&1; mv universal.tar.xz "$out/"; rm -rf "$work/*"; } +makeuni () { echo "Making universal..."; cd "$work"; tar xf $(find "$in" -name jre8-arm64-*release.tar.xz) > /dev/null 2>&1; rm -rf bin; rm -rf lib/aarch64; rm lib/jexec; tar cJf universal.tar.xz * > /dev/null 2>&1; mv universal.tar.xz "$out"/; rm -rf "$work"/*; } # now time to use them! makeuni @@ -30,6 +30,8 @@ makearch amd64 x86_64 # if running under GitHub Actions, write commit sha, else formatted system date if [ -n "$GITHUB_SHA" ] +then $GITHUB_SHA>$out/version else date +%Y%m%d>"$out/version" +fi From 9da0f4d0c01ae6236aa201fd24c17e2e7a31d41d Mon Sep 17 00:00:00 2001 From: Google61 Date: Tue, 20 Apr 2021 11:24:02 +0300 Subject: [PATCH 10/10] Update repackjre.sh --- repackjre.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repackjre.sh b/repackjre.sh index 47530a6..7fc58f6 100644 --- a/repackjre.sh +++ b/repackjre.sh @@ -31,7 +31,7 @@ makearch amd64 x86_64 # if running under GitHub Actions, write commit sha, else formatted system date if [ -n "$GITHUB_SHA" ] then -$GITHUB_SHA>$out/version +echo $GITHUB_SHA>"$out"/version else -date +%Y%m%d>"$out/version" +date +%Y%m%d>"$out"/version fi