Revision: 78014
http://sourceforge.net/p/brlcad/code/78014
Author: starseeker
Date: 2020-12-18 23:35:00 +0000 (Fri, 18 Dec 2020)
Log Message:
-----------
bu_brlcad_root -> bu_dir in rtwizard, misc Tcl files
Modified Paths:
--------------
brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
brlcad/trunk/src/tclscripts/archer/ShaderEdit.tcl
brlcad/trunk/src/tclscripts/rtwizard/rtwizard
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2020-12-18 23:30:57 UTC
(rev 78013)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2020-12-18 23:35:00 UTC
(rev 78014)
@@ -1091,7 +1091,7 @@
set env(DISPLAY) ":0"
}
- set mImgDir [file join [bu_brlcad_root "share/tclscripts"] archer images]
+ set mImgDir [file join [bu_dir data] tclscripts archer images]
if {[llength $args] == 1} {
set args [lindex $args 0]
Modified: brlcad/trunk/src/tclscripts/archer/ShaderEdit.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/archer/ShaderEdit.tcl 2020-12-18 23:30:57 UTC
(rev 78013)
+++ brlcad/trunk/src/tclscripts/archer/ShaderEdit.tcl 2020-12-18 23:35:00 UTC
(rev 78014)
@@ -1017,7 +1017,7 @@
foreach s { 0 1 2 3 4 5 6 7 8 9 } {
set lightImages(light_i${i}_v${v}_s${s}) \
[image create photo -file \
- [file join [bu_brlcad_root "share/tclscripts"]
archer images l_i${i}_v${v}_s${s}.gif]]
+ [file join [bu_dir data] tclscripts archer images
l_i${i}_v${v}_s${s}.gif]]
}
}
}
Modified: brlcad/trunk/src/tclscripts/rtwizard/rtwizard
===================================================================
--- brlcad/trunk/src/tclscripts/rtwizard/rtwizard 2020-12-18 23:30:57 UTC
(rev 78013)
+++ brlcad/trunk/src/tclscripts/rtwizard/rtwizard 2020-12-18 23:35:00 UTC
(rev 78014)
@@ -118,12 +118,12 @@
}
# Check whether the framebuffer already exists. If it does, and if
# it was specified on the command line, go with it.
- if { [catch {exec [file join [bu_brlcad_root bin] fblabel] -F
$::RtWizard::wizard_state(fbserv_port) 1 1 " "} error ] && $error == 12} {
- catch {exec [file join [bu_brlcad_root bin] fbserv] -w
$::RtWizard::wizard_state(width) -n $::RtWizard::wizard_state(scanlines)
$::RtWizard::wizard_state(fbserv_port) $::RtWizard::wizard_state(fbserv_device)
&} pid
+ if { [catch {exec [file join [bu_dir bin] fblabel] -F
$::RtWizard::wizard_state(fbserv_port) 1 1 " "} error ] && $error == 12} {
+ catch {exec [file join [bu_dir bin] fbserv] -w
$::RtWizard::wizard_state(width) -n $::RtWizard::wizard_state(scanlines)
$::RtWizard::wizard_state(fbserv_port) $::RtWizard::wizard_state(fbserv_device)
&} pid
if {[info exists pid]} {
set fbserv_pid $pid
# Wait a few milliseconds to make sure fbserv has completed its work
and is available
- while { [catch {exec [file join [bu_brlcad_root bin] fblabel] -F
$::RtWizard::wizard_state(fbserv_port) 1 1 " "} error] && $error == 12} {after
300}
+ while { [catch {exec [file join [bu_dir bin] fblabel] -F
$::RtWizard::wizard_state(fbserv_port) 1 1 " "} error] && $error == 12} {after
300}
} else {
if {$::RtWizard::wizard_state(verbose)} {puts "fbserv port
$::RtWizard::wizard_state(fbserv_port) failed!"}
incr ::RtWizard::wizard_state(fbserv_port)
@@ -133,14 +133,14 @@
# If we didn't have a pre-specified port number and the default didn't
work, start counting up
if { ! $port_number_specified && ! [info exists fbserv_pid] } {
incr ::RtWizard::wizard_state(fbserv_port)
- while { ! [catch {exec [file join [bu_brlcad_root bin] fbclear] -F
$::RtWizard::wizard_state(fbserv_port) } error ] } {
+ while { ! [catch {exec [file join [bu_dir bin] fbclear] -F
$::RtWizard::wizard_state(fbserv_port) } error ] } {
if {$::RtWizard::wizard_state(verbose)} {puts "fbserv port
$::RtWizard::wizard_state(fbserv_port) is already in use."}
incr ::RtWizard::wizard_state(fbserv_port)
}
- catch {exec [file join [bu_brlcad_root bin] fbserv] -w
$::RtWizard::wizard_state(width) -n $::RtWizard::wizard_state(scanlines)
$::RtWizard::wizard_state(fbserv_port) $::RtWizard::wizard_state(fbserv_device)
&} pid
+ catch {exec [file join [bu_dir bin] fbserv] -w
$::RtWizard::wizard_state(width) -n $::RtWizard::wizard_state(scanlines)
$::RtWizard::wizard_state(fbserv_port) $::RtWizard::wizard_state(fbserv_device)
&} pid
set fbserv_pid $pid
# Wait a few milliseconds to make sure fbserv has completed its work and
is available
- while { [catch {exec [file join [bu_brlcad_root bin] fblabel] -F
$::RtWizard::wizard_state(fbserv_port) 1 1 " "} error] && $error == 12 } {after
300}
+ while { [catch {exec [file join [bu_dir bin] fblabel] -F
$::RtWizard::wizard_state(fbserv_port) 1 1 " "} error] && $error == 12 } {after
300}
}
# Either we're using a specified view model, or we're deducing one based on
user options
@@ -223,11 +223,11 @@
if {[info exists ::RtWizard::wizard_state(output_filename)]} {
set output_generated 0
if {[file extension $::RtWizard::wizard_state(output_filename)] ==
".png"} {
- exec [file join [bu_brlcad_root bin] fb-png] -w
$::RtWizard::wizard_state(width) -n $::RtWizard::wizard_state(scanlines) -F
$::RtWizard::wizard_state(fbserv_port)
$::RtWizard::wizard_state(output_filename)
+ exec [file join [bu_dir bin] fb-png] -w
$::RtWizard::wizard_state(width) -n $::RtWizard::wizard_state(scanlines) -F
$::RtWizard::wizard_state(fbserv_port)
$::RtWizard::wizard_state(output_filename)
set output_generated 1
}
if {!$output_generated} {
- exec [file join [bu_brlcad_root bin] fb-pix] -w
$::RtWizard::wizard_state(width) -n $::RtWizard::wizard_state(scanlines) -F
$::RtWizard::wizard_state(fbserv_port)
$::RtWizard::wizard_state(output_filename)
+ exec [file join [bu_dir bin] fb-pix] -w
$::RtWizard::wizard_state(width) -n $::RtWizard::wizard_state(scanlines) -F
$::RtWizard::wizard_state(fbserv_port)
$::RtWizard::wizard_state(output_filename)
set output_generated 1
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
