diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2002-07-09 13:10:53 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2002-07-09 13:10:53 +0000 |
| commit | 1d4b728cf2b576893d996c52708ebc4e91aef66a (patch) | |
| tree | dacaebd27280a62967a20f28f3c16af8bec892c8 | |
| parent | 88d7ecde2c87af2686db16a75a2f29448c50e11d (diff) | |
| download | ATCD-1d4b728cf2b576893d996c52708ebc4e91aef66a.tar.gz | |
ChangeLogTag: Tue Jul 9 08:07:20 2002 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 8 | ||||
| -rw-r--r-- | bin/MakeProjectCreator/modules/TemplateParser.pm | 11 |
3 files changed, 26 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index b7e08d677f7..d0163ebfcb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Jul 9 08:07:20 2002 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/modules/TemplateParser.pm: + + When using Cygwin Perl, we need to convert the cwd to a windows + path to match up with environment variables that are usable + outside of Cygwin. + Tue Jul 9 07:46:57 2002 Chad Elliott <elliott_c@ociweb.com> * bin/MakeProjectCreator/modules/TemplateParser.pm: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index b7e08d677f7..d0163ebfcb3 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,11 @@ +Tue Jul 9 08:07:20 2002 Chad Elliott <elliott_c@ociweb.com> + + * bin/MakeProjectCreator/modules/TemplateParser.pm: + + When using Cygwin Perl, we need to convert the cwd to a windows + path to match up with environment variables that are usable + outside of Cygwin. + Tue Jul 9 07:46:57 2002 Chad Elliott <elliott_c@ociweb.com> * bin/MakeProjectCreator/modules/TemplateParser.pm: diff --git a/bin/MakeProjectCreator/modules/TemplateParser.pm b/bin/MakeProjectCreator/modules/TemplateParser.pm index 3e7e726f123..f7560f8aea1 100644 --- a/bin/MakeProjectCreator/modules/TemplateParser.pm +++ b/bin/MakeProjectCreator/modules/TemplateParser.pm @@ -177,8 +177,17 @@ sub relative { while(substr($value, $start) =~ /(\$\(([^)]+)\))/) { my($whole) = $1; my($name) = $2; - my($val) = $$rel{$name}; + my($val) = $$rel{$name}; if (defined $val) { + if ($^O eq 'cygwin' && + $cwd !~ /[A-Za-z]:/ && $val =~ /[A-Za-z]:/) { + my($cyg) = `cygpath -w $cwd`; + if (defined $cyg) { + $cyg =~ s/\\/\//g; + chop($cwd = $cyg); + } + } + ## Fix up the value for Windows (capitalize the drive and ## switch the \\'s to / $val =~ s/\\/\//g; |