Skip to content

Commit a255d69

Browse files
committed
fix OPENJDK_TAG in java version output
Signed-off-by: Bhaktavatsal Reddy <[email protected]>
1 parent f1a22d1 commit a255d69

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

closed/autoconf/custom-hook.m4

+6
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,12 @@ AC_DEFUN_ONCE([OPENJDK_VERSION_DETAILS],
195195
[
196196
OPENJDK_SHA=`git -C $SRC_ROOT rev-parse --short HEAD`
197197
OPENJDK_TAG=`git -C $SRC_ROOT describe --abbrev=0 --tags --match "jdk-9*" "${OPENJDK_SHA}"`
198+
199+
if test "x$OPENJDK_TAG" = x; then
200+
LAST_TAGGED_REVISION=`git -C $SRC_ROOT rev-list --tags --max-count=1`
201+
OPENJDK_TAG=`git -C $SRC_ROOT describe --abbrev=0 --tags --match "jdk-9*" "${LAST_TAGGED_REVISION}"`
202+
fi
203+
198204
AC_SUBST(OPENJDK_SHA)
199205
AC_SUBST(OPENJDK_TAG)
200206
])

closed/autoconf/generated-configure.sh

+7-1
Original file line numberDiff line numberDiff line change
@@ -5251,7 +5251,7 @@ VS_SDK_PLATFORM_NAME_2013=
52515251

52525252

52535253
# Do not change or remove the following line, it is needed for consistency checks:
5254-
DATE_WHEN_GENERATED=1512490616
5254+
DATE_WHEN_GENERATED=1515058356
52555255

52565256
###############################################################################
52575257
#
@@ -17167,6 +17167,12 @@ $as_echo "$as_me: Unknown variant(s) specified: $INVALID_VARIANTS" >&6;}
1716717167
OPENJDK_SHA=`git -C $SRC_ROOT rev-parse --short HEAD`
1716817168
OPENJDK_TAG=`git -C $SRC_ROOT describe --abbrev=0 --tags --match "jdk-9*" "${OPENJDK_SHA}"`
1716917169

17170+
if test "x$OPENJDK_TAG" = x; then
17171+
LAST_TAGGED_REVISION=`git -C $SRC_ROOT rev-list --tags --max-count=1`
17172+
OPENJDK_TAG=`git -C $SRC_ROOT describe --abbrev=0 --tags --match "jdk-9*" "${LAST_TAGGED_REVISION}"`
17173+
fi
17174+
17175+
1717017176

1717117177

1717217178

common/autoconf/generated-configure.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5186,7 +5186,7 @@ VS_SDK_PLATFORM_NAME_2013=
51865186
#CUSTOM_AUTOCONF_INCLUDE
51875187

51885188
# Do not change or remove the following line, it is needed for consistency checks:
5189-
DATE_WHEN_GENERATED=1512490616
5189+
DATE_WHEN_GENERATED=1515058356
51905190

51915191
###############################################################################
51925192
#

0 commit comments

Comments
 (0)