diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2004-12-21 18:18:42 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2004-12-21 18:18:42 +0000 |
| commit | cdfe6393e96ca7343115447314a3777f9e2bf058 (patch) | |
| tree | 8b9f149aba8d5802ee3f2ca80a6d0c9eb89e2606 | |
| parent | a27b73e0dfd2a7e26c2e1f2b9c359d87141ee075 (diff) | |
| download | ATCD-cdfe6393e96ca7343115447314a3777f9e2bf058.tar.gz | |
ChangeLogTag: Tue Dec 21 12:17:50 2004 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ChangeLog | 25 | ||||
| -rw-r--r-- | bin/PerlACE/Process_Win32.pm | 14 |
2 files changed, 23 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog index ce8714ffe05..e839a1af469 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,16 @@ +Tue Dec 21 12:17:50 2004 Chad Elliott <elliott_c@ociweb.com> + + * bin/PerlACE/Process_Win32.pm: + + Take into account the fact that installed binaries do not conform + to the -ExeSubDir option. + Tue Dec 21 04:52:25 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu> - * Release: - * bin/make_release: + * Release: + * bin/make_release: - Udated them to add the correct versions of files. + Udated them to add the correct versions of files. Mon Dec 20 17:38:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> @@ -12,17 +19,17 @@ Mon Dec 20 17:38:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl> Mon Dec 20 08:33:28 2004 J.T. Conklin <jtc@acorntoolworks.com> - * configure.ac: + * configure.ac: - Added test for ACE_LACKS_UMASK. + Added test for ACE_LACKS_UMASK. Mon Dec 20 08:10:31 2004 J.T. Conklin <jtc@acorntoolworks.com> - * configure.ac: - * m4/config_h.m4: + * configure.ac: + * m4/config_h.m4: - Replaced autoheader templates for type and size in config_h.m4 - with a third argument to AC_DEFINE in configure.ac. + Replaced autoheader templates for type and size in config_h.m4 + with a third argument to AC_DEFINE in configure.ac. Mon Dec 20 09:40:22 2004 Chad Elliott <elliott_c@ociweb.com> diff --git a/bin/PerlACE/Process_Win32.pm b/bin/PerlACE/Process_Win32.pm index 746f241e145..d83f333e118 100644 --- a/bin/PerlACE/Process_Win32.pm +++ b/bin/PerlACE/Process_Win32.pm @@ -81,6 +81,11 @@ sub Normalize_Executable_Name $executable = $dirname.$PerlACE::Process::ExeSubDir.$basename.".EXE"; + ## Installed executables do not conform to the ExeSubDir + if (! -x $executable && -x $dirname.$basename.'.EXE') { + $executable = $dirname.$basename.'.EXE'; + } + $executable =~ s/\//\\/g; # / <- # color coding issue in devenv return $executable; @@ -98,18 +103,13 @@ sub Executable my $executable = $self->{EXECUTABLE}; if ($self->{IGNOREEXESUBDIR} == 0) { - - my $basename = basename ($executable); - my $dirname = dirname ($executable). '/'; - - $executable = $dirname.$PerlACE::Process::ExeSubDir.$basename.".EXE"; - + $executable = PerlACE::Process::Normalize_Executable_Name ($executable); } else { $executable = $executable.".EXE"; + $executable =~ s/\//\\/g; # / <- # color coding issue in devenv } - $executable =~ s/\//\\/g; # / <- # color coding issue in devenv return $executable; } |