1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
|
From: Stuart Prescott <stuart@debian.org>
Date: Mon, 19 Jan 2026 21:22:04 +1100
Subject: Build java bindings
Enable building the Java bindings.
---
CMakeLists.txt | 8 +-
bindings/CMakeLists.txt | 6 +-
bindings/java/CMakeLists.txt | 60 +++++++------
cmake_include/FindJava.cmake | 207 -------------------------------------------
4 files changed, 38 insertions(+), 243 deletions(-)
delete mode 100644 cmake_include/FindJava.cmake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c50538..02ed40a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -224,10 +224,10 @@ find_package(LibXml2)
#find_package(PythonInterp)
#Find the java runtime and sdk
-#if(ENABLE_JAVA_BINDINGS)
-# find_package(Java 1.6)
-# find_package(JNI)
-#endif()
+if(ENABLE_JAVA)
+ find_package(Java 1.6)
+ find_package(JNI)
+endif()
find_library(PTHREAD pthread)
diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt
index b0b1d27..b1a9ac9 100644
--- a/bindings/CMakeLists.txt
+++ b/bindings/CMakeLists.txt
@@ -44,9 +44,9 @@ if(ENABLE_FORTRAN90)
endif()
#add_subdirectory (idl)
-#if (NOT(Java_JAVAC_EXECUTABLE MATCHES NOTFOUND))
-# add_subdirectory (java)
-#endif ()
+if (NOT(Java_JAVAC_EXECUTABLE MATCHES NOTFOUND))
+ add_subdirectory (java)
+endif ()
#add_subdirectory (matlab)
#if (PYTHONINTERP_FOUND)
# add_subdirectory (python)
diff --git a/bindings/java/CMakeLists.txt b/bindings/java/CMakeLists.txt
index 8e912f0..8b7a0e6 100644
--- a/bindings/java/CMakeLists.txt
+++ b/bindings/java/CMakeLists.txt
@@ -37,33 +37,33 @@ if(DEFINED Java_JAVAC_EXECUTABLE)
SET(JAVA_TEST ${PROJECT_SOURCE_DIR}/bindings/java/test/TestJapi.java)
- SET(JAVA_SOURCES ${PROJECT_SOURCE_DIR}/bindings/java/ncsa/hdf/hdflib/HDFException.java
- ${PROJECT_SOURCE_DIR}/bindings/java/ncsa/hdf/hdflib/HDFJavaException.java
- ${PROJECT_SOURCE_DIR}/bindings/java/ncsa/hdf/hdflib/HDFNotImplementedException.java
- ${PROJECT_SOURCE_DIR}/bindings/java/ncsa/hdf/hdflib/HDFConstants.java
- ${PROJECT_SOURCE_DIR}/bindings/java/ncsa/hdf/hdflib/HDFArray.java
- ${PROJECT_SOURCE_DIR}/bindings/java/ncsa/hdf/hdflib/HDFNativeData.java
- ${PROJECT_SOURCE_DIR}/bindings/java/org/nexusformat/NexusException.java
- ${PROJECT_SOURCE_DIR}/bindings/java/org/nexusformat/NXlink.java
- ${PROJECT_SOURCE_DIR}/bindings/java/org/nexusformat/NeXusFileInterface.java
- ${PROJECT_SOURCE_DIR}/bindings/java/org/nexusformat/AttributeEntry.java
- ${PROJECT_SOURCE_DIR}/bindings/java/org/nexusformat/NexusFile.java
+ SET(JAVA_SOURCES ${PROJECT_SOURCE_DIR}/bindings/java/ncsa/hdf/hdflib/HDFException.java
+ ${PROJECT_SOURCE_DIR}/bindings/java/ncsa/hdf/hdflib/HDFJavaException.java
+ ${PROJECT_SOURCE_DIR}/bindings/java/ncsa/hdf/hdflib/HDFNotImplementedException.java
+ ${PROJECT_SOURCE_DIR}/bindings/java/ncsa/hdf/hdflib/HDFConstants.java
+ ${PROJECT_SOURCE_DIR}/bindings/java/ncsa/hdf/hdflib/HDFArray.java
+ ${PROJECT_SOURCE_DIR}/bindings/java/ncsa/hdf/hdflib/HDFNativeData.java
+ ${PROJECT_SOURCE_DIR}/bindings/java/org/nexusformat/NexusException.java
+ ${PROJECT_SOURCE_DIR}/bindings/java/org/nexusformat/NXlink.java
+ ${PROJECT_SOURCE_DIR}/bindings/java/org/nexusformat/NeXusFileInterface.java
+ ${PROJECT_SOURCE_DIR}/bindings/java/org/nexusformat/AttributeEntry.java
+ ${PROJECT_SOURCE_DIR}/bindings/java/org/nexusformat/NexusFile.java
${JAVA_TEST})
- SET(JAVA_CLASSES ${PROJECT_BINARY_DIR}/bindings/java/ncsa/hdf/hdflib/HDFException.class
- ${PROJECT_BINARY_DIR}/bindings/java/ncsa/hdf/hdflib/HDFJavaException.class
- ${PROJECT_BINARY_DIR}/bindings/java/ncsa/hdf/hdflib/HDFNotImplementedException.class
- ${PROJECT_BINARY_DIR}/bindings/java/ncsa/hdf/hdflib/HDFConstants.class
- ${PROJECT_BINARY_DIR}/bindings/java/ncsa/hdf/hdflib/HDFArray.class
- ${PROJECT_BINARY_DIR}/bindings/java/ncsa/hdf/hdflib/HDFNativeData.class
- ${PROJECT_BINARY_DIR}/bindings/java/org/nexusformat/NexusException.class
- ${PROJECT_BINARY_DIR}/bindings/java/org/nexusformat/NXlink.class
- ${PROJECT_BINARY_DIR}/bindings/java/org/nexusformat/NeXusFileInterface.class
- ${PROJECT_BINARY_DIR}/bindings/java/org/nexusformat/AttributeEntry.class
- ${PROJECT_BINARY_DIR}/bindings/java/org/nexusformat/NexusFile.class
- ${PROJECT_BINARY_DIR}/bindings/java/TestJapi.class)
-
- SET(EXTRA_CLASSES ${PROJECT_BINARY_DIR}/bindings/java/ncsa/hdf/hdflib/ArrayDescriptor.class)
+ SET(JAVA_CLASSES ncsa/hdf/hdflib/HDFException.class
+ ncsa/hdf/hdflib/HDFJavaException.class
+ ncsa/hdf/hdflib/HDFNotImplementedException.class
+ ncsa/hdf/hdflib/HDFConstants.class
+ ncsa/hdf/hdflib/HDFArray.class
+ ncsa/hdf/hdflib/HDFNativeData.class
+ org/nexusformat/NexusException.class
+ org/nexusformat/NXlink.class
+ org/nexusformat/NeXusFileInterface.class
+ org/nexusformat/AttributeEntry.class
+ org/nexusformat/NexusFile.class
+ TestJapi.class)
+
+ SET(EXTRA_CLASSES ncsa/hdf/hdflib/ArrayDescriptor.class)
SET(JNI_HEADER native/org_nexusformat_NexusFile.h)
@@ -90,15 +90,15 @@ if(DEFINED Java_JAVAC_EXECUTABLE)
ADD_CUSTOM_COMMAND(
OUTPUT ${JAR_ARCHIVE}
COMMAND ${Java_JAR_EXECUTABLE}
- ARGS cvf ${JAR_ARCHIVE} ${JAVA_CLASSES} ${EXTRA_CLASSES}
+ ARGS cvf ${JAR_ARCHIVE} -C ${PROJECT_BINARY_DIR}/bindings/java/ ${JAVA_CLASSES} ${EXTRA_CLASSES}
DEPENDS ${EXTRA_CLASSES}
COMMENT "Build JAR File"
)
ADD_CUSTOM_COMMAND(
OUTPUT ${JNI_HEADER}
- COMMAND ${Java_JAVAH_EXECUTABLE}
- ARGS -jni -d native -classpath . org.nexusformat.NexusFile
+ COMMAND ${Java_JAVAC_EXECUTABLE}
+ ARGS -h native ${PROJECT_SOURCE_DIR}/bindings/java/org/nexusformat/NexusFile.java
DEPENDS ${JAR_ARCHIVE}
COMMENT "Build JNI Header"
)
@@ -113,7 +113,7 @@ if(DEFINED Java_JAVAC_EXECUTABLE)
)
ADD_CUSTOM_TARGET(NexusJavaBuild ALL echo
- DEPENDS ${JAR_ARCHIVE}
+ DEPENDS ${JAR_ARCHIVE} ${JNI_HEADER}
)
ADD_CUSTOM_TARGET(NexusJavadocBuild ALL echo
@@ -126,6 +126,8 @@ if(DEFINED Java_JAVAC_EXECUTABLE)
native/NexusFile.c
native/hdfexceptionImp.h)
+ ADD_DEPENDENCIES(jnexus NexusJavaBuild)
+
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set_target_properties(jnexus PROPERTIES OUTPUT_NAME libjnexus-0
VERSION 1.0 SOVERSION 4 )
diff --git a/cmake_include/FindJava.cmake b/cmake_include/FindJava.cmake
deleted file mode 100644
index 93572ac..0000000
--- a/cmake_include/FindJava.cmake
+++ /dev/null
@@ -1,207 +0,0 @@
-# - Find Java
-# This module finds if Java is installed and determines where the
-# include files and libraries are. This code sets the following
-# variables:
-#
-# Java_JAVA_EXECUTABLE = the full path to the Java runtime
-# Java_JAVAC_EXECUTABLE = the full path to the Java compiler
-# Java_JAR_EXECUTABLE = the full path to the Java archiver
-# Java_JNI_EXECUTABLE = the full path to the Java JNI command
-# Java_DOC_EXECUTABLE = the full path to the Javadoc command
-# Java_VERSION_STRING = Version of the package found (java version), eg. 1.6.0_12
-# Java_VERSION_MAJOR = The major version of the package found.
-# Java_VERSION_MINOR = The minor version of the package found.
-# Java_VERSION_PATCH = The patch version of the package found.
-# Java_VERSION_TWEAK = The tweak version of the package found (after '_')
-# Java_VERSION = This is set to: $major.$minor.$patch(.$tweak)
-#
-# The minimum required version of Java can be specified using the
-# standard CMake syntax, e.g. FIND_PACKAGE(Java 1.5)
-#
-# NOTE: ${Java_VERSION} and ${Java_VERSION_STRING} are not guaranteed to be
-# identical. For example some java version may return:
-# Java_VERSION_STRING = 1.5.0_17
-# and
-# Java_VERSION = 1.5.0.17
-#
-# another example is the Java OEM, with:
-# Java_VERSION_STRING = 1.6.0-oem
-# and
-# Java_VERSION = 1.6.0
-#
-# For these components the following variables are set:
-#
-# Java_FOUND - TRUE if all components are found.
-# Java_INCLUDE_DIRS - Full paths to all include dirs.
-# Java_LIBRARIES - Full paths to all libraries.
-# Java_<component>_FOUND - TRUE if <component> is found.
-#
-# Example Usages:
-# FIND_PACKAGE(Java)
-# FIND_PACKAGE(Java COMPONENTS Runtime)
-# FIND_PACKAGE(Java COMPONENTS Development)
-#
-
-#=============================================================================
-# Copyright 2002-2009 Kitware, Inc.
-# Copyright 2009-2011 Mathieu Malaterre <mathieu.malaterre@gmail.com>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-# License text for the above reference.)
-
-# The HINTS option should only be used for values computed from the system.
-SET(_JAVA_HINTS
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\2.0;JavaHome]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.9;JavaHome]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.8;JavaHome]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.7;JavaHome]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.6;JavaHome]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.5;JavaHome]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin"
- $ENV{JAVA_HOME}/bin
- )
-# Hard-coded guesses should still go in PATHS. This ensures that the user
-# environment can always override hard guesses.
-SET(_JAVA_PATHS
- /usr/lib/java/bin
- /usr/share/java/bin
- /usr/local/java/bin
- /usr/local/java/share/bin
- /usr/java/j2sdk1.4.2_04
- /usr/lib/j2sdk1.4-sun/bin
- /usr/java/j2sdk1.4.2_09/bin
- /usr/lib/j2sdk1.5-sun/bin
- /opt/sun-jdk-1.5.0.04/bin
- )
-FIND_PROGRAM(Java_JAVA_EXECUTABLE
- NAMES java
- HINTS ${_JAVA_HINTS}
- PATHS ${_JAVA_PATHS}
-)
-
-IF(Java_JAVA_EXECUTABLE)
- EXECUTE_PROCESS(COMMAND ${Java_JAVA_EXECUTABLE} -version
- RESULT_VARIABLE res
- OUTPUT_VARIABLE var
- ERROR_VARIABLE var # sun-java output to stderr
- OUTPUT_STRIP_TRAILING_WHITESPACE
- ERROR_STRIP_TRAILING_WHITESPACE)
- IF( res )
- IF(${Java_FIND_REQUIRED})
- MESSAGE( FATAL_ERROR "Error executing java -version" )
- ELSE()
- MESSAGE( STATUS "Warning, could not run java --version")
- ENDIF()
- ELSE()
- # extract major/minor version and patch level from "java -version" output
- # Tested on linux using
- # 1. Sun / Sun OEM
- # 2. OpenJDK 1.6
- # 3. GCJ 1.5
- # 4. Kaffe 1.4.2
- IF(var MATCHES "java version \"[0-9]+\\.[0-9]+\\.[0-9_.]+[oem-]*\".*")
- # This is most likely Sun / OpenJDK, or maybe GCJ-java compat layer
- STRING( REGEX REPLACE ".* version \"([0-9]+\\.[0-9]+\\.[0-9_.]+)[oem-]*\".*"
- "\\1" Java_VERSION_STRING "${var}" )
- ELSEIF(var MATCHES "java full version \"kaffe-[0-9]+\\.[0-9]+\\.[0-9_]+\".*")
- # Kaffe style
- STRING( REGEX REPLACE "java full version \"kaffe-([0-9]+\\.[0-9]+\\.[0-9_]+).*"
- "\\1" Java_VERSION_STRING "${var}" )
- ELSE()
- IF(NOT Java_FIND_QUIETLY)
- message(WARNING "regex not supported: ${var}. Please report")
- ENDIF(NOT Java_FIND_QUIETLY)
- ENDIF()
- STRING( REGEX REPLACE "([0-9]+).*" "\\1" Java_VERSION_MAJOR "${Java_VERSION_STRING}" )
- STRING( REGEX REPLACE "[0-9]+\\.([0-9]+).*" "\\1" Java_VERSION_MINOR "${Java_VERSION_STRING}" )
- STRING( REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" Java_VERSION_PATCH "${Java_VERSION_STRING}" )
- # warning tweak version can be empty:
- STRING( REGEX REPLACE "[0-9]+\\.[0-9]+\\.[0-9]+\\_?\\.?([0-9]*)$" "\\1" Java_VERSION_TWEAK "${Java_VERSION_STRING}" )
- if( Java_VERSION_TWEAK STREQUAL "" ) # check case where tweak is not defined
- set(Java_VERSION ${Java_VERSION_MAJOR}.${Java_VERSION_MINOR}.${Java_VERSION_PATCH})
- else( )
- set(Java_VERSION ${Java_VERSION_MAJOR}.${Java_VERSION_MINOR}.${Java_VERSION_PATCH}.${Java_VERSION_TWEAK})
- endif( )
- # display info
- #MESSAGE( STATUS "Java version ${Java_VERSION_STRING} configured successfully!" ) # keep me, used for debug
- IF(NOT Java_FIND_QUIETLY)
- MESSAGE( STATUS "Java version ${Java_VERSION} configured successfully!" )
- ENDIF(NOT Java_FIND_QUIETLY)
- ENDIF()
-
-ENDIF(Java_JAVA_EXECUTABLE)
-
-
-FIND_PROGRAM(Java_JAR_EXECUTABLE
- NAMES jar
- HINTS ${_JAVA_HINTS}
- PATHS ${_JAVA_PATHS}
-)
-
-FIND_PROGRAM(Java_JAVAC_EXECUTABLE
- NAMES javac
- HINTS ${_JAVA_HINTS}
- PATHS ${_JAVA_PATHS}
-)
-
-FIND_PROGRAM(Java_JNI_EXECUTABLE
- NAMES javah
- HINTS ${_JAVA_HINTS}
- PATHS ${_JAVA_PATHS}
-)
-
-FIND_PROGRAM(Java_DOC_EXECUTABLE
- NAMES javadoc
- HINTS ${_JAVA_HINTS}
- PATHS ${_JAVA_PATHS}
-)
-
-include(FindPackageHandleStandardArgs)
-if(Java_FIND_COMPONENTS)
- foreach(component ${Java_FIND_COMPONENTS})
- # User just want to execute some Java byte-compiled
- if(component STREQUAL "Runtime")
- find_package_handle_standard_args(Java
- REQUIRED_VARS Java_JAVA_EXECUTABLE
- VERSION_VAR Java_VERSION
- )
- elseif(component STREQUAL "Development")
- find_package_handle_standard_args(Java
- REQUIRED_VARS Java_JAVA_EXECUTABLE Java_JAR_EXECUTABLE Java_JAVAC_EXECUTABLE Java_JNI_EXECUTABLE Java_DOC_EXECUTABLE
- VERSION_VAR Java_VERSION
- )
- else()
- message(FATAL_ERROR "Comp: ${component} is not handled")
- endif()
- set(Java_${component}_FOUND TRUE)
- endforeach(component)
-else()
- # Check for everything
- find_package_handle_standard_args(Java
- REQUIRED_VARS Java_JAVA_EXECUTABLE Java_JAR_EXECUTABLE Java_JAVAC_EXECUTABLE Java_JNI_EXECUTABLE Java_DOC_EXECUTABLE
- VERSION_VAR Java_VERSION
- )
-endif()
-
-
-MARK_AS_ADVANCED(
- Java_JAVA_EXECUTABLE
- Java_JAR_EXECUTABLE
- Java_JAVAC_EXECUTABLE
- Java_JNI_EXECUTABLE
- Java_DOC_EXECUTABLE
- )
-
-# LEGACY
-SET(JAVA_RUNTIME ${Java_JAVA_EXECUTABLE})
-SET(JAVA_ARCHIVE ${Java_JAR_EXECUTABLE})
-SET(JAVA_COMPILE ${Java_JAVAC_EXECUTABLE})
-
|
