Mercurial > hg > openjdk > lambda
changeset 867:92facce22941
8023957: Lock down version of autoconf
Reviewed-by: chegar, dsamersoff, tbell, dholmes
author | erikj |
---|---|
date | Fri, 30 Aug 2013 10:13:25 +0200 |
parents | 21198f51bc7e |
children | 2aacc7080d36 0f6dde6231bd |
files | README-builds.html common/autoconf/autogen.sh common/autoconf/configure.ac common/autoconf/generated-configure.sh |
diffstat | 4 files changed, 28 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/README-builds.html Thu Aug 29 15:47:55 2013 +0200 +++ b/README-builds.html Fri Aug 30 10:13:25 2013 +0200 @@ -1210,19 +1210,18 @@ <blockquote> <p> - <b>Q:</b> The <code>configure</code> file looks horrible! + <b>Q:</b> The <code>generated-configure.sh</code> file looks horrible! How are you going to edit it? <br> - <b>A:</b> The <code>configure</code> file is generated (think + <b>A:</b> The <code>generated-configure.sh</code> file is generated (think "compiled") by the autoconf tools. The source code is - in <code>configure.ac</code> various .m4 files in common/autoconf, - which are - much more readable. + in <code>configure.ac</code> and various .m4 files in common/autoconf, + which are much more readable. </p> <p> <b>Q:</b> - Why is the <code>configure</code> file checked in, + Why is the <code>generated-configure.sh</code> file checked in, if it is generated? <br> <b>A:</b> @@ -1237,13 +1236,29 @@ <p> <b>Q:</b> Do you require a specific version of autoconf for regenerating - <code>configure</code>? + <code>generated-configure.sh</code>? <br> <b>A:</b> - Currently, no, but this will likely be the case when things have - settled down a bit more. (The reason for this is to avoid - large spurious changes in <code>configure</code> - in commits that made small changes to <code>configure.ac</code>). + Yes, version 2.69 is required and should be easy + enough to aquire on all supported operating + systems. The reason for this is to avoid + large spurious changes in <code>generated-configure.sh</code>. + </p> + + <p> + <b>Q:</b> + How do you regenerate <code>generated-configure.sh</code> + after making changes to the input files? + <br> + <b>A:</b> + Regnerating <code>generated-configure.sh</code> + should always be done using the + script <code>common/autoconf/autogen.sh</code> to + ensure that the correct files get updated. This + script should also be run after mercurial tries to + merge <code>generated-configure.sh</code> as a + merge of the generated file is not guaranteed to + be correct. </p> <p>
--- a/common/autoconf/autogen.sh Thu Aug 29 15:47:55 2013 +0200 +++ b/common/autoconf/autogen.sh Fri Aug 30 10:13:25 2013 +0200 @@ -44,10 +44,8 @@ custom_hook=$custom_script_dir/custom-hook.m4 AUTOCONF="`which autoconf 2> /dev/null | grep -v '^no autoconf in'`" -AUTOCONF_267="`which autoconf-2.67 2> /dev/null | grep -v '^no autoconf-2.67 in'`" echo "Autoconf found: ${AUTOCONF}" -echo "Autoconf-2.67 found: ${AUTOCONF_267}" if test "x${AUTOCONF}" = x; then echo You need autoconf installed to be able to regenerate the configure script @@ -55,10 +53,6 @@ exit 1 fi -if test "x${AUTOCONF_267}" != x; then - AUTOCONF=${AUTOCONF_267}; -fi - echo Generating generated-configure.sh with ${AUTOCONF} cat $script_dir/configure.ac | sed -e "s|@DATE_WHEN_GENERATED@|$TIMESTAMP|" | ${AUTOCONF} -W all -I$script_dir - > $script_dir/generated-configure.sh rm -rf autom4te.cache
--- a/common/autoconf/configure.ac Thu Aug 29 15:47:55 2013 +0200 +++ b/common/autoconf/configure.ac Fri Aug 30 10:13:25 2013 +0200 @@ -30,7 +30,7 @@ ############################################################################### -AC_PREREQ([2.61]) +AC_PREREQ([2.69]) AC_INIT(OpenJDK, jdk8, build-dev@openjdk.java.net,,http://openjdk.java.net) AC_CONFIG_AUX_DIR([build-aux])
--- a/common/autoconf/generated-configure.sh Thu Aug 29 15:47:55 2013 +0200 +++ b/common/autoconf/generated-configure.sh Fri Aug 30 10:13:25 2013 +0200 @@ -3818,7 +3818,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1377784024 +DATE_WHEN_GENERATED=1377850299 ############################################################################### #