Revision: 41006
http://brlcad.svn.sourceforge.net/brlcad/?rev=41006&view=rev
Author: bob1961
Date: 2010-10-15 21:05:47 +0000 (Fri, 15 Oct 2010)
Log Message:
-----------
Removed use of env(ARCHER_HOME).
Modified Paths:
--------------
brlcad/trunk/src/archer/archer
brlcad/trunk/src/tclscripts/archer/Archer.tcl
brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
Modified: brlcad/trunk/src/archer/archer
===================================================================
--- brlcad/trunk/src/archer/archer 2010-10-15 19:06:31 UTC (rev 41005)
+++ brlcad/trunk/src/archer/archer 2010-10-15 21:05:47 UTC (rev 41006)
@@ -65,32 +65,16 @@
::ttk::style theme use clam
}
-# normalize ARCHER_HOME
-if {[info exists env(ARCHER_HOME)]} {
- set dir [file normalize $env(ARCHER_HOME)]
+# normalize dir
+if {[info exists argv0]} {
+ set dir [file normalize [file join [file dir $argv0] ..]]
} else {
- if {[info exists argv0]} {
- set dir [file normalize [file join [file dir $argv0] ..]]
- } else {
- set dir [file normalize [pwd]]
- }
+ set dir [file normalize [pwd]]
}
-set env(ARCHER_HOME) $dir
-# Decide on a parent class for ArcherCore
-#namespace eval ArcherCore {
-# if {0} {
-# set parentClass itk::Toplevel
-# set inheritFromToplevel 1
-# } else {
-# set parentClass itk::Widget
-# set inheritFromToplevel 0
-# }
-#}
-
if {$tcl_platform(platform) == "windows"} {
- lappend auto_path ${env(ARCHER_HOME)}/bin/Tkhtml3.0
- lappend auto_path ${env(ARCHER_HOME)}/bin/Tktable2.10
+ lappend auto_path ${dir}/lib/Tkhtml3.0
+ lappend auto_path ${dir}/lib/Tktable2.10
}
# load archer guts
@@ -103,7 +87,6 @@
set Archer::debug 0
if { [info exists env(DEBUG)] } {
- puts "Using ARCHER_HOME of $env(ARCHER_HOME)"
set Archer::debug $env(DEBUG)
}
Modified: brlcad/trunk/src/tclscripts/archer/Archer.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/archer/Archer.tcl 2010-10-15 19:06:31 UTC
(rev 41005)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2010-10-15 21:05:47 UTC
(rev 41006)
@@ -36,11 +36,9 @@
set methodImpls ""
set extraMgedCommands ""
set corePluginInit ""
- set pluginsdir [file join $env(ARCHER_HOME) plugins archer]
+
+ set pluginsdir [file join [bu_brlcad_data "plugins"] archer]
if {![file exists $pluginsdir]} {
- set pluginsdir [file join [bu_brlcad_data "plugins"] archer]
- }
- if {![file exists $pluginsdir]} {
set pluginsdir [file join [bu_brlcad_data "src"] archer plugins]
}
Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2010-10-15 19:06:31 UTC
(rev 41005)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl 2010-10-15 21:05:47 UTC
(rev 41006)
@@ -23,16 +23,6 @@
# This is a BRL-CAD Application Core mega-widget.
#
-if {![info exists env(ARCHER_HOME)]} {
- if {[info exists argv0]} {
- if [catch { set env(ARCHER_HOME) [file normalize [file join [file dir
$argv0] ..]] }] {
- set env(ARCHER_HOME) .
- }
- } else {
- set env(ARCHER_HOME) .
- }
-}
-
LoadArcherCoreLibs
package provide ArcherCore 1.0
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
