File tree Expand file tree Collapse file tree 2 files changed +34
-2
lines changed
Expand file tree Collapse file tree 2 files changed +34
-2
lines changed Original file line number Diff line number Diff line change @@ -94,8 +94,10 @@ elif [ "$JDKVER" == "11" ]; then
9494
9595# OpenJDK Master+dev
9696elif [ " $JDKVER " == " 12" ]; then
97- JAVA_REPO=" http://hg.openjdk.java.net/jdk/jdk/"
98- JAVA_SCM=" hg"
97+ JAVA_REPO=" http://hg.openjdk.java.net/jdk/jdk/archive/tip.tar.bz2"
98+ JAVA_SCM=" hg_zip"
99+ JAVA_BZ2=" $BUILDDIR /tip.tar.bz2"
100+ JAVA_TMP=" $BUILDDIR /jdk_tmp"
99101 PATCHVER=" jdk12"
100102 AUTOGEN_STYLE=" v2"
101103 HOSTJDK=" $BUILDDIR /jdk-11.0.1"
Original file line number Diff line number Diff line change @@ -22,6 +22,36 @@ if [ ! -d "$JDKDIR" ]; then
2222
2323 JAVA_VERSION=" $( hg log -r " ." --template " {latesttag}\n" | sed ' s/jdk-//' ) -ev3"
2424
25+ elif [ " $JAVA_SCM " == " hg_zip" ]; then
26+ cd " $BUILDDIR "
27+
28+ # download bz2
29+ echo " [FETCH] Downloading Java tarball from Mercurial"
30+ wget -nv -N " $JAVA_REPO "
31+
32+ # extract
33+ echo " [FETCH] Extracting tarball"
34+ mkdir " $JAVA_TMP "
35+ tar -C " $JAVA_TMP " -xf " $JAVA_BZ2 "
36+
37+ # move to the right place
38+ # https://unix.stackexchange.com/a/156287
39+ pattern=" $JAVA_TMP /*"
40+ files=( $pattern )
41+ mv " ${files[0]} " " $JDKDIR "
42+ rmdir " $JAVA_TMP "
43+
44+ # enter the jdk repo
45+ cd " $JDKDIR "
46+
47+ # clone the rest of the tree, if needed
48+ if [ -f " ./get_source.sh" ]; then
49+ echo " [FETCH] Downloading Java components"
50+ bash ./get_source.sh
51+ fi
52+
53+ JAVA_VERSION=" $( cat ./.hg_archival.txt | grep " latesttag:" | sed -E ' s/^.*jdk-//' ) -ev3"
54+
2555 elif [ " $JAVA_SCM " == " git" ]; then
2656 latestTag=" $( $SCRIPTDIR /latest.awk " $JAVA_REPO " ) "
2757 JAVA_VERSION=" $( echo " $latestTag " | sed ' s/jdk-//' ) -ev3"
You can’t perform that action at this time.
0 commit comments