fixincludes: a few genfixes changes

Message ID 20180609132258.12474-1-rasmus.villemoes@prevas.dk
State New
Headers show
Series
  • fixincludes: a few genfixes changes
Related show

Commit Message

Rasmus Villemoes June 9, 2018, 1:22 p.m.
It's useful to have genfixes fail when autogen is not found, especially
when genfixes is run as part of an automated build. That's also more
consistent with what happens if autogen is found, but the run fails for
some reason (set -e is in effect).

Setting $@ to fixincl.x when $# is 0 doesn't seem to have any purpose,
since $@ is not used afterwards. Remove that logic to not confuse a
reader.

There's no (longer) any autogen package at the gcc/infrastucture
URL. Update to the folder pointed to by the downloads link on
autogen's webpage.

2018-06-09    Rasmus Villemoes <rasmus.villemoes@prevas.dk>

fixincludes/

	* genfixes: exit 1 when autogen not found.
	* genfixes: Remove some redundant code.
	* genfixes: Update URL to autogen source code.
---
 fixincludes/genfixes | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

Comments

Bruce Korb June 12, 2018, 2:25 p.m. | #1
This looks pretty reasonable to me. I'm sure "set -- fixincl.x"
meant something two decades ago when I wrote it. :)
I should update my e-address since I can be off gnu mail for
weeks at a time nowadays. (We retired folk are less consistent
about checking project emails ...)

Oh, the assert.h thingy seems fine, too. RE:
    https://gcc.gnu.org/ml/gcc-patches/2018-06/msg00370.html

On 06/09/18 06:22, Rasmus Villemoes wrote:
> 2018-06-09    Rasmus Villemoes <rasmus.villemoes@prevas.dk>
> 
> fixincludes/
> 
> 	* genfixes: exit 1 when autogen not found.
> 	* genfixes: Remove some redundant code.
> 	* genfixes: Update URL to autogen source code.
> ---
>  fixincludes/genfixes | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/fixincludes/genfixes b/fixincludes/genfixes
> index f0fc5e64f8b..47aad01289d 100755
> --- a/fixincludes/genfixes
> +++ b/fixincludes/genfixes
> @@ -55,19 +55,16 @@ do
>    esac
>  done
>  
> -if [ $# -eq 0 ] ; then
> -  set -- fixincl.x
> -fi
> -
>  AG="autogen $AG"
>  set -e
>  
>  if [ -z "`${AG} -v | fgrep ' 5.'`" ]
>  then
>    echo "AutoGen appears to be out of date or not correctly installed."
> -  echo "Please download and install:"
> -  echo "   ftp://gcc.gnu.org/pub/gcc/infrastructure/autogen.tar.gz"
> +  echo "Please download and install from:"
> +  echo "   https://ftp.gnu.org/gnu/autogen/"
>    touch fixincl.x
> +  exit 1
>  else
>    echo AutoGen-ing fixincl.x
>    $AG inclhack.def
>
Jeff Law June 12, 2018, 3:02 p.m. | #2
On 06/12/2018 08:25 AM, Bruce Korb wrote:
> This looks pretty reasonable to me. I'm sure "set -- fixincl.x"
> meant something two decades ago when I wrote it. :)
> I should update my e-address since I can be off gnu mail for
> weeks at a time nowadays. (We retired folk are less consistent
> about checking project emails ...)
I hope to join the list of "retired folk" at some point.  Good to hear
from you again Bruce...  Hard to believe it was 20 years ago you
revamped the old fixincludes script to use autogen...


> 
> Oh, the assert.h thingy seems fine, too. RE:
>     https://gcc.gnu.org/ml/gcc-patches/2018-06/msg00370.html
Olivier ack'd the assert.h change earlier today as well :-)

> 
> On 06/09/18 06:22, Rasmus Villemoes wrote:
>> 2018-06-09    Rasmus Villemoes <rasmus.villemoes@prevas.dk>
>>
>> fixincludes/
>>
>> 	* genfixes: exit 1 when autogen not found.
>> 	* genfixes: Remove some redundant code.
>> 	* genfixes: Update URL to autogen source code.
Installed.


Jeff

Patch

diff --git a/fixincludes/genfixes b/fixincludes/genfixes
index f0fc5e64f8b..47aad01289d 100755
--- a/fixincludes/genfixes
+++ b/fixincludes/genfixes
@@ -55,19 +55,16 @@  do
   esac
 done
 
-if [ $# -eq 0 ] ; then
-  set -- fixincl.x
-fi
-
 AG="autogen $AG"
 set -e
 
 if [ -z "`${AG} -v | fgrep ' 5.'`" ]
 then
   echo "AutoGen appears to be out of date or not correctly installed."
-  echo "Please download and install:"
-  echo "   ftp://gcc.gnu.org/pub/gcc/infrastructure/autogen.tar.gz"
+  echo "Please download and install from:"
+  echo "   https://ftp.gnu.org/gnu/autogen/"
   touch fixincl.x
+  exit 1
 else
   echo AutoGen-ing fixincl.x
   $AG inclhack.def