Skip to content

Commit

Permalink
[Misc] Update dragonwell version to 8.0.0
Browse files Browse the repository at this point in the history
Summary:
Update dragonwell version to 8.0.0

Test Plan: make.sh saint check.

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

Issue: dragonwell-project#30
  • Loading branch information
yfxhust committed May 23, 2019
1 parent 724cdc9 commit 5412452
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion common/autoconf/spec.gmk.in
Original file line number Diff line number Diff line change
Expand Up @@ -693,6 +693,6 @@ JRE_BUNDLE_DIR=$(IMAGES_OUTPUTDIR)/$(JRE_BUNDLE_SUBDIR)

# Include Dragonwell version information
-include @TOPDIR@/dragonwell_version
DISTRO_NAME=Dragonwell
DISTRO_NAME="Alibaba Dragonwell"
COMPANY_NAME=Alibaba
DISTRO_VERSION=$(DRAGONWELL_VERSION)
3 changes: 2 additions & 1 deletion dragonwell_version
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@
# 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_BUILD_NUMBER=b01
14 changes: 9 additions & 5 deletions make.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ if [ ! -f "dragonwell_version" ]; then
fi
source dragonwell_version

DISTRO_VERSION=$DRAGONWELL_VERSION

if [ $# -lt 1 ]; then
echo "USAGE: $0 release/debug"
Expand Down Expand Up @@ -62,18 +61,23 @@ else
BUILD_INDEX=b$BUILD_NUMBER
fi

DISTRO_VERSION=${DRAGONWELL_VERSION}-${BUILD_INDEX}

shift

bash ./configure --with-milestone=fcs \
--with-build-number=$BUILD_INDEX \
--with-build-number=${DRAGONWELL_JDK_BUILD_NUMBER} \
--with-user-release-suffix="" \
--enable-unlimited-crypto \
--with-cacerts-file=`pwd`/common/security/cacerts \
--with-jvm-variants=server \
--with-debug-level=$DEBUG_LEVEL \
--with-zlib=system $*
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 customer defined build number.
make LOG=debug DISTRO_VERSION=${DISTRO_VERSION} images

# Sanity tests
JAVA_EXES=("$NEW_JAVA_HOME/bin/java" "$NEW_JAVA_HOME/jre/bin/java" "$NEW_JRE_HOME/bin/java")
Expand Down Expand Up @@ -117,9 +121,9 @@ done

# check version string
$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
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
\rm -f /tmp/version.out

Expand Down

0 comments on commit 5412452

Please sign in to comment.