diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2006-02-24 00:25:24 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2006-02-24 00:25:24 +0000 |
| commit | 9745a4f16cd1f8ae25750ca38d9c62df6bfca0c1 (patch) | |
| tree | 6791b0d0f07745c175f7878c5e4ffe8f42058020 | |
| parent | 1922f0eac2ff0ed84b6fe17bf61350b1cddf22e4 (diff) | |
| download | MPC-9745a4f16cd1f8ae25750ca38d9c62df6bfca0c1.tar.gz | |
ChangeLogTag: Fri Feb 24 00:23:57 UTC 2006 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | modules/ProjectCreator.pm | 4 |
2 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,11 @@ +Fri Feb 24 00:23:57 UTC 2006 Chad Elliott <elliott_c@ociweb.com> + + * modules/ProjectCreator.pm: + + Removed calls to escape_regex_special() before calling + generated_filenames(). This was breaking when files with regular + expression special characters (like .) were listed. + Thu Feb 23 10:33:25 2006 J.T. Conklin <jtc@acorntoolworks.com> * templates/automake.mpd diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm index 8c2556f1..37512dae 100644 --- a/modules/ProjectCreator.pm +++ b/modules/ProjectCreator.pm @@ -2610,7 +2610,6 @@ sub generate_default_components { $input, $self->{'valid_components'}->{$gentype}); - $part = $self->escape_regex_special($part); my(@files) = $self->generated_filenames($part, $gentype, $tag, $input); if ($#copy != -1) { @@ -2729,12 +2728,11 @@ sub generated_source_listed { foreach my $key (keys %$comps) { foreach my $val (@{$$comps{$key}}) { foreach my $i (@$arr) { - my($ifile) = $self->escape_regex_special($i); foreach my $wanted (@$sext) { ## Remove any escape characters from the extension my($oext) = $wanted; $oext =~ s/\\//g; - foreach my $re ($self->generated_filenames($ifile, $gent, + foreach my $re ($self->generated_filenames($i, $gent, $tag, "$i$oext")) { $re = $self->escape_regex_special($re); if ($val =~ /$re$/) { |