diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2003-05-12 18:24:21 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2003-05-12 18:24:21 +0000 |
| commit | 82504bb31df0a95fbd84a84171d77f77d34e2ad9 (patch) | |
| tree | fb7f5ec1f6ac20f4f195d588ca53c39ed8b36336 | |
| parent | 51a2addf3b43c018f1f06674bc38947d9b45c272 (diff) | |
| download | ATCD-82504bb31df0a95fbd84a84171d77f77d34e2ad9.tar.gz | |
ChangeLogTag: Mon May 12 13:23:27 2003 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/modules/Creator.pm | 2 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/modules/ProjectCreator.pm | 8 |
3 files changed, 15 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 06e7d398d91..6494372dd93 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,16 @@ +Mon May 12 13:23:27 2003 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/modules/Creator.pm: + * bin/MakeProjectCreator/modules/ProjectCreator.pm: + + Convert dashes in project names to underscores. VC6 can't handle + project names with dashes. + Mon May 12 16:35:16 2003 Simon McQueen <sm@prismtechnologies.com> - * include/makeinclude/build_example.bor: + * include/makeinclude/build_example.bor: - Added missing libraries to fix static build link errors. + Added missing libraries to fix static build link errors. Mon May 12 08:56:27 2003 Chad Elliott <elliott_c@ociweb.com> diff --git a/bin/MakeProjectCreator/modules/Creator.pm b/bin/MakeProjectCreator/modules/Creator.pm index 5f03e567eb4..7af3fbdd8c4 100644 --- a/bin/MakeProjectCreator/modules/Creator.pm +++ b/bin/MakeProjectCreator/modules/Creator.pm @@ -400,7 +400,7 @@ sub transform_file_name { my($self) = shift; my($name) = shift; - $name =~ s/\s/_/g; + $name =~ s/[\s\-]/_/g; return $name; } diff --git a/bin/MakeProjectCreator/modules/ProjectCreator.pm b/bin/MakeProjectCreator/modules/ProjectCreator.pm index 8282b754a6b..c8b0dc6b296 100644 --- a/bin/MakeProjectCreator/modules/ProjectCreator.pm +++ b/bin/MakeProjectCreator/modules/ProjectCreator.pm @@ -316,7 +316,7 @@ sub parse_line { else { $name =~ s/^\(\s*//; $name =~ s/\s*\)$//; - $name =~ s/\s/_/g; + $name = $self->transform_file_name($name); $self->process_assignment('project_name', $name); } } @@ -1485,7 +1485,7 @@ sub generate_defaults { my($current) = $self->get_current_input(); if ($current eq '') { my($base) = $self->base_directory(); - $base =~ s/\s/_/g; + $base = $self->transform_file_name($base); $self->process_assignment('project_name', $base); } else { @@ -1493,8 +1493,8 @@ sub generate_defaults { ## into underscores. $current =~ s/\\/_/g; - ## Convert spaces to underscores - $current =~ s/\s/_/g; + ## Convert then name to a usable name + $current = $self->transform_file_name($current); ## Take off the extension $current =~ s/\.[^\.]+$//; |