Menu
▾
▴
plplot-cvs
|
From: <ai...@us...> - 2013-11-12 05:48:14
|
Revision: 12679
http://sourceforge.net/p/plplot/code/12679
Author: airwin
Date: 2013-11-12 05:48:09 +0000 (Tue, 12 Nov 2013)
Log Message:
-----------
Correct some bit rot due to replacing our long-since-retired (!)
autotools-based build system with the present CMake-based build system.
As a result of this change, the Tcl standard examples can now be run
from tclsh by following the directions in examples/tcl/README.tcldemos.
Modified Paths:
--------------
trunk/bindings/tcl/pkgIndex.tcl.in
Modified: trunk/bindings/tcl/pkgIndex.tcl.in
===================================================================
--- trunk/bindings/tcl/pkgIndex.tcl.in 2013-11-12 03:22:18 UTC (rev 12678)
+++ trunk/bindings/tcl/pkgIndex.tcl.in 2013-11-12 05:48:09 UTC (rev 12679)
@@ -37,7 +37,7 @@
set buildDir "@BUILD_DIR@"
set bLen [string length $buildDir]
if {![string compare -length $bLen $buildDir $thisDir]} then {
- set searchdirs ".libs"} else {
+ set searchdirs "."} else {
set searchdirs [list "@LIB_HARDDIR@"]}
#puts $searchdirs
# prefer double precision version
@@ -74,4 +74,3 @@
}
package ifneeded Pltcl @PLPLOT_VERSION@ [list load_pkg_Pltcl $dir]
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-01-13 03:22:41
|
Revision: 12937
http://sourceforge.net/p/plplot/code/12937
Author: airwin
Date: 2014-01-13 03:22:38 +0000 (Mon, 13 Jan 2014)
Log Message:
-----------
Update the TEA-based approach for accessing Pltcl under tclsh on
Windows platforms. I have dropped the old Windows method which was
completely broken and replaced it with a method which slightly adapts
the Unix way of accessing PLtcl by using the known different locations
for the dll's in the Windows case.
Tested by Alan W. Irwin <ai...@us...> on
MinGW/MSYS/Wine by running the tclsh demo given by
examples/tcl/README.tcldemos by hand for a few examples and also by
running the test_tclsh_standard_examples target.
Modified Paths:
--------------
trunk/bindings/tcl/pkgIndex.tcl.in
Modified: trunk/bindings/tcl/pkgIndex.tcl.in
===================================================================
--- trunk/bindings/tcl/pkgIndex.tcl.in 2014-01-13 03:13:30 UTC (rev 12936)
+++ trunk/bindings/tcl/pkgIndex.tcl.in 2014-01-13 03:22:38 UTC (rev 12937)
@@ -32,48 +32,48 @@
#puts "loading Pltcl, dir: $dir"
set pllibrary $dir
+ set thisDir [pwd]
+ # Find absolute path of $dir
+ cd $dir
+ set pkgIndexDir [pwd]
+ cd $thisDir
+ set buildDir "@BUILD_DIR@"
+ set bLen [string length $buildDir]
+ # If pkgIndexDir is in the build tree...
if {$tcl_platform(platform) == "unix"} {
- set thisDir [pwd]
- # Find absolute path of $dir
- cd $dir
- set pkgIndexDir [pwd]
- cd $thisDir
- set buildDir "@BUILD_DIR@"
- set bLen [string length $buildDir]
- # If pkgIndexDir is in the build tree...
if {![string compare -length $bLen $buildDir $pkgIndexDir]} then {
- set searchdirs "."} else {
- set searchdirs [list "@LIB_HARDDIR@"]}
- #puts $searchdirs
- # prefer double precision version
- set dlnames [list "@DLNAME_LIBPLPLOTTCLTKD@" "@DLNAME_LIBPLPLOTTCLTK@"]
- set file ""
- foreach reldir $searchdirs {
- foreach dlname $dlnames {
- set driver [file join $dir $reldir $dlname]
- #puts "looking for driver file: $driver"
- if [file exists $driver] {
- set file $driver
- break
- }
- }
- if { $file != "" } { break }
+ set searchdirs "."
+ } else {
+ set searchdirs [list "@LIB_HARDDIR@"]
}
- if { $file == "" } {
- error "load_pkg_Pltcl: could not find loadable driver"
- }
-
} else {
- # This is probably broken, someone should fix it.
- if {[info exists tcl_platform(debug)]} {
- set file [file join $dir plplot510d[info sharedlibextension]]
+ if {![string compare -length $bLen $buildDir $pkgIndexDir]} then {
+ set searchdirs "../../dll"
} else {
- set file [file join $dir plplot510[info sharedlibextension]]
+ set searchdirs [list "@LIB_HARDDIR@../bin"]
}
}
+ #puts $searchdirs
+ # prefer double precision version
+ set dlnames [list "@DLNAME_LIBPLPLOTTCLTKD@" "@DLNAME_LIBPLPLOTTCLTK@"]
+ set file ""
+ foreach reldir $searchdirs {
+ foreach dlname $dlnames {
+ set driver [file join $dir $reldir $dlname]
+ #puts "looking for driver file: $driver"
+ if [file exists $driver] {
+ set file $driver
+ break
+ }
+ }
+ if { $file != "" } { break }
+ }
+ if { $file == "" } {
+ error "load_pkg_Pltcl: could not find loadable driver"
+ }
load $file Pltcl
-# put core tcl scripts in path
+ # put core tcl scripts in path
lappend auto_path $dir/tcl
rename load_pkg_Pltcl {}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-03-12 23:39:24
|
Revision: 13051
http://sourceforge.net/p/plplot/code/13051
Author: airwin
Date: 2014-03-12 23:39:20 +0000 (Wed, 12 Mar 2014)
Log Message:
-----------
Fix typographical error that made "package require Pltcl" fail
under tclsh on the MinGW/MSYS platform.
This fix allows the test_tclsh_standard_examples target to work on
MinGW/MSYS. As a result, an epa_build of the build_plplot_lite target
using -DCOMPREHENSIVE_PLPLOT_TEST_INTERACTIVE=ON works for the very
first time on my MinGW/MSYS/Wine platform.
Modified Paths:
--------------
trunk/bindings/tcl/pkgIndex.tcl.in
Modified: trunk/bindings/tcl/pkgIndex.tcl.in
===================================================================
--- trunk/bindings/tcl/pkgIndex.tcl.in 2014-03-12 20:54:20 UTC (rev 13050)
+++ trunk/bindings/tcl/pkgIndex.tcl.in 2014-03-12 23:39:20 UTC (rev 13051)
@@ -48,7 +48,7 @@
if {![string compare -length $bLen $buildDir $pkgIndexDir]} then {
set searchdirs "../../dll"
} else {
- set searchdirs [list "@LIB_HARDDIR@../bin"]
+ set searchdirs [list "@LIB_HARDDIR@/../bin"]
}
}
#puts $searchdirs
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X