[svn-r29291] Merge of r29226-29259 from trunk.

Mostly java JNI + a few smaller merges.

Tested on: h5committest.new
           jam w/ java

1 files changed, 138 insertions, 0 deletions

diff --git a/java/examples/datasets/CMakeLists.txt b/java/examples/datasets/CMakeLists.txt
new file mode 100644
index 0000000..077c6bb
--- /dev/null
+++ b/java/examples/datasets/CMakeLists.txt
@@ -0,0 +1,138 @@
+cmake_minimum_required (VERSION 3.1.0)
+PROJECT (HDFJAVA_EXAMPLES_DATASETS Java)
+
+set (CMAKE_VERBOSE_MAKEFILE 1)
+
+INCLUDE_DIRECTORIES (
+    ${HDF5_JAVA_JNI_BINARY_DIR}
+    ${HDF5_JAVA_HDF5_LIB_DIR}
+)
+
+set (HDF_JAVA_EXAMPLES
+    H5Ex_D_Alloc
+    H5Ex_D_Checksum
+    H5Ex_D_Chunk
+    H5Ex_D_Compact
+    H5Ex_D_External
+    H5Ex_D_FillValue
+    H5Ex_D_Gzip
+    H5Ex_D_Hyperslab
+    H5Ex_D_ReadWrite
+    H5Ex_D_Shuffle
+    H5Ex_D_Szip
+    H5Ex_D_UnlimitedAdd
+    H5Ex_D_UnlimitedGzip
+    H5Ex_D_UnlimitedMod
+    H5Ex_D_Nbit
+    H5Ex_D_Transform
+    H5Ex_D_Sofloat
+    H5Ex_D_Soint
+)
+
+if (WIN32)
+  set (CMAKE_JAVA_INCLUDE_FLAG_SEP ";")
+else (WIN32)
+  set (CMAKE_JAVA_INCLUDE_FLAG_SEP ":")
+endif (WIN32)
+
+set (CMAKE_JAVA_INCLUDE_PATH "${HDF5_JAVA_JARS}")
+
+set (CMAKE_JAVA_CLASSPATH ".")
+foreach (CMAKE_INCLUDE_PATH ${CMAKE_JAVA_INCLUDE_PATH})
+  set (CMAKE_JAVA_CLASSPATH "${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${CMAKE_INCLUDE_PATH}")
+endforeach (CMAKE_INCLUDE_PATH)
+
+foreach (example ${HDF_JAVA_EXAMPLES})
+  file (WRITE ${PROJECT_BINARY_DIR}/${example}_Manifest.txt
+  "Main-Class: examples.datasets.${example}
+"
+  )
+  add_jar (${example} MANIFEST ${PROJECT_BINARY_DIR}/${example}_Manifest.txt ${example}.java)
+  get_target_property (${example}_JAR_FILE ${example} JAR_FILE)
+#  install_jar (${example} ${HJAVA_INSTALL_DATA_DIR}/examples examples)
+  get_target_property (${example}_CLASSPATH ${example} CLASSDIR)
+  add_dependencies (${example} ${HDF5_JAVA_HDF5_LIB_TARGET})
+endforeach (example ${HDF_JAVA_EXAMPLES})
+
+set (CMAKE_JAVA_INCLUDE_PATH "${HDF5_JAVA_JARS};${HDF5_JAVA_LOGGING_JAR};${HDF5_JAVA_LOGGING_NOP_JAR}")
+
+set (CMAKE_JAVA_CLASSPATH ".")
+foreach (HDFJAVA_JAR ${CMAKE_JAVA_INCLUDE_PATH})
+  set (CMAKE_JAVA_CLASSPATH "${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${HDFJAVA_JAR}")
+endforeach (HDFJAVA_JAR)
+
+MACRO (ADD_H5_TEST resultfile resultcode)
+  add_test (
+      NAME JAVA_datasets-${resultfile}
+      COMMAND "${CMAKE_COMMAND}"
+          -D "TEST_TESTER=${CMAKE_Java_RUNTIME};${CMAKE_Java_RUNTIME_FLAGS}"
+          -D "TEST_CLASSPATH:STRING=${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${${resultfile}_JAR_FILE}"
+          -D "TEST_ARGS:STRING=${ARGN}"
+          -D "TEST_PROGRAM=examples.datasets.${resultfile}"
+          -D "TEST_LIBRARY_DIRECTORY=${CMAKE_TEST_OUTPUT_DIRECTORY}"
+          -D "TEST_FOLDER=${HDFJAVA_EXAMPLES_BINARY_DIR}"
+          -D "TEST_OUTPUT=datasets/${resultfile}.out"
+          -D "TEST_EXPECT=${resultcode}"
+          -D "TEST_REFERENCE=datasets/${resultfile}.txt"
+          -P "${HDF_RESOURCES_DIR}/jrunTest.cmake"
+  )
+  if (NOT "${last_test}" STREQUAL "")
+    set_tests_properties (JAVA_datasets-${resultfile} PROPERTIES DEPENDS ${last_test})
+  endif (NOT "${last_test}" STREQUAL "")
+  set (last_test "JAVA_datasets-${resultfile}")
+ENDMACRO (ADD_H5_TEST file)
+
+if (BUILD_TESTING)
+
+# detect whether the encoder is present.
+  if (H5_HAVE_FILTER_DEFLATE)
+    set (USE_FILTER_DEFLATE "true")
+  endif (H5_HAVE_FILTER_DEFLATE)
+
+  if (H5_HAVE_FILTER_SZIP)
+    set (USE_FILTER_SZIP "true")
+  endif (H5_HAVE_FILTER_SZIP)
+
+  foreach (example ${HDF_JAVA_EXAMPLES})
+    if (${example} STREQUAL "H5Ex_D_External")
+      add_test (
+          NAME JAVA_datasets-${example}-clearall-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              ${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.h5
+              ${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.data
+              ${example}.out
+              ${example}.out.err
+      )
+    else (${example} STREQUAL "H5Ex_D_External")
+      add_test (
+          NAME JAVA_datasets-${example}-clearall-objects
+          COMMAND    ${CMAKE_COMMAND}
+              -E remove
+              ${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.h5
+              ${example}.out
+              ${example}.out.err
+      )
+    endif (${example} STREQUAL "H5Ex_D_External")
+    if (NOT "${last_test}" STREQUAL "")
+      set_tests_properties (JAVA_datasets-${example}-clearall-objects PROPERTIES DEPENDS ${last_test})
+    endif (NOT "${last_test}" STREQUAL "")
+    add_test (
+        NAME JAVA_datasets-${example}-copy-objects
+        COMMAND    ${CMAKE_COMMAND}
+            -E copy_if_different
+            ${HDFJAVA_EXAMPLES_SOURCE_DIR}/testfiles/examples.datasets.${example}.txt
+            ${HDFJAVA_EXAMPLES_DATASETS_BINARY_DIR}/${example}.txt
+    )
+    set_tests_properties (JAVA_datasets-${example}-copy-objects PROPERTIES DEPENDS JAVA_datasets-${example}-clearall-objects)
+    set (last_test "JAVA_datasets-${example}-copy-objects")
+    if (${example} STREQUAL "H5Ex_D_Szip")
+      if (USE_FILTER_SZIP)
+        ADD_H5_TEST (${example} 0)
+      endif (USE_FILTER_SZIP)
+    else (${example} STREQUAL "H5Ex_D_Szip")
+      ADD_H5_TEST (${example} 0)
+    endif (${example} STREQUAL "H5Ex_D_Szip")
+
+  endforeach (example ${HDF_JAVA_EXAMPLES})
+endif (BUILD_TESTING)