diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-05-22 12:11:52 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-05-22 12:11:52 +0000 |
| commit | 9c01c2246dcd3291f17c9ce9af7d67197c6380b3 (patch) | |
| tree | cc2557a67030b60ad3a35bfabd56e681f494a924 | |
| parent | c8ebe9c29241646cd17fed856eb0c05b5e78b476 (diff) | |
| download | ATCD-9c01c2246dcd3291f17c9ce9af7d67197c6380b3.tar.gz | |
Fri May 22 12:11:05 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* bin/PerlACE/ProcessWinCE.pm:
* bin/PerlACE/ProcessWinCE_Unix.pm:
Only use the vxtest file in a non static test
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/bin/PerlACE/ProcessWinCE.pm | 22 | ||||
| -rw-r--r-- | ACE/bin/PerlACE/ProcessWinCE_Unix.pm | 22 |
3 files changed, 30 insertions, 20 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index bdb3db766c5..cce851c039d 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Fri May 22 12:11:05 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * bin/PerlACE/ProcessWinCE.pm: + * bin/PerlACE/ProcessWinCE_Unix.pm: + Only use the vxtest file in a non static test + Fri May 22 11:12:05 2009 Johnny Willemsen <jwillemsen@remedy.nl> * ace/SOCK_Dgram.cpp: diff --git a/ACE/bin/PerlACE/ProcessWinCE.pm b/ACE/bin/PerlACE/ProcessWinCE.pm index 33676395b87..61c832ce14f 100644 --- a/ACE/bin/PerlACE/ProcessWinCE.pm +++ b/ACE/bin/PerlACE/ProcessWinCE.pm @@ -348,18 +348,20 @@ sub handle_vxtest_file push @$vx_ref, "copy " . $ENV{"ACE_RUN_VX_TGTSVR_ROOT"} . "/lib/" . $token . " ."; } } - if (open ($fh, $vxtestfile)) { - my $line1 = <$fh>; - chomp $line1; - while(<$fh>) { - $line1 = $_; + if (!$PerlACE::Static) { + if (open ($fh, $vxtestfile)) { + my $line1 = <$fh>; chomp $line1; - push @$vx_ref, "copy " . $ENV{"ACE_RUN_VX_TGTSVR_ROOT"} . "/lib/$line1" . "d.dll ."; - unshift @$unld_ref, "del $line1" . "d.dll"; + while(<$fh>) { + $line1 = $_; + chomp $line1; + push @$vx_ref, "copy " . $ENV{"ACE_RUN_VX_TGTSVR_ROOT"} . "/lib/$line1" . "d.dll ."; + unshift @$unld_ref, "del $line1" . "d.dll"; + } + close $fh; + } else { + return 0; } - close $fh; - } else { - return 0; } return 1; } diff --git a/ACE/bin/PerlACE/ProcessWinCE_Unix.pm b/ACE/bin/PerlACE/ProcessWinCE_Unix.pm index a88bcad577f..6c8b2773695 100644 --- a/ACE/bin/PerlACE/ProcessWinCE_Unix.pm +++ b/ACE/bin/PerlACE/ProcessWinCE_Unix.pm @@ -420,18 +420,20 @@ sub handle_vxtest_file push @$vx_ref, "copy " . $ENV{"ACE_RUN_VX_TGTSVR_ROOT"} . "/lib/" . $token . " ."; } } - if (open ($fh, $vxtestfile)) { - my $line1 = <$fh>; - chomp $line1; - while(<$fh>) { - $line1 = $_; + if (!$PerlACE::Static) { + if (open ($fh, $vxtestfile)) { + my $line1 = <$fh>; chomp $line1; - push @$vx_ref, "copy " . $ENV{"ACE_RUN_VX_TGTSVR_ROOT"} . "/lib/$line1" . ".dll ."; - unshift @$unld_ref, "del $line1" . "d.dll"; + while(<$fh>) { + $line1 = $_; + chomp $line1; + push @$vx_ref, "copy " . $ENV{"ACE_RUN_VX_TGTSVR_ROOT"} . "/lib/$line1" . ".dll ."; + unshift @$unld_ref, "del $line1" . "d.dll"; + } + close $fh; + } else { + return 0; } - close $fh; - } else { - return 0; } return 1; } |