diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2005-11-14 15:51:28 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2005-11-14 15:51:28 +0000 |
| commit | 79517156194b01e9f60e8b5217d2b4eaf1aabcbe (patch) | |
| tree | 1f1110c6715b63067916ccf97cc7e78ffc568f7d | |
| parent | 38f34d898106d8a4c84326e9a7721535b10e3cdf (diff) | |
| download | MPC-79517156194b01e9f60e8b5217d2b4eaf1aabcbe.tar.gz | |
ChangeLogTag: Mon Nov 14 09:50:38 2005 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | modules/WorkspaceCreator.pm | 11 |
2 files changed, 15 insertions, 4 deletions
@@ -1,3 +1,11 @@ +Mon Nov 14 09:50:38 2005 Chad Elliott <elliott_c@ociweb.com> + + * modules/WorkspaceCreator.pm: + + Fixed a bug where a project name that conflicts with a directory + name would not get mapped in cases where the directory had + multiple levels. + Mon Nov 14 07:40:19 2005 Chad Elliott <elliott_c@ociweb.com> * modules/WorkspaceCreator.pm: diff --git a/modules/WorkspaceCreator.pm b/modules/WorkspaceCreator.pm index 808a0091..7667d55d 100644 --- a/modules/WorkspaceCreator.pm +++ b/modules/WorkspaceCreator.pm @@ -1637,9 +1637,9 @@ sub number_target_deps { sub project_target_translation { - my($self) = shift; - my($cased) = shift; - my(%map) = (); + my($self) = shift; + my($case) = shift; + my(%map) = (); ## Translate project names to avoid target collision with ## some versions of make. @@ -1647,7 +1647,10 @@ sub project_target_translation { my($dir) = $self->mpc_dirname($key); my($name) = $self->{'project_info'}->{$key}->[0]; - if (($cased && $dir eq $name) || (!$cased && lc($dir) eq lc($name))) { + ## We want to compare to the upper most directory. This will be the + ## one that may conflict with the project name. + $dir =~ s/[\/\\].*//; + if (($case && $dir eq $name) || (!$case && lc($dir) eq lc($name))) { $map{$key} = "$name-target"; } else { |