# HG changeset patch # User Simon Howkins # Date 1242059484 -3600 # Node ID 5b27412eeaf058a99d6f6ac02c0ce12114e1b782 # Parent a8aa5d600806e7ad9f420b348a096cfde5ad0ca0 Removed obsolete variable (@includes). Moved remaining code round so that an XML entry is created even if there are no local files detected. (Ie same approach as src repositories.) diff -r a8aa5d600806 -r 5b27412eeaf0 common/tools/populateziptemplate.pl --- a/common/tools/populateziptemplate.pl Mon May 11 13:48:11 2009 +0100 +++ b/common/tools/populateziptemplate.pl Mon May 11 17:31:24 2009 +0100 @@ -78,22 +78,7 @@ { # RnD repository my $name = "bin_rnd_$1_$2"; - # Enumerate all the files on the local disk that are in this repository - (my $dosCompatibleDst = $package->{dst}) =~ s{/}{\\}g; - my @files = `dir /b/s/a-d $dosCompatibleDst 2> nul:`; - #print "@files\n"; - next unless @files; - # Add the files to this zip object - @files = grep { - chomp; - s{\\}{/}g; - s!^[A-Z]:/$package->{dst}/!!i; - m{^epoc32/}i; - } @files; - #print "@files\n"; - push @allRndFiles, @files; # Create a zip object - my @includes = map { {name => "include", value => "$_"} } @files; push @{$zipConfig->{config}->{config}->{src}->{config}->{rnd}->{config}}, { set => @@ -112,6 +97,19 @@ }, ] }; + # Enumerate all the files on the local disk that are in this repository + (my $dosCompatibleDst = $package->{dst}) =~ s{/}{\\}g; + my @files = `dir /b/s/a-d $dosCompatibleDst 2> nul:`; + #print "@files\n"; + next unless @files; + # Add the files to this zip object + @files = grep { + chomp; + s{\\}{/}g; + s!^[A-Z]:/$package->{dst}/!!i; + m{^epoc32/}i; + } @files; + push @allRndFiles, @files; } else {