Skip to content

Commit da7804c

Browse files
hjmjohnsonhjmjohnson
committed
ENH: Remove support for wrapping with RUBY
The RUBY bindings are not tested. This batch of untested code makes refactoring the wrapping process more difficult as it requires changes to code that is very unlikely to be used. NOTE: parts of the JAVA, PERL, & RUBY wrapping support has been commented out since a17865c 2018-07-07, and does not work for wrapping currently.
1 parent 2f9ee4e commit da7804c

13 files changed

+1
-1316
lines changed

‎CMake/ITKConfig.cmake.in

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,6 @@ set(ITK_WRAPPING "@ITK_WRAPPING@")
119119
if( NOT DEFINED ITK_WRAP_PYTHON)
120120
set(ITK_WRAP_PYTHON "@ITK_WRAP_PYTHON@")
121121
endif()
122-
if( NOT DEFINED ITK_WRAP_JAVA)
123-
set(ITK_WRAP_JAVA "@ITK_WRAP_JAVA@")
124-
endif()
125-
if(NOT DEFINED ITK_WRAP_RUBY)
126-
set(ITK_WRAP_RUBY "@ITK_WRAP_RUBY@")
127-
endif()
128122

129123
# Set up the rest of the variables that WrapITK was built with.
130124
set(ITK_WRAP_unsigned_char @ITK_WRAP_unsigned_char@)

