stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8005794: in new infra, how do we change java -version?

Browse Source 
Added configure parameter --with-user-release-suffix

Reviewed-by: ohair, tbell
This commit is contained in:
Tim Bell 2013-01-08 16:23:45 -08:00
parent d6b52d13ee
commit 3c8b65b820
2 changed files with 303 additions and 256 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

473
common/autoconf/generated-configure.sh
View File

File diff suppressed because it is too large Load Diff

20
common/autoconf/jdk-options.m4
View File

@ -400,6 +400,20 @@ if test "x$JDK_BUILD_NUMBER" = x; then
JDK_BUILD_NUMBER=b00 JDK_BUILD_NUMBER=b00
fi fi
AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix],
[Add a custom string to the version string if build number isn't set.@<:@username_builddateb00@:>@])])
if test "x$with_user_release_suffix" = xyes; then
AC_MSG_ERROR([Release suffix must have a value])
elif test "x$with_user_release_suffix" != x; then
USER_RELEASE_SUFFIX="$with_user_release_suffix"
else
BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
# Avoid [:alnum:] since it depends on the locale.
CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'`
USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
fi
AC_SUBST(USER_RELEASE_SUFFIX)
# Now set the JDK version, milestone, build number etc. # Now set the JDK version, milestone, build number etc.
AC_SUBST(JDK_MAJOR_VERSION) AC_SUBST(JDK_MAJOR_VERSION)
AC_SUBST(JDK_MINOR_VERSION) AC_SUBST(JDK_MINOR_VERSION)
@ -425,12 +439,6 @@ else
fi fi
AC_SUBST(JDK_VERSION) AC_SUBST(JDK_VERSION)
BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
# Avoid [:alnum:] since it depends on the locale.
CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyz0123456789'`
USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
AC_SUBST(USER_RELEASE_SUFFIX)
COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'` COOKED_BUILD_NUMBER=`$ECHO $JDK_BUILD_NUMBER | $SED -e 's/^b//' -e 's/^0//'`
AC_SUBST(COOKED_BUILD_NUMBER) AC_SUBST(COOKED_BUILD_NUMBER)
]) ])