opendemo-cvs Mailing List for OpenDemo (Page 3)
Status: Beta
Brought to you by:
girlich
Menu
▾
▴
opendemo-cvs — cvs checkin list
You can subscribe to this list here.
| 2002 |
Jan
(43) |
Feb
|
Mar
|
Apr
(38) |
May
(65) |
Jun
(108) |
Jul
(2) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(17) |
Feb
(13) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(8) |
Sep
(62) |
Oct
(81) |
Nov
(12) |
Dec
(32) |
| 2004 |
Jan
(25) |
Feb
(76) |
Mar
(32) |
Apr
(10) |
May
(6) |
Jun
|
Jul
(1) |
Aug
(5) |
Sep
|
Oct
(19) |
Nov
(1) |
Dec
|
| 2005 |
Jan
(2) |
Feb
(23) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
(14) |
Nov
|
Dec
|
|
From: Uwe G. <gi...@us...> - 2004-10-26 17:53:21
|
Update of /cvsroot/opendemo/opendemo/tools/odcut In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22170 Modified Files: odcutgui.pm Log Message: Remove shell between pwrap.pl and quake3.x86 by changing the directory, calling quake3.x86 directly and changing back. Introduce new variables for the game directory. Index: odcutgui.pm =================================================================== RCS file: /cvsroot/opendemo/opendemo/tools/odcut/odcutgui.pm,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** odcutgui.pm 25 Oct 2004 17:07:35 -0000 1.43 --- odcutgui.pm 26 Oct 2004 17:53:11 -0000 1.44 *************** *** 603,608 **** # TODO make this configurable if (!exists $self->{"game_executable"}) { ! $self->{"game_executable"} = "/home/uwe/games/q3a/game/linuxq3apoint-1.32b-2/quake3"; } if (!exists $self->{"game_opendemo"}) { --- 603,611 ---- # TODO make this configurable + if (!exists $self->{"game_dir"}) { + $self->{"game_dir"} = "/home/uwe/games/q3a/game/linuxq3apoint-1.32b-2"; + } if (!exists $self->{"game_executable"}) { ! $self->{"game_executable"} = $self->{"game_dir"} . "/quake3.x86"; } if (!exists $self->{"game_opendemo"}) { *************** *** 627,631 **** # $self->{"game_opendemo"}; my @command = [ ! "../pwrap.pl", $self->{"game_executable"}, "+set", "fs_game", $self->{"game_opendemo"} --- 630,634 ---- # $self->{"game_opendemo"}; my @command = [ ! Cwd::getcwd() . "/../pwrap.pl", $self->{"game_executable"}, "+set", "fs_game", $self->{"game_opendemo"} *************** *** 634,638 **** --- 637,646 ---- $self->{"odgame"} = odprocess->new($self); $self->{"odgame"}->Redirect(); + # Make sure the external binary will be started in the right directory. + my $prevdir=Cwd::getcwd(); + chdir $self->{"game_dir"}; $self->{"odgame_pid"} = Wx::ExecuteArgs( @command, 0, $self->{"odgame"} ); + # Go back to the old directory. + chdir $prevdir; # Timer *************** *** 937,944 **** $self->{TIMER}->Start($waitsec * 1000.0, 1); if ($self->{TIMER}->IsRunning == 0) { ! printf STDERR "but not running any more.\n"; ! } ! else { ! printf STDERR "OK.\n"; } } --- 945,949 ---- $self->{TIMER}->Start($waitsec * 1000.0, 1); if ($self->{TIMER}->IsRunning == 0) { ! printf STDERR "Timer is not running.\n"; } } *************** *** 983,987 **** my $self = $process->{"object"}; $self->OnProcessEnd(); ! sprintf STDERR "Process '$pid' terminated with status $status"; } --- 988,992 ---- my $self = $process->{"object"}; $self->OnProcessEnd(); ! printf STDERR "Process '$pid' terminated with status $status"; } |
|
From: Uwe G. <gi...@us...> - 2004-10-25 17:07:46
|
Update of /cvsroot/opendemo/opendemo/tools/odcut In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5277 Modified Files: odcutgui.pm Log Message: Add a new process class, which can call my own function but nor with EVT_END_PROCESS. Don't allow double start of sub-process (not complete). Remember the pid of the started process to make a later kill easier. Add a function to explicitely kill the sub-process. Index: odcutgui.pm =================================================================== RCS file: /cvsroot/opendemo/opendemo/tools/odcut/odcutgui.pm,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** odcutgui.pm 24 Oct 2004 19:28:55 -0000 1.42 --- odcutgui.pm 25 Oct 2004 17:07:35 -0000 1.43 *************** *** 30,33 **** --- 30,34 ---- use Wx::Event qw(EVT_MENU EVT_SLIDER EVT_BUTTON EVT_TIMER EVT_CHECKBOX EVT_SPINCTRL EVT_NOTEBOOK_PAGE_CHANGED EVT_IDLE EVT_END_PROCESS); use Wx qw(:filedialog); + use Wx qw(wxSIGTERM); use Wx::Html; *************** *** 222,226 **** # end of sub process ! EVT_END_PROCESS( $self, -1, \&OnEndProcess ); $self; --- 223,227 ---- # end of sub process ! # EVT_END_PROCESS( $self, -1, \&OnEndProcess ); $self; *************** *** 597,611 **** - sub OnEndProcess($) - { - my ($self) = @_; - - print "process terminated\n"; - Wx::LogMessage( "Process terminated" ); - $self->{"odgame"}->Destroy; - undef $self->{"odgame"}; - } - - sub OnGameStart($) { --- 598,601 ---- *************** *** 622,626 **** # Clean up. if (exists $self->{"odgame"}) { ! OnEndProcess($self); } --- 612,618 ---- # Clean up. if (exists $self->{"odgame"}) { ! EndGame($self); ! Wx::LogMessage( "First Terminate Sub Process. Try again." ); ! return; } *************** *** 640,646 **** ]; ! $self->{"odgame"} = Wx::Process->new($self); $self->{"odgame"}->Redirect(); ! Wx::ExecuteArgs( @command, 0, $self->{"odgame"} ); # Timer --- 632,638 ---- ]; ! $self->{"odgame"} = odprocess->new($self); $self->{"odgame"}->Redirect(); ! $self->{"odgame_pid"} = Wx::ExecuteArgs( @command, 0, $self->{"odgame"} ); # Timer *************** *** 649,652 **** --- 641,668 ---- + sub EndGame($) + { + my ($self) = @_; + + if (exists $self->{"odgame_pid"}) { + if (Wx::Process->Exists($self->{"odgame_pid"})) { + Wx::Process->Kill($self->{"odgame_pid"}, wxSIGTERM); + delete $self->{"odgame_pid"}; + } + } + } + + + sub OnProcessEnd($) + { + my ($self) = @_; + + print "process terminated\n"; + Wx::LogMessage( "Sub Process terminated" ); + $self->{"odgame"}->Destroy; + undef $self->{"odgame"}; + } + + sub StartGameTimer($) { *************** *** 915,919 **** $waitsec = 0.01; } ! printf STDERR "Start timer in %fsec ... ", $waitsec; if (!exists $self->{TIMER}) { $self->{TIMER} = odinteractivetimer->new($self); --- 931,935 ---- $waitsec = 0.01; } ! # printf STDERR "Start timer in %fsec ... ", $waitsec; if (!exists $self->{TIMER}) { $self->{TIMER} = odinteractivetimer->new($self); *************** *** 932,936 **** { my ($self, $event) = @_; ! print STDERR "Handling a timer event.\n"; my $output = $self->{"output"}; $self->UpdateMoving(); --- 948,952 ---- { my ($self, $event) = @_; ! # print STDERR "Handling a timer event.\n"; my $output = $self->{"output"}; $self->UpdateMoving(); *************** *** 943,946 **** --- 959,993 ---- + package odprocess; + + use strict; + use vars qw(@ISA); + @ISA = qw(Wx::Process); + + sub new($$) + { + # Get the class name + my $class = shift; + # Init the super class Wx::Process. + my $self = $class->SUPER::new(); + # Remember the object itself. + $self->{"object"} = shift; + + return $self; + } + + + sub OnTerminate($$$) + { + my( $process, $pid, $status) = @_; + my $self = $process->{"object"}; + $self->OnProcessEnd(); + sprintf STDERR "Process '$pid' terminated with status $status"; + } + + + ###################################################################### + + package odinteractivetimer; *************** *** 949,953 **** ! sub new { # Get the class name. my $class = shift; --- 996,1001 ---- ! sub new($$) ! { # Get the class name. my $class = shift; *************** *** 965,969 **** my ($self) = @_; my $object = $self->{"object"}; ! printf STDERR "Overriding Notify works"; $object->OnTimer(1); } --- 1013,1017 ---- my ($self) = @_; my $object = $self->{"object"}; ! # printf STDERR "Overriding Notify works"; $object->OnTimer(1); } |
|
From: Uwe G. <gi...@us...> - 2004-10-25 17:04:22
|
Update of /cvsroot/opendemo/opendemo/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4392 Modified Files: pwrap.pl Log Message: move signalling a child process into the main loop make it possible to signal a child process repeatedly don't include write file descriptors in select, if there is nothing to write -> this reduces the CPU load considerably. Index: pwrap.pl =================================================================== RCS file: /cvsroot/opendemo/opendemo/tools/pwrap.pl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pwrap.pl 22 Oct 2004 20:05:11 -0000 1.3 --- pwrap.pl 25 Oct 2004 17:04:03 -0000 1.4 *************** *** 19,23 **** my $pid_status = undef; my $got_signal = undef; ! my $kill_child_with = undef; my %signum; --- 19,23 ---- my $pid_status = undef; my $got_signal = undef; ! my $signal_child_with = undef; my %signum; *************** *** 26,33 **** $got_signal = shift; # warn "got signal $got_signal"; ! if ($got_signal ne "CHLD") { ! $kill_child_with = $signum{$got_signal}; } - $loop_end = 1; } --- 26,35 ---- $got_signal = shift; # warn "got signal $got_signal"; ! if ($got_signal eq "CHLD") { ! $loop_end = 1; ! } ! else { ! $signal_child_with = $signum{$got_signal}; } } *************** *** 88,91 **** --- 90,94 ---- my $stdout_buffer = ""; my $stderr_buffer = ""; + # Main loop. while (!$loop_end) { if (!$stdout_up && !$stderr_up) { *************** *** 101,105 **** } if ($stdin_up) { ! $write->add($stdin_up); $error->add($stdin_up); } --- 104,110 ---- } if ($stdin_up) { ! if (length($stdin_buffer) > 0) { ! $write->add($stdin_up); ! } $error->add($stdin_up); } *************** *** 109,113 **** } if ($stdout) { ! $write->add($stdout); $error->add($stdout); } --- 114,120 ---- } if ($stdout) { ! if (length($stdout_buffer) > 0) { ! $write->add($stdout); ! } $error->add($stdout); } *************** *** 117,121 **** } if ($stderr) { ! $write->add($stderr); $error->add($stderr); } --- 124,130 ---- } if ($stderr) { ! if (length($stderr_buffer) > 0) { ! $write->add($stderr); ! } $error->add($stderr); } *************** *** 192,196 **** --- 201,214 ---- } } + if ($signal_child_with) { + # warn "kill the whole process group $pid sig $signal_child_with"; + kill $signal_child_with, -$pid; # perlipc man page + kill -$signal_child_with, $pid; # perlfunc man page + # at least kill the direct child + kill $signal_child_with, $pid; + $signal_child_with = undef; + } } + # End of main loop. if ($stdout_up) { $stdout_up->close(); *************** *** 201,218 **** $stderr_up = undef; } foreach my $signame (keys %signum) { $SIG{$signame} = 'DEFAULT'; } ! if ($kill_child_with) { ! # warn "kill the whole process group $pid sig $kill_child_with"; ! kill $kill_child_with, -$pid; # perlipc man page ! kill -$kill_child_with, $pid; # perlfunc man page ! # at least kill the direct child ! kill $kill_child_with, $pid; ! # make sure the process is gone ! kill 9, -$pid; ! kill -9, $pid; ! kill 9, $pid; ! } while (!$pid_status) { my $child = waitpid(-1,WNOHANG); --- 219,228 ---- $stderr_up = undef; } + # Remove signal handler. foreach my $signame (keys %signum) { $SIG{$signame} = 'DEFAULT'; } ! # Make sure the child is gone. ! kill 9, $pid; while (!$pid_status) { my $child = waitpid(-1,WNOHANG); |
|
From: Uwe G. <gi...@us...> - 2004-10-24 19:29:05
|
Update of /cvsroot/opendemo/opendemo/tools/odcut In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29094 Modified Files: odcutgui.pm Log Message: handling 2 different timer event with double EVT_TIMER calls does not work as expected. An additional class is needed. Index: odcutgui.pm =================================================================== RCS file: /cvsroot/opendemo/opendemo/tools/odcut/odcutgui.pm,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** odcutgui.pm 24 Oct 2004 18:49:00 -0000 1.41 --- odcutgui.pm 24 Oct 2004 19:28:55 -0000 1.42 *************** *** 214,220 **** $sa->SetSizeHints($self); # connect sizer with frame ! # Timer ! $self->{TIMER} = Wx::Timer->new($self, 1); ! EVT_TIMER($self, 1, \&OnTimer); # Idle --- 214,220 ---- $sa->SetSizeHints($self); # connect sizer with frame ! # Timer will be created on the fly. ! # $self->{TIMER} = Wx::Timer->new($self, 1); ! # EVT_TIMER($self, 1, \&OnTimer); # Idle *************** *** 582,586 **** # Make sure the timer is running in interactive mode. if ($self->{"output"}->interactive()==1) { ! if ($self->{TIMER}->IsRunning==0) { print STDERR "Timer is not running. Start it.\n"; $self->StartTimer(); --- 582,586 ---- # Make sure the timer is running in interactive mode. if ($self->{"output"}->interactive()==1) { ! if (!defined $self->{TIMER} || $self->{TIMER}->IsRunning==0) { print STDERR "Timer is not running. Start it.\n"; $self->StartTimer(); *************** *** 589,593 **** else { # Make sure the timer is not running in non-interactive mode. ! if ($self->{TIMER}->IsRunning==1) { print STDERR "Timer is running in non-interactive mode. Stop it.\n"; $self->{TIMER}->Stop(); --- 589,593 ---- else { # Make sure the timer is not running in non-interactive mode. ! if (defined $self->{TIMER} && $self->{TIMER}->IsRunning==1) { print STDERR "Timer is running in non-interactive mode. Stop it.\n"; $self->{TIMER}->Stop(); *************** *** 653,656 **** --- 653,657 ---- my ($self) = @_; + if (0) { # Deactivate game timer. # Make sure the timer exists. if (!exists $self->{"gametimer"}) { *************** *** 659,662 **** --- 660,664 ---- } $self->{"gametimer"}->Start(1000, 1); + } } *************** *** 914,917 **** --- 916,922 ---- } printf STDERR "Start timer in %fsec ... ", $waitsec; + if (!exists $self->{TIMER}) { + $self->{TIMER} = odinteractivetimer->new($self); + } $self->{TIMER}->Start($waitsec * 1000.0, 1); if ($self->{TIMER}->IsRunning == 0) { *************** *** 935,938 **** --- 940,976 ---- + ###################################################################### + + + package odinteractivetimer; + + use vars qw(@ISA); + @ISA = qw(Wx::Timer); + + + sub new { + # Get the class name. + my $class = shift; + # Init the super class Wx::Timer. + my $self = $class->SUPER::new( @_ ); + # Remember the object itself. + $self->{"object"} = shift; + + return $self; + } + + + sub Notify() + { + my ($self) = @_; + my $object = $self->{"object"}; + printf STDERR "Overriding Notify works"; + $object->OnTimer(1); + } + + + ###################################################################### + + package odcuttab; |
|
From: Uwe G. <gi...@us...> - 2004-10-24 18:49:08
|
Update of /cvsroot/opendemo/opendemo/tools/odcut In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17323 Modified Files: odcutgui.pm Log Message: Beautify the timer behaviour. It is still totally wrong: with a game running (sub process started), no timer event will be generated any more. Index: odcutgui.pm =================================================================== RCS file: /cvsroot/opendemo/opendemo/tools/odcut/odcutgui.pm,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** odcutgui.pm 22 Oct 2004 21:26:53 -0000 1.40 --- odcutgui.pm 24 Oct 2004 18:49:00 -0000 1.41 *************** *** 561,574 **** if (defined $self->{"odgame"}) { my $odgame = $self->{"odgame"}; my $stream = $odgame->GetInputStream(); # TODO ! # We must read as long as there are data available and not ! # only a single line. my $value = <$stream>; ! print "STDOUT>>>$value<<<STDOUT" if defined $value; $stream = $odgame->GetErrorStream(); $value = <$stream>; ! print "STDERR>>>$value<<<STDERR" if defined $value; } } --- 561,596 ---- if (defined $self->{"odgame"}) { my $odgame = $self->{"odgame"}; + # A single line is not enough. + my $oldsep = $/; + $/ = ""; my $stream = $odgame->GetInputStream(); # TODO ! # We have to check, if there is data to read at all. my $value = <$stream>; ! if (defined $value && length($value)>0) { ! print "STDOUT>>>$value<<<STDOUT"; ! } $stream = $odgame->GetErrorStream(); $value = <$stream>; ! if (defined $value && length($value)>0) { ! print "STDERR>>>$value<<<STDERR"; ! } ! $/ = $oldsep; ! } ! ! # Make sure the timer is running in interactive mode. ! if ($self->{"output"}->interactive()==1) { ! if ($self->{TIMER}->IsRunning==0) { ! print STDERR "Timer is not running. Start it.\n"; ! $self->StartTimer(); ! } ! } ! else { ! # Make sure the timer is not running in non-interactive mode. ! if ($self->{TIMER}->IsRunning==1) { ! print STDERR "Timer is running in non-interactive mode. Stop it.\n"; ! $self->{TIMER}->Stop(); ! } } } *************** *** 623,626 **** --- 645,657 ---- # Timer + $self->StartGameTimer(); + } + + + sub StartGameTimer($) + { + my ($self) = @_; + + # Make sure the timer exists. if (!exists $self->{"gametimer"}) { $self->{"gametimer"} = Wx::Timer->new($self, 1); *************** *** 638,643 **** $self->OnIdle(); ! # restart timer ! $self->{"gametimer"}->Start(1000, 1); } --- 669,674 ---- $self->OnIdle(); ! # Restart game timerr. ! $self->StartGameTimer(); } *************** *** 653,657 **** my $stream = $self->{"odgame"}->GetOutputStream(); ! # this requires, that the directory is in od. my $demofile = basename($output->get_outputfile()); my $map = $output->get_currentfile()->mapname(); --- 684,688 ---- my $stream = $self->{"odgame"}->GetOutputStream(); ! # this requires, that the demo file pipe is in od. my $demofile = basename($output->get_outputfile()); my $map = $output->get_currentfile()->mapname(); *************** *** 882,886 **** $waitsec = 0.01; } ! $self->{TIMER}->Start($output->frame_interactive_timeout() * 1000, 1); } --- 913,924 ---- $waitsec = 0.01; } ! printf STDERR "Start timer in %fsec ... ", $waitsec; ! $self->{TIMER}->Start($waitsec * 1000.0, 1); ! if ($self->{TIMER}->IsRunning == 0) { ! printf STDERR "but not running any more.\n"; ! } ! else { ! printf STDERR "OK.\n"; ! } } *************** *** 889,897 **** { my ($self, $event) = @_; my $output = $self->{"output"}; $self->UpdateMoving(); $output->frame_interactive_write(); $self->StartTimer(); - print "timer\n"; } --- 927,935 ---- { my ($self, $event) = @_; + print STDERR "Handling a timer event.\n"; my $output = $self->{"output"}; $self->UpdateMoving(); $output->frame_interactive_write(); $self->StartTimer(); } |
|
From: Uwe G. <gi...@us...> - 2004-10-24 18:47:18
|
Update of /cvsroot/opendemo/opendemo/tools/odcut In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17140 Modified Files: odcut.pl Log Message: flush behaviour was totally right in 1.43. Index: odcut.pl =================================================================== RCS file: /cvsroot/opendemo/opendemo/tools/odcut/odcut.pl,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** odcut.pl 24 Oct 2004 18:44:52 -0000 1.44 --- odcut.pl 24 Oct 2004 18:47:10 -0000 1.45 *************** *** 802,806 **** if ($result=$self->{"outputFd"}->print($text)) { # normally here we are finished - $self->{"outputFd"}->flush(); last; } --- 802,805 ---- |
|
From: Uwe G. <gi...@us...> - 2004-10-24 18:45:01
|
Update of /cvsroot/opendemo/opendemo/tools/odcut In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16677 Modified Files: odcut.pl Log Message: flush output file descriptor after every write. Index: odcut.pl =================================================================== RCS file: /cvsroot/opendemo/opendemo/tools/odcut/odcut.pl,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** odcut.pl 31 Mar 2004 08:39:06 -0000 1.43 --- odcut.pl 24 Oct 2004 18:44:52 -0000 1.44 *************** *** 802,805 **** --- 802,806 ---- if ($result=$self->{"outputFd"}->print($text)) { # normally here we are finished + $self->{"outputFd"}->flush(); last; } |
|
From: Uwe G. <gi...@us...> - 2004-10-22 21:27:02
|
Update of /cvsroot/opendemo/opendemo/tools/odcut In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19724 Modified Files: odcutgui.pm Log Message: API change get_name -> name, get_snapshotc -> snapshotc Index: odcutgui.pm =================================================================== RCS file: /cvsroot/opendemo/opendemo/tools/odcut/odcutgui.pm,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** odcutgui.pm 22 Oct 2004 21:18:33 -0000 1.39 --- odcutgui.pm 22 Oct 2004 21:26:53 -0000 1.40 *************** *** 816,821 **** if (!$file_found) { my $tab = odcuttab->new($notebook,$file); ! $tab->SetToolTip($file->get_name()); ! my $shortname = basename($file->get_name()); $notebook->AddPage( $tab, $shortname, 1, -1 ); } --- 816,821 ---- if (!$file_found) { my $tab = odcuttab->new($notebook,$file); ! $tab->SetToolTip($file->name()); ! my $shortname = basename($file->name()); $notebook->AddPage( $tab, $shortname, 1, -1 ); } *************** *** 840,844 **** my $tab = $self->{NOTEBOOK}->GetPage($i); my $file = $tab->{"file"}; ! $self->{CLOSEMENU}->Append( 100+ $i, $file->get_name(), 'Close ' . $file->get_name()); EVT_MENU($self,100 + $i, sub { OnClose($self, $file) } ); } --- 840,844 ---- my $tab = $self->{NOTEBOOK}->GetPage($i); my $file = $tab->{"file"}; ! $self->{CLOSEMENU}->Append( 100+ $i, $file->name(), 'Close ' . $file->name()); EVT_MENU($self,100 + $i, sub { OnClose($self, $file) } ); } *************** *** 866,870 **** my $current_file = $self->{"output"}->get_currentfile(); if ($current_file) { ! $text = $current_file->get_name() . " - " . $text; } $self->SetTitle($text); --- 866,870 ---- my $current_file = $self->{"output"}->get_currentfile(); if ($current_file) { ! $text = $current_file->name() . " - " . $text; } $self->SetTitle($text); *************** *** 920,924 **** $self->{SLIDER} = Wx::Slider->new($self, -1, 0, ! 0, $file->get_snapshotc() -1, [-1,-1], [-1,-1], wxSL_LABELS ); --- 920,924 ---- $self->{SLIDER} = Wx::Slider->new($self, -1, 0, ! 0, $file->snapshotc() -1, [-1,-1], [-1,-1], wxSL_LABELS ); *************** *** 964,968 **** $self->{"odcutmain"} = odcutmain->new($output); foreach my $file ($output->get_files()) { ! $self->{"odcutmain"}->Add( $file->get_name() ); } $self->{"odcutmain"}->Show(1); --- 964,968 ---- $self->{"odcutmain"} = odcutmain->new($output); foreach my $file ($output->get_files()) { ! $self->{"odcutmain"}->Add( $file->name() ); } $self->{"odcutmain"}->Show(1); |
|
From: Uwe G. <gi...@us...> - 2004-10-22 21:23:47
|
Update of /cvsroot/opendemo/opendemo/tools/odcut In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19185 Modified Files: odfile_parser.pm Log Message: _deep_copy and _getAttribute are private functions with _ prefix Index: odfile_parser.pm =================================================================== RCS file: /cvsroot/opendemo/opendemo/tools/odcut/odfile_parser.pm,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** odfile_parser.pm 31 Mar 2004 08:39:07 -0000 1.7 --- odfile_parser.pm 22 Oct 2004 21:23:37 -0000 1.8 *************** *** 477,481 **** my $node = [ $self->{"snaparray"}->[$self->{"list"}->[$index]], ! deep_copy($self->{"snaparray"}->[$self->{"list"}->[$index] + 1]) ]; --- 477,481 ---- my $node = [ $self->{"snaparray"}->[$self->{"list"}->[$index]], ! _deep_copy($self->{"snaparray"}->[$self->{"list"}->[$index] + 1]) ]; *************** *** 483,487 **** # It will reduce the acutal time to currentTime but hold # the different times inside a single frame. ! my $offsetTime = - getAttribute($node,0,"time") + $currentTime; # Adapt the frame time. --- 483,487 ---- # It will reduce the acutal time to currentTime but hold # the different times inside a single frame. ! my $offsetTime = - _getAttribute($node,0,"time") + $currentTime; # Adapt the frame time. |
|
From: Uwe G. <gi...@us...> - 2004-10-22 21:18:42
|
Update of /cvsroot/opendemo/opendemo/tools/odcut In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18238 Modified Files: odcutgui.pm Log Message: use only the filename without path for od_demofile correct function names of parser module Index: odcutgui.pm =================================================================== RCS file: /cvsroot/opendemo/opendemo/tools/odcut/odcutgui.pm,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** odcutgui.pm 22 Oct 2004 20:14:21 -0000 1.38 --- odcutgui.pm 22 Oct 2004 21:18:33 -0000 1.39 *************** *** 562,566 **** my $odgame = $self->{"odgame"}; my $stream = $odgame->GetInputStream(); ! # We should read as long as there are data available and not # only a single line. my $value = <$stream>; --- 562,567 ---- my $odgame = $self->{"odgame"}; my $stream = $odgame->GetInputStream(); ! # TODO ! # We must read as long as there are data available and not # only a single line. my $value = <$stream>; *************** *** 652,656 **** my $stream = $self->{"odgame"}->GetOutputStream(); ! my $demofile = $output->get_outputfile(); my $map = $output->get_currentfile()->mapname(); --- 653,658 ---- my $stream = $self->{"odgame"}->GetOutputStream(); ! # this requires, that the directory is in od. ! my $demofile = basename($output->get_outputfile()); my $map = $output->get_currentfile()->mapname(); *************** *** 814,819 **** if (!$file_found) { my $tab = odcuttab->new($notebook,$file); ! $tab->SetToolTip($file->name()); ! my $shortname = basename($file->name()); $notebook->AddPage( $tab, $shortname, 1, -1 ); } --- 816,821 ---- if (!$file_found) { my $tab = odcuttab->new($notebook,$file); ! $tab->SetToolTip($file->get_name()); ! my $shortname = basename($file->get_name()); $notebook->AddPage( $tab, $shortname, 1, -1 ); } *************** *** 838,842 **** my $tab = $self->{NOTEBOOK}->GetPage($i); my $file = $tab->{"file"}; ! $self->{CLOSEMENU}->Append( 100+ $i, $file->name(), 'Close ' . $file->name()); EVT_MENU($self,100 + $i, sub { OnClose($self, $file) } ); } --- 840,844 ---- my $tab = $self->{NOTEBOOK}->GetPage($i); my $file = $tab->{"file"}; ! $self->{CLOSEMENU}->Append( 100+ $i, $file->get_name(), 'Close ' . $file->get_name()); EVT_MENU($self,100 + $i, sub { OnClose($self, $file) } ); } *************** *** 864,868 **** my $current_file = $self->{"output"}->get_currentfile(); if ($current_file) { ! $text = $current_file->name() . " - " . $text; } $self->SetTitle($text); --- 866,870 ---- my $current_file = $self->{"output"}->get_currentfile(); if ($current_file) { ! $text = $current_file->get_name() . " - " . $text; } $self->SetTitle($text); *************** *** 918,922 **** $self->{SLIDER} = Wx::Slider->new($self, -1, 0, ! 0, $file->snapshotc() -1, [-1,-1], [-1,-1], wxSL_LABELS ); --- 920,924 ---- $self->{SLIDER} = Wx::Slider->new($self, -1, 0, ! 0, $file->get_snapshotc() -1, [-1,-1], [-1,-1], wxSL_LABELS ); *************** *** 962,966 **** $self->{"odcutmain"} = odcutmain->new($output); foreach my $file ($output->get_files()) { ! $self->{"odcutmain"}->Add( $file->name() ); } $self->{"odcutmain"}->Show(1); --- 964,968 ---- $self->{"odcutmain"} = odcutmain->new($output); foreach my $file ($output->get_files()) { ! $self->{"odcutmain"}->Add( $file->get_name() ); } $self->{"odcutmain"}->Show(1); |
|
From: Uwe G. <gi...@us...> - 2004-10-22 20:14:32
|
Update of /cvsroot/opendemo/opendemo/tools/odcut In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5299 Modified Files: odcutgui.pm Log Message: activate 'start both' menu entry give just started external program the right demofile name Index: odcutgui.pm =================================================================== RCS file: /cvsroot/opendemo/opendemo/tools/odcut/odcutgui.pm,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** odcutgui.pm 30 Mar 2004 08:09:45 -0000 1.37 --- odcutgui.pm 22 Oct 2004 20:14:21 -0000 1.38 *************** *** 72,76 **** $action_menu->Append( 16, "Create FIFO", "Create named pipe (FIFO)"); EVT_MENU($self,16,\&OnFIFO); ! # $action_menu->Append( 17, "Start Map and FIFO", "Start Map in game and FIFO writing"); EVT_MENU($self,17,\&OnBothStart); my( $help_menu ) = Wx::Menu->new( '', wxMENU_TEAROFF ); --- 72,76 ---- $action_menu->Append( 16, "Create FIFO", "Create named pipe (FIFO)"); EVT_MENU($self,16,\&OnFIFO); ! $action_menu->Append( 17, "Start Map and FIFO", "Start Map in game and FIFO writing"); EVT_MENU($self,17,\&OnBothStart); my( $help_menu ) = Wx::Menu->new( '', wxMENU_TEAROFF ); *************** *** 652,656 **** my $stream = $self->{"odgame"}->GetOutputStream(); ! my $demofile = $output->get_currentfile()->name(); my $map = $output->get_currentfile()->mapname(); --- 652,656 ---- my $stream = $self->{"odgame"}->GetOutputStream(); ! my $demofile = $output->get_outputfile(); my $map = $output->get_currentfile()->mapname(); |
|
From: Uwe G. <gi...@us...> - 2004-10-22 20:05:22
|
Update of /cvsroot/opendemo/opendemo/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3335 Modified Files: pwrap.pl Log Message: only write, if the write fs is open for writing. Index: pwrap.pl =================================================================== RCS file: /cvsroot/opendemo/opendemo/tools/pwrap.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pwrap.pl 11 Mar 2004 21:17:58 -0000 1.2 --- pwrap.pl 22 Oct 2004 20:05:11 -0000 1.3 *************** *** 79,95 **** } open(my $stdin, "<&=STDIN") || die "can't reopen STDIN for reading: $!\n"; use IO::Select; use Errno qw(EINTR ECHILD); while (!$loop_end) { my $read = IO::Select->new(); my $error = IO::Select->new(); if ($stdin) { $read->add($stdin); } ! if (!$stdout_up && !$stderr_up) { ! $loop_end = 1; ! last; } if ($stdout_up) { --- 79,106 ---- } open(my $stdin, "<&=STDIN") || die "can't reopen STDIN for reading: $!\n"; + open(my $stdout, ">&=STDOUT") || die "can't reopen STDOUT for writing: $!\n"; + open(my $stderr, ">&=STDERR") || die "can't reopen STDERR for writing: $!\n"; use IO::Select; use Errno qw(EINTR ECHILD); + my $stdin_buffer = ""; + my $stdout_buffer = ""; + my $stderr_buffer = ""; while (!$loop_end) { + if (!$stdout_up && !$stderr_up) { + $loop_end = 1; + last; + } my $read = IO::Select->new(); + my $write = IO::Select->new(); my $error = IO::Select->new(); if ($stdin) { $read->add($stdin); + $error->add($stdin); } ! if ($stdin_up) { ! $write->add($stdin_up); ! $error->add($stdin_up); } if ($stdout_up) { *************** *** 97,105 **** $error->add($stdout_up); } if ($stderr_up) { $read->add($stderr_up); $error->add($stderr_up); } ! my @res = IO::Select::select($read,undef,undef); if (scalar @res == 0) { # warn "select had an error: $!\n"; --- 108,124 ---- $error->add($stdout_up); } + if ($stdout) { + $write->add($stdout); + $error->add($stdout); + } if ($stderr_up) { $read->add($stderr_up); $error->add($stderr_up); } ! if ($stderr) { ! $write->add($stderr); ! $error->add($stderr); ! } ! my @res = IO::Select::select($read,$write,$error); if (scalar @res == 0) { # warn "select had an error: $!\n"; *************** *** 110,118 **** foreach my $fd (@{$canread}) { if ($stdin && ($fd == $stdin)) { ! my $res = sysread $stdin, my $buffer, 1000; ! if ($res) { ! syswrite $stdin_up, $buffer; ! } ! else { if ($! != EINTR) { $stdin_up->close(); --- 129,134 ---- foreach my $fd (@{$canread}) { if ($stdin && ($fd == $stdin)) { ! my $res = sysread $stdin, $stdin_buffer, 1000, length($stdin_buffer); ! if (!$res) { if ($! != EINTR) { $stdin_up->close(); *************** *** 123,132 **** } if ($stdout_up && ($fd == $stdout_up)) { ! my $res = sysread $stdout_up, my $buffer, 1000; ! if ($res) { ! syswrite STDOUT, $buffer; ! } ! else { if ($! != EINTR) { $stdout_up->close(); $stdout_up = undef; --- 139,146 ---- } if ($stdout_up && ($fd == $stdout_up)) { ! my $res = sysread $stdout_up, $stdout_buffer, 1000, length($stdout_buffer); ! if (!$res) { if ($! != EINTR) { + # $stdout->close(); $stdout_up->close(); $stdout_up = undef; *************** *** 135,144 **** } if ($stderr_up && ($fd == $stderr_up)) { ! my $res = sysread $stderr_up, my $buffer, 1000; ! if ($res) { ! syswrite STDERR, $buffer; ! } ! else { if ($! != EINTR) { $stderr_up->close(); $stderr_up = undef; --- 149,156 ---- } if ($stderr_up && ($fd == $stderr_up)) { ! my $res = sysread $stderr_up, $stderr_buffer, 1000, length($stderr_buffer); ! if (!$res) { if ($! != EINTR) { + # $stderr->close(); $stderr_up->close(); $stderr_up = undef; *************** *** 147,150 **** --- 159,182 ---- } } + foreach my $fd (@{$canwrite}) { + if ($stdin_up && ($fd == $stdin_up) && length($stdin_buffer)>0) { + my $res = syswrite $stdin_up, $stdin_buffer; + if ($res>0) { + substr $stdin_buffer, 0, $res, ""; + } + } + if ($stdout && ($fd == $stdout) && length($stdout_buffer)>0) { + my $res = syswrite $stdout, $stdout_buffer; + if ($res>0) { + substr $stdout_buffer, 0, $res, ""; + } + } + if ($stderr && ($fd == $stderr) && length($stderr_buffer)>0) { + my $res = syswrite $stderr, $stderr_buffer; + if ($res>0) { + substr $stderr_buffer, 0, $res, ""; + } + } + } foreach my $fd (@{$haserror}) { if ($stdout_up && ($fd == $stdout_up)) { |
|
From: Uwe G. <gi...@us...> - 2004-08-28 17:02:28
|
Update of /cvsroot/opendemo/opendemo/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6113 Modified Files: wpu Log Message: adopted current lmpc version Index: wpu =================================================================== RCS file: /cvsroot/opendemo/opendemo/tools/wpu,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** wpu 28 Aug 2004 09:20:27 -0000 1.22 --- wpu 28 Aug 2004 17:02:18 -0000 1.23 *************** *** 390,395 **** my $DownloadSceleton = "You can download everything directly from ! <A HREF=\"\@FTPCDROMBASE@/\"><TT>ftp.cdrom.com</TT></A> ! or look it up in the PlanetQuake FTP mirror list. <DL> \@DOWNLOADENTRIES@ --- 390,395 ---- my $DownloadSceleton = "You can download everything directly from ! <A HREF=\"\@FILEPLANET@/\">FilePlanet</A> ! or look it up in the <A HREF=\"\@DOWNSF@\">SourceForge mirror list</A>. <DL> \@DOWNLOADENTRIES@ *************** *** 432,438 **** $desc = $values{"DD$count"}; $output .= "<DT><TT>$name</TT> from ! <A HREF=\"\@FTPCDROMBASE@/$name\">cdrom.com</A> or the ! <A HREF=\"\@FTPMIRRORBASE@/$name\">mirror list</A> <DD>$desc "; --- 432,438 ---- $desc = $values{"DD$count"}; $output .= "<DT><TT>$name</TT> from ! <A HREF=\"\@DOWNFP\@$name\">FilePlanet</A> or the ! <A HREF=\"\@DOWNSF@\">SourceForge mirror list</A> <DD>$desc "; |
|
From: Uwe G. <gi...@us...> - 2004-08-28 09:20:35
|
Update of /cvsroot/opendemo/opendemo/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1544 Modified Files: wpu Log Message: copy current LMPC version Index: wpu =================================================================== RCS file: /cvsroot/opendemo/opendemo/tools/wpu,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** wpu 28 Aug 2004 09:03:04 -0000 1.21 --- wpu 28 Aug 2004 09:20:27 -0000 1.22 *************** *** 874,877 **** --- 874,882 ---- chdir ".."; + ## make sure DIRECTORY exists + if (!-d $values{"DIRECTORY"}) { + symlink $currdir, $values{"DIRECTORY"}; + } + ### method zipdos if ($method eq "zipdos") { |
|
From: Uwe G. <gi...@us...> - 2004-08-28 09:03:14
|
Update of /cvsroot/opendemo/opendemo/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31517 Modified Files: wpu Log Message: copy current LMPC version Index: wpu =================================================================== RCS file: /cvsroot/opendemo/opendemo/tools/wpu,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** wpu 9 Aug 2004 19:52:39 -0000 1.20 --- wpu 28 Aug 2004 09:03:04 -0000 1.21 *************** *** 4,8 **** # This is The Web Publishing Utility (wpu). ! # It is needed in the process of preparing web pages out of SGML sources # and some more macro expansion jobs. --- 4,8 ---- # This is The Web Publishing Utility (wpu). ! # It is needed in the process of preparing web pages out of SGML/XML sources # and some more macro expansion jobs. *************** *** 224,228 **** sub syntax { print "Web Publishing Utility\n"; ! print "$script: (c) U. Girlich, 1998-2003, Release $version, $date,\n$comment\n"; print "$script options fileargs\n"; print "--set NAME=value sets various parameters\n"; --- 224,228 ---- sub syntax { print "Web Publishing Utility\n"; ! print "$script: (c) U. Girlich, 1998-2004, Release $version, $date,\n$comment\n"; print "$script options fileargs\n"; print "--set NAME=value sets various parameters\n"; |
|
From: Uwe G. <gi...@us...> - 2004-08-09 19:52:47
|
Update of /cvsroot/opendemo/opendemo/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10582 Modified Files: wpu Log Message: copy over current LMPC version Index: wpu =================================================================== RCS file: /cvsroot/opendemo/opendemo/tools/wpu,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wpu 2 Aug 2004 19:22:38 -0000 1.19 --- wpu 9 Aug 2004 19:52:39 -0000 1.20 *************** *** 188,203 **** mergehash(\%values, $optctl{"set"}); - foreach (sort keys %values) { - $values{$_} = substvariables ($values{$_}); - # printf "'%s' = '%s'\n", $_, $values{$_}; - } - - #print "package=" , $values{"PACKAGE"}, - # " version=", $values{"VERSION"}, - # " date=", $values{"DATE"}, "\n"; - #print "comment=\"" , $values{"COMMENT"} , "\"\n"; - # print "file args=", join ", ", @ARGV; - # print "\n"; - # set some calculated variables due to the limitation of the @blahblah@ # method. --- 188,191 ---- *************** *** 206,209 **** --- 194,203 ---- } + # generic subst action + foreach (sort keys %values) { + $values{$_} = substvariables ($values{$_}); + # printf "'%s' = '%s'\n", $_, $values{$_}; + } + if (exists $values{"PACKAGE"}) { $values{"CAPSPACKAGE"} = uc $values{"PACKAGE"}; *************** *** 948,951 **** --- 942,946 ---- $from = "@" . $value . "@"; $to = $values{$value}; + # printf STDERR "subst ($from) -> ($to)\n"; $count += ($string =~ s/$from/$to/g); } |
|
From: Uwe G. <gi...@us...> - 2004-08-02 19:22:46
|
Update of /cvsroot/opendemo/opendemo/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12540 Modified Files: wpu Log Message: adapt current version from LMPC Index: wpu =================================================================== RCS file: /cvsroot/opendemo/opendemo/tools/wpu,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wpu 10 Jul 2004 17:04:30 -0000 1.18 --- wpu 2 Aug 2004 19:22:38 -0000 1.19 *************** *** 118,122 **** "Makefile", "Makefile.inc", ! "configure.in" ); --- 118,123 ---- "Makefile", "Makefile.inc", ! "configure.ac", ! "configure.in", ); |
|
From: Uwe G. <gi...@us...> - 2004-07-10 17:04:38
|
Update of /cvsroot/opendemo/opendemo/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25178 Modified Files: wpu Log Message: copy current version from LMPC Index: wpu =================================================================== RCS file: /cvsroot/opendemo/opendemo/tools/wpu,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** wpu 30 May 2004 18:45:40 -0000 1.17 --- wpu 10 Jul 2004 17:04:30 -0000 1.18 *************** *** 304,312 **** } out: s#<#<#g; s#>#>#g; s#([^\s("]+@[^\s),]+)#<a href="mailto:$1">$1</a>#g; ! s#(http:[^\s]+[^\.\s])#<a href="$1">$1</a>#g; s#(ftp:[^\s]+[^\.\s])#<a href="$1">$1</a>#g; push @body, $_; } --- 304,315 ---- } out: + s#<(http[^>]+)>#[[[$1]]]#g; s#<#<#g; s#>#>#g; s#([^\s("]+@[^\s),]+)#<a href="mailto:$1">$1</a>#g; ! s#(http:[^\s]+[^\.\s\]])#<a href="$1">$1</a>#g; s#(ftp:[^\s]+[^\.\s])#<a href="$1">$1</a>#g; + s#\[\[\[#<#g; + s#]]]#>#g; push @body, $_; } |
|
From: Uwe G. <gi...@us...> - 2004-05-30 18:45:49
|
Update of /cvsroot/opendemo/opendemo/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16924 Modified Files: wpu Log Message: copy current version from LMPC Index: wpu =================================================================== RCS file: /cvsroot/opendemo/opendemo/tools/wpu,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** wpu 29 May 2004 19:13:00 -0000 1.16 --- wpu 30 May 2004 18:45:40 -0000 1.17 *************** *** 916,919 **** --- 916,929 ---- print join (" ", @args), "\n"; system @args; + if ($? == -1) { + print "failed to execute: $!\n"; + } + elsif ($? & 127) { + printf "child died with signal %d, %s coredump\n", + ($? & 127), ($? & 128) ? 'with' : 'without'; + } + else { + exit ($? >> 8); + } } |
|
From: Uwe G. <gi...@us...> - 2004-05-29 19:13:10
|
Update of /cvsroot/opendemo/opendemo/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23809 Modified Files: wpu Log Message: update to current LMPC version Index: wpu =================================================================== RCS file: /cvsroot/opendemo/opendemo/tools/wpu,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** wpu 26 May 2004 19:13:22 -0000 1.15 --- wpu 29 May 2004 19:13:00 -0000 1.16 *************** *** 546,550 **** small Perl script glues everything together. <P> ! <UL> </UL> \@SIG@ --- 546,550 ---- small Perl script glues everything together. <P> ! <UL>\@MAINFIXED@ </UL> \@SIG@ |
|
From: Uwe G. <gi...@us...> - 2004-05-26 19:13:32
|
Update of /cvsroot/opendemo/opendemo/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2587 Modified Files: wpu Log Message: copy over the current version from LMPC Index: wpu =================================================================== RCS file: /cvsroot/opendemo/opendemo/tools/wpu,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** wpu 22 May 2004 17:52:00 -0000 1.14 --- wpu 26 May 2004 19:13:22 -0000 1.15 *************** *** 943,947 **** (my $filename) = @_; ! die "$script: can't read $filename\n" unless open FILE, "$filename"; my $sep = $/; $/ = ''; --- 943,947 ---- (my $filename) = @_; ! die "$script: can't read $filename: $!\n" unless open FILE, "$filename"; my $sep = $/; $/ = ''; |
|
From: Uwe G. <gi...@us...> - 2004-05-22 17:52:10
|
Update of /cvsroot/opendemo/opendemo/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5243 Modified Files: wpu Log Message: updated to the current LMPC version Index: wpu =================================================================== RCS file: /cvsroot/opendemo/opendemo/tools/wpu,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wpu 22 May 2004 15:03:31 -0000 1.13 --- wpu 22 May 2004 17:52:00 -0000 1.14 *************** *** 39,42 **** --- 39,43 ---- sub packaging; sub readmepackaging; + sub execsubst; sub WriteStringToFile; sub ReadFileToString; *************** *** 903,906 **** --- 904,922 ---- + sub execsubst + { + if (@ARGV < 1) { + print "README syntax: $script commands\n"; + exit(1); + } + my @args = (); + foreach (@ARGV) { + push @args, substvariables($_); + } + print join (" ", @args), "\n"; + system @args; + } + + sub mergehash { (my $dest, my $src) = @_; |
|
From: Uwe G. <gi...@us...> - 2004-05-22 15:03:51
|
Update of /cvsroot/opendemo/opendemo/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6199 Modified Files: wpu Log Message: incorporated the last LMPC changes Index: wpu =================================================================== RCS file: /cvsroot/opendemo/opendemo/tools/wpu,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** wpu 22 May 2004 13:57:52 -0000 1.12 --- wpu 22 May 2004 15:03:31 -0000 1.13 *************** *** 505,509 **** my $HtmlSceleton = "<LI><A NAME=\"\@PACKAGE@\"><B>\@TITLE@</B> ! <A NAME=\"\@PACKAGE@-\@VERSION@\"> <BLOCKQUOTE> <A HREF=\"\@PACKAGE@\@SUBPACKAGE@/\">v\@VERSION@</A>, \@DATE@\@WITHCOMMENT@ --- 505,509 ---- my $HtmlSceleton = "<LI><A NAME=\"\@PACKAGE@\"><B>\@TITLE@</B> ! <A NAME=\"\@PACKAGE\@-\@VERSION@\"> <BLOCKQUOTE> <A HREF=\"\@PACKAGE@\@SUBPACKAGE@/\">v\@VERSION@</A>, \@DATE@\@WITHCOMMENT@ |
|
From: Uwe G. <gi...@us...> - 2004-05-22 13:58:02
|
Update of /cvsroot/opendemo/opendemo/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27154 Modified Files: wpu Log Message: Adapt changes made for LMPC. Index: wpu =================================================================== RCS file: /cvsroot/opendemo/opendemo/tools/wpu,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wpu 29 Feb 2004 12:29:47 -0000 1.11 --- wpu 22 May 2004 13:57:52 -0000 1.12 *************** *** 79,84 **** "BANNER2" => "<!--ACCIPITERADINSERT /SITE=PQ/GENRE=ACTION/AREA=HOSTED/AAMSZ=IAB_FULL_BANNER-->", "SIG" => "<HR> ! Last changed: \@DATE@, Count: <img ! src=\"/counter/count.exe?srgb=00ff00&prgb=101010&ft=0&tr=1&pad=0&df=pqdemospecs\">, <A HREF=\"mailto:\@MYEMAIL@\">\@MYNAME@</A> <P ALIGN=\"CENTER\"> --- 79,83 ---- "BANNER2" => "<!--ACCIPITERADINSERT /SITE=PQ/GENRE=ACTION/AREA=HOSTED/AAMSZ=IAB_FULL_BANNER-->", "SIG" => "<HR> ! Last changed: \@DATE@, <A HREF=\"mailto:\@MYEMAIL@\">\@MYNAME@</A> <P ALIGN=\"CENTER\"> *************** *** 112,121 **** mergehash(\%values, \%ENV); - # merge the command line options ##################################### - my %optctl = (); - my $result = GetOptions (\%optctl, "set=s%"); - die "$script: command line parse problem" unless $result; - mergehash(\%values, $optctl{"set"}); - # get config files ################################################### # general files --- 111,114 ---- *************** *** 178,184 **** @configs = uniq @configs; ! #foreach my $e (@configs) { # print "$e\n"; ! #} # process and merge the entries --- 171,177 ---- @configs = uniq @configs; ! foreach my $e (@configs) { # print "$e\n"; ! } # process and merge the entries *************** *** 187,193 **** } foreach (sort keys %values) { $values{$_} = substvariables ($values{$_}); ! # printf "`%s´ = `%s´\n", $_, $values{$_}; } --- 180,192 ---- } + # merge the command line options ##################################### + my %optctl = (); + my $result = GetOptions (\%optctl, "set=s%"); + die "$script: command line parse problem" unless $result; + mergehash(\%values, $optctl{"set"}); + foreach (sort keys %values) { $values{$_} = substvariables ($values{$_}); ! # printf "'%s' = '%s'\n", $_, $values{$_}; } *************** *** 363,367 **** <P>"; ! my $DocumentationSceleton = "The \@DOCTYPE@ is available in several formats: <DL> <DT>HTML --- 362,366 ---- <P>"; ! my $DocumentationSceleton_old = "The \@DOCTYPE@ is available in several formats: <DL> <DT>HTML *************** *** 380,383 **** --- 379,393 ---- "; + my $DocumentationSceleton = "The \@DOCTYPE@ is available as: + <DL> + <DT><A HREF=\"http://www.w3.org/TR/html401/\">Hypertext Markup Language version 4.01</A> + <DD><A HREF=\"\@PACKAGE@.html\"><TT>\@PACKAGE@.html</TT></A> + <DT><A HREF=\"http://partners.adobe.com/asn/tech/pdf/specifications.jsp\">Adobe Portable Document Format version 1.4</A> + <DD><A HREF=\"\@PACKAGE@.pdf\"><TT>\@PACKAGE@.pdf</TT></A> + <DT><A HREF=\"http://www.oasis-open.org/docbook/sgml/4.2/index.shtml\">DocBook SGML version 4.2</A> + <DD><A HREF=\"\@PACKAGE@.sgml\"><TT>\@PACKAGE@.sgml</TT></A> + </DL> + "; + my $DownloadSceleton = "You can download everything directly from <A HREF=\"\@FTPCDROMBASE@/\"><TT>ftp.cdrom.com</TT></A> *************** *** 414,418 **** # prepare DOWNLOAD section ----------------------------------------- ! if (exists $values{"DOWNCOUNT"}) { $output=""; for (my $count=1;$count<=$values{"DOWNCOUNT"} ; $count++) { --- 424,428 ---- # prepare DOWNLOAD section ----------------------------------------- ! if (exists $values{"DOWNCOUNT"} && $values{"DOWNCOUNT"}>0) { $output=""; for (my $count=1;$count<=$values{"DOWNCOUNT"} ; $count++) { |
|
From: Uwe G. <gi...@us...> - 2004-04-17 18:17:36
|
Update of /cvsroot/opendemo/opendemo/src/sof2/opendemo/opendemo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19391/opendemo/opendemo Modified Files: od_fields.c Log Message: Correct the long standing "leaning player" bug. The correction came from RCFmember. Index: od_fields.c =================================================================== RCS file: /cvsroot/opendemo/opendemo/src/sof2/opendemo/opendemo/od_fields.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** od_fields.c 26 May 2002 15:34:20 -0000 1.3 --- od_fields.c 17 Apr 2004 18:17:27 -0000 1.4 *************** *** 146,149 **** --- 146,150 ---- /* maybe we need here some more fields */ PSFIELD(ping, ODF_INT), + PSFIELD(leanTime, ODF_INT), {NULL, 0, 0, 0} }; |