‎CMake/ITKModuleExternal.cmake

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,19 +193,13 @@ endif()
193193
if(ITK_WRAPPING)
194194
CMAKE_DEPENDENT_OPTION(${itk-module}_WRAP_PYTHON "Build Python support." ${ITK_WRAP_PYTHON}
195195
"ITK_WRAP_PYTHON" OFF)
196-
CMAKE_DEPENDENT_OPTION(${itk-module}_WRAP_JAVA "Build Java support." ${ITK_WRAP_JAVA}
197-
"ITK_WRAP_JAVA" OFF)
198-
CMAKE_DEPENDENT_OPTION(${itk-module}_WRAP_RUBY "Build Ruby support." ${ITK_WRAP_RUBY}
199-
"ITK_WRAP_RUBY" OFF)
200196
CMAKE_DEPENDENT_OPTION(${itk-module}_WRAP_EXPLICIT "Build Explicit support." OFF
201197
"ITK_WRAP_EXPLICIT" OFF)
202198
CMAKE_DEPENDENT_OPTION(${itk-module}_WRAP_DOC "Build Doxygen support." OFF
203199
"ITK_WRAP_DOC" OFF)
204200
set(${itk-module}_WRAP_CASTXML ${ITK_WRAPPING})
205201
set(${itk-module}_WRAP_SWIGINTERFACE ${ITK_WRAPPING})
206202
if( (${itk-module}_WRAP_PYTHON OR
207-
${itk-module}_WRAP_JAVA OR
208-
${itk-module}_WRAP_RUBY OR
209203
${itk-module}_WRAP_EXPLICIT OR
210204
${itk-module}_WRAP_DOC
211205
)

‎Wrapping/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ set(WRAP_ITK_INSTALL_PREFIX "${path}" CACHE INTERNAL "subpath where where most o
4747
# Output directories.
4848
set(WRAP_ITK_CONFIG_DIR "${WrapITK_SOURCE_DIR}/")
4949
set(WRAP_ITK_CMAKE_DIR "${WrapITK_SOURCE_DIR}")
50-
set(ITK_WRAP_JAVA_DIR "${WrapITK_BINARY_DIR}/Java")
5150
set(WRAPPER_MASTER_INDEX_OUTPUT_DIR "${ITK_DIR}/Wrapping/Typedefs" CACHE INTERNAL "typedefs dir")
5251

5352
if(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)

‎Wrapping/ConfigureWrapping.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
#
77
# The following variables should be set before including this file:
88
# ITK_WRAP_PYTHON
9-
# ITK_WRAP_JAVA
109
# ITK_WRAP_unsigned_char
1110
# ITK_WRAP_unsigned_short
1211
# ITK_WRAP_unsigned_long_long
@@ -20,7 +19,6 @@
2019
# ITK_WRAP_covariant_vector_float
2120
# ITK_WRAP_covariant_vector_double
2221
# ITK_WRAP_IMAGE_DIMS
23-
# ITK_WRAP_JAVA_DIR -- directory for java classes to be placed
2422
# WRAP_ITK_CONFIG_DIR -- directory where XXX.in files for CONFIGURE_FILE
2523
# commands are to be found.
2624
# WRAP_ITK_CMAKE_DIR -- directory where XXX.cmake files are to be found

‎Wrapping/Generators/CMakeLists.txt

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,13 @@ endmacro()
1212
# the macros in charge of dispatching to the language specific macros
1313

1414
macro(itk_wrap_modules_all_generators)
15-
#! if(${module_prefix}_WRAP_JAVA AND WRAPPER_LIBRARY_JAVA)
16-
#! INIT_itk_wrap_module_java()
17-
#! endif()
1815
itk_wrap_modules_set_prefix()
1916
if(${module_prefix}_WRAP_PYTHON)
2017
# Wrap PyBase
2118
if(NOT EXTERNAL_WRAP_ITK_PROJECT)
2219
add_subdirectory(${ITK_WRAP_PYTHON_SOURCE_DIR}/PyBase)
2320
endif()
2421
endif()
25-
if(${module_prefix}_WRAP_JAVA)
26-
if(NOT EXTERNAL_WRAP_ITK_PROJECT)
27-
add_subdirectory(${ITK_WRAP_JAVA_SOURCE_DIR}/JavaBase)
28-
endif()
29-
endif()
30-
if(${module_prefix}_WRAP_RUBY)
31-
if(NOT EXTERNAL_WRAP_ITK_PROJECT)
32-
add_subdirectory(${ITK_WRAP_RUBY_SOURCE_DIR}/RbBase)
33-
endif()
34-
endif()
3522
endmacro()
3623

3724

@@ -52,12 +39,6 @@ macro(itk_wrap_module_all_generators library_name)
5239
if(${module_prefix}_WRAP_PYTHON AND WRAPPER_LIBRARY_PYTHON)
5340
itk_wrap_module_python("${library_name}")
5441
endif()
55-
if(${module_prefix}_WRAP_RUBY AND WRAPPER_LIBRARY_RUBY)
56-
itk_wrap_module_ruby("${library_name}")
57-
endif()
58-
if(${module_prefix}_WRAP_JAVA AND WRAPPER_LIBRARY_JAVA)
59-
itk_wrap_module_java("${library_name}")
60-
endif()
6142
endmacro()
6243

6344

@@ -78,12 +59,6 @@ macro(itk_wrap_submodule_all_generators module)
7859
if(${module_prefix}_WRAP_PYTHON AND WRAPPER_LIBRARY_PYTHON)
7960
itk_wrap_submodule_python("${module}" "${WRAPPER_LIBRARY_NAME}")
8061
endif()
81-
if(${module_prefix}_WRAP_RUBY AND WRAPPER_LIBRARY_RUBY)
82-
itk_wrap_submodule_ruby("${module}")
83-
endif()
84-
if(${module_prefix}_WRAP_JAVA AND WRAPPER_LIBRARY_JAVA)
85-
itk_wrap_submodule_java("${module}")
86-
endif()
8762
endmacro()
8863

8964
macro(itk_end_wrap_submodule_all_generators module)
@@ -100,12 +75,6 @@ macro(itk_end_wrap_submodule_all_generators module)
10075
if(${module_prefix}_WRAP_PYTHON AND WRAPPER_LIBRARY_PYTHON)
10176
itk_end_wrap_submodule_python("${module}")
10277
endif()
103-
if(${module_prefix}_WRAP_RUBY AND WRAPPER_LIBRARY_RUBY)
104-
itk_end_wrap_submodule_ruby("${module}")
105-
endif()
106-
if(${module_prefix}_WRAP_JAVA AND WRAPPER_LIBRARY_JAVA)
107-
itk_end_wrap_submodule_java("${module}")
108-
endif()
10978
if(${module_prefix}_WRAP_DOC)
11079
itk_end_wrap_submodule_DOC()
11180
endif()
@@ -120,9 +89,6 @@ macro(itk_wrap_named_class_all_generators class swig_name)
12089
if(${module_prefix}_WRAP_PYTHON AND WRAPPER_LIBRARY_PYTHON)
12190
itk_wrap_named_class_python("${class}" "${swig_name}")
12291
endif()
123-
if(${module_prefix}_WRAP_RUBY AND WRAPPER_LIBRARY_RUBY)
124-
itk_wrap_named_class_ruby("${class}" "${swig_name}")
125-
endif()
12692
if(${module_prefix}_WRAP_DOC)
12793
itk_wrap_named_class_DOC("${class}" "${swig_name}")
12894
endif()
@@ -158,9 +124,6 @@ macro(itk_wrap_template_all_generators name types)
158124
if(${module_prefix}_WRAP_PYTHON AND WRAPPER_LIBRARY_PYTHON)
159125
itk_wrap_template_python("${name}" "${types}")
160126
endif()
161-
if(${module_prefix}_WRAP_RUBY AND WRAPPER_LIBRARY_RUBY)
162-
itk_wrap_template_ruby("${name}" "${types}")
163-
endif()
164127
endmacro()
165128

166129

@@ -181,12 +144,6 @@ macro(itk_wrap_one_type_all_generators wrap_method wrap_class swig_name template
181144
if(${module_prefix}_WRAP_PYTHON AND WRAPPER_LIBRARY_PYTHON)
182145
itk_wrap_one_type_python("${wrap_method}" "${wrap_class}" "${swig_name}" "${template_params}")
183146
endif()
184-
if(${module_prefix}_WRAP_RUBY AND WRAPPER_LIBRARY_RUBY)
185-
itk_wrap_one_type_ruby("${wrap_method}" "${wrap_class}" "${swig_name}" "${template_params}")
186-
endif()
187-
if(${module_prefix}_WRAP_JAVA AND WRAPPER_LIBRARY_JAVA)
188-
itk_wrap_one_type_java("${wrap_method}" "${wrap_class}" "${swig_name}" "${template_params}")
189-
endif()
190147
endmacro()
191148

192149

@@ -198,12 +155,6 @@ macro(itk_wrap_simple_type_all_generators wrap_class swig_name)
198155
if(${module_prefix}_WRAP_PYTHON AND WRAPPER_LIBRARY_PYTHON)
199156
itk_wrap_simple_type_python("${wrap_class}" "${swig_name}")
200157
endif()
201-
if(${module_prefix}_WRAP_RUBY AND WRAPPER_LIBRARY_RUBY)
202-
itk_wrap_simple_type_ruby("${wrap_class}" "${swig_name}")
203-
endif()
204-
if(${module_prefix}_WRAP_JAVA AND WRAPPER_LIBRARY_JAVA)
205-
itk_wrap_simple_type_java("${wrap_class}" "${swig_name}")
206-
endif()
207158
endmacro()
208159

209160

0 commit comments

Comments
 (0)