[PD-cvs] pd/src desire.tk,1.1.2.200,1.1.2.201

[Mathieu Bouchard]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9085

Modified Files:
      Tag: devel_0_39
	desire.tk 
Log Message:
added -server for choosing the pd executable
-server defaults to file "pd" in the same directory as "desire" (and NOT the system PATH)


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.200
retrieving revision 1.1.2.201
diff -C2 -d -r1.1.2.200 -r1.1.2.201
*** desire.tk	7 May 2006 04:36:09 -0000	1.1.2.200
--- desire.tk	7 May 2006 23:47:48 -0000	1.1.2.201
***************
*** 309,312 ****
--- 309,314 ----
  proc say_category  {text} {}
  
+ set argh0 [file normalize [file join [pwd] $argv0]]
+ set cmdline(server) [list [file join [file dirname $argh0] pd]]
  set cmdline(rcfilename) ~/.pdrc
  set cmdline(ddrcfilename) ~/.ddrc
***************
*** 323,326 ****
--- 325,330 ----
    set o [lindex $argv $i]
    switch -regexp -- $o {
+     ^-serverargs\$ {error "not supported yet"}
+     ^-server\$  {incr i; set cmdline(server)  [lindex $argv $i]}
      ^-lang\$    {incr i; set cmdline(lang)    [lindex $argv $i]}
      ^-console\$ {incr i; set cmdline(console) [lindex $argv $i]}
***************
*** 506,510 ****
  
  if {$cmdline(valgrind)} {
! 	exec valgrind --tool=memcheck pd -guiport $server_port &
  } {
      if {$cmdline(gdb)} {
--- 510,514 ----
  
  if {$cmdline(valgrind)} {
! 	exec valgrind --tool=memcheck $cmdline(server) -guiport $server_port &
  } {
      if {$cmdline(gdb)} {
***************
*** 512,524 ****
  	    set gdb [open "| gdb 2&>1" w+]
  	    fconfigure $gdb -blocking 0 -buffering none
! 	    puts $gdb "file pd"
  	    puts $gdb "run -guiport $server_port"
  	    flush $gdb
  	    after 0 poll_gdb
  	} {
! 	    exec gdb --tui --args pd -guiport $server_port &
  	}
      } {
! 	exec pd -guiport $server_port &
      }
  }
--- 516,528 ----
  	    set gdb [open "| gdb 2&>1" w+]
  	    fconfigure $gdb -blocking 0 -buffering none
! 	    puts $gdb "file $cmdline(server)"
  	    puts $gdb "run -guiport $server_port"
  	    flush $gdb
  	    after 0 poll_gdb
  	} {
! 	    exec gdb --tui --args $cmdline(server) -guiport $server_port &
  	}
      } {
! 	exec $cmdline(server) -guiport $server_port &
      }
  }