Changeset 93d0ddd in rtems

Timestamp:

Aug 29, 2014, 1:39:29 AM (7 years ago)

Author:

Chris Johns <chrisj@…>

Branches:

4.11, 5, master

Children:

59990cc

Parents:

b597c0d

Message:

bootstrap: Sort the various hash keys used in generating preinstall.am.

Something must have changed in perl to change the way the keys are
ordered by default.

File:

• ampolish3 (modified) (4 diffs)

ampolish3

@@ -10 +10 @@
 # Usage: ampolish3 Makefile.am > preinstall.am
 #
-# Reads a Makefile.am from stdin and writes corresponding 
+# Reads a Makefile.am from stdin and writes corresponding
 # pre/tmpinstall rules to stdout.
 
@@ -86 +86 @@
     $dirmap{"\$\($1\)"} = replace($2);
   } elsif ( $l =~ /^\s*noinst_(.*)\s*[\+]?\=(.*)$/o )
-  { 
+  {
     #ignore: noinst_* are not relevant here.
   } elsif ( $l =~ /^\s*(nodist_|dist_|)(project_|)([a-zA-Z0-9_]+)_(HEADERS|LIBRARIES|DATA|SCRIPTS|PROGRAMS)\s*([\+]?\=)\s*(.*)/o )
@@ -218 +218 @@
 $output .= "endif\n\n";
 
-foreach my $k ( keys %seen )
+foreach my $k ( sort keys %seen )
 {
   if ( $k =~ /PREINSTALL_FILES/o ) {
@@ -259 +259 @@
 {
   my ($v) = @_;
-  foreach my $i ( keys %dirmap )
+  foreach my $i ( sort keys %dirmap )
   {
     $v =~ s/\Q$i/$dirmap{$i}/g;