Changeset 9811391 in tol

Timestamp:

Mar 14, 2012, 10:33:46 AM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

b10b2a7

Parents:

5b6de6a

Message:

refs #1479, pkgIndex.tcl deal with USE_TOLTCL_x environment variable

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@4363 be4846ae-f051-483a-831f-b64e7d08527f

Location:

toltcl

Files:

• pkgIndex.tcl (modified) (1 diff)
• pkgIndex.tcl.in (modified) (1 diff)

toltcl/pkgIndex.tcl

@@ -3 +3 @@
 proc LoadToltcl { version dir } {
   global tcl_platform
-  
-  set suffix [info sharedlibextension]
-  if {$tcl_platform(platform) eq "unix"} {
-    set name libtoltcl${version}[info sharedlibextension]
-  } else  {
-    set name toltcl.dll
+ 
+  set _version [ string map [ list "." "" ] $version ]
+  if {[info exist ::env(USE_TOLTCL_$_version)]} {
+    puts "requested to load Toltcl from $::env(USE_TOLTCL_$_version)"
+    load $::env(USE_TOLTCL_$_version)
+  } else {
+    set suffix [info sharedlibextension]
+    if {$tcl_platform(platform) eq "unix"} {
+      set name libtoltcl${version}[info sharedlibextension]
+    } else  {
+      set name toltcl.dll
+    }
+    load [file join $dir $name] Toltcl
   }
-  load [file join $dir $name] Toltcl
 }
 

toltcl/pkgIndex.tcl.in

@@ -3 +3 @@
 proc LoadToltcl { version dir } {
   global tcl_platform
-  
-  set suffix [info sharedlibextension]
-  if {$tcl_platform(platform) eq "unix"} {
-    set name libtoltcl${version}[info sharedlibextension]
-  } else  {
-    set name toltcl.dll
+ 
+  set _version [ string map [ list "." "" ] $version ]
+  if {[info exist ::env(USE_TOLTCL_$_version)]} {
+    puts "requested to load Toltcl from $::env(USE_TOLTCL_$_version)"
+    load $::env(USE_TOLTCL_$_version)
+  } else {
+    set suffix [info sharedlibextension]
+    if {$tcl_platform(platform) eq "unix"} {
+      set name libtoltcl${version}[info sharedlibextension]
+    } else  {
+      set name toltcl.dll
+    }
+    load [file join $dir $name] Toltcl
   }
-  load [file join $dir $name] Toltcl
 }
 
 package ifneeded Toltcl @PACKAGE_VERSION@ \
     [ string map [list %d $dir] {
-      LoadToltcl @PACKAGE_VERSION@ %d
-      source [ file join %d toltcl.tcl ]
+      LoadToltcl @PACKAGE_VERSION@ {%d}
+      source [ file join {%d} toltcl.tcl ]
     } ]