diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2004-07-02 13:18:19 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2004-07-02 13:18:19 +0000 |
| commit | de8577cfe96df2410320359185de4777adf3fbbd (patch) | |
| tree | 0e5406df1d3d71ad1ea10f5440d00101f2d784b9 | |
| parent | b577eb27bab4b98de8163214057bc48ffac1a346 (diff) | |
| download | MPC-de8577cfe96df2410320359185de4777adf3fbbd.tar.gz | |
ChangeLogTag: Fri Jul 2 08:17:48 2004 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 19 | ||||
| -rw-r--r-- | modules/Creator.pm | 2 | ||||
| -rw-r--r-- | modules/ProjectCreator.pm | 11 | ||||
| -rw-r--r-- | templates/vc7.mpd | 14 |
4 files changed, 44 insertions, 2 deletions
@@ -1,3 +1,22 @@ +Fri Jul 2 08:17:48 2004 Chad Elliott <elliott_c@ociweb.com> + + * modules/Creator.pm: + + Return the same kind of crlf on OS/2 as we do on Windows. Just in + case someone tries to use MPC on OS/2. + + * modules/ProjectCreator.pm: + + When returning the list of grouped source files, convert the + slashes if it is necessary. + + * templates/vc7.mpd: + + The above change allows us to use file grouping for vc7. + Previously, files would have a forward slash in the name (if they + were in sub-directories) which confused vc7 and would cause link + errors. + Thu Jul 1 09:35:27 2004 Chad Elliott <elliott_c@ociweb.com> * modules/MakeWorkspaceCreator.pm: diff --git a/modules/Creator.pm b/modules/Creator.pm index 02b967a0..3b2016b4 100644 --- a/modules/Creator.pm +++ b/modules/Creator.pm @@ -440,7 +440,7 @@ sub generate_default_file_list { sub windows_crlf { #my($self) = shift; - if ($^O eq 'MSWin32' || $^O eq 'cygwin') { + if ($^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'os2') { return "\n"; } else { diff --git a/modules/ProjectCreator.pm b/modules/ProjectCreator.pm index e9eeba35..266f7630 100644 --- a/modules/ProjectCreator.pm +++ b/modules/ProjectCreator.pm @@ -2419,7 +2419,16 @@ sub get_grouped_value { my($comps) = $$names{$name}; foreach my $comp (keys %$comps) { if ($comp eq $based) { - $value = $$comps{$comp}; + if ($self->{'convert_slashes'}) { + my(@converted) = (); + foreach my $file (@{$$comps{$comp}}) { + push(@converted, $self->slash_to_backslash($file)); + } + $value = \@converted; + } + else { + $value = $$comps{$comp}; + } last; } } diff --git a/templates/vc7.mpd b/templates/vc7.mpd index 27073035..14d0ad4f 100644 --- a/templates/vc7.mpd +++ b/templates/vc7.mpd @@ -135,11 +135,25 @@ <%endfor%> </File> <%endif%> +<%if(grouped_source_files)%> +<%foreach(grouped_source_files)%> + <Filter + Name="<%grouped_source_file%>" + Filter=""> +<%foreach(grouped_source_file->files)%> + <File + RelativePath="<%grouped_source_file->file%>"> + </File> +<%endfor%> + </Filter> +<%endfor%> +<%else%> <%foreach(source_files)%> <File RelativePath="<%source_file%>"> </File> <%endfor%> +<%endif%> </Filter> <%endif%> <%endif%> |