common/autoconf/jdk-options.m4

changeset 562
14d7ebe42c8d
parent 561
abc8078e070b
child 573
b284980b7d9a
equal deleted inserted replaced
561:abc8078e070b 562:14d7ebe42c8d
1 # 1 #
2 # Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved. 2 # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 # 4 #
5 # This code is free software; you can redistribute it and/or modify it 5 # This code is free software; you can redistribute it and/or modify it
6 # under the terms of the GNU General Public License version 2 only, as 6 # under the terms of the GNU General Public License version 2 only, as
7 # published by the Free Software Foundation. Oracle designates this 7 # published by the Free Software Foundation. Oracle designates this
367 COMPRESS_JARS=false 367 COMPRESS_JARS=false
368 368
369 AC_SUBST(COMPRESS_JARS) 369 AC_SUBST(COMPRESS_JARS)
370 ]) 370 ])
371 371
372 ###############################################################################
373 #
374 # Setup version numbers
375 #
372 AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VERSION_NUMBERS], 376 AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_VERSION_NUMBERS],
373 [ 377 [
374 # Source the version numbers 378 # Source the version numbers
375 . $AUTOCONF_DIR/version.numbers 379 . $AUTOCONF_DIR/version-numbers
376 if test "x$OPENJDK" = "xfalse"; then 380
377 . $AUTOCONF_DIR/closed.version.numbers 381 # Get the settings from parameters
378 fi
379
380 AC_ARG_WITH(milestone, [AS_HELP_STRING([--with-milestone], 382 AC_ARG_WITH(milestone, [AS_HELP_STRING([--with-milestone],
381 [Set milestone value for build @<:@internal@:>@])]) 383 [Set milestone value for build @<:@internal@:>@])])
382 if test "x$with_milestone" = xyes; then 384 if test "x$with_milestone" = xyes; then
383 AC_MSG_ERROR([Milestone must have a value]) 385 AC_MSG_ERROR([Milestone must have a value])
384 elif test "x$with_milestone" != x; then 386 elif test "x$with_milestone" != x; then
391 [Set build number value for build @<:@b00@:>@])]) 393 [Set build number value for build @<:@b00@:>@])])
392 if test "x$with_build_number" = xyes; then 394 if test "x$with_build_number" = xyes; then
393 AC_MSG_ERROR([Build number must have a value]) 395 AC_MSG_ERROR([Build number must have a value])
394 elif test "x$with_build_number" != x; then 396 elif test "x$with_build_number" != x; then
395 JDK_BUILD_NUMBER="$with_build_number" 397 JDK_BUILD_NUMBER="$with_build_number"
398 fi
399 if test "x$JDK_BUILD_NUMBER" = x; then
400 JDK_BUILD_NUMBER=b00
396 fi 401 fi
397 402
398 # Now set the JDK version, milestone, build number etc. 403 # Now set the JDK version, milestone, build number etc.
399 AC_SUBST(JDK_MAJOR_VERSION) 404 AC_SUBST(JDK_MAJOR_VERSION)
400 AC_SUBST(JDK_MINOR_VERSION) 405 AC_SUBST(JDK_MINOR_VERSION)
411 AC_SUBST(MACOSX_BUNDLE_ID_BASE) 416 AC_SUBST(MACOSX_BUNDLE_ID_BASE)
412 417
413 COPYRIGHT_YEAR=`date +'%Y'` 418 COPYRIGHT_YEAR=`date +'%Y'`
414 AC_SUBST(COPYRIGHT_YEAR) 419 AC_SUBST(COPYRIGHT_YEAR)
415 420
416 RUNTIME_NAME="$PRODUCT_NAME $PRODUCT_SUFFIX"
417 AC_SUBST(RUNTIME_NAME)
418
419 if test "x$JDK_UPDATE_VERSION" != x; then 421 if test "x$JDK_UPDATE_VERSION" != x; then
420 JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}" 422 JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
421 else 423 else
422 JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}" 424 JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}"
423 fi 425 fi

mercurial