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

8170632: Stop modifying VERSION_OPT for adhoc builds on reconfigure

Browse Source 
Reviewed-by: erikj
This commit is contained in:
Magnus Ihse Bursie 2016-12-07 09:46:39 +01:00
parent 5c5ffe13e3
commit e262ab65a7
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5082,7 +5082,7 @@ VS_SDK_PLATFORM_NAME_2013=
#CUSTOM_AUTOCONF_INCLUDE #CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks: # Do not change or remove the following line, it is needed for consistency checks:
DATE_WHEN_GENERATED=1481098917 DATE_WHEN_GENERATED=1481100369
############################################################################### ###############################################################################
# #
@ -24451,11 +24451,10 @@ $as_echo "$as_me: WARNING: --with-version-opt value has been sanitized from '$wi
fi fi
else else
if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then
# Default is to calculate a string like this <timestamp>.<username>.<base dir name> # Default is to calculate a string like this 'adhoc.<username>.<base dir name>'
timestamp=`$DATE '+%Y-%m-%d-%H%M%S'`
# Outer [ ] to quote m4. # Outer [ ] to quote m4.
basedirname=`$BASENAME "$TOPDIR" | $TR -d -c '[a-z][A-Z][0-9].-'` basedirname=`$BASENAME "$TOPDIR" | $TR -d -c '[a-z][A-Z][0-9].-'`
VERSION_OPT="$timestamp.$USERNAME.$basedirname" VERSION_OPT="adhoc.$USERNAME.$basedirname"
fi fi
fi fi

5
common/autoconf/jdk-version.m4
View File

@ -160,11 +160,10 @@ AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
fi fi
else else
if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then if test "x$NO_DEFAULT_VERSION_PARTS" != xtrue; then
# Default is to calculate a string like this <timestamp>.<username>.<base dir name> # Default is to calculate a string like this 'adhoc.<username>.<base dir name>'
timestamp=`$DATE '+%Y-%m-%d-%H%M%S'`
# Outer [ ] to quote m4. # Outer [ ] to quote m4.
[ basedirname=`$BASENAME "$TOPDIR" | $TR -d -c '[a-z][A-Z][0-9].-'` ] [ basedirname=`$BASENAME "$TOPDIR" | $TR -d -c '[a-z][A-Z][0-9].-'` ]
VERSION_OPT="$timestamp.$USERNAME.$basedirname" VERSION_OPT="adhoc.$USERNAME.$basedirname"
fi fi
fi fi