Changeset 93d0ddd in rtems


Ignore:
Timestamp:
Aug 29, 2014, 1:39:29 AM (6 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:
1 edited

Legend:

Unmodified
Added
Removed
  • ampolish3

    rb597c0d r93d0ddd  
    1010# Usage: ampolish3 Makefile.am > preinstall.am
    1111#
    12 # Reads a Makefile.am from stdin and writes corresponding 
     12# Reads a Makefile.am from stdin and writes corresponding
    1313# pre/tmpinstall rules to stdout.
    1414
     
    8686    $dirmap{"\$\($1\)"} = replace($2);
    8787  } elsif ( $l =~ /^\s*noinst_(.*)\s*[\+]?\=(.*)$/o )
    88   { 
     88  {
    8989    #ignore: noinst_* are not relevant here.
    9090  } elsif ( $l =~ /^\s*(nodist_|dist_|)(project_|)([a-zA-Z0-9_]+)_(HEADERS|LIBRARIES|DATA|SCRIPTS|PROGRAMS)\s*([\+]?\=)\s*(.*)/o )
     
    218218$output .= "endif\n\n";
    219219
    220 foreach my $k ( keys %seen )
     220foreach my $k ( sort keys %seen )
    221221{
    222222  if ( $k =~ /PREINSTALL_FILES/o ) {
     
    259259{
    260260  my ($v) = @_;
    261   foreach my $i ( keys %dirmap )
     261  foreach my $i ( sort keys %dirmap )
    262262  {
    263263    $v =~ s/\Q$i/$dirmap{$i}/g;
Note: See TracChangeset for help on using the changeset viewer.