diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2004-09-13 17:55:57 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2004-09-13 17:55:57 +0000 |
| commit | 388c41b51bceb25d1e72edd3e7d7a93964fabfc6 (patch) | |
| tree | 4c65ad77dd5703fe18fffbcd8a256b29d4b18d45 | |
| parent | c834a8d6d7df7e1ac529aeb9f457fa4f6ce23358 (diff) | |
| download | MPC-388c41b51bceb25d1e72edd3e7d7a93964fabfc6.tar.gz | |
ChangeLogTag: Mon Sep 13 12:52:22 2004 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | modules/Creator.pm | 5 | ||||
| -rw-r--r-- | modules/ProjectCreator.pm | 15 | ||||
| -rw-r--r-- | modules/WorkspaceCreator.pm | 1 |
4 files changed, 36 insertions, 2 deletions
@@ -1,3 +1,20 @@ +Mon Sep 13 12:52:22 2004 Chad Elliott <elliott_c@ociweb.com> + + * modules/ProjectCreator.pm: + + Fixed a bug where if a custom file is in a directory other than + '.' and the 'gendir' setting is used to specify that the generated + output will be in a particular directory, it would be ignored when + determining if generated files were listed. + + * modules/Creator.pm: + * modules/WorkspaceCreator.pm: + + When converting slashes to back slashes (on Windows), only convert + values when the parameter name does not contain 'flags'. Some + custom build executables on Windows require the use of / as + command switches. + Tue Sep 7 07:08:26 2004 Chad Elliott <elliott_c@ociweb.com> * USAGE: diff --git a/modules/Creator.pm b/modules/Creator.pm index b31fcae2..e31e9d44 100644 --- a/modules/Creator.pm +++ b/modules/Creator.pm @@ -537,9 +537,10 @@ sub extension_recursive_input_list { sub modify_assignment_value { my($self) = shift; + my($name) = shift; my($value) = shift; - if ($self->{'convert_slashes'}) { + if ($self->{'convert_slashes'} && $name !~ /flags/) { $value = $self->slash_to_backslash($value); } return $value; @@ -589,7 +590,7 @@ sub process_assignment { $value =~ s/\s+$//; ## Modify the assignment value before saving it - $$assign{$name} = $self->modify_assignment_value($value); + $$assign{$name} = $self->modify_assignment_value($name, $value); } else { $$assign{$name} = undef; diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm index 6774f808..719db217 100644 --- a/modules/ProjectCreator.pm +++ b/modules/ProjectCreator.pm @@ -1588,6 +1588,21 @@ sub generated_filename_arrays { $base = $part; } + ## If gendir was specified, then we need to account for that + if (defined $self->{'flag_overrides'}->{$type}) { + foreach my $q (keys %{$self->{'flag_overrides'}->{$type}}) { + if (defined $self->{'flag_overrides'}->{$type}->{$q}->{'gendir'}) { + if ($self->{'flag_overrides'}->{$type}->{$q}->{'gendir'} eq '.') { + $dir = ''; + } + else { + $dir = $self->{'flag_overrides'}->{$type}->{$q}->{'gendir'}; + } + last; + } + } + } + ## Loop through creating all of the possible file names foreach my $pe (@pearr) { push(@array, []); diff --git a/modules/WorkspaceCreator.pm b/modules/WorkspaceCreator.pm index 635b33ad..3b2b2ed8 100644 --- a/modules/WorkspaceCreator.pm +++ b/modules/WorkspaceCreator.pm @@ -118,6 +118,7 @@ sub new { sub modify_assignment_value { my($self) = shift; + my($name) = shift; my($value) = shift; ## Workspace assignments do not need modification. |