[Plplot-cvs] SF.net SVN: plplot:[10794] trunk/bindings

[<and...@us...>]

Revision: 10794
          http://plplot.svn.sourceforge.net/plplot/?rev=10794&view=rev
Author:   andrewross
Date:     2010-02-06 20:35:25 +0000 (Sat, 06 Feb 2010)

Log Message:
-----------
Fix (due to Arjen Markus) which allows blank spaces to be used in build / install path names.

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

Modified: trunk/bindings/tcl/pkgIndex.tcl.in
===================================================================
--- trunk/bindings/tcl/pkgIndex.tcl.in	2010-02-06 01:48:39 UTC (rev 10793)
+++ trunk/bindings/tcl/pkgIndex.tcl.in	2010-02-06 20:35:25 UTC (rev 10794)
@@ -38,10 +38,10 @@
 	set bLen [string length $buildDir]
 	if {![string compare -length $bLen $buildDir $thisDir]}	then {
 		set searchdirs ".libs"} else {
-		set searchdirs "@LIB_HARDDIR@"}
+		set searchdirs [list "@LIB_HARDDIR@"]}
 	#puts $searchdirs
 	# prefer double precision version
-	set dlnames "@DLNAME_LIBPLPLOTTCLTKD@ @DLNAME_LIBPLPLOTTCLTK@";
+	set dlnames [list "@DLNAME_LIBPLPLOTTCLTKD@" "@DLNAME_LIBPLPLOTTCLTK@"]
 	set file ""
 	foreach reldir $searchdirs {
 	    foreach dlname $dlnames {

Modified: trunk/bindings/tcl/tclAPI.c
===================================================================
--- trunk/bindings/tcl/tclAPI.c	2010-02-06 01:48:39 UTC (rev 10793)
+++ trunk/bindings/tcl/tclAPI.c	2010-02-06 20:35:25 UTC (rev 10794)
@@ -651,7 +651,7 @@
 
 #ifdef TCL_DIR
     Tcl_SetVar( interp, "dir", TCL_DIR, TCL_GLOBAL_ONLY );
-    if ( tcl_cmd( interp, "set auto_path \"$dir $auto_path\"" ) == TCL_ERROR )
+    if ( tcl_cmd( interp, "set auto_path [list $dir $auto_path]" ) == TCL_ERROR )
     {
         return_code = TCL_ERROR;
         goto finish;
@@ -669,7 +669,7 @@
     {
         plGetName( dn, "tcl", "", &ptr );
         Tcl_SetVar( interp, "dir", ptr, 0 );
-        if ( tcl_cmd( interp, "set auto_path \"$dir $auto_path\"" ) == TCL_ERROR )
+        if ( tcl_cmd( interp, "set auto_path [list $dir $auto_path]" ) == TCL_ERROR )
         {
             return_code = TCL_ERROR;
             goto finish;
@@ -688,7 +688,7 @@
     {
         plGetName( dn, "", "", &ptr );
         Tcl_SetVar( interp, "dir", ptr, 0 );
-        if ( tcl_cmd( interp, "set auto_path \"$dir $auto_path\"" ) == TCL_ERROR )
+        if ( tcl_cmd( interp, "set auto_path [list $dir $auto_path]" ) == TCL_ERROR )
         {
             return_code = TCL_ERROR;
             goto finish;
@@ -708,7 +708,7 @@
     {
         plGetName( dn, "tcl", "", &ptr );
         Tcl_SetVar( interp, "dir", ptr, 0 );
-        if ( tcl_cmd( interp, "set auto_path \"$dir $auto_path\"" ) == TCL_ERROR )
+        if ( tcl_cmd( interp, "set auto_path [list $dir $auto_path]" ) == TCL_ERROR )
         {
             return_code = TCL_ERROR;
             goto finish;
@@ -732,7 +732,7 @@
         }
     }
     Tcl_SetVar( interp, "dir", buf, 0 );
-    if ( tcl_cmd( interp, "set auto_path \"$dir $auto_path\"" ) == TCL_ERROR )
+    if ( tcl_cmd( interp, "set auto_path [list $dir $auto_path]" ) == TCL_ERROR )
     {
         return_code = TCL_ERROR;
         goto finish;
@@ -741,7 +741,7 @@
     if ( plInBuildTree() )
     {
         Tcl_SetVar( interp, "dir", BUILD_DIR "/bindings/tk", TCL_GLOBAL_ONLY );
-        if ( tcl_cmd( interp, "set auto_path \"$dir $auto_path\"" ) == TCL_ERROR )
+        if ( tcl_cmd( interp, "set auto_path [list $dir $auto_path]" ) == TCL_ERROR )
         {
             return_code = TCL_ERROR;
             goto finish;

Modified: trunk/bindings/tk/pkgIndex.tcl.in
===================================================================
--- trunk/bindings/tk/pkgIndex.tcl.in	2010-02-06 01:48:39 UTC (rev 10793)
+++ trunk/bindings/tk/pkgIndex.tcl.in	2010-02-06 20:35:25 UTC (rev 10794)
@@ -39,7 +39,7 @@
 	set bLen [string length $buildDir]
 	if {![string compare -length $bLen $buildDir $thisDir]}	then {
 		set searchdirs "../../drivers/.libs"} else {
-		set searchdirs "@DRV_HARDDIR@"}
+		set searchdirs [list "@DRV_HARDDIR@"]}
 	#puts $searchdirs
 	set suf [info sharedlibextension]
 
@@ -55,9 +55,9 @@
 	}
 	if { $file == "" } {
 	# Dynamic driver location failed, now try static driver location.
-	set searchdirs "@LIB_HARDDIR@";
+	set searchdirs [list "@LIB_HARDDIR@"]
 	# prefer double precision version
-	set dlnames "@DLNAME_LIBPLPLOTD@ @DLNAME_LIBPLPLOT@";
+	set dlnames [list "@DLNAME_LIBPLPLOTD@" "@DLNAME_LIBPLPLOT@"]
 	set file ""
 	foreach reldir $searchdirs {
 	    foreach dlname $dlnames {

Modified: trunk/bindings/tk/plserver.c
===================================================================
--- trunk/bindings/tk/plserver.c	2010-02-06 01:48:39 UTC (rev 10793)
+++ trunk/bindings/tk/plserver.c	2010-02-06 20:35:25 UTC (rev 10794)
@@ -225,7 +225,7 @@
     if ( auto_path != NULL )
     {
         Tcl_SetVar( interp, "dir", auto_path, 0 );
-        tcl_cmd( interp, "set auto_path \"$dir $auto_path\"" );
+        tcl_cmd( interp, "set auto_path [list $dir $auto_path]" );
     }
 
 /* Rename "exit" to "tkexit", and insert custom exit handler */


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