提交 8169339b 编写于 作者: F fangxi.yfx

[Misc] Update dragonwell version to 8.0.0

Summary:
Update dragonwell version to 8.0.0

Test Plan: make.sh saint check.

Reviewed-by: D-D-H, mmyxym, luchsh

Issue: https://github.com/alibaba/dragonwell8/issues/30
上级 869be2e4
...@@ -724,6 +724,6 @@ JRE_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_BUNDLE_SUBDIR) ...@@ -724,6 +724,6 @@ JRE_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_BUNDLE_SUBDIR)
# Include Dragonwell version information # Include Dragonwell version information
-include @TOPDIR@/dragonwell_version -include @TOPDIR@/dragonwell_version
DISTRO_NAME=Dragonwell DISTRO_NAME=Alibaba Dragonwell
COMPANY_NAME=Alibaba COMPANY_NAME=Alibaba
DISTRO_VERSION=$(DRAGONWELL_VERSION) DISTRO_VERSION=$(DRAGONWELL_VERSION)
...@@ -19,5 +19,6 @@ ...@@ -19,5 +19,6 @@
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
# #
DRAGONWELL_VERSION=8.0-preview DRAGONWELL_VERSION=8.0.0
DRAGONWELL_JDK_UPDATE_VERSION=202 DRAGONWELL_JDK_UPDATE_VERSION=202
DRAGONWELL_JDK_BUILD_NUMBER=b01
...@@ -27,7 +27,6 @@ if [ ! -f "dragonwell_version" ]; then ...@@ -27,7 +27,6 @@ if [ ! -f "dragonwell_version" ]; then
fi fi
source dragonwell_version source dragonwell_version
DISTRO_VERSION=$DRAGONWELL_VERSION
if [ $# -lt 1 ]; then if [ $# -lt 1 ]; then
echo "USAGE: $0 release/debug" echo "USAGE: $0 release/debug"
...@@ -62,10 +61,12 @@ else ...@@ -62,10 +61,12 @@ else
BUILD_INDEX=b$BUILD_NUMBER BUILD_INDEX=b$BUILD_NUMBER
fi fi
DISTRO_VERSION=${DRAGONWELL_VERSION}-${BUILD_INDEX}
shift shift
bash ./configure --with-milestone=fcs \ bash ./configure --with-milestone=fcs \
--with-build-number=$BUILD_INDEX \ --with-build-number=${DRAGONWELL_JDK_BUILD_NUMBER} \
--with-user-release-suffix="" \ --with-user-release-suffix="" \
--enable-unlimited-crypto \ --enable-unlimited-crypto \
--with-cacerts-file=`pwd`/common/security/cacerts \ --with-cacerts-file=`pwd`/common/security/cacerts \
...@@ -73,7 +74,10 @@ bash ./configure --with-milestone=fcs \ ...@@ -73,7 +74,10 @@ bash ./configure --with-milestone=fcs \
--with-debug-level=$DEBUG_LEVEL \ --with-debug-level=$DEBUG_LEVEL \
--with-zlib=system $* --with-zlib=system $*
make clean make clean
make LOG=debug images
# The default DISTRO_VERSION in spec.gmk.in does not contain the customer defined build number.
# Hack DISTRO_VERSION to introduce the number.
make LOG=debug DISTRO_VERSION=${DISTRO_VERSION} images
# Sanity tests # Sanity tests
JAVA_EXES=("$NEW_JAVA_HOME/bin/java" "$NEW_JAVA_HOME/jre/bin/java" "$NEW_JRE_HOME/bin/java") JAVA_EXES=("$NEW_JAVA_HOME/bin/java" "$NEW_JAVA_HOME/jre/bin/java" "$NEW_JRE_HOME/bin/java")
...@@ -117,9 +121,9 @@ done ...@@ -117,9 +121,9 @@ done
# check version string # check version string
$NEW_JAVA_HOME/bin/java -version > /tmp/version.out 2>&1 $NEW_JAVA_HOME/bin/java -version > /tmp/version.out 2>&1
grep "^OpenJDK Runtime" /tmp/version.out | grep "(Dragonwell $DISTRO_VERSION)" grep "^OpenJDK Runtime" /tmp/version.out | grep "(Alibaba Dragonwell $DISTRO_VERSION)"
if [ 0 != $? ]; then RET=1; fi if [ 0 != $? ]; then RET=1; fi
grep "^OpenJDK .*VM" /tmp/version.out | grep "(Dragonwell $DISTRO_VERSION)" grep "^OpenJDK .*VM" /tmp/version.out | grep "(Alibaba Dragonwell $DISTRO_VERSION)"
if [ 0 != $? ]; then RET=1; fi if [ 0 != $? ]; then RET=1; fi
\rm -f /tmp/version.out \rm -f /tmp/version.out
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册