[Plplot-cvs] SF.net SVN: plplot:[11622] trunk

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

Revision: 11622
          http://plplot.svn.sourceforge.net/plplot/?rev=11622&view=rev
Author:   airwin
Date:     2011-03-13 20:47:44 +0000 (Sun, 13 Mar 2011)

Log Message:
-----------
Retire matwrapped version of octave bindings (by forcing their
disablement although we will leave the files around for a while)
because the swig-generated octave bindings are much better, and I
doubt anybody wants to maintain the matwrapped versions (e.g., for the
recent large "const" modifier change to our API).

Modified Paths:
--------------
    trunk/README.release
    trunk/cmake/modules/octave.cmake

Modified: trunk/README.release
===================================================================
--- trunk/README.release	2011-03-13 20:01:09 UTC (rev 11621)
+++ trunk/README.release	2011-03-13 20:47:44 UTC (rev 11622)
@@ -339,21 +339,15 @@
 
 Octave is a powerful platform that demands a first-class PLplot
 solution, but we were finding it difficult to realize that goal
-because we were running up against some limitations of the (now
-deprecated) matwrap-generated Octave bindings.  Accordingly, a
-swig-generated version of the Octave bindings has now been implemented
-that builds on the prior matwrapped bindings effort but also extends
-it with, e.g., bindings for plstring, plstring3, pllegend, and
-plcolbar which now make it possible to run examples 4, 18, 26, and 33
-(all of which have now have been updated to use those functions) and
-get consistent results with the corresponding C examples.  The
-swig-generated bindings for Octave are used by default, but the build
-system falls back to the legacy matwrapped bindings if swig is not
-available.  For now, users can force the legacy matwrapped bindings by
-using the -DENABLE_matwrapped_octave=ON cmake command-line option for
-comparison purposes, but in the near future we plan to remove the
-matwrapped octave bindings because the swig-generated alternative is
-more complete and easier to maintain.
+because we were running up against limitations of the previous
+matwrap-generated Octave bindings.  Accordingly, a swig-generated
+version of the Octave bindings has now been implemented that builds on
+the prior matwrapped bindings effort but also extends it with, e.g.,
+bindings for plstring, plstring3, pllegend, and plcolbar.  These new
+octave bindings (which now completely replace the prior matwrapped
+bindings) make it possible to run examples 4, 18, 26, and 33 (all of
+which have now have been updated to use those functions) and get
+consistent results with the corresponding C examples.
 
 Like the matwrapped bindings before it, the new swig-generated octave
 bindings currently do not have a number of the PLplot functions
@@ -1164,21 +1158,15 @@
 
 Octave is a powerful platform that demands a first-class PLplot
 solution, but we were finding it difficult to realize that goal
-because we were running up against some limitations of the (now
-deprecated) matwrap-generated Octave bindings.  Accordingly, a
-swig-generated version of the Octave bindings has now been implemented
-that builds on the prior matwrapped bindings effort but also extends
-it with, e.g., bindings for plstring, plstring3, pllegend, and
-plcolbar which now make it possible to run examples 4, 18, 26, and 33
-(all of which have now have been updated to use those functions) and
-get consistent results with the corresponding C examples.  The
-swig-generated bindings for Octave are used by default, but the build
-system falls back to the legacy matwrapped bindings if swig is not
-available.  For now, users can force the legacy matwrapped bindings by
-using the -DENABLE_matwrapped_octave=ON cmake command-line option for
-comparison purposes, but in the near future we plan to remove the
-matwrapped octave bindings because the swig-generated alternative is
-more complete and easier to maintain.
+because we were running up against limitations of the previous
+matwrap-generated Octave bindings.  Accordingly, a swig-generated
+version of the Octave bindings has now been implemented that builds on
+the prior matwrapped bindings effort but also extends it with, e.g.,
+bindings for plstring, plstring3, pllegend, and plcolbar.  These new
+octave bindings (which now completely replace the prior matwrapped
+bindings) make it possible to run examples 4, 18, 26, and 33 (all of
+which have now have been updated to use those functions) and get
+consistent results with the corresponding C examples.
 
 Like the matwrapped bindings before it, the new swig-generated octave
 bindings currently do not have a number of the PLplot functions

Modified: trunk/cmake/modules/octave.cmake
===================================================================
--- trunk/cmake/modules/octave.cmake	2011-03-13 20:01:09 UTC (rev 11621)
+++ trunk/cmake/modules/octave.cmake	2011-03-13 20:47:44 UTC (rev 11622)
@@ -32,6 +32,12 @@
   set(ENABLE_octave OFF CACHE BOOL "Enable Octave bindings" FORCE)
 endif(ENABLE_octave AND NOT CMAKE_CXX_COMPILER_WORKS)
 
+if(ENABLE_octave AND NOT SWIG_FOUND)
+  message(STATUS "WARNING: "
+    "swig not found. Disabling Octave bindings")
+  set(ENABLE_octave OFF CACHE BOOL "Enable Octave bindings" FORCE)
+endif(ENABLE_octave AND NOT SWIG_FOUND)
+
 if(ENABLE_octave AND NOT BUILD_SHARED_LIBS)
   message(STATUS "WARNING: "
     "Octave requires shared libraries. Disabling octave bindings")
@@ -263,11 +269,13 @@
   if(PL_DOUBLE)
     set(DEFINE_PL_DOUBLE "#define PL_DOUBLE")
   endif(PL_DOUBLE)
-  option(ENABLE_matwrapped_octave "Enable legacy Octave bindings generated by matwrap" OFF)
-  if(NOT SWIG_FOUND AND NOT ENABLE_matwrapped_octave)
-    message(STATUS "WARNING: "
-      "SWIG not found. Falling back to deprecated matwrapped Octave bindings.")
-    set(ENABLE_matwrapped_octave ON CACHE BOOL "Enable legacy Octave bindings generated by matwrap" FORCE)
-  endif(NOT SWIG_FOUND AND NOT ENABLE_matwrapped_octave)
+#  option(ENABLE_matwrapped_octave "Enable legacy Octave bindings generated by matwrap" OFF)
+#  if(NOT SWIG_FOUND AND NOT ENABLE_matwrapped_octave)
+#    message(STATUS "WARNING: "
+#      "SWIG not found. Falling back to deprecated matwrapped Octave bindings.")
+#    set(ENABLE_matwrapped_octave ON CACHE BOOL "Enable legacy Octave bindings generated by matwrap" FORCE)
+#  endif(NOT SWIG_FOUND AND NOT ENABLE_matwrapped_octave)
+  # Force disabling of matwrapped bindings which are no longer maintained.
+  set(ENABLE_matwrapped_octave OFF CACHE BOOL "Enable legacy Octave bindings generated by matwrap" FORCE)
 
 endif(ENABLE_octave)


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