Skip to content

Commit c1a8fdb

Browse files
committed
[scripts] Switch everything to Mercurial tarballs
1 parent 87f117f commit c1a8fdb

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

scripts/config.sh

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ ABLDDIR="$BUILDDIR/openjdk-build"
2020
ABLDREPO="https://github.com/AdoptOpenJDK/openjdk-build.git"
2121
# cacertfile
2222
CACERTFILE="$ABLDDIR/security/cacerts"
23+
# hg tarball
24+
JAVA_BZ2="$BUILDDIR/tip.tar.bz2"
25+
JAVA_TMP="$BUILDDIR/jdk_tmp"
2326

2427
##
2528
## Version-specific configuration
@@ -73,8 +76,8 @@ HOTSPOT_VARIANT="$JDKVM"
7376

7477
# OpenJDK 9
7578
if [ "$JDKVER" == "9" ]; then
76-
JAVA_REPO="https://github.com/AdoptOpenJDK/openjdk-jdk9u.git"
77-
JAVA_SCM="git"
79+
JAVA_REPO="https://hg.openjdk.java.net/jdk-updates/jdk9u/archive/tip.tar.bz2"
80+
JAVA_SCM="hg_zip"
7881
PATCHVER="jdk9"
7982
AUTOGEN_STYLE="v1"
8083
AUTOGEN_PATH="./common/autoconf/autogen.sh"
@@ -85,8 +88,8 @@ if [ "$JDKVER" == "9" ]; then
8588

8689
# OpenJDK 10
8790
elif [ "$JDKVER" == "10" ]; then
88-
JAVA_REPO="https://github.com/AdoptOpenJDK/openjdk-jdk10u.git"
89-
JAVA_SCM="git"
91+
JAVA_REPO="https://hg.openjdk.java.net/jdk-updates/jdk10u/archive/tip.tar.bz2"
92+
JAVA_SCM="hg_zip"
9093
PATCHVER="jdk10"
9194
AUTOGEN_STYLE="v1"
9295
AUTOGEN_PATH="./make/autoconf/autogen.sh"
@@ -97,8 +100,8 @@ elif [ "$JDKVER" == "10" ]; then
97100

98101
# OpenJDK 11
99102
elif [ "$JDKVER" == "11" ]; then
100-
JAVA_REPO="https://github.com/AdoptOpenJDK/openjdk-jdk11.git"
101-
JAVA_SCM="git"
103+
JAVA_REPO="https://hg.openjdk.java.net/jdk-updates/jdk11u/archive/tip.tar.bz2"
104+
JAVA_SCM="hg_zip"
102105
PATCHVER="jdk11"
103106
AUTOGEN_STYLE="v2"
104107
HOSTJDK="$BUILDDIR/jdk-11.0.1"
@@ -108,10 +111,8 @@ elif [ "$JDKVER" == "11" ]; then
108111

109112
# OpenJDK Master+dev
110113
elif [ "$JDKVER" == "12" ]; then
111-
JAVA_REPO="http://hg.openjdk.java.net/jdk/jdk/archive/tip.tar.bz2"
114+
JAVA_REPO="https://hg.openjdk.java.net/jdk/jdk/archive/tip.tar.bz2"
112115
JAVA_SCM="hg_zip"
113-
JAVA_BZ2="$BUILDDIR/tip.tar.bz2"
114-
JAVA_TMP="$BUILDDIR/jdk_tmp"
115116
PATCHVER="jdk12"
116117
AUTOGEN_STYLE="v2"
117118
HOSTJDK="$BUILDDIR/jdk-11.0.1"

0 commit comments

Comments
 (0)