Revision: 42197
http://brlcad.svn.sourceforge.net/brlcad/?rev=42197&view=rev
Author: brlcad
Date: 2011-01-13 02:26:52 +0000 (Thu, 13 Jan 2011)
Log Message:
-----------
bu_brlcad_root should ideally only be called with one subdirectory for
portability, then use tcl's [file join] on the rest of the path. this is
likely the problem that necessitated adding '.exe' extensions to the binaries
for windows because the lower-level C code was trying to stat the file. this
should simplify things nicely.
Modified Paths:
--------------
brlcad/trunk/src/tclscripts/geometree/GeometryBrowser.tcl
brlcad/trunk/src/tclscripts/lib/RtControl.tcl
brlcad/trunk/src/tclscripts/mged/anim.tcl
brlcad/trunk/src/tclscripts/mged/asc2g.tcl
brlcad/trunk/src/tclscripts/mged/dbupgrade.tcl
brlcad/trunk/src/tclscripts/mged/g2asc.tcl
brlcad/trunk/src/tclscripts/mged/man.tcl
brlcad/trunk/src/tclscripts/mged/mged.tcl
brlcad/trunk/src/tclscripts/mged/mike.tcl
brlcad/trunk/src/tclscripts/mged/openw.tcl
brlcad/trunk/src/tclscripts/mged/points.tcl
brlcad/trunk/src/tclscripts/mged/rt.tcl
brlcad/trunk/src/tclscripts/mged/shaders.tcl
Modified: brlcad/trunk/src/tclscripts/geometree/GeometryBrowser.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/geometree/GeometryBrowser.tcl 2011-01-13
01:59:47 UTC (rev 42196)
+++ brlcad/trunk/src/tclscripts/geometree/GeometryBrowser.tcl 2011-01-13
02:26:52 UTC (rev 42197)
@@ -475,7 +475,7 @@
# destroy the framebuffer, if we opened it
if { $_weStartedFbserv } {
puts "cleaning up fbserv"
- set fbfree [bu_brlcad_root "bin/fbfree"]
+ set fbfree [file join [bu_brlcad_root "bin"] fbfree]
if { [ catch { exec $fbfree -F $_fbservPort } error ] } {
puts $error
puts "Unable to properly clean up after our fbserv"
@@ -956,10 +956,10 @@
set device /dev/X
set rgb "255 255 255"
set rtrun ""
- set fbserv [bu_brlcad_root "bin/fbserv"]
- set fbfree [bu_brlcad_root "bin/fbfree"]
- set fbclear [bu_brlcad_root "bin/fbclear"]
- set fbline [bu_brlcad_root "bin/fbline"]
+ set fbserv [file join [bu_brlcad_root "bin"] fbserv]
+ set fbfree [file join [bu_brlcad_root "bin"] fbfree]
+ set fbline [file join [bu_brlcad_root "bin"] fbline]
+ set fbclear [file join [bu_brlcad_root "bin"] fbclear]
# see if we can try to use the mged graphics window instead of firing up
our own framebuffer
set useMgedWindow 0
@@ -1111,7 +1111,7 @@
# simply fires off rtwizard
#
body GeometryBrowser::raytraceWizard {} {
- set rtwizard [bu_brlcad_root "bin/rtwizard"]
+ set rtwizard [file join [bu_brlcad_root "bin"] rtwizard]
puts "exec $rtwizard &"
return [ exec $rtwizard & ]
}
Modified: brlcad/trunk/src/tclscripts/lib/RtControl.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/lib/RtControl.tcl 2011-01-13 01:59:47 UTC
(rev 42196)
+++ brlcad/trunk/src/tclscripts/lib/RtControl.tcl 2011-01-13 02:26:52 UTC
(rev 42197)
@@ -471,12 +471,7 @@
set cooked_dest [get_cooked_dest]
- if {$tcl_platform(platform) == "windows"} {
- set fbclear [bu_brlcad_root "bin/fbclear.exe"]
- regsub -all {\\} $fbclear {/} fbclear
- } else {
- set fbclear [bu_brlcad_root "bin/fbclear"]
- }
+ set fbclear [file join [bu_brlcad_root "bin"] fbclear]
set result [catch {eval exec $fbclear -F $cooked_dest $rtColor &} rt_error]
if {$result} {
Modified: brlcad/trunk/src/tclscripts/mged/anim.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/anim.tcl 2011-01-13 01:59:47 UTC (rev
42196)
+++ brlcad/trunk/src/tclscripts/mged/anim.tcl 2011-01-13 02:26:52 UTC (rev
42197)
@@ -56,8 +56,8 @@
uplevel #0 set mged_sketch_temp1 "./_mged_sketch_temp1_"
uplevel #0 set mged_sketch_temp2 "./_mged_sketch_temp2_"
- uplevel #0 {set mged_sketch_anim_path [bu_brlcad_root "bin/"]}
- uplevel #0 {set mged_sketch_tab_path [bu_brlcad_root "bin/"]}
+ uplevel #0 {set mged_sketch_anim_path [bu_brlcad_root "bin"]}
+ uplevel #0 {set mged_sketch_tab_path [bu_brlcad_root "bin"]}
#variable shared between draw and table
uplevel #0 set mged_sketch_fps "30"
Modified: brlcad/trunk/src/tclscripts/mged/asc2g.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/asc2g.tcl 2011-01-13 01:59:47 UTC (rev
42196)
+++ brlcad/trunk/src/tclscripts/mged/asc2g.tcl 2011-01-13 02:26:52 UTC (rev
42197)
@@ -70,11 +70,7 @@
}
# convert ascii database to binary
- if {$tcl_platform(platform) == "windows"} {
- set asc2g [bu_brlcad_root "bin/asc2g.exe"]
- } else {
- set asc2g [bu_brlcad_root "bin/asc2g"]
- }
+ set asc2g [file join [bu_brlcad_root "bin"] asc2g]
catch {exec $asc2g $filename $db_name} msg
# concat the binary
Modified: brlcad/trunk/src/tclscripts/mged/dbupgrade.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/dbupgrade.tcl 2011-01-13 01:59:47 UTC
(rev 42196)
+++ brlcad/trunk/src/tclscripts/mged/dbupgrade.tcl 2011-01-13 02:26:52 UTC
(rev 42197)
@@ -257,11 +257,7 @@
file attributes $db_orig -permissions 0440
# dbupgrade converts the original database to the current db format
- if {$tcl_platform(platform) == "windows"} {
- set dbupgrade [bu_brlcad_root "bin/dbupgrade.exe"]
- } else {
- set dbupgrade [bu_brlcad_root "bin/dbupgrade"]
- }
+ set dbupgrade [file join [bu_brlcad_root "bin"] dbupgrade]
catch {exec $dbupgrade $db_orig $dbname} ret
if {[file exists $dbname]} {
Modified: brlcad/trunk/src/tclscripts/mged/g2asc.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/g2asc.tcl 2011-01-13 01:59:47 UTC (rev
42196)
+++ brlcad/trunk/src/tclscripts/mged/g2asc.tcl 2011-01-13 02:26:52 UTC (rev
42197)
@@ -61,11 +61,7 @@
}
}
- if {$tcl_platform(platform) == "windows"} {
- set g2asc [bu_brlcad_root "bin/g2asc.exe"]
- } else {
- set g2asc [bu_brlcad_root "bin/g2asc"]
- }
+ set g2asc [file join [bu_brlcad_root "bin"] g2asc]
catch {exec $g2asc $db_name $ascii_filename} msg
}
} else {
Modified: brlcad/trunk/src/tclscripts/mged/man.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/man.tcl 2011-01-13 01:59:47 UTC (rev
42196)
+++ brlcad/trunk/src/tclscripts/mged/man.tcl 2011-01-13 02:26:52 UTC (rev
42197)
@@ -34,7 +34,7 @@
global man_data
# get file data
- set man_fd [open [bu_brlcad_data "html/mann/en/$cmdname.html"]]
+ set man_fd [open [file join [bu_brlcad_data "html"] mann en $cmdname.html]]
set man_data [read $man_fd]
close $man_fd
}
@@ -70,7 +70,7 @@
set _mgedFramebufferId [ lindex $_mgedFramebufferId 0 ]
- if {![file exists [bu_brlcad_data "html/mann/en/$cmdname.html"]]} {
+ if {![file exists [file join [bu_brlcad_data "html"] mann en
$cmdname.html]]]} {
puts "No man page found for $cmdname"
return
} else {
@@ -100,7 +100,7 @@
grid .man.top.l .man.top.s -sticky nsew -in .man.top.listing
grid columnconfigure .man.top.listing 0 -weight 0
grid rowconfigure .man.top.listing 0 -weight 1
- set cmdfiles [glob -directory [bu_brlcad_data "html/mann/en"] *.html ]
+ set cmdfiles [glob -directory [file join [bu_brlcad_data "html"] mann
en] *.html ]
set cmds [list ]
foreach cmdfile $cmdfiles {
regexp {(.+/)(.+)(.html)} $cmdfile -> url cmdrootname htmlsuffix
Modified: brlcad/trunk/src/tclscripts/mged/mged.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/mged.tcl 2011-01-13 01:59:47 UTC (rev
42196)
+++ brlcad/trunk/src/tclscripts/mged/mged.tcl 2011-01-13 02:26:52 UTC (rev
42197)
@@ -51,9 +51,9 @@
# bu_brlcad_data/html/manuals/mged
if ![info exists mged_default(html_dir)] {
- set mged_default(html_dir) [file normalize [bu_brlcad_data
"html/manuals/mged"]]
+ set mged_default(html_dir) [file normalize [file join [bu_brlcad_data
"html"] manuals mged]]
if {![file exists $mged_default(html_dir)]} {
- set mged_default(html_dir) [file normalize [bu_brlcad_data
"doc/html/manuals/mged"]]
+ set mged_default(html_dir) [file normalize [file join [bu_brlcad_data
"doc"] html manuals mged]]
}
}
Modified: brlcad/trunk/src/tclscripts/mged/mike.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/mike.tcl 2011-01-13 01:59:47 UTC (rev
42196)
+++ brlcad/trunk/src/tclscripts/mged/mike.tcl 2011-01-13 02:26:52 UTC (rev
42197)
@@ -32,7 +32,7 @@
toplevel $top -screen $mged_gui($id,screen)
set row 0
- set mike_file [bu_brlcad_data "tclscripts/mged"]/mike-tux.ppm
+ set mike_file [file join [bu_brlcad_data "tclscripts"] mged mike-tux.ppm]
if { [file exists $mike_file] } {
set mike [image create photo -file $mike_file]
label $top.mike_im -image $mike -relief sunken
@@ -45,7 +45,7 @@
# grid rowconfigure $top $row -weight 1
incr row
- set dedi_file [bu_brlcad_data "tclscripts/mged"]/mike-dedication.txt
+ set dedi_file [file join [bu_brlcad_data "tclscripts"] mged
mike-dedication.txt]
if { [file exists $dedi_file] } {
if { [catch {open $dedi_file "r"} fp] == 0 } {
set dedi_text [read -nonewline $fp]
Modified: brlcad/trunk/src/tclscripts/mged/openw.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/openw.tcl 2011-01-13 01:59:47 UTC (rev
42196)
+++ brlcad/trunk/src/tclscripts/mged/openw.tcl 2011-01-13 02:26:52 UTC (rev
42197)
@@ -52,9 +52,9 @@
set mged_default(tran_factor) 0.01
}
-set mged_default(html_dir) [file normalize [bu_brlcad_data
"html/manuals/mged"]]
+set mged_default(html_dir) [file normalize [file join [bu_brlcad_data "html"]
manuals mged]]
if {![file exists $mged_default(html_dir)]} {
- set mged_default(html_dir) [file normalize [bu_brlcad_data
"doc/html/manuals/mged"]]
+ set mged_default(html_dir) [file normalize [file join [bu_brlcad_data
"doc"] html manuals mged]]
}
if {[info exists env(MGED_HTML_DIR)]} {
Modified: brlcad/trunk/src/tclscripts/mged/points.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/points.tcl 2011-01-13 01:59:47 UTC (rev
42196)
+++ brlcad/trunk/src/tclscripts/mged/points.tcl 2011-01-13 02:26:52 UTC (rev
42197)
@@ -391,11 +391,7 @@
eval "$cmd"
close $fd
- if {$tcl_platform(platform) == "windows"} {
- set asc2pl [bu_brlcad_root "bin/asc-pl.exe"]
- } else {
- set asc2pl [bu_brlcad_root "bin/asc-pl"]
- }
+ set asc2pl [file join [bu_brlcad_root "bin"] asc-pl]
exec "$asc2pl < pipe$pipe_number.plasc > pipe$pipe_nubmer.pl"
incr pipe_number
@@ -701,11 +697,7 @@
set c "Q"
}
close $fd
- if {$tcl_platform(platform) == "windows"} {
- set asc2pl [bu_brlcad_root "bin/asc-pl.exe"]
- } else {
- set asc2pl [bu_brlcad_root "bin/asc-pl"]
- }
+ set asc2pl [file join [bu_brlcad_root "bin"] asc-pl]
exec "$asc2pl < pipe.asc > pipe.pl"
overlay pipe.pl
file delete pipe.asc
Modified: brlcad/trunk/src/tclscripts/mged/rt.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/rt.tcl 2011-01-13 01:59:47 UTC (rev
42196)
+++ brlcad/trunk/src/tclscripts/mged/rt.tcl 2011-01-13 02:26:52 UTC (rev
42197)
@@ -579,11 +579,7 @@
set blue 0
}
- if {$tcl_platform(platform) == "windows"} {
- set fbclear [bu_brlcad_root "bin/fbclear.exe"]
- } else {
- set fbclear [bu_brlcad_root "bin/fbclear"]
- }
+ set fbclear [file join [bu_brlcad_root "bin"] fbclear]
set result [catch { exec $fbclear -F $rt_control($id,cooked_dest)\
$red $green $blue & } rt_error]
Modified: brlcad/trunk/src/tclscripts/mged/shaders.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/shaders.tcl 2011-01-13 01:59:47 UTC
(rev 42196)
+++ brlcad/trunk/src/tclscripts/mged/shaders.tcl 2011-01-13 02:26:52 UTC
(rev 42197)
@@ -1615,8 +1615,7 @@
foreach s { 0 1 2 3 4 5 6 7 8 9 } {
set shader_params(light_i${i}_v${v}_s${s}) \
[image create photo -file \
- [bu_brlcad_data \
- "tclscripts/mged/l_i${i}_v${v}_s${s}.gif"]]
+ [file join [bu_brlcad_data "tclscripts"] mged
l_i${i}_v${v}_s${s}.gif]]
}
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
