Revision: 75255
http://sourceforge.net/p/brlcad/code/75255
Author: starseeker
Date: 2020-04-02 19:26:53 +0000 (Thu, 02 Apr 2020)
Log Message:
-----------
Need the auto_path before we do package require
Modified Paths:
--------------
brlcad/branches/tcltk86/src/libtclcad/tclcadAutoPath.c
brlcad/branches/tcltk86/src/libtclcad/tclcad_init.c
Modified: brlcad/branches/tcltk86/src/libtclcad/tclcadAutoPath.c
===================================================================
--- brlcad/branches/tcltk86/src/libtclcad/tclcadAutoPath.c 2020-04-02
19:09:06 UTC (rev 75254)
+++ brlcad/branches/tcltk86/src/libtclcad/tclcadAutoPath.c 2020-04-02
19:26:53 UTC (rev 75255)
@@ -117,14 +117,6 @@
* BRLCAD_ROOT/lib/iwidgetsIWIDGETS_VERSION/iwidgets.tcl
* BRLCAD_ROOT/share/tclscripts/pkgIndex.tcl and subdirs
*
- ** source invocation paths
- * src/other/tcl/library/init.tcl
- * src/other/tk/library/tk.tcl
- * src/other/incrTcl/itcl/library/itcl.tcl
- * src/other/incrTcl/itk/library/itk.tcl
- * src/other/iwidgets/library/iwidgets.tcl
- * src/tclscripts/pkgIndex.tcl and subdirs
- *
* if TCLCAD_LIBRARY_PATH is set
* append to search path
* get installation directory and invocation path
Modified: brlcad/branches/tcltk86/src/libtclcad/tclcad_init.c
===================================================================
--- brlcad/branches/tcltk86/src/libtclcad/tclcad_init.c 2020-04-02 19:09:06 UTC
(rev 75254)
+++ brlcad/branches/tcltk86/src/libtclcad/tclcad_init.c 2020-04-02 19:26:53 UTC
(rev 75255)
@@ -103,6 +103,10 @@
/* Initialize [incr Tcl] */
Tcl_ResetResult(interp);
+
+ /* Locate the BRL-CAD-specific Tcl scripts, set the auto_path */
+ tclcad_auto_path(interp);
+
/* NOTE: Calling "package require Itcl" may be a problem - there have
* been reports of the Combination Editor in mged failing with an
* iwidgets class already loaded error if we don't perform Itcl_Init()
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
