Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[12700] trunk
|
From: <and...@us...> - 2013-11-14 23:19:11
|
Revision: 12700
http://sourceforge.net/p/plplot/code/12700
Author: andrewross
Date: 2013-11-14 23:19:09 +0000 (Thu, 14 Nov 2013)
Log Message:
-----------
Remove obsolete support for matwrap generated octave bindings. The new swig generated bindings offer a fuller coverage of the plplot API and are more maintainable.
Modified Paths:
--------------
trunk/bindings/octave/CMakeLists.txt
trunk/cmake/modules/octave.cmake
trunk/plplot_test/CMakeLists.txt
trunk/plplot_test/test_octave.sh.in
Removed Paths:
-------------
trunk/bindings/octave/matwrap/
trunk/bindings/octave/plplot_octave_def
Modified: trunk/bindings/octave/CMakeLists.txt
===================================================================
--- trunk/bindings/octave/CMakeLists.txt 2013-11-14 23:04:56 UTC (rev 12699)
+++ trunk/bindings/octave/CMakeLists.txt 2013-11-14 23:19:09 UTC (rev 12700)
@@ -121,160 +121,59 @@
)
# Build octave interface.
- if(ENABLE_matwrapped_octave)
+ add_custom_command(
+ OUTPUT
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
+ COMMAND ${CMAKE_COMMAND} -E copy
+ ${CMAKE_CURRENT_SOURCE_DIR}/plplot_stub_hand_crafted.m
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
+ DEPENDS
+ ${CMAKE_CURRENT_SOURCE_DIR}/plplot_stub_hand_crafted.m
+ )
- # Add (Unix) custom target to check that plplot_oct_def (used only
- # when ENABLE_matwrapped_octave is ON) is consistent
- # with swig-support/plplotcapi.i.
- add_custom_target(
- check_plplot_octave_def
- COMMAND ${CMAKE_COMMAND} -E remove -f
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_compare
- COMMAND
- sed -f ${CMAKE_CURRENT_SOURCE_DIR}/global_defines.sed <
- ${CMAKE_SOURCE_DIR}/bindings/swig-support/plplotcapi.i >
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_compare
- COMMAND
- ${CMAKE_COMMAND} -E echo "Check that plplot_octave_def is consistent with bindings/swig-support/plplotcapi.i"
- COMMAND
- cmp ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_def
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_compare
- )
+ add_custom_target(
+ plplot_stub.m_built ALL
+ DEPENDS
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
+ )
- set(octave_interface_INCLUDE_PATHS
- ${CMAKE_SOURCE_DIR}/include
- ${CMAKE_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/include
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}
- ${OCTAVE_INCLUDE_PATH}
- )
- include_directories(${octave_interface_INCLUDE_PATHS})
+ set(octave_interface_INCLUDE_PATHS
+ ${CMAKE_SOURCE_DIR}/include
+ ${CMAKE_SOURCE_DIR}/lib/qsastime
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_BINARY_DIR}/include
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${OCTAVE_INCLUDE_PATH}
+ ${CMAKE_SOURCE_DIR}/bindings/swig-support
+ )
+ include_directories(${octave_interface_INCLUDE_PATHS})
+ set(CMAKE_SWIG_FLAGS -DSWIG_OCTAVE)
+ set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR})
- add_custom_command(
- OUTPUT
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc
- ${CMAKE_CURRENT_BINARY_DIR}/tmp_stub
- COMMAND ${PERL_EXECUTABLE}
- -I${MATWRAP_PATH} ${MATWRAP}
- -language octave -o plplot_octave.cc -stub tmp_stub
- -cpp_ignore ${CMAKE_CURRENT_SOURCE_DIR}
- -cpp_ignore ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_rej.h
- -cpp ${CMAKE_C_COMPILER} -D__builtin_va_list=void -E
- -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_CURRENT_BINARY_DIR} -C plplot_octave.h
- DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.h
- )
- set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc
- PROPERTIES GENERATED ON)
+ set_source_files_properties(plplot_octave.i
+ PROPERTIES
+ SWIG_MODULE_NAME plplot_octave
+ CPLUSPLUS ON
+ )
- add_library(plplot_octave MODULE ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc)
- target_link_libraries(
- plplot_octave
- plplot${LIB_TAG}
- "${OCTAVE_LIBRARIES}"
- "${OCTINTERP_LIBRARIES}"
- )
+ set(SWIG_MODULE_plplot_octave_EXTRA_DEPS
+ ${CMAKE_SOURCE_DIR}/bindings/swig-support/swig_documentation.i
+ ${CMAKE_SOURCE_DIR}/bindings/swig-support/plplotcapi.i
+ )
- # Build and install plplot_stub.m
- add_executable(massage massage.c)
- get_target_property(
- massage_LOCATION
- massage
- LOCATION
- )
+ # Set up swig + c wrapper.
+ swig_add_module(plplot_octave octave plplot_octave.i)
+ swig_link_libraries(
+ plplot_octave
+ plplot${LIB_TAG}
+ "${OCTAVE_LIBRARIES}"
+ "${OCTINTERP_LIBRARIES}"
+ )
- file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m_part2
- "# It was also massaged to add online documentation\n"
- "# extracted from some PLplot distribution files\n"
- "\n"
- "1;\n"
- "\n"
- )
- add_custom_command(
- OUTPUT
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
- ${CMAKE_CURRENT_BINARY_DIR}/missing_help
- COMMAND head -5 tmp_stub > plplot_stub.m
- COMMAND
- cat plplot_stub.m_part2 >> plplot_stub.m
- COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_def >> plplot_stub.m
- COMMAND echo >> plplot_stub.m
- COMMAND
- ${massage_LOCATION} >> plplot_stub.m 2> missing_help
- DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/tmp_stub
- ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_def
- ${massage_LOCATION}
- ${make_documentation_DEPENDS}
- )
+ # Make sure plplot_stub.m is copied to build tree before plplot_octave
+ # is created so can use plplot_octave in normal way.
+ add_dependencies(plplot_octave plplot_stub.m_built)
- add_custom_target(
- plplot_stub.m_built ALL
- DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
- )
-
- # Both these targets file-depend on custom commands which in turn
- # file-depend on ${make_documentation_DEPENDS}. Therefore, must
- # serialize these custom targets so that parallel build jobs
- # don't interfere with each other.
- add_dependencies(plplot_stub.m_built make_documentation)
- else(ENABLE_matwrapped_octave)
- add_custom_command(
- OUTPUT
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
- COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_CURRENT_SOURCE_DIR}/plplot_stub_hand_crafted.m
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
- DEPENDS
- ${CMAKE_CURRENT_SOURCE_DIR}/plplot_stub_hand_crafted.m
- )
-
- add_custom_target(
- plplot_stub.m_built ALL
- DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
- )
-
- set(octave_interface_INCLUDE_PATHS
- ${CMAKE_SOURCE_DIR}/include
- ${CMAKE_SOURCE_DIR}/lib/qsastime
- ${CMAKE_BINARY_DIR}
- ${CMAKE_BINARY_DIR}/include
- ${CMAKE_CURRENT_BINARY_DIR}
- ${OCTAVE_INCLUDE_PATH}
- ${CMAKE_SOURCE_DIR}/bindings/swig-support
- )
- include_directories(${octave_interface_INCLUDE_PATHS})
- set(CMAKE_SWIG_FLAGS -DSWIG_OCTAVE)
- set(CMAKE_SWIG_OUTDIR ${CMAKE_CURRENT_BINARY_DIR})
-
- set_source_files_properties(plplot_octave.i
- PROPERTIES
- SWIG_MODULE_NAME plplot_octave
- CPLUSPLUS ON
- )
-
- set(SWIG_MODULE_plplot_octave_EXTRA_DEPS
- ${CMAKE_SOURCE_DIR}/bindings/swig-support/swig_documentation.i
- ${CMAKE_SOURCE_DIR}/bindings/swig-support/plplotcapi.i
- )
-
- # Set up swig + c wrapper.
- swig_add_module(plplot_octave octave plplot_octave.i)
- swig_link_libraries(
- plplot_octave
- plplot${LIB_TAG}
- "${OCTAVE_LIBRARIES}"
- "${OCTINTERP_LIBRARIES}"
- )
-
- # Make sure plplot_stub.m is copied to build tree before plplot_octave
- # is created so can use plplot_octave in normal way.
- add_dependencies(plplot_octave plplot_stub.m_built)
- endif(ENABLE_matwrapped_octave)
-
# Need access elsewhere (examples/octave) to the file depends of
# this custom target.
set_property(GLOBAL PROPERTY
Deleted: trunk/bindings/octave/plplot_octave_def
===================================================================
--- trunk/bindings/octave/plplot_octave_def 2013-11-14 23:04:56 UTC (rev 12699)
+++ trunk/bindings/octave/plplot_octave_def 2013-11-14 23:19:09 UTC (rev 12700)
@@ -1,256 +0,0 @@
-global PLESC_SET_RGB
-PLESC_SET_RGB = 1; # obsolete
-global PLESC_ALLOC_NCOL
-PLESC_ALLOC_NCOL = 2; # obsolete
-global PLESC_SET_LPB
-PLESC_SET_LPB = 3; # obsolete
-global PLESC_EXPOSE
-PLESC_EXPOSE = 4; # handle window expose
-global PLESC_RESIZE
-PLESC_RESIZE = 5; # handle window resize
-global PLESC_REDRAW
-PLESC_REDRAW = 6; # handle window redraw
-global PLESC_TEXT
-PLESC_TEXT = 7; # switch to text screen
-global PLESC_GRAPH
-PLESC_GRAPH = 8; # switch to graphics screen
-global PLESC_FILL
-PLESC_FILL = 9; # fill polygon
-global PLESC_DI
-PLESC_DI = 10; # handle DI command
-global PLESC_FLUSH
-PLESC_FLUSH = 11; # flush output
-global PLESC_EH
-PLESC_EH = 12; # handle Window events
-global PLESC_GETC
-PLESC_GETC = 13; # get cursor position
-global PLESC_SWIN
-PLESC_SWIN = 14; # set window parameters
-global PLESC_PLFLTBUFFERING
-PLESC_PLFLTBUFFERING = 15; # configure PLFLT buffering
-global PLESC_XORMOD
-PLESC_XORMOD = 16; # set xor mode
-global PLESC_SET_COMPRESSION
-PLESC_SET_COMPRESSION = 17; # AFR: set compression
-global PLESC_CLEAR
-PLESC_CLEAR = 18; # RL: clear graphics region
-global PLESC_DASH
-PLESC_DASH = 19; # RL: draw dashed line
-global PLESC_HAS_TEXT
-PLESC_HAS_TEXT = 20; # driver draws text
-global PLESC_IMAGE
-PLESC_IMAGE = 21; # handle image
-global PLESC_IMAGEOPS
-PLESC_IMAGEOPS = 22; # plimage related operations
-global DRAW_LINEX
-DRAW_LINEX = 0x01; # draw lines parallel to the X axis
-global DRAW_LINEY
-DRAW_LINEY = 0x02; # draw lines parallel to the Y axis
-global DRAW_LINEXY
-DRAW_LINEXY = 0x03; # draw lines parallel to both the X and Y axes
-global MAG_COLOR
-MAG_COLOR = 0x04; # draw the mesh with a color dependent of the magnitude
-global BASE_CONT
-BASE_CONT = 0x08; # draw contour plot at bottom xy plane
-global TOP_CONT
-TOP_CONT = 0x10; # draw contour plot at top xy plane
-global SURF_CONT
-SURF_CONT = 0x20; # draw contour plot at surface
-global DRAW_SIDES
-DRAW_SIDES = 0x40; # draw sides
-global FACETED
-FACETED = 0x80; # draw outline for each square that makes up the surface
-global MESH
-MESH = 0x100; # draw mesh
-global PL_BIN_DEFAULT
-PL_BIN_DEFAULT = 0;
-global PL_BIN_CENTRED
-PL_BIN_CENTRED = 1;
-global PL_BIN_NOEXPAND
-PL_BIN_NOEXPAND = 2;
-global PL_BIN_NOEMPTY
-PL_BIN_NOEMPTY = 4;
-global PL_HIST_DEFAULT
-PL_HIST_DEFAULT = 0;
-global PL_HIST_NOSCALING
-PL_HIST_NOSCALING = 1;
-global PL_HIST_IGNORE_OUTLIERS
-PL_HIST_IGNORE_OUTLIERS = 2;
-global PL_HIST_NOEXPAND
-PL_HIST_NOEXPAND = 8;
-global PL_HIST_NOEMPTY
-PL_HIST_NOEMPTY = 16;
-global PL_POSITION_LEFT
-PL_POSITION_LEFT = 1;
-global PL_POSITION_RIGHT
-PL_POSITION_RIGHT = 2;
-global PL_POSITION_TOP
-PL_POSITION_TOP = 4;
-global PL_POSITION_BOTTOM
-PL_POSITION_BOTTOM = 8;
-global PL_POSITION_INSIDE
-PL_POSITION_INSIDE = 16;
-global PL_POSITION_OUTSIDE
-PL_POSITION_OUTSIDE = 32;
-global PL_POSITION_VIEWPORT
-PL_POSITION_VIEWPORT = 64;
-global PL_POSITION_SUBPAGE
-PL_POSITION_SUBPAGE = 128;
-global PL_LEGEND_NONE
-PL_LEGEND_NONE = 1;
-global PL_LEGEND_COLOR_BOX
-PL_LEGEND_COLOR_BOX = 2;
-global PL_LEGEND_LINE
-PL_LEGEND_LINE = 4;
-global PL_LEGEND_SYMBOL
-PL_LEGEND_SYMBOL = 8;
-global PL_LEGEND_TEXT_LEFT
-PL_LEGEND_TEXT_LEFT = 16;
-global PL_LEGEND_BACKGROUND
-PL_LEGEND_BACKGROUND = 32;
-global PL_LEGEND_BOUNDING_BOX
-PL_LEGEND_BOUNDING_BOX = 64;
-global PL_LEGEND_ROW_MAJOR
-PL_LEGEND_ROW_MAJOR = 128;
-global PL_COLORBAR_LABEL_LEFT
-PL_COLORBAR_LABEL_LEFT = 0x1;
-global PL_COLORBAR_LABEL_RIGHT
-PL_COLORBAR_LABEL_RIGHT = 0x2;
-global PL_COLORBAR_LABEL_TOP
-PL_COLORBAR_LABEL_TOP = 0x4;
-global PL_COLORBAR_LABEL_BOTTOM
-PL_COLORBAR_LABEL_BOTTOM = 0x8;
-global PL_COLORBAR_IMAGE
-PL_COLORBAR_IMAGE = 0x10;
-global PL_COLORBAR_SHADE
-PL_COLORBAR_SHADE = 0x20;
-global PL_COLORBAR_GRADIENT
-PL_COLORBAR_GRADIENT = 0x40;
-global PL_COLORBAR_CAP_NONE
-PL_COLORBAR_CAP_NONE = 0x80;
-global PL_COLORBAR_CAP_LOW
-PL_COLORBAR_CAP_LOW = 0x100;
-global PL_COLORBAR_CAP_HIGH
-PL_COLORBAR_CAP_HIGH = 0x200;
-global PL_COLORBAR_SHADE_LABEL
-PL_COLORBAR_SHADE_LABEL = 0x400;
-global PL_COLORBAR_ORIENT_RIGHT
-PL_COLORBAR_ORIENT_RIGHT = 0x800;
-global PL_COLORBAR_ORIENT_TOP
-PL_COLORBAR_ORIENT_TOP = 0x1000;
-global PL_COLORBAR_ORIENT_LEFT
-PL_COLORBAR_ORIENT_LEFT = 0x2000;
-global PL_COLORBAR_ORIENT_BOTTOM
-PL_COLORBAR_ORIENT_BOTTOM = 0x4000;
-global PL_COLORBAR_BACKGROUND
-PL_COLORBAR_BACKGROUND = 0x8000;
-global PL_COLORBAR_BOUNDING_BOX
-PL_COLORBAR_BOUNDING_BOX = 0x10000;
-global PLSWIN_DEVICE
-PLSWIN_DEVICE = 1; # device coordinates
-global PLSWIN_WORLD
-PLSWIN_WORLD = 2; # world coordinates
-global PL_X_AXIS
-PL_X_AXIS = 1; # The x-axis
-global PL_Y_AXIS
-PL_Y_AXIS = 2; # The y-axis
-global PL_Z_AXIS
-PL_Z_AXIS = 3; # The z-axis
-global PL_OPT_ENABLED
-PL_OPT_ENABLED = 0x0001; # Obsolete
-global PL_OPT_ARG
-PL_OPT_ARG = 0x0002; # Option has an argment
-global PL_OPT_NODELETE
-PL_OPT_NODELETE = 0x0004; # Don't delete after processing
-global PL_OPT_INVISIBLE
-PL_OPT_INVISIBLE = 0x0008; # Make invisible
-global PL_OPT_DISABLED
-PL_OPT_DISABLED = 0x0010; # Processing is disabled
-global PL_OPT_FUNC
-PL_OPT_FUNC = 0x0100; # Call handler function
-global PL_OPT_BOOL
-PL_OPT_BOOL = 0x0200; # Set *var = 1
-global PL_OPT_INT
-PL_OPT_INT = 0x0400; # Set *var = atoi(optarg)
-global PL_OPT_FLOAT
-PL_OPT_FLOAT = 0x0800; # Set *var = atof(optarg)
-global PL_OPT_STRING
-PL_OPT_STRING = 0x1000; # Set var = optarg
-global PL_PARSE_PARTIAL
-PL_PARSE_PARTIAL = 0x0000; # For backward compatibility
-global PL_PARSE_FULL
-PL_PARSE_FULL = 0x0001; # Process fully & exit if error
-global PL_PARSE_QUIET
-PL_PARSE_QUIET = 0x0002; # Don't issue messages
-global PL_PARSE_NODELETE
-PL_PARSE_NODELETE = 0x0004; # Don't delete options after
-global PL_PARSE_SHOWALL
-PL_PARSE_SHOWALL = 0x0008; # Show invisible options
-global PL_PARSE_OVERRIDE
-PL_PARSE_OVERRIDE = 0x0010; # Obsolete
-global PL_PARSE_NOPROGRAM
-PL_PARSE_NOPROGRAM = 0x0020; # Program name NOT in *argv[0]..
-global PL_PARSE_NODASH
-PL_PARSE_NODASH = 0x0040; # Set if leading dash NOT required
-global PL_PARSE_SKIP
-PL_PARSE_SKIP = 0x0080; # Skip over unrecognized args
-global PL_FCI_MARK
-PL_FCI_MARK = 0x80000000;
-global PL_FCI_IMPOSSIBLE
-PL_FCI_IMPOSSIBLE = 0x00000000;
-global PL_FCI_HEXDIGIT_MASK
-PL_FCI_HEXDIGIT_MASK = 0xf;
-global PL_FCI_HEXPOWER_MASK
-PL_FCI_HEXPOWER_MASK = 0x7;
-global PL_FCI_HEXPOWER_IMPOSSIBLE
-PL_FCI_HEXPOWER_IMPOSSIBLE = 0xf;
-global PL_FCI_FAMILY
-PL_FCI_FAMILY = 0x0;
-global PL_FCI_STYLE
-PL_FCI_STYLE = 0x1;
-global PL_FCI_WEIGHT
-PL_FCI_WEIGHT = 0x2;
-global PL_FCI_SANS
-PL_FCI_SANS = 0x0;
-global PL_FCI_SERIF
-PL_FCI_SERIF = 0x1;
-global PL_FCI_MONO
-PL_FCI_MONO = 0x2;
-global PL_FCI_SCRIPT
-PL_FCI_SCRIPT = 0x3;
-global PL_FCI_SYMBOL
-PL_FCI_SYMBOL = 0x4;
-global PL_FCI_UPRIGHT
-PL_FCI_UPRIGHT = 0x0;
-global PL_FCI_ITALIC
-PL_FCI_ITALIC = 0x1;
-global PL_FCI_OBLIQUE
-PL_FCI_OBLIQUE = 0x2;
-global PL_FCI_MEDIUM
-PL_FCI_MEDIUM = 0x0;
-global PL_FCI_BOLD
-PL_FCI_BOLD = 0x1;
-global PL_MAXKEY
-PL_MAXKEY = 16;
-global PL_MAXWINDOWS
-PL_MAXWINDOWS = 64; # Max number of windows/page tracked
-global PL_NOTSET
-PL_NOTSET = -42;
-global PLESPLFLTBUFFERING_ENABLE
-PLESPLFLTBUFFERING_ENABLE = 1;
-global PLESPLFLTBUFFERING_DISABLE
-PLESPLFLTBUFFERING_DISABLE = 2;
-global PLESPLFLTBUFFERING_QUERY
-PLESPLFLTBUFFERING_QUERY = 3;
-global GRID_CSA
-GRID_CSA = 1; # Bivariate Cubic Spline approximation
-global GRID_DTLI
-GRID_DTLI = 2; # Delaunay Triangulation Linear Interpolation
-global GRID_NNI
-GRID_NNI = 3; # Natural Neighbors Interpolation
-global GRID_NNIDW
-GRID_NNIDW = 4; # Nearest Neighbors Inverse Distance Weighted
-global GRID_NNLI
-GRID_NNLI = 5; # Nearest Neighbors Linear Interpolation
-global GRID_NNAIDW
-GRID_NNAIDW = 6; # Nearest Neighbors Around Inverse Distance Weighted
Modified: trunk/cmake/modules/octave.cmake
===================================================================
--- trunk/cmake/modules/octave.cmake 2013-11-14 23:04:56 UTC (rev 12699)
+++ trunk/cmake/modules/octave.cmake 2013-11-14 23:19:09 UTC (rev 12700)
@@ -208,13 +208,6 @@
endif(ENABLE_octave)
if(ENABLE_octave)
- #MATWRAP is the path+filename of the matwrap script.
- set(MATWRAP "${CMAKE_CURRENT_SOURCE_DIR}/bindings/octave/matwrap/matwrap")
- message(STATUS "MATWRAP = ${MATWRAP}")
- #MATWRAP_PATH is the path of the matwrap script
- get_filename_component(MATWRAP_PATH ${MATWRAP} PATH)
- message(STATUS "MATWRAP_PATH = ${MATWRAP_PATH}")
-
# PLPLOT_OCTAVE_DIR is the directory for installation of the PLplot_Octave
# specific m files
set(PLPLOT_OCTAVE_DIR ${CMAKE_INSTALL_DATADIR}/plplot_octave)
@@ -286,13 +279,5 @@
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)
- # 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)
Modified: trunk/plplot_test/CMakeLists.txt
===================================================================
--- trunk/plplot_test/CMakeLists.txt 2013-11-14 23:04:56 UTC (rev 12699)
+++ trunk/plplot_test/CMakeLists.txt 2013-11-14 23:19:09 UTC (rev 12700)
@@ -140,13 +140,6 @@
endif(ENABLE_java)
if(ENABLE_octave)
- if(ENABLE_matwrapped_octave)
- set(matwrap_octave_comment)
- set(swig_octave_comment "# (ignore for matwrap-generated case) ")
- else(ENABLE_matwrapped_octave)
- set(swig_octave_comment)
- set(matwrap_octave_comment "# (ignore for swig-generated case) ")
- endif(ENABLE_matwrapped_octave)
configure_file(
test_octave_interactive.sh.in
Modified: trunk/plplot_test/test_octave.sh.in
===================================================================
--- trunk/plplot_test/test_octave.sh.in 2013-11-14 23:04:56 UTC (rev 12699)
+++ trunk/plplot_test/test_octave.sh.in 2013-11-14 23:19:09 UTC (rev 12700)
@@ -59,8 +59,7 @@
# Remove 7, 16 until plshade1 fix is done.
-@swig_octave_comment@for i=[1:6 8 9 13 15 21] ;
-@matwrap_octave_comment@for i=[1:6 8 9 13 15 21] ;
+for i=[1:6 8 9 13 15 21] ;
if (verbose_test)
printf("p%d\n",i);
endif
@@ -73,10 +72,7 @@
# Example 32 not implemented because there has been no call for propagation
# and it exercises no new API.
failed = [] ;
-@swig_octave_comment@for i=[0:18 19 20:31 33] ;
-# Drop 4, 18, 26, and 33 because deprecated matwrap does not include plstring,
-# plstring3, pllegend, or plcolorbar.
-@matwrap_octave_comment@for i=[0:3 5:17 20:25 27:31 ] ;
+for i=[0:18 19 20:31 33] ;
ofile = sprintf("${OUTPUT_DIR}/x%.2d${lang}_${dsuffix}.txt",i);
strm = fopen(ofile,"w");
cmd = sprintf("x%.2dc",i);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
