[Plplot-cvs] SF.net SVN: plplot:[11366] trunk/plplot_test

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

Revision: 11366
          http://plplot.svn.sourceforge.net/plplot/?rev=11366&view=rev
Author:   airwin
Date:     2010-12-10 21:31:58 +0000 (Fri, 10 Dec 2010)

Log Message:
-----------
Transform PATH component from drive-letter form to leading-slash form.
This turns out to be a necessary change on the MinGW/MSYS wine Windows
platform (and probably MS Windows as well).

Modified Paths:
--------------
    trunk/plplot_test/CMakeLists.txt
    trunk/plplot_test/plplot-test.sh.cmake

Modified: trunk/plplot_test/CMakeLists.txt
===================================================================
--- trunk/plplot_test/CMakeLists.txt	2010-12-10 21:27:54 UTC (rev 11365)
+++ trunk/plplot_test/CMakeLists.txt	2010-12-10 21:31:58 UTC (rev 11366)
@@ -13,6 +13,14 @@
 
   set(JAVA_TEST_ENVIRONMENT "${TEST_ENVIRONMENT} PLPLOT_JAVA_WRAP_DIR=${CMAKE_BINARY_DIR}/bindings/java/ PLPLOT_CLASSPATH=${CMAKE_BINARY_DIR}/examples/java/plplot.jar")
 
+  # Experience with MSYS bash shows that variables used to set a PATH
+  # component must transform the drive letter form to the "/" Unix
+  # form of the PATH component.  The case of the drive letter doesn't
+  # matter.  For example converting z:/whatever/path ==>
+  # /z/whatever/path or /Z/whatever/path works fine for MSYS bash.
+
+  string(REGEX REPLACE "^(.):" "/\\1/" PATH_FORM_BIN_DIR ${BIN_DIR})
+
   #Build-tree configuration
   set(CONFIGURED_EXAMPLES_DIR EXAMPLES_DIR)
   configure_file(

Modified: trunk/plplot_test/plplot-test.sh.cmake
===================================================================
--- trunk/plplot_test/plplot-test.sh.cmake	2010-12-10 21:27:54 UTC (rev 11365)
+++ trunk/plplot_test/plplot-test.sh.cmake	2010-12-10 21:31:58 UTC (rev 11366)
@@ -266,7 +266,7 @@
 "@PLPLOT_OCTAVE_DIR@"/support:\
 "@OCTAVE_M_DIR@"/PLplot:\
 "@OCTAVE_OCT_DIR@":
-PATH="$EXAMPLES_DIR"/../utils:"@BIN_DIR@":"$PATH"
+PATH="$EXAMPLES_DIR"/../utils:"@PATH_FORM_BIN_DIR@":"$PATH"
 export cdir cxxdir f77dir f95dir pythondir javadir octave octavedir tcldir perldir adadir ocamldir luadir ddir PATH
 
 fe=""


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