diff options
| author | Steve Totten <tottens@users.noreply.github.com> | 2004-09-17 13:44:11 +0000 |
|---|---|---|
| committer | Steve Totten <tottens@users.noreply.github.com> | 2004-09-17 13:44:11 +0000 |
| commit | 5fde04e6745043e6effc11899d6e35c1c6cc44d7 (patch) | |
| tree | dc808f65910245d8551ecdca653ef569294d0b3c | |
| parent | 104d61e26f24722419de85ff00b89832e4fa681b (diff) | |
| download | ATCD-5fde04e6745043e6effc11899d6e35c1c6cc44d7.tar.gz | |
ChangeLogTag: Fri Sep 17 08:42:50 2004 Steve Totten <totten_s@ociweb.com>
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | bin/PerlACE/Process_Win32.pm | 16 |
2 files changed, 22 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index fa5311c2b11..0390e24ed2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Fri Sep 17 08:42:50 2004 Steve Totten <totten_s@ociweb.com> + + * bin/PerlACE/Process_Win32.pm (Executable): + Fixed an error in which Executable() returns a UNIX-style + path instead of a Windows-style path if the IGNOREEXESUBDIR + member is set. Now, test scripts can use + PerlACE::Process::IgnoreExeSubDir() to make sure an + executable is found in the path specified without the + addition of the setting of -ExeSubDir. This change was + required for Windows Release and Static builds after the + installation directory for various common utilities was + changed to %ACE_ROOT%\bin. + Fri Sep 17 09:30:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> * ace/config-cygwin32.h: diff --git a/bin/PerlACE/Process_Win32.pm b/bin/PerlACE/Process_Win32.pm index e9d8c173025..746f241e145 100644 --- a/bin/PerlACE/Process_Win32.pm +++ b/bin/PerlACE/Process_Win32.pm @@ -97,17 +97,19 @@ sub Executable my $executable = $self->{EXECUTABLE}; - if ($self->{IGNOREEXESUBDIR}) { - return $executable; - } + if ($self->{IGNOREEXESUBDIR} == 0) { - my $basename = basename ($executable); - my $dirname = dirname ($executable). '/'; + my $basename = basename ($executable); + my $dirname = dirname ($executable). '/'; - $executable = $dirname.$PerlACE::Process::ExeSubDir.$basename.".EXE"; + $executable = $dirname.$PerlACE::Process::ExeSubDir.$basename.".EXE"; - $executable =~ s/\//\\/g; # / <- # color coding issue in devenv + } + else { + $executable = $executable.".EXE"; + } + $executable =~ s/\//\\/g; # / <- # color coding issue in devenv return $executable; } |