plplot-cvs

[Plplot-cvs] SF.net SVN: plplot:[12649] trunk/bindings/tk/pkgIndex.tcl.in

[<ai...@us...>]

Revision: 12649
          http://sourceforge.net/p/plplot/code/12649
Author:   airwin
Date:     2013-11-05 06:12:52 +0000 (Tue, 05 Nov 2013)
Log Message:
-----------
Use the correct build-tree location for the tk device.
This gets rid of some bit rot left over from the autotools days!

The result is that the tk device driver can once again be found in the
build tree following the wish directions in
examples/tk/README.tkdemos, e.g.,

cd <top-directory in build tree>
cd examples/tk
wish
lappend auto_path ../../bindings/tk
package require Pltk

N.B. the subsequent suggested command "source tkdemos.tcl" segfaults
so there is still work to do here to get this PLplot Tk test to work
again.

Modified Paths:
--------------
    trunk/bindings/tk/pkgIndex.tcl.in

Modified: trunk/bindings/tk/pkgIndex.tcl.in
===================================================================
--- trunk/bindings/tk/pkgIndex.tcl.in	2013-11-05 00:48:39 UTC (rev 12648)
+++ trunk/bindings/tk/pkgIndex.tcl.in	2013-11-05 06:12:52 UTC (rev 12649)
@@ -38,7 +38,7 @@
 	set buildDir "@BUILD_DIR@"
 	set bLen [string length $buildDir]
 	if {![string compare -length $bLen $buildDir $thisDir]}	then {
-		set searchdirs "../../drivers/.libs"} else {
+		set searchdirs "../../drivers"} else {
 		set searchdirs [list "@DRV_HARDDIR@"]}
 	#puts $searchdirs
 	set suf [info sharedlibextension]

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12834] trunk/bindings/tk/pkgIndex.tcl.in

[<arj...@us...>]

Revision: 12834
          http://sourceforge.net/p/plplot/code/12834
Author:   arjenmarkus
Date:     2013-12-09 19:16:11 +0000 (Mon, 09 Dec 2013)
Log Message:
-----------
Adjust the package loading script for Cygwin - a specific library name and a different directory. The name (now: cygplplottcltkd-10) should be configured but I could not find the right keyword for it.

Modified Paths:
--------------
    trunk/bindings/tk/pkgIndex.tcl.in

Modified: trunk/bindings/tk/pkgIndex.tcl.in
===================================================================
--- trunk/bindings/tk/pkgIndex.tcl.in	2013-12-09 16:48:06 UTC (rev 12833)
+++ trunk/bindings/tk/pkgIndex.tcl.in	2013-12-09 19:16:11 UTC (rev 12834)
@@ -33,9 +33,13 @@
     set pllibrary $dir
 
     if {$tcl_platform(platform) == "unix"} {
-	set stem tk
+	if {[string match "*CYGWIN*" $::tcl_platform(os)]} {
+	    set stem cygplplottcltk@LIB_TAG@-10
+	} else {
+	    set stem tk
+	}
 	set thisDir [pwd]
-	# Find absolute path of $dir 
+	# Find absolute path of $dir
 	cd $dir
 	set pkgIndexDir [pwd]
 	cd $thisDir
@@ -43,7 +47,7 @@
 	set bLen [string length $buildDir]
 	# If pkgIndexDir is in the build tree...
 	if {![string compare -length $bLen $buildDir $pkgIndexDir]} then {
-		set searchdirs "../../drivers"} else {
+		set searchdirs [list "../../drivers" "../../dll"]} else {
 		set searchdirs [list "@DRV_HARDDIR@"]}
 	#puts $searchdirs
 	set suf [info sharedlibextension]

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Plplot-cvs] SF.net SVN: plplot:[12941] trunk/bindings/tk/pkgIndex.tcl.in

[<arj...@us...>]

Revision: 12941
          http://sourceforge.net/p/plplot/code/12941
Author:   arjenmarkus
Date:     2014-01-15 20:16:36 +0000 (Wed, 15 Jan 2014)
Log Message:
-----------
Use the CMake variable plplottcltk_SOVERSION as the suffix for the Tcl/Tk library, so that the pkgIndex.tcl file is adjusted automatically.

Modified Paths:
--------------
    trunk/bindings/tk/pkgIndex.tcl.in

Modified: trunk/bindings/tk/pkgIndex.tcl.in
===================================================================
--- trunk/bindings/tk/pkgIndex.tcl.in	2014-01-15 02:32:38 UTC (rev 12940)
+++ trunk/bindings/tk/pkgIndex.tcl.in	2014-01-15 20:16:36 UTC (rev 12941)
@@ -34,7 +34,7 @@
 
     if {$tcl_platform(platform) == "unix"} {
 	if {[string match "*CYGWIN*" $::tcl_platform(os)]} {
-	    set stem cygplplottcltk@LIB_TAG@-10
+	    set stem cygplplottcltk@LIB_TAG@-@plplottcltk_SOVERSION@
 	} else {
 	    set stem tk
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.