1.1 --- a/common/autoconf/generated-configure.sh Tue Jan 01 14:13:18 2013 +0100
1.2 +++ b/common/autoconf/generated-configure.sh Wed Jan 02 11:29:29 2013 +0100
1.3 @@ -754,7 +754,6 @@
1.4 COOKED_BUILD_NUMBER
1.5 USER_RELEASE_SUFFIX
1.6 JDK_VERSION
1.7 -RUNTIME_NAME
1.8 COPYRIGHT_YEAR
1.9 MACOSX_BUNDLE_ID_BASE
1.10 MACOSX_BUNDLE_NAME_BASE
1.11 @@ -783,7 +782,6 @@
1.12 OS_VERSION_MINOR
1.13 OS_VERSION_MAJOR
1.14 PKG_CONFIG
1.15 -COMM
1.16 TIME
1.17 STAT
1.18 HG
1.19 @@ -899,7 +897,9 @@
1.20 DIFF
1.21 DATE
1.22 CUT
1.23 +CPIO
1.24 CP
1.25 +COMM
1.26 CMP
1.27 CHMOD
1.28 CAT
1.29 @@ -2986,7 +2986,7 @@
1.30
1.31 # Include these first...
1.32 #
1.33 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
1.34 +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
1.35 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.36 #
1.37 # This code is free software; you can redistribute it and/or modify it
1.38 @@ -3401,7 +3401,7 @@
1.39
1.40
1.41 #
1.42 -# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
1.43 +# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
1.44 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.45 #
1.46 # This code is free software; you can redistribute it and/or modify it
1.47 @@ -3433,6 +3433,10 @@
1.48
1.49
1.50
1.51 +###############################################################################
1.52 +#
1.53 +# Setup version numbers
1.54 +#
1.55
1.56
1.57
1.58 @@ -3682,7 +3686,7 @@
1.59 #CUSTOM_AUTOCONF_INCLUDE
1.60
1.61 # Do not change or remove the following line, it is needed for consistency checks:
1.62 -DATE_WHEN_GENERATED=1357045896
1.63 +DATE_WHEN_GENERATED=1357120071
1.64
1.65 ###############################################################################
1.66 #
1.67 @@ -4009,6 +4013,65 @@
1.68
1.69
1.70
1.71 + for ac_prog in comm
1.72 +do
1.73 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.74 +set dummy $ac_prog; ac_word=$2
1.75 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.76 +$as_echo_n "checking for $ac_word... " >&6; }
1.77 +if test "${ac_cv_path_COMM+set}" = set; then :
1.78 + $as_echo_n "(cached) " >&6
1.79 +else
1.80 + case $COMM in
1.81 + [\\/]* | ?:[\\/]*)
1.82 + ac_cv_path_COMM="$COMM" # Let the user override the test with a path.
1.83 + ;;
1.84 + *)
1.85 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.86 +for as_dir in $PATH
1.87 +do
1.88 + IFS=$as_save_IFS
1.89 + test -z "$as_dir" && as_dir=.
1.90 + for ac_exec_ext in '' $ac_executable_extensions; do
1.91 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.92 + ac_cv_path_COMM="$as_dir/$ac_word$ac_exec_ext"
1.93 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.94 + break 2
1.95 + fi
1.96 +done
1.97 + done
1.98 +IFS=$as_save_IFS
1.99 +
1.100 + ;;
1.101 +esac
1.102 +fi
1.103 +COMM=$ac_cv_path_COMM
1.104 +if test -n "$COMM"; then
1.105 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMM" >&5
1.106 +$as_echo "$COMM" >&6; }
1.107 +else
1.108 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.109 +$as_echo "no" >&6; }
1.110 +fi
1.111 +
1.112 +
1.113 + test -n "$COMM" && break
1.114 +done
1.115 +
1.116 +
1.117 + if test "x$COMM" = x; then
1.118 + if test "xcomm" = x; then
1.119 + PROG_NAME=comm
1.120 + else
1.121 + PROG_NAME=comm
1.122 + fi
1.123 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.124 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.125 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.126 + fi
1.127 +
1.128 +
1.129 +
1.130 for ac_prog in cp
1.131 do
1.132 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.133 @@ -4068,6 +4131,65 @@
1.134
1.135
1.136
1.137 + for ac_prog in cpio
1.138 +do
1.139 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1.140 +set dummy $ac_prog; ac_word=$2
1.141 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1.142 +$as_echo_n "checking for $ac_word... " >&6; }
1.143 +if test "${ac_cv_path_CPIO+set}" = set; then :
1.144 + $as_echo_n "(cached) " >&6
1.145 +else
1.146 + case $CPIO in
1.147 + [\\/]* | ?:[\\/]*)
1.148 + ac_cv_path_CPIO="$CPIO" # Let the user override the test with a path.
1.149 + ;;
1.150 + *)
1.151 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1.152 +for as_dir in $PATH
1.153 +do
1.154 + IFS=$as_save_IFS
1.155 + test -z "$as_dir" && as_dir=.
1.156 + for ac_exec_ext in '' $ac_executable_extensions; do
1.157 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1.158 + ac_cv_path_CPIO="$as_dir/$ac_word$ac_exec_ext"
1.159 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1.160 + break 2
1.161 + fi
1.162 +done
1.163 + done
1.164 +IFS=$as_save_IFS
1.165 +
1.166 + ;;
1.167 +esac
1.168 +fi
1.169 +CPIO=$ac_cv_path_CPIO
1.170 +if test -n "$CPIO"; then
1.171 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPIO" >&5
1.172 +$as_echo "$CPIO" >&6; }
1.173 +else
1.174 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1.175 +$as_echo "no" >&6; }
1.176 +fi
1.177 +
1.178 +
1.179 + test -n "$CPIO" && break
1.180 +done
1.181 +
1.182 +
1.183 + if test "x$CPIO" = x; then
1.184 + if test "xcpio" = x; then
1.185 + PROG_NAME=cpio
1.186 + else
1.187 + PROG_NAME=cpio
1.188 + fi
1.189 + { $as_echo "$as_me:${as_lineno-$LINENO}: Could not find $PROG_NAME!" >&5
1.190 +$as_echo "$as_me: Could not find $PROG_NAME!" >&6;}
1.191 + as_fn_error $? "Cannot continue" "$LINENO" 5
1.192 + fi
1.193 +
1.194 +
1.195 +
1.196 for ac_prog in cut
1.197 do
1.198 # Extract the first word of "$ac_prog", so it can be a program name with args.
1.199 @@ -10607,11 +10729,9 @@
1.200
1.201
1.202 # Source the version numbers
1.203 -. $AUTOCONF_DIR/version.numbers
1.204 -if test "x$OPENJDK" = "xfalse"; then
1.205 - . $AUTOCONF_DIR/closed.version.numbers
1.206 -fi
1.207 -
1.208 +. $AUTOCONF_DIR/version-numbers
1.209 +
1.210 +# Get the settings from parameters
1.211
1.212 # Check whether --with-milestone was given.
1.213 if test "${with_milestone+set}" = set; then :
1.214 @@ -10637,6 +10757,9 @@
1.215 elif test "x$with_build_number" != x; then
1.216 JDK_BUILD_NUMBER="$with_build_number"
1.217 fi
1.218 +if test "x$JDK_BUILD_NUMBER" = x; then
1.219 + JDK_BUILD_NUMBER=b00
1.220 +fi
1.221
1.222 # Now set the JDK version, milestone, build number etc.
1.223
1.224 @@ -10656,9 +10779,6 @@
1.225 COPYRIGHT_YEAR=`date +'%Y'`
1.226
1.227
1.228 -RUNTIME_NAME="$PRODUCT_NAME $PRODUCT_SUFFIX"
1.229 -
1.230 -
1.231 if test "x$JDK_UPDATE_VERSION" != x; then
1.232 JDK_VERSION="${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_MICRO_VERSION}_${JDK_UPDATE_VERSION}"
1.233 else
