merged tcl 8.1 branch back into the main trunk

1 files changed, 12 insertions, 76 deletions

diff --git a/generic/tclInitScript.h b/generic/tclInitScript.h
index 25ce3a9..a1da091 100644
--- a/generic/tclInitScript.h
+++ b/generic/tclInitScript.h
@@ -3,106 +3,41 @@
  *
  *	This file contains Unix & Windows common init script
  *      It is not used on the Mac. (the mac init script is in tclMacInit.c)
- *	This file should only be included once in the entire set of C
- *	source files for Tcl (by the respective platform initialization
- *	C source file, tclUnixInit.c and tclWinInit.c) and thus the
- *	presence of the routine, TclSetPreInitScript, below, should be
- *	harmless.
  *
  * Copyright (c) 1998 Sun Microsystems, Inc.
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclInitScript.h,v 1.8 1998/10/23 22:22:15 welch Exp $
+ * RCS: @(#) $Id: tclInitScript.h,v 1.9 1999/04/16 00:46:47 stanton Exp $
  */
 
 /*
- * In order to find init.tcl during initialization, the following script
- * is invoked by Tcl_Init().  It looks in several different directories:
- *
- *	$tcl_library		- can specify a primary location, if set
- *				  no other locations will be checked
- *
- *	$env(TCL_LIBRARY)	- highest priority so user can always override
- *				  the search path unless the application has
- *				  specified an exact directory above
- *
- *	$tclDefaultLibrary	- this value is initialized by TclPlatformInit
- *				  from a static C variable that was set at
- *				  compile time
- *
- *	<executable directory>/../lib/tcl$tcl_version
- *				- look for a lib/tcl<ver> in a sibling of
- *				  the bin directory (e.g. install hierarchy)
- *
- *	<executable directory>/../../lib/tcl$tcl_version
- *				- look for a lib/tcl<ver> in a sibling of
- *				  the bin/arch directory
- *
- *	<executable directory>/../library
- *				- look in build directory
- *
- *	<executable directory>/../../library
- *				- look in build directory from unix/arch
- *
- *	<executable directory>/../../tcl$tcl_patchLevel/library
- *				- look for tcl build directory relative
- *				  to a parallel build directory (e.g. Tk)
- *
- *	<executable directory>/../../../tcl$tcl_patchLevel/library
- *				- look for tcl build directory relative
- *				  to a parallel build directory from
- *				  down inside unix/arch directory
- *
- * The first directory on this path that contains a valid init.tcl script
- * will be set as the value of tcl_library.
- *
- * Note that this entire search mechanism can be bypassed by defining an
- * alternate tclInit procedure before calling Tcl_Init().
+ * The following string is the startup script executed in new
+ * interpreters.  It looks on disk in several different directories
+ * for a script "init.tcl" that is compatible with this version
+ * of Tcl.  The init.tcl script does all of the real work of
+ * initialization.
  */
 
 static char initScript[] = "if {[info proc tclInit]==\"\"} {\n\
   proc tclInit {} {\n\
-    global tcl_library tcl_version tcl_patchLevel errorInfo\n\
-    global env tclDefaultLibrary\n\
+    global tcl_libPath tcl_library errorInfo\n\
     rename tclInit {}\n\
     set errors {}\n\
-    set dirs {}\n\
-    if {[info exists tcl_library]} {\n\
-	lappend dirs $tcl_library\n\
-    } else {\n\
-	if {[info exists env(TCL_LIBRARY)]} {\n\
-	    lappend dirs $env(TCL_LIBRARY)\n\
-	}\n\
-	lappend dirs $tclDefaultLibrary\n\
-	unset tclDefaultLibrary\n\
-	set parentDir [file dirname [file dirname [info nameofexecutable]]]\n\
-	lappend dirs [file join $parentDir lib tcl$tcl_version]\n\
-	lappend dirs [file join [file dirname $parentDir] lib tcl$tcl_version]\n\
-	lappend dirs [file join $parentDir library]\n\
-	lappend dirs [file join [file dirname $parentDir] library]\n\
-	if {[string match {*[ab]*} $tcl_patchLevel]} {\n\
-	    set ver $tcl_patchLevel\n\
-	} else {\n\
-	    set ver $tcl_version\n\
-	}\n\
-	lappend dirs [file join [file dirname $parentDir] tcl$ver library]\n\
-	lappend dirs [file join [file dirname [file dirname $parentDir]] tcl$ver library]\n\
-    }\n\
-    foreach i $dirs {\n\
+    foreach i $tcl_libPath {\n\
 	set tcl_library $i\n\
 	set tclfile [file join $i init.tcl]\n\
 	if {[file exists $tclfile]} {\n\
-	    if {![catch {uplevel #0 [list source $tclfile]} msg]} {\n\
-	        return\n\
+	    if {[catch {uplevel #0 [list source $tclfile]} msg] != 1} {\n\
+		return\n\
 	    } else {\n\
 		append errors \"$tclfile: $msg\n$errorInfo\n\"\n\
 	    }\n\
 	}\n\
     }\n\
     set msg \"Can't find a usable init.tcl in the following directories: \n\"\n\
-    append msg \"    $dirs\n\n\"\n\
+    append msg \"    $tcl_libPath\n\n\"\n\
     append msg \"$errors\n\n\"\n\
     append msg \"This probably means that Tcl wasn't installed properly.\n\"\n\
     error $msg\n\
@@ -110,6 +45,7 @@ static char initScript[] = "if {[info proc tclInit]==\"\"} {\n\
 }\n\
 tclInit";
 
+
 /*
  * A pointer to a string that holds an initialization script that if non-NULL
  * is evaluated in Tcl_Init() prior to the the built-in initialization script