Revision: 54448
http://brlcad.svn.sourceforge.net/brlcad/?rev=54448&view=rev
Author: n_reed
Date: 2013-02-21 02:21:20 +0000 (Thu, 21 Feb 2013)
Log Message:
-----------
add a tclIndex for boteditor and remove manual dependency sourcing
Modified Paths:
--------------
brlcad/trunk/src/libtclcad/tclcadAutoPath.c
brlcad/trunk/src/tclscripts/archer/BotUtility.tcl
brlcad/trunk/src/tclscripts/boteditor/CMakeLists.txt
brlcad/trunk/src/tclscripts/boteditor/Makefile.am
brlcad/trunk/src/tclscripts/boteditor/botEditor.tcl
brlcad/trunk/src/tclscripts/mged/botedit.tcl
Added Paths:
-----------
brlcad/trunk/src/tclscripts/boteditor/tclIndex
Modified: brlcad/trunk/src/libtclcad/tclcadAutoPath.c
===================================================================
--- brlcad/trunk/src/libtclcad/tclcadAutoPath.c 2013-02-21 01:09:49 UTC (rev
54447)
+++ brlcad/trunk/src/libtclcad/tclcadAutoPath.c 2013-02-21 02:21:20 UTC (rev
54448)
@@ -247,6 +247,7 @@
join_path(&auto_path, data, "tclscripts", "graph", NULL);
join_path(&auto_path, data, "tclscripts", "rtwizard", NULL);
join_path(&auto_path, data, "tclscripts", "archer", NULL);
+ join_path(&auto_path, data, "tclscripts", "boteditor", NULL);
}
/* are we running uninstalled? */
@@ -270,6 +271,7 @@
join_path(&auto_path, srcpath, "src", "tclscripts", "graph", NULL);
join_path(&auto_path, srcpath, "src", "tclscripts", "rtwizard", NULL);
join_path(&auto_path, srcpath, "src", "tclscripts", "archer", NULL);
+ join_path(&auto_path, srcpath, "src", "tclscripts", "boteditor", NULL);
}
/* add search paths for dist invocation */
@@ -293,6 +295,7 @@
join_path(&auto_path, srcpath, "..", "src", "tclscripts", "graph",
NULL);
join_path(&auto_path, srcpath, "..", "src", "tclscripts",
"rtwizard", NULL);
join_path(&auto_path, srcpath, "..", "src", "tclscripts", "archer",
NULL);
+ join_path(&auto_path, srcpath, "..", "src", "tclscripts",
"boteditor", NULL);
}
}
Modified: brlcad/trunk/src/tclscripts/archer/BotUtility.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/archer/BotUtility.tcl 2013-02-21 01:09:49 UTC
(rev 54447)
+++ brlcad/trunk/src/tclscripts/archer/BotUtility.tcl 2013-02-21 02:21:20 UTC
(rev 54448)
@@ -27,19 +27,6 @@
package require Itcl
package require Itk
-if {$tcl_platform(platform) == "windows"} {
- load [file join [bu_brlcad_root [bu_brlcad_dir bin]] libbu[info
sharedlibextension]]
-} else {
- load [file join [bu_brlcad_root [bu_brlcad_dir lib]] libbu[info
sharedlibextension]]
-}
-
-if {[catch {
- set script [file join [bu_brlcad_data "tclscripts"] boteditor
botEditor.tcl]
- source $script
-} errMsg] > 0} {
- puts "Couldn't load \"$script\"\n$errMsg"
-}
-
::itcl::class BotUtility {
inherit Utility
Modified: brlcad/trunk/src/tclscripts/boteditor/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/tclscripts/boteditor/CMakeLists.txt 2013-02-21
01:09:49 UTC (rev 54447)
+++ brlcad/trunk/src/tclscripts/boteditor/CMakeLists.txt 2013-02-21
02:21:20 UTC (rev 54448)
@@ -4,8 +4,10 @@
botTools.tcl
)
BRLCAD_ADDDATA(boteditor_TCLSCRIPTS tclscripts/boteditor)
-CMAKEFILES(Makefile.am)
+tclIndex_BUILD(boteditor tclscripts/boteditor)
+CMAKEFILES(Makefile.am tclIndex)
+
# Local Variables:
# tab-width: 8
# mode: cmake
Modified: brlcad/trunk/src/tclscripts/boteditor/Makefile.am
===================================================================
--- brlcad/trunk/src/tclscripts/boteditor/Makefile.am 2013-02-21 01:09:49 UTC
(rev 54447)
+++ brlcad/trunk/src/tclscripts/boteditor/Makefile.am 2013-02-21 02:21:20 UTC
(rev 54448)
@@ -1,11 +1,20 @@
this_dir = tclscripts/boteditor
tcldir = $(BRLCAD_DATA)/$(this_dir)
+BUILT_SOURCES = tclIndex
+
tcl_SCRIPTS = \
botEditor.tcl \
botPropertyBox.tcl \
- botTools.tcl
+ botTools.tcl \
+ $(BUILT_SOURCES)
EXTRA_DIST = $(tcl_SCRIPTS) CMakeLists.txt
+tclIndex:
+ TCL_LIBRARY=$(top_srcdir)/src/other/tcl/library \
+
LD_LIBRARY_PATH=$(top_builddir)/src/other/tcl/unix:$(top_builddir)/src/other/tk/unix:$$LD_LIBRARY_PATH
\
+
DYLD_LIBRARY_PATH=$(top_builddir)/src/other/tcl/unix:$(top_builddir)/src/other/tk/unix:$$DYLD_LIBRARY_PATH
\
+ $(top_builddir)/src/bwish/btclsh $(top_srcdir)/src/tclscripts/ami.tcl
$(top_srcdir)/src/$(this_dir)
+
include $(top_srcdir)/misc/Makefile.defs
Modified: brlcad/trunk/src/tclscripts/boteditor/botEditor.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/boteditor/botEditor.tcl 2013-02-21 01:09:49 UTC
(rev 54447)
+++ brlcad/trunk/src/tclscripts/boteditor/botEditor.tcl 2013-02-21 02:21:20 UTC
(rev 54448)
@@ -29,18 +29,6 @@
package require Itcl
package require Itk
-# manually sourcing dependencies for now
-if {[catch {
- set script [file join [bu_brlcad_data "tclscripts"] boteditor
botPropertyBox.tcl]
- source $script
-
- set script [file join [bu_brlcad_data "tclscripts"] boteditor botTools.tcl]
- source $script
-} errMsg] > 0} {
- puts "Couldn't load \"$script\"\n$errMsg"
- exit
-}
-
::itcl::class BotEditor {
inherit ::itk::Toplevel
Added: brlcad/trunk/src/tclscripts/boteditor/tclIndex
===================================================================
--- brlcad/trunk/src/tclscripts/boteditor/tclIndex
(rev 0)
+++ brlcad/trunk/src/tclscripts/boteditor/tclIndex 2013-02-21 02:21:20 UTC
(rev 54448)
@@ -0,0 +1,52 @@
+# Tcl autoload index file, version 2.0
+# This file is generated by the "auto_mkindex" command
+# and sourced to set up indexing information for one or
+# more commands. Typically each line is a command that
+# sets an element in the auto_index array, where the
+# element name is the name of a command and the value is
+# a script that loads the command.
+
+set auto_index(::BotEditor::accept) [list source [file join $dir
botEditor.tcl]]
+set auto_index(::BotEditor::animate) [list source [file join $dir
botEditor.tcl]]
+set auto_index(::BotEditor::cancel) [list source [file join $dir
botEditor.tcl]]
+set auto_index(::BotEditor::constructor) [list source [file join $dir
botEditor.tcl]]
+set auto_index(::BotEditor::defineCommands) [list source [file join $dir
botEditor.tcl]]
+set auto_index(::BotEditor::focusOnEnter) [list source [file join $dir
botEditor.tcl]]
+set auto_index(::BotEditor::giveFeedback) [list source [file join $dir
botEditor.tcl]]
+set auto_index(::BotEditor::localizeDialog) [list source [file join $dir
botEditor.tcl]]
+set auto_index(::BotEditor::onChange) [list source [file join $dir
botEditor.tcl]]
+set auto_index(::BotEditor::reject) [list source [file join $dir
botEditor.tcl]]
+set auto_index(::BotEditor::showUnsaved) [list source [file join $dir
botEditor.tcl]]
+set auto_index(::BotEditor::updateStatus) [list source [file join $dir
botEditor.tcl]]
+set auto_index(::BotPropertyBox::constructor) [list source [file join $dir
botPropertyBox.tcl]]
+set auto_index(::BotPropertyBox::update) [list source [file join $dir
botPropertyBox.tcl]]
+set auto_index(::BotTools::constructor) [list source [file join $dir
botTools.tcl]]
+set auto_index(::BotTools::decimate) [list source [file join $dir
botTools.tcl]]
+set auto_index(::BotTools::intInRange) [list source [file join $dir
botTools.tcl]]
+set auto_index(::BotTools::isPositiveFloat) [list source [file join $dir
botTools.tcl]]
+set auto_index(::BotTools::keepFocus) [list source [file join $dir
botTools.tcl]]
+set auto_index(::BotTools::loadDecimateSuggestions) [list source [file join
$dir botTools.tcl]]
+set auto_index(::BotTools::makeCleanupPane) [list source [file join $dir
botTools.tcl]]
+set auto_index(::BotTools::makeDensityPane) [list source [file join $dir
botTools.tcl]]
+set auto_index(::BotTools::makePane) [list source [file join $dir
botTools.tcl]]
+set auto_index(::BotTools::makePerformancePane) [list source [file join $dir
botTools.tcl]]
+set auto_index(::BotTools::print) [list source [file join $dir botTools.tcl]]
+set auto_index(::BotTools::runBotCmd) [list source [file join $dir
botTools.tcl]]
+set auto_index(::BotTools::simplify) [list source [file join $dir
botTools.tcl]]
+set auto_index(::BotTools::sortFaces) [list source [file join $dir
botTools.tcl]]
+set auto_index(::BotTools::updateDecimateState) [list source [file join $dir
botTools.tcl]]
+set auto_index(::BotTools::validateChordEntry) [list source [file join $dir
botTools.tcl]]
+set auto_index(::BotTools::validateEdgeEntry) [list source [file join $dir
botTools.tcl]]
+set auto_index(::BotTools::validateGroupsEntry) [list source [file join $dir
botTools.tcl]]
+set auto_index(::BotTools::validateNormalEntry) [list source [file join $dir
botTools.tcl]]
+set auto_index(::BotTools::validateSimplifyChecks) [list source [file join
$dir botTools.tcl]]
+set auto_index(::PropertiesPane::constructor) [list source [file join $dir
botPropertyBox.tcl]]
+set auto_index(::PropertiesPane::updateMode) [list source [file join $dir
botPropertyBox.tcl]]
+set auto_index(::PropertiesPane::updateOrientation) [list source [file join
$dir botPropertyBox.tcl]]
+set auto_index(BotEditor) [list source [file join $dir botEditor.tcl]]
+set auto_index(BotPropertyBox) [list source [file join $dir
botPropertyBox.tcl]]
+set auto_index(BotTools) [list source [file join $dir botTools.tcl]]
+set auto_index(ConfirmationDialog) [list source [file join $dir botEditor.tcl]]
+set auto_index(EditPane) [list source [file join $dir botEditor.tcl]]
+set auto_index(GeometryPane) [list source [file join $dir botPropertyBox.tcl]]
+set auto_index(PropertiesPane) [list source [file join $dir
botPropertyBox.tcl]]
Property changes on: brlcad/trunk/src/tclscripts/boteditor/tclIndex
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: brlcad/trunk/src/tclscripts/mged/botedit.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/mged/botedit.tcl 2013-02-21 01:09:49 UTC
(rev 54447)
+++ brlcad/trunk/src/tclscripts/mged/botedit.tcl 2013-02-21 02:21:20 UTC
(rev 54448)
@@ -18,14 +18,6 @@
# information.
#
###
-# manually sourcing dependencies for now
-if {[catch {
- set script [file join [bu_brlcad_data "tclscripts"] boteditor
botEditor.tcl]
- source $script
-} errMsg] > 0} {
- puts "Couldn't load \"$script\"\n$errMsg"
- exit
-}
proc bot_askforname {parent screen} {
if {[cad_input_dialog $parent.botname $screen "BoT to Edit"\
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_feb
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
