RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

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

Browse Source 
Something must have changed in perl to change the way the keys are
ordered by default.
This commit is contained in:
Chris Johns
2014-08-29 11:39:29 +10:00
parent b597c0d60c
commit 93d0ddd41b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ampolish3
View File

@@ -9,7 +9,7 @@
# #
# Usage: ampolish3 Makefile.am > preinstall.am # 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. # pre/tmpinstall rules to stdout.
sub replace($); sub replace($);
@@ -85,7 +85,7 @@ foreach my $l ( @buffer1 ) {
push @buffer2, "$l"; push @buffer2, "$l";
$dirmap{"\$\($1\)"} = replace($2); $dirmap{"\$\($1\)"} = replace($2);
} elsif ( $l =~ /^\s*noinst_(.*)\s*[\+]?\=(.*)$/o ) } elsif ( $l =~ /^\s*noinst_(.*)\s*[\+]?\=(.*)$/o )
{ {
#ignore: noinst_* are not relevant here. #ignore: noinst_* are not relevant here.
} elsif ( $l =~ /^\s*(nodist_|dist_|)(project_|)([a-zA-Z0-9_]+)_(HEADERS|LIBRARIES|DATA|SCRIPTS|PROGRAMS)\s*([\+]?\=)\s*(.*)/o ) } elsif ( $l =~ /^\s*(nodist_|dist_|)(project_|)([a-zA-Z0-9_]+)_(HEADERS|LIBRARIES|DATA|SCRIPTS|PROGRAMS)\s*([\+]?\=)\s*(.*)/o )
{ {
@@ -217,7 +217,7 @@ $output .= "\$(srcdir)/preinstall.am: Makefile.am\n";
$output .= "\t\$(AMPOLISH3) \$(srcdir)/Makefile.am > \$(srcdir)/preinstall.am\n"; $output .= "\t\$(AMPOLISH3) \$(srcdir)/Makefile.am > \$(srcdir)/preinstall.am\n";
$output .= "endif\n\n"; $output .= "endif\n\n";
foreach my $k ( keys %seen ) foreach my $k ( sort keys %seen )
{ {
if ( $k =~ /PREINSTALL_FILES/o ) { if ( $k =~ /PREINSTALL_FILES/o ) {
$output .= "all-am: \$(PREINSTALL_FILES)\n\n"; $output .= "all-am: \$(PREINSTALL_FILES)\n\n";
@@ -258,7 +258,7 @@ exit 0;
sub replace($) sub replace($)
{ {
my ($v) = @_; my ($v) = @_;
foreach my $i ( keys %dirmap ) foreach my $i ( sort keys %dirmap )
{ {
$v =~ s/\Q$i/$dirmap{$i}/g; $v =~ s/\Q$i/$dirmap{$i}/g;
} }