common/autoconf/jdk-options.m4

changeset 813
9b102ab97693
parent 811
feb4f2d97042
child 839
174a54ce39c4
child 854
22c6f0b7e2b5
equal deleted inserted replaced
812:d23177734b28 813:9b102ab97693
424 AC_MSG_ERROR([Update version must have a value]) 424 AC_MSG_ERROR([Update version must have a value])
425 elif test "x$with_update_version" != x; then 425 elif test "x$with_update_version" != x; then
426 JDK_UPDATE_VERSION="$with_update_version" 426 JDK_UPDATE_VERSION="$with_update_version"
427 fi 427 fi
428 428
429 AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix],
430 [Add a custom string to the version string if build number isn't set.@<:@username_builddateb00@:>@])])
431 if test "x$with_user_release_suffix" = xyes; then
432 AC_MSG_ERROR([Release suffix must have a value])
433 elif test "x$with_user_release_suffix" != x; then
434 USER_RELEASE_SUFFIX="$with_user_release_suffix"
435 fi
436
429 AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number], 437 AC_ARG_WITH(build-number, [AS_HELP_STRING([--with-build-number],
430 [Set build number value for build @<:@b00@:>@])]) 438 [Set build number value for build @<:@b00@:>@])])
431 if test "x$with_build_number" = xyes; then 439 if test "x$with_build_number" = xyes; then
432 AC_MSG_ERROR([Build number must have a value]) 440 AC_MSG_ERROR([Build number must have a value])
433 elif test "x$with_build_number" != x; then 441 elif test "x$with_build_number" != x; then
434 JDK_BUILD_NUMBER="$with_build_number" 442 JDK_BUILD_NUMBER="$with_build_number"
435 fi 443 fi
444 # Define default USER_RELEASE_SUFFIX if BUILD_NUMBER and USER_RELEASE_SUFFIX are not set
436 if test "x$JDK_BUILD_NUMBER" = x; then 445 if test "x$JDK_BUILD_NUMBER" = x; then
437 JDK_BUILD_NUMBER=b00 446 JDK_BUILD_NUMBER=b00
438 fi 447 if test "x$USER_RELEASE_SUFFIX" = x; then
439 448 BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
440 AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix], 449 # Avoid [:alnum:] since it depends on the locale.
441 [Add a custom string to the version string if build number isn't set.@<:@username_builddateb00@:>@])]) 450 CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'`
442 if test "x$with_user_release_suffix" = xyes; then 451 USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
443 AC_MSG_ERROR([Release suffix must have a value]) 452 fi
444 elif test "x$with_user_release_suffix" != x; then 453 fi
445 USER_RELEASE_SUFFIX="$with_user_release_suffix" 454
446 else 455 # Now set the JDK version, milestone, build number etc.
447 BUILD_DATE=`date '+%Y_%m_%d_%H_%M'`
448 # Avoid [:alnum:] since it depends on the locale.
449 CLEAN_USERNAME=`echo "$USER" | $TR -d -c 'abcdefghijklmnopqrstuvqxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'`
450 USER_RELEASE_SUFFIX=`echo "${CLEAN_USERNAME}_${BUILD_DATE}" | $TR 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
451 fi
452 AC_SUBST(USER_RELEASE_SUFFIX) 456 AC_SUBST(USER_RELEASE_SUFFIX)
453
454 # Now set the JDK version, milestone, build number etc.
455 AC_SUBST(JDK_MAJOR_VERSION) 457 AC_SUBST(JDK_MAJOR_VERSION)
456 AC_SUBST(JDK_MINOR_VERSION) 458 AC_SUBST(JDK_MINOR_VERSION)
457 AC_SUBST(JDK_MICRO_VERSION) 459 AC_SUBST(JDK_MICRO_VERSION)
458 AC_SUBST(JDK_UPDATE_VERSION) 460 AC_SUBST(JDK_UPDATE_VERSION)
459 AC_SUBST(JDK_BUILD_NUMBER) 461 AC_SUBST(JDK_BUILD_NUMBER)

mercurial