Revision: 78016
http://sourceforge.net/p/brlcad/code/78016
Author: starseeker
Date: 2020-12-19 00:03:09 +0000 (Sat, 19 Dec 2020)
Log Message:
-----------
More bu_dir conversions
Modified Paths:
--------------
brlcad/trunk/src/tclscripts/lib/RtImage.tcl
brlcad/trunk/src/tclscripts/lib/gui_conversion.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/help.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/lib/RtImage.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/lib/RtImage.tcl 2020-12-18 23:52:04 UTC (rev
78015)
+++ brlcad/trunk/src/tclscripts/lib/RtImage.tcl 2020-12-19 00:03:09 UTC (rev
78016)
@@ -90,7 +90,7 @@
set tmod [list [file join $dir $pid\_bwmod.bw] ]
set tbwpix [list [file join $dir $pid\_bwpix.pix] ]
- set binpath [bu_brlcad_root "bin"]
+ set binpath [bu_dir bin]
if {[llength $_color_objects]} {
set have_color_objects 1
Modified: brlcad/trunk/src/tclscripts/lib/gui_conversion.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/lib/gui_conversion.tcl 2020-12-18 23:52:04 UTC
(rev 78015)
+++ brlcad/trunk/src/tclscripts/lib/gui_conversion.tcl 2020-12-19 00:03:09 UTC
(rev 78016)
@@ -144,7 +144,7 @@
# For 3dm-g, it's options first, then output file, then input file
proc ::rhino_build_cmd {} {
- set cmd [list [bu_brlcad_root [file join [bu_brlcad_dir bin]
3dm-g$::exe_ext]]]
+ set cmd [list [file join [bu_dir bin] 3dm-g$::exe_ext]]
if {$::print_debug_info == 1} {
append cmd " -d" { }
@@ -246,7 +246,7 @@
}
proc ::fast4_build_cmd {} {
- set cmd [list [bu_brlcad_root [file join [bu_brlcad_dir bin]
fast4-g$::exe_ext]]]
+ set cmd [list [file join [bu_dir bin] fast4-g$::exe_ext]]
if {$::print_debug_info == 1} {
append cmd " -d" { }
@@ -361,7 +361,7 @@
# For stl-g, it's options first, then input file, then output file
proc ::stl_build_cmd {} {
- set cmd [list [bu_brlcad_root [file join [bu_brlcad_dir bin]
stl-g$::exe_ext]]]
+ set cmd [list [file join [bu_dir bin] stl-g$::exe_ext]]
if {$::print_debug_info == 1} {
append cmd " -d" { }
@@ -504,7 +504,7 @@
# For obj-g, it's options first, then input file, then output file
proc ::obj_build_cmd {} {
- set cmd [list [bu_brlcad_root [file join [bu_brlcad_dir bin]
obj-g$::exe_ext]]]
+ set cmd [list [file join [bu_dir bin] obj-g$::exe_ext]]
if {[llength "$::debug_level"] > 0} {
append cmd " -d -v $::debug_level" { }
}
@@ -684,7 +684,7 @@
gui_conversion $::rhino_cmd $::log_file
}
".asc" {
- set asc_cmd [list [bu_brlcad_root [file join [bu_brlcad_dir bin]
asc2g$::exe_ext]] \
+ set asc_cmd [list [file join [bu_dir bin] asc2g$::exe_ext] \
$::input_file \
$::output_file]
gui_conversion $asc_cmd $::log_file
@@ -730,13 +730,13 @@
gui_conversion $::stl_cmd $::log_file
}
".stp" {
- set step_cmd [list [bu_brlcad_root [file join [bu_brlcad_dir bin]
step-g$::exe_ext]] \
+ set step_cmd [list [file join [bu_dir bin] step-g$::exe_ext] \
-v -o $::output_file \
$::input_file]
gui_conversion $step_cmd $::log_file
}
".step" {
- set step_cmd [list [bu_brlcad_root [file join [bu_brlcad_dir bin]
step-g$::exe_ext]] \
+ set step_cmd [list [file join [bu_dir bin] step-g$::exe_ext] \
-v -o $::output_file \
$::input_file]
gui_conversion $step_cmd $::log_file
Modified: brlcad/trunk/src/tclscripts/mged/asc2g.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/asc2g.tcl 2020-12-18 23:52:04 UTC (rev
78015)
+++ brlcad/trunk/src/tclscripts/mged/asc2g.tcl 2020-12-19 00:03:09 UTC (rev
78016)
@@ -66,7 +66,7 @@
}
# convert ascii database to binary
- set asc2g [file join [bu_brlcad_root "bin"] asc2g]
+ set asc2g [file join [bu_dir 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 2020-12-18 23:52:04 UTC
(rev 78015)
+++ brlcad/trunk/src/tclscripts/mged/dbupgrade.tcl 2020-12-19 00:03:09 UTC
(rev 78016)
@@ -286,7 +286,7 @@
}
# dbupgrade converts the original database to the current db format
- set dbupgrade_cmd [file join [bu_brlcad_root "bin"] dbupgrade]
+ set dbupgrade_cmd [file join [bu_dir bin] dbupgrade]
catch {exec "$dbupgrade_cmd" "$db_orig" "$dbname"} ret
if {![file exists "$dbname"]} {
Modified: brlcad/trunk/src/tclscripts/mged/g2asc.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/g2asc.tcl 2020-12-18 23:52:04 UTC (rev
78015)
+++ brlcad/trunk/src/tclscripts/mged/g2asc.tcl 2020-12-19 00:03:09 UTC (rev
78016)
@@ -50,7 +50,7 @@
set mged_gui(databaseDir) [ file dirname $filename ]
# convert binary database to ascii
- set g2asc [bu_brlcad_root "bin/g2asc"]
+ set g2asc [file join [bu_dir bin] g2asc]
catch {exec $g2asc $db_name $filename} msg
}
}
Modified: brlcad/trunk/src/tclscripts/mged/help.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/help.tcl 2020-12-18 23:52:04 UTC (rev
78015)
+++ brlcad/trunk/src/tclscripts/mged/help.tcl 2020-12-19 00:03:09 UTC (rev
78016)
@@ -25,7 +25,7 @@
#==============================================================================
# This command causes helplib.tcl to get read in.
-source [file join [bu_brlcad_root "share/tclscripts"] "helplib.tcl"]
+source [file join [bu_dir data] "tclscripts" "helplib.tcl"]
helplib
set mged_help_data(?) {{} {summary of available mged commands}}
Modified: brlcad/trunk/src/tclscripts/mged/man.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/man.tcl 2020-12-18 23:52:04 UTC (rev
78015)
+++ brlcad/trunk/src/tclscripts/mged/man.tcl 2020-12-19 00:03:09 UTC (rev
78016)
@@ -44,7 +44,7 @@
if {$::tcl_platform(platform) == "windows"} {
set exe_ext ".exe"
}
- set cmd [list [bu_brlcad_root [file join [bu_brlcad_dir bin]
brlman$exe_ext]]]
+ set cmd [list [file join [bu_dir bin] brlman$exe_ext]]
exec $cmd $cmdname
}
}
Modified: brlcad/trunk/src/tclscripts/mged/mged.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/mged.tcl 2020-12-18 23:52:04 UTC (rev
78015)
+++ brlcad/trunk/src/tclscripts/mged/mged.tcl 2020-12-19 00:03:09 UTC (rev
78016)
@@ -48,12 +48,12 @@
# MGED html manual directory search order precedence should be:
# MGED_HTML_DIR
-# bu_brlcad_root/share/html/manuals/mged
+# [bu_dir doc]/html/manuals/mged
if ![info exists mged_default(html_dir)] {
- set mged_default(html_dir) [file normalize [file join [bu_brlcad_root
"share/html"] manuals mged]]
+ set mged_default(html_dir) [file normalize [file join [bu_dir doc] html
manuals mged]]
if {![file exists $mged_default(html_dir)]} {
- set mged_default(html_dir) [file normalize [file join [bu_brlcad_root
"share/doc"] html manuals mged]]
+ set mged_default(html_dir) [file normalize [file join [bu_dir doc] html
manuals mged]]
}
}
Modified: brlcad/trunk/src/tclscripts/mged/mike.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/mike.tcl 2020-12-18 23:52:04 UTC (rev
78015)
+++ brlcad/trunk/src/tclscripts/mged/mike.tcl 2020-12-19 00:03:09 UTC (rev
78016)
@@ -32,7 +32,7 @@
toplevel $top -screen $mged_gui($id,screen)
set row 0
- set mike_file [file join [bu_brlcad_root "share/tclscripts"] mged
mike-tux.ppm]
+ set mike_file [file join [bu_dir 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 [file join [bu_brlcad_root "share/tclscripts"] mged
mike-dedication.txt]
+ set dedi_file [file join [bu_dir 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 2020-12-18 23:52:04 UTC (rev
78015)
+++ brlcad/trunk/src/tclscripts/mged/openw.tcl 2020-12-19 00:03:09 UTC (rev
78016)
@@ -52,9 +52,9 @@
set mged_default(tran_factor) 0.01
}
-set mged_default(html_dir) [file normalize [file join [bu_brlcad_root
"share/html"] manuals mged]]
+set mged_default(html_dir) [file normalize [file join [bu_dir data] html
manuals mged]]
if {![file exists $mged_default(html_dir)]} {
- set mged_default(html_dir) [file normalize [file join [bu_brlcad_root
"share/doc"] html manuals mged]]
+ set mged_default(html_dir) [file normalize [file join [bu_dir 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 2020-12-18 23:52:04 UTC (rev
78015)
+++ brlcad/trunk/src/tclscripts/mged/points.tcl 2020-12-19 00:03:09 UTC (rev
78016)
@@ -391,7 +391,7 @@
eval "$cmd"
close $fd
- set asc2plot3 [file join [bu_brlcad_root "bin"] asc-plot3]
+ set asc2plot3 [file join [bu_dir bin] asc-plot3]
exec "$asc2plot3 < pipe$pipe_number.plasc > pipe$pipe_number.plot3"
incr pipe_number
@@ -697,7 +697,7 @@
set c "Q"
}
close $fd
- set asc2plot3 [file join [bu_brlcad_root "bin"] asc-plot3]
+ set asc2plot3 [file join [bu_dir bin] asc-plot3]
exec "$asc2plot3 < pipe.asc > pipe.plot3"
overlay pipe.plot3
file delete pipe.asc
Modified: brlcad/trunk/src/tclscripts/mged/rt.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/rt.tcl 2020-12-18 23:52:04 UTC (rev
78015)
+++ brlcad/trunk/src/tclscripts/mged/rt.tcl 2020-12-19 00:03:09 UTC (rev
78016)
@@ -579,7 +579,7 @@
set blue 0
}
- set fbclear [file join [bu_brlcad_root "bin"] fbclear]
+ set fbclear [file join [bu_dir 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 2020-12-18 23:52:04 UTC
(rev 78015)
+++ brlcad/trunk/src/tclscripts/mged/shaders.tcl 2020-12-19 00:03:09 UTC
(rev 78016)
@@ -1615,7 +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 \
- [file join [bu_brlcad_root "share/tclscripts"]
mged l_i${i}_v${v}_s${s}.gif]]
+ [file join [bu_dir 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.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
