Skip to content

Commit 9e6536b

Browse files
committed
[scripts] Remove JShell+microjdk, use targz format
1 parent 3453a0b commit 9e6536b

File tree

1 file changed

+4
-29
lines changed

1 file changed

+4
-29
lines changed

build/zip.sh

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ cd "$IMAGEDIR"
99

1010
# clean destinations
1111
rm -rf ./jre-ev3
12-
rm -rf ./jdk-pc
13-
rm -rf ./jshell-support
14-
rm -f ./jdk-ev3
1512

1613
# build ev3 runtime image
1714
"$SCRIPTDIR/jdk-10/bin/jlink" \
@@ -21,32 +18,10 @@ rm -f ./jdk-ev3
2118
--strip-debug \
2219
--no-header-files \
2320
--no-man-pages \
24-
--add-modules java.se,jdk.jdwp.agent,jdk.jshell \
21+
--add-modules java.se,jdk.jdwp.agent \
2522
--output ./jre-ev3
2623

27-
# build microjdk
28-
"$SCRIPTDIR/jdk-10/bin/jlink" \
29-
--module-path "$SCRIPTDIR/jdk-10/jmods" \
30-
--compress 2 \
31-
--strip-debug \
32-
--no-header-files \
33-
--no-man-pages \
34-
--add-modules java.se,jdk.attach,jdk.jdwp.agent,jdk.jlink,jdk.jartool,jdk.compiler,jdk.jdi,jdk.jshell \
35-
--output ./jdk-pc
36-
37-
cp -r ./jmods ./jdk-pc/jmods-ev3
38-
39-
# rename jdk directory
40-
ln -s ./jdk ./jdk-ev3
41-
42-
# JShell hack
43-
mkdir jshell-support
44-
"$SCRIPTDIR/jdk-10/bin/javac" -d ./jshell-support "$SCRIPTDIR/jshellhack/DumpPort.java"
45-
"$SCRIPTDIR/jdk-10/bin/jar" cf ./jshellhack.jar -C ./jshell-support jshellhack/DumpPort.class
46-
cp ./jshellhack.jar ./jdk-pc/bin
47-
cp "$SCRIPTDIR/jshell-launch.sh" ./jdk-pc/bin
48-
4924
# create zip files
50-
zip -9r "$BUILDDIR/jdk-ev3.zip" jdk-ev3
51-
zip -9r "$BUILDDIR/jre-ev3.zip" jre-ev3
52-
zip -9r "$BUILDDIR/jdk-pc.zip" jdk-pc
25+
tar -cf - jre-ev3 | pigz -9 > "$BUILDDIR/jre-ev3.tar.gz"
26+
tar -cf - jdk | pigz -9 > "$BUILDDIR/jdk-ev3.tar.gz"
27+
tar -cf - jmods | pigz -9 > "$BUILDDIR/jmods.tar.gz"

0 commit comments

Comments
 (0)