< prev index next >

make/autoconf/jdk-version.m4

Print this page
rev 48341 : 8193764: Cannot set COMPANY_NAME when configuring a build


  57 
  58 AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
  59 [
  60   # Warn user that old version arguments are deprecated.
  61   BASIC_DEPRECATED_ARG_WITH([milestone])
  62   BASIC_DEPRECATED_ARG_WITH([update-version])
  63   BASIC_DEPRECATED_ARG_WITH([user-release-suffix])
  64   BASIC_DEPRECATED_ARG_WITH([build-number])
  65   BASIC_DEPRECATED_ARG_WITH([version-major])
  66   BASIC_DEPRECATED_ARG_WITH([version-minor])
  67   BASIC_DEPRECATED_ARG_WITH([version-security])
  68 
  69   # Source the version numbers file
  70   . $AUTOCONF_DIR/version-numbers
  71 
  72   # Some non-version number information is set in that file
  73   AC_SUBST(LAUNCHER_NAME)
  74   AC_SUBST(PRODUCT_NAME)
  75   AC_SUBST(PRODUCT_SUFFIX)
  76   AC_SUBST(JDK_RC_PLATFORM_NAME)
  77   AC_SUBST(COMPANY_NAME)
  78   AC_SUBST(HOTSPOT_VM_DISTRO)
  79   AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
  80   AC_SUBST(MACOSX_BUNDLE_ID_BASE)












  81 
  82   # Override version from arguments
  83 
  84   # If --with-version-string is set, process it first. It is possible to
  85   # override parts with more specific flags, since these are processed later.
  86   AC_ARG_WITH(version-string, [AS_HELP_STRING([--with-version-string],
  87       [Set version string @<:@calculated@:>@])])
  88   if test "x$with_version_string" = xyes; then
  89     AC_MSG_ERROR([--with-version-string must have a value])
  90   elif test "x$with_version_string" != x; then
  91     # Additional [] needed to keep m4 from mangling shell constructs.
  92     if [ [[ $with_version_string =~ ^([0-9]+)(\.([0-9]+))?(\.([0-9]+))?(\.([0-9]+))?(-([a-zA-Z]+))?((\+)([0-9]+)?(-([-a-zA-Z0-9.]+))?)?$ ]] ]; then
  93       VERSION_FEATURE=${BASH_REMATCH[[1]]}
  94       VERSION_INTERIM=${BASH_REMATCH[[3]]}
  95       VERSION_UPDATE=${BASH_REMATCH[[5]]}
  96       VERSION_PATCH=${BASH_REMATCH[[7]]}
  97       VERSION_PRE=${BASH_REMATCH[[9]]}
  98       version_plus_separator=${BASH_REMATCH[[11]]}
  99       VERSION_BUILD=${BASH_REMATCH[[12]]}
 100       VERSION_OPT=${BASH_REMATCH[[14]]}




  57 
  58 AC_DEFUN_ONCE([JDKVER_SETUP_JDK_VERSION_NUMBERS],
  59 [
  60   # Warn user that old version arguments are deprecated.
  61   BASIC_DEPRECATED_ARG_WITH([milestone])
  62   BASIC_DEPRECATED_ARG_WITH([update-version])
  63   BASIC_DEPRECATED_ARG_WITH([user-release-suffix])
  64   BASIC_DEPRECATED_ARG_WITH([build-number])
  65   BASIC_DEPRECATED_ARG_WITH([version-major])
  66   BASIC_DEPRECATED_ARG_WITH([version-minor])
  67   BASIC_DEPRECATED_ARG_WITH([version-security])
  68 
  69   # Source the version numbers file
  70   . $AUTOCONF_DIR/version-numbers
  71 
  72   # Some non-version number information is set in that file
  73   AC_SUBST(LAUNCHER_NAME)
  74   AC_SUBST(PRODUCT_NAME)
  75   AC_SUBST(PRODUCT_SUFFIX)
  76   AC_SUBST(JDK_RC_PLATFORM_NAME)

  77   AC_SUBST(HOTSPOT_VM_DISTRO)
  78   AC_SUBST(MACOSX_BUNDLE_NAME_BASE)
  79   AC_SUBST(MACOSX_BUNDLE_ID_BASE)
  80 
  81   # The vendor name, if any
  82   AC_ARG_WITH(vendor-name, [AS_HELP_STRING([--with-vendor-name],
  83       [Set vendor name @<:@not specified@:>@])])
  84   if test "x$with_vendor_name" = xyes; then
  85     AC_MSG_ERROR([--with-vendor-name must have a value])
  86   elif [ ! [[ $with_vendor_name =~ ^[[:print:]]*$ ]] ]; then
  87     AC_MSG_ERROR([--with--vendor-name contains non-printing characters: $with_vendor_name])
  88   else
  89     COMPANY_NAME="$with_vendor_name"
  90   fi
  91   AC_SUBST(COMPANY_NAME)
  92 
  93   # Override version from arguments
  94 
  95   # If --with-version-string is set, process it first. It is possible to
  96   # override parts with more specific flags, since these are processed later.
  97   AC_ARG_WITH(version-string, [AS_HELP_STRING([--with-version-string],
  98       [Set version string @<:@calculated@:>@])])
  99   if test "x$with_version_string" = xyes; then
 100     AC_MSG_ERROR([--with-version-string must have a value])
 101   elif test "x$with_version_string" != x; then
 102     # Additional [] needed to keep m4 from mangling shell constructs.
 103     if [ [[ $with_version_string =~ ^([0-9]+)(\.([0-9]+))?(\.([0-9]+))?(\.([0-9]+))?(-([a-zA-Z]+))?((\+)([0-9]+)?(-([-a-zA-Z0-9.]+))?)?$ ]] ]; then
 104       VERSION_FEATURE=${BASH_REMATCH[[1]]}
 105       VERSION_INTERIM=${BASH_REMATCH[[3]]}
 106       VERSION_UPDATE=${BASH_REMATCH[[5]]}
 107       VERSION_PATCH=${BASH_REMATCH[[7]]}
 108       VERSION_PRE=${BASH_REMATCH[[9]]}
 109       version_plus_separator=${BASH_REMATCH[[11]]}
 110       VERSION_BUILD=${BASH_REMATCH[[12]]}
 111       VERSION_OPT=${BASH_REMATCH[[14]]}


< prev index next >