common/autoconf/jdk-options.m4

*** 398,407 ****
--- 398,421 ----
  fi
  if test "x$JDK_BUILD_NUMBER" = x; then
    JDK_BUILD_NUMBER=b00
  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.
  AC_SUBST(JDK_MAJOR_VERSION)
  AC_SUBST(JDK_MINOR_VERSION)
  AC_SUBST(JDK_MICRO_VERSION)
  AC_SUBST(JDK_UPDATE_VERSION)
*** 423,438 ****
  else
      JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}"
  fi
  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//'`
  AC_SUBST(COOKED_BUILD_NUMBER)
  ])
  
  AC_DEFUN_ONCE([JDKOPT_SETUP_BUILD_TWEAKS],
--- 437,446 ----