Skip to content

Commit 28368eb

Browse files
committed
[scripts] First try at to-be OpenJDK 12
1 parent ef0585b commit 28368eb

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

scripts/config.sh

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,29 +78,29 @@ elif [ "$JDKVER" == "10" ]; then
7878
PATCHVER="jdk10"
7979
AUTOGEN_STYLE="v1"
8080
AUTOGEN_PATH="./make/autoconf/autogen.sh"
81-
HOSTJDK="$BUILDDIR/jdk-10"
82-
HOSTJDK_FILE="$BUILDDIR/openjdk-10_linux-x64_bin.tar.gz"
83-
HOSTJDK_URL="https://download.java.net/java/GA/jdk10/10/binaries/openjdk-10_linux-x64_bin.tar.gz"
81+
HOSTJDK="$BUILDDIR/jdk-10.0.2"
82+
HOSTJDK_FILE="$BUILDDIR/openjdk-10.0.2_linux-x64_bin.tar.gz"
83+
HOSTJDK_URL="https://download.java.net/java/GA/jdk10/10.0.2/19aef61b38124481863b1413dce1855f/13/openjdk-10.0.2_linux-x64_bin.tar.gz"
8484

8585
# OpenJDK 11
8686
elif [ "$JDKVER" == "11" ]; then
8787
JAVA_REPO="https://github.com/AdoptOpenJDK/openjdk-jdk11.git"
8888
JAVA_SCM="git"
8989
PATCHVER="jdk11"
9090
AUTOGEN_STYLE="v2"
91-
HOSTJDK="$BUILDDIR/jdk-10"
92-
HOSTJDK_FILE="$BUILDDIR/openjdk-10_linux-x64_bin.tar.gz"
93-
HOSTJDK_URL="https://download.java.net/java/GA/jdk10/10/binaries/openjdk-10_linux-x64_bin.tar.gz"
91+
HOSTJDK="$BUILDDIR/jdk-11.0.1"
92+
HOSTJDK_FILE="$BUILDDIR/openjdk-11.0.1_linux-x64_bin.tar.gz"
93+
HOSTJDK_URL="https://download.java.net/java/GA/jdk11/13/GPL/openjdk-11.0.1_linux-x64_bin.tar.gz"
9494

9595
# OpenJDK Master+dev
96-
elif [ "$JDKVER" == "dev" ]; then
96+
elif [ "$JDKVER" == "12" ]; then
9797
JAVA_REPO="http://hg.openjdk.java.net/jdk/jdk/"
9898
JAVA_SCM="hg"
99-
PATCHVER="jdkdev"
99+
PATCHVER="jdk12"
100100
AUTOGEN_STYLE="v2"
101-
HOSTJDK="$BUILDDIR/jdk-10"
102-
HOSTJDK_FILE="$BUILDDIR/openjdk-10_linux-x64_bin.tar.gz"
103-
HOSTJDK_URL="https://download.java.net/java/GA/jdk10/10/binaries/openjdk-10_linux-x64_bin.tar.gz"
101+
HOSTJDK="$BUILDDIR/jdk-11.0.1"
102+
HOSTJDK_FILE="$BUILDDIR/openjdk-11.0.1_linux-x64_bin.tar.gz"
103+
HOSTJDK_URL="https://download.java.net/java/GA/jdk11/13/GPL/openjdk-11.0.1_linux-x64_bin.tar.gz"
104104

105105

106106
# invalid or unset version
@@ -110,7 +110,7 @@ else
110110
echo "JDKVER=9" >&2
111111
echo "JDKVER=10" >&2
112112
echo "JDKVER=11" >&2
113-
echo "JDKVER=dev" >&2
113+
echo "JDKVER=12" >&2
114114
exit 1
115115
fi
116116

0 commit comments

Comments
 (0)