From: David B. <bil...@us...> - 2004-07-04 03:30:44
|
Update of /cvsroot/maxima/maxima/interfaces/xmaxima/Tkmaxima In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5629/interfaces/xmaxima/Tkmaxima Modified Files: Paths.tcl Log Message: 2004-07-04 David Billinghurst * interfaces/xmaxima/Tkmaxima/Paths.tcl: These changes remove some windows 95 specific code. For once, it has been possible to clean up, rather than add another layer of hacks. - Remove code to set path. This is now done in maxima.bat so that the command line version works. - Remove special case code to bypass maxima.bat on windows 95 Index: Paths.tcl =================================================================== RCS file: /cvsroot/maxima/maxima/interfaces/xmaxima/Tkmaxima/Paths.tcl,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- Paths.tcl 3 Jul 2004 01:44:55 -0000 1.11 +++ Paths.tcl 4 Jul 2004 03:30:35 -0000 1.12 @@ -225,21 +225,6 @@ set env(MAXIMA_USERDIR) "$maxima_priv(maxima_prefix)/user" } } - - # jfa: extend path so that gcl can see gcc in windows package - # I don't know that this is the best place for this - if {$tcl_platform(platform) == "windows"} { - # jfa: This is an attempt to get a working path designation - # on various Windows versions. - if {$tcl_platform(os) == "Windows 95"} { - # Windows 95 or Windows 98 - regsub -all {/} "$maxima_priv(maxima_prefix)\\BIN" {\\} maxbinpath - } else { - # Other versions of Windows - set maxbinpath "$maxima_priv(maxima_prefix)/bin" - } - set env(PATH) "$maxbinpath;$env(PATH)" - } } proc vMAXSetMaximaCommand {} { @@ -268,25 +253,10 @@ if {[set exe [auto_execok $maxima_priv(xmaxima_maxima)]] == "" } { tide_failure [M "Error: Maxima executable not found\n\n Try setting the environment variable XMAXIMA_MAXIMA."] } - # jfa: bypass maxima script on windows - # vvz: on Windows 9X/ME only - if {$tcl_platform(os) == "Windows 95"} { - # maybe it's in lib - I don't like this - set dir $maxima_priv(maxima_verpkglibdir) - # FIXME - need autoconf(lisp) so we don't need glob - set exes [glob -nocomplain $dir/binary-*/maxima.exe] - if {[llength $exes] != "1" || \ - [set exe [lindex $exes 0]] == "" || \ - ![file isfile $exe]} { - tide_failure [M "Error: Maxima executable not found\n\n Try setting the environment variable XMAXIMA_MAXIMA."] - return - } - - } else { - set maxima_priv(xmaxima_maxima) maxima - if {[set exe [auto_execok $maxima_priv(xmaxima_maxima)]] == "" } { - tide_failure [M "Error: Maxima executable not found\n\n Try setting the environment variable XMAXIMA_MAXIMA."] - } + + set maxima_priv(xmaxima_maxima) maxima + if {[set exe [auto_execok $maxima_priv(xmaxima_maxima)]] == "" } { + tide_failure [M "Error: Maxima executable not found\n\n Try setting the environment variable XMAXIMA_MAXIMA."] } } @@ -305,26 +275,15 @@ lappend command $exe eval lappend command $maxima_opts - # FIXME: This is gcl specific so -lisp option is bogus - if {$tcl_platform(os) == "Windows 95"} { - # A gruesome hack. Normally, we communicate to the - # maxima image through the maxima shell script, as - # above. If the maxima script is not available, - # as may happen on windows, directly talk to the GCL - # saved image. jfa 04/28/2002 - #mike FIXME: this means xmaxima on windows is GCL only - # vvz: We need this only on Windows 9X/ME - lappend command -eval "(maxima::start-server PORT)" -eval "(run)" -f - } else { - # vvz: Windows NT/2000/XP - if {$tcl_platform(platform) == "windows"} { - lappend command -s PORT - # vvz: Unix. Should be as above but we need this due to - # weird behaviour with some lisps - Why? - } else { + # vvz: Windows NT/2000/XP + # db: All windows now + if {$tcl_platform(platform) == "windows"} { + lappend command -s PORT + # vvz: Unix. Should be as above but we need this due to + # weird behaviour with some lisps - Why? + } else { lappend command -r ":lisp (start-server PORT)" - } } lappend command & @@ -332,4 +291,3 @@ } - |