Revision: 78018
http://sourceforge.net/p/brlcad/code/78018
Author: starseeker
Date: 2020-12-19 00:18:57 +0000 (Sat, 19 Dec 2020)
Log Message:
-----------
Remainder of bu_brlcad_root -> bu_dir changes
Modified Paths:
--------------
brlcad/trunk/src/archer/plugins/Utility/attrGroupsDisplayUtilityP.tcl
brlcad/trunk/src/archer/plugins/Utility/botUtilityP.tcl
brlcad/trunk/src/archer/plugins/Utility/lodUtilityP.tcl
brlcad/trunk/src/archer/plugins/Wizards/humanwizard.tcl
brlcad/trunk/src/gtools/gsh.cpp
brlcad/trunk/src/libanalyze/tests/nhit.cpp
brlcad/trunk/src/libbu/dir.c
brlcad/trunk/src/util/morphedit.tcl
Modified: brlcad/trunk/src/archer/plugins/Utility/attrGroupsDisplayUtilityP.tcl
===================================================================
--- brlcad/trunk/src/archer/plugins/Utility/attrGroupsDisplayUtilityP.tcl
2020-12-19 00:13:43 UTC (rev 78017)
+++ brlcad/trunk/src/archer/plugins/Utility/attrGroupsDisplayUtilityP.tcl
2020-12-19 00:18:57 UTC (rev 78018)
@@ -23,15 +23,9 @@
# This is a script for loading/registering the attribute groups display
utility.
#
-set brlcadDataPath [bu_brlcad_root "share/plugins"]
-# puts "pwd is [pwd], path is $brlcadDataPath"
+set brlcadDataPath [file join [bu_dir data] plugins]
set filename [file join $brlcadDataPath archer Utility
attrGroupsDisplayUtilityP AttrGroupsDisplayUtilityP.tcl]
if { ![file exists $filename] } {
- # non-tclscript resource, look in the source invocation path
- set brlcadDataPath [bu_brlcad_root "src"]
- set filename [file join $brlcadDataPath archer plugins Utility
attrGroupsDisplayUtilityP AttrGroupsDisplayUtilityP.tcl]
-}
-if { ![file exists $filename] } {
puts "Could not load the AttrGroupsDisplayUtilityP plugin, skipping
$filename"
return
}
Modified: brlcad/trunk/src/archer/plugins/Utility/botUtilityP.tcl
===================================================================
--- brlcad/trunk/src/archer/plugins/Utility/botUtilityP.tcl 2020-12-19
00:13:43 UTC (rev 78017)
+++ brlcad/trunk/src/archer/plugins/Utility/botUtilityP.tcl 2020-12-19
00:18:57 UTC (rev 78018)
@@ -23,12 +23,8 @@
# This is a script for loading/registering the bot editor utility.
#
-set filename [file join [bu_brlcad_root "share/plugins"] archer Utility
botUtilityP BotUtilityP.tcl]
+set filename [file join [bu_dir data] plugins archer Utility botUtilityP
BotUtilityP.tcl]
if { ![file exists $filename] } {
- # non-tclscript resource, look in the source invocation path
- set filename [file join [bu_brlcad_root "src"] archer plugins Utility
botUtilityP BotUtilityP.tcl]
-}
-if { ![file exists $filename] } {
puts "Could not load the BotUtilityP plugin, skipping $filename"
return
}
Modified: brlcad/trunk/src/archer/plugins/Utility/lodUtilityP.tcl
===================================================================
--- brlcad/trunk/src/archer/plugins/Utility/lodUtilityP.tcl 2020-12-19
00:13:43 UTC (rev 78017)
+++ brlcad/trunk/src/archer/plugins/Utility/lodUtilityP.tcl 2020-12-19
00:18:57 UTC (rev 78018)
@@ -24,12 +24,8 @@
# configuration utility.
#
-set filename [file join [bu_brlcad_root "share/plugins"] archer Utility
lodUtilityP LODUtilityP.tcl]
+set filename [file join [bu_dir data] plugins archer Utility lodUtilityP
LODUtilityP.tcl]
if { ![file exists $filename] } {
- # non-tclscript resource, look in the source invocation path
- set filename [file join [bu_brlcad_root "src"] archer plugins Utility
lodUtilityP LODUtilityP.tcl]
-}
-if { ![file exists $filename] } {
puts "Could not load the LODUtilityP plugin, skipping $filename"
return
}
Modified: brlcad/trunk/src/archer/plugins/Wizards/humanwizard.tcl
===================================================================
--- brlcad/trunk/src/archer/plugins/Wizards/humanwizard.tcl 2020-12-19
00:13:43 UTC (rev 78017)
+++ brlcad/trunk/src/archer/plugins/Wizards/humanwizard.tcl 2020-12-19
00:18:57 UTC (rev 78018)
@@ -23,15 +23,10 @@
# This is a script for loading/registering the human wizard.
#
-set brlcadDataPath [bu_brlcad_root "share/plugins"]
+set brlcadDataPath [file join [bu_dir data] plugins]
# puts "pwd is [pwd], path is $brlcadDataPath"
set filename [file join $brlcadDataPath archer Wizards humanwizard
HumanWizard.tcl]
if { ![file exists $filename] } {
- # non-tclscript resource, look in the source invocation path
- set brlcadDataPath [bu_brlcad_root "src"]
- set filename [file join $brlcadDataPath archer plugins Wizards humanwizard
HumanWizard.tcl]
-}
-if { ![file exists $filename] } {
puts "Could not load the HumanWizard plugin, skipping $filename"
return
}
Modified: brlcad/trunk/src/gtools/gsh.cpp
===================================================================
--- brlcad/trunk/src/gtools/gsh.cpp 2020-12-19 00:13:43 UTC (rev 78017)
+++ brlcad/trunk/src/gtools/gsh.cpp 2020-12-19 00:18:57 UTC (rev 78018)
@@ -57,7 +57,7 @@
if (argc == 0 || !argv) return -1;
- /* Let bu_brlcad_root and friends know where we are */
+ /* Let libbu know where we are */
bu_setprogname(argv[0]);
/* Done with program name */
Modified: brlcad/trunk/src/libanalyze/tests/nhit.cpp
===================================================================
--- brlcad/trunk/src/libanalyze/tests/nhit.cpp 2020-12-19 00:13:43 UTC (rev
78017)
+++ brlcad/trunk/src/libanalyze/tests/nhit.cpp 2020-12-19 00:18:57 UTC (rev
78018)
@@ -103,7 +103,7 @@
if (argc == 0 || !argv)
return -1;
- /* Let bu_brlcad_root and friends know where we are */
+ /* Let libbu know where we are */
bu_setprogname(argv[0]);
argv++; argc--;
Modified: brlcad/trunk/src/libbu/dir.c
===================================================================
--- brlcad/trunk/src/libbu/dir.c 2020-12-19 00:13:43 UTC (rev 78017)
+++ brlcad/trunk/src/libbu/dir.c 2020-12-19 00:18:57 UTC (rev 78018)
@@ -421,7 +421,7 @@
char where[MAX_WHERE_SIZE] = {0};
if (UNLIKELY(bu_debug & BU_DEBUG_PATHS)) {
- bu_log("bu_brlcad_root: searching for [%s]\n", rhs?rhs:"");
+ bu_log("_bu_dir_brlcad_root: searching for [%s]\n", rhs?rhs:"");
}
/* BRLCAD_ROOT environment variable if set */
Modified: brlcad/trunk/src/util/morphedit.tcl
===================================================================
--- brlcad/trunk/src/util/morphedit.tcl 2020-12-19 00:13:43 UTC (rev 78017)
+++ brlcad/trunk/src/util/morphedit.tcl 2020-12-19 00:18:57 UTC (rev 78018)
@@ -37,7 +37,7 @@
# the next line restarts using bwish \
exec $BWISH "$0" "$@"
-set brlcad_path [bu_brlcad_root bin]
+set brlcad_path [bu_dir bin]
set PIXFB [file join $brlcad_path pix-fb]
set PIXMORPH [file join $brlcad_path pixmorph]
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
