Fix critical pinning for JNI (#20)

* Fix critical pinning for JNI

* Fix CMake ext lib to match hdf5 and fix jni typo

* Add test for native function to verify link

Co-authored-by: Larry Knox <lrknox@hdfgroup.org>

Author: byrnHDF

CMakeFilters.cmake

@@ -3,6 +3,7 @@
 # Options for HDF4 Filters
 #-----------------------------------------------------------------------------
 option (USE_LIBAEC "Use AEC library as SZip Filter" OFF)
+option (USE_LIBAEC_STATIC "Use static AEC library " OFF)
 
 include (ExternalProject)
 #option (HDF4_ALLOW_EXTERNAL_SUPPORT "Allow External Library Building (NO GIT TGZ)" "NO")
@@ -24,11 +25,29 @@ if (HDF4_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF4_ALLOW_EXTERNAL_SUPPORT MAT
       set (TGZPATH ${HDF4_SOURCE_DIR})
     endif ()
     set (JPEG_URL ${TGZPATH}/${JPEG_TGZ_NAME})
+    if (NOT EXISTS "${JPEG_URL}")
+      set (HDF4_ENABLE_JPEG_SUPPORT OFF CACHE BOOL "" FORCE)
+      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+        message (VERBOSE "Filter JPEG file ${JPEG_URL} not found")
+      endif ()
+    endif ()
     set (ZLIB_URL ${TGZPATH}/${ZLIB_TGZ_NAME})
+    if (NOT EXISTS "${ZLIB_URL}")
+      set (HDF4_ENABLE_Z_LIB_SUPPORT OFF CACHE BOOL "" FORCE)
+      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+        message (VERBOSE "Filter ZLIB file ${ZLIB_URL} not found")
+      endif ()
+    endif ()
     set (SZIP_URL ${TGZPATH}/${SZIP_TGZ_NAME})
     if (USE_LIBAEC)
       set (SZIP_URL ${TGZPATH}/${SZAEC_TGZ_NAME})
     endif ()
+    if (NOT EXISTS "${SZIP_URL}")
+      set (HDF4_ENABLE_SZIP_SUPPORT OFF CACHE BOOL "" FORCE)
+      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+        message (VERBOSE "Filter SZIP file ${SZIP_URL} not found")
+      endif ()
+    endif ()
   else ()
     set (JPEG_USE_EXTERNAL 0)
     set (ZLIB_USE_EXTERNAL 0)
@@ -117,7 +136,9 @@ if (HDF4_ENABLE_Z_LIB_SUPPORT)
         set (H4_HAVE_FILTER_DEFLATE 1)
         set (H4_HAVE_ZLIB_H 1)
         set (H4_HAVE_LIBZ 1)
-        message (STATUS "Filter ZLIB is built")
+        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+          message (VERBOSE "Filter HDF4_ZLIB is built")
+        endif ()
       else ()
         message (FATAL_ERROR " ZLib is Required for ZLib support in HDF4")
       endif ()
@@ -130,7 +151,9 @@ if (HDF4_ENABLE_Z_LIB_SUPPORT)
   endif ()
   set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${ZLIB_STATIC_LIBRARY})
   INCLUDE_DIRECTORIES (${ZLIB_INCLUDE_DIRS})
-  message (STATUS "Filter ZLIB is ON")
+  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+    message (VERBOSE "Filter HDF4_ZLIB is ON")
+  endif ()
 endif ()
 
 #-----------------------------------------------------------------------------
@@ -141,13 +164,24 @@ set (SZIP_INFO "disabled")
 if (HDF4_ENABLE_SZIP_SUPPORT)
   option (HDF4_ENABLE_SZIP_ENCODING "Use SZip Encoding" OFF)
   if (NOT SZIP_USE_EXTERNAL)
-    find_package (SZIP NAMES ${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared)
-    if (NOT SZIP_FOUND)
-      find_package (SZIP) # Legacy find
+    set(SZIP_FOUND FALSE)
+    if (USE_LIBAEC)
+      set(libaec_USE_STATIC_LIBS ${USE_LIBAEC_STATIC})
+      find_package (libaec 1.0.5 CONFIG)
       if (SZIP_FOUND)
         set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_LIBRARIES})
       endif ()
     endif ()
+
+    if (NOT SZIP_FOUND)
+      find_package (SZIP NAMES ${SZIP_PACKAGE_NAME}${HDF_PACKAGE_EXT} COMPONENTS static shared)
+      if (NOT SZIP_FOUND)
+        find_package (SZIP) # Legacy find
+        if (SZIP_FOUND)
+          set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_LIBRARIES})
+        endif ()
+      endif ()
+    endif ()
   endif ()
   if (SZIP_FOUND)
     set (H4_HAVE_FILTER_SZIP 1)
@@ -161,20 +195,26 @@ if (HDF4_ENABLE_SZIP_SUPPORT)
       set (H4_HAVE_FILTER_SZIP 1)
       set (H4_HAVE_SZLIB_H 1)
       set (H4_HAVE_LIBSZ 1)
-      message (STATUS "Filter SZIP is built")
+      if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+        message (VERBOSE "Filter SZIP is built")
+      endif ()
       if (USE_LIBAEC)
-        message (STATUS "... with library AEC")
-        set (SZ_PACKAGE_NAME ${LIBAEC_PACKAGE_NAME})
+        if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+          message (VERBOSE "... with library AEC")
+        endif ()
+        set (SZIP_PACKAGE_NAME ${LIBAEC_PACKAGE_NAME})
       else ()
-        set (SZ_PACKAGE_NAME ${SZIP_PACKAGE_NAME})
+        set (SZIP_PACKAGE_NAME ${SZIP_PACKAGE_NAME})
       endif ()
     else ()
       message (FATAL_ERROR "SZIP is Required for SZIP support in HDF4")
     endif ()
   endif ()
   set (LINK_COMP_LIBS ${LINK_COMP_LIBS} ${SZIP_STATIC_LIBRARY})
   INCLUDE_DIRECTORIES (${SZIP_INCLUDE_DIRS})
-  message (STATUS "Filter SZIP is ON")
+  if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0")
+    message (VERBOSE "Filter SZIP is ON")
+  endif ()
   if (HDF4_ENABLE_SZIP_ENCODING)
     set (H4_HAVE_SZIP_ENCODER 1)
     set (SZIP_INFO "enabled with encoder")

CMakeInstallation.cmake

@@ -278,7 +278,7 @@ if (NOT HDF4_EXTERNALLY_CONFIGURED AND NOT HDF4_NO_PACKAGES)
   set (CPACK_PACKAGE_ICON "${HDF_RESOURCES_EXT_DIR}/hdf.bmp")
 
   set (CPACK_GENERATOR "TGZ")
-  if (WIN32 OR MINGW)
+  if (WIN32)
     set (CPACK_GENERATOR "ZIP")
 
     if (NSIS_EXECUTABLE)
@@ -443,7 +443,7 @@ The HDF data model, file format, API, library, and tools are open and distribute
   if (HDF4_PACKAGE_EXTLIBS)
     if (HDF4_ALLOW_EXTERNAL_SUPPORT MATCHES "GIT" OR HDF4_ALLOW_EXTERNAL_SUPPORT MATCHES "TGZ")
       if (JPEG_FOUND AND JPEG_USE_EXTERNAL)
-        if (WIN32 OR MINGW)
+        if (WIN32)
           set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${JPEG_INCLUDE_DIR_GEN};JPEG;ALL;/")
         else ()
           set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${JPEG_INCLUDE_DIR_GEN};JPEG;libraries;/")
@@ -452,7 +452,7 @@ The HDF data model, file format, API, library, and tools are open and distribute
         endif ()
       endif ()
       if (ZLIB_FOUND AND ZLIB_USE_EXTERNAL)
-        if (WIN32 OR MINGW)
+        if (WIN32)
           set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${ZLIB_INCLUDE_DIR_GEN};ZLIB;ALL;/")
         else ()
           set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${ZLIB_INCLUDE_DIR_GEN};ZLIB;libraries;/")
@@ -461,7 +461,7 @@ The HDF data model, file format, API, library, and tools are open and distribute
         endif ()
       endif ()
       if (SZIP_FOUND AND SZIP_USE_EXTERNAL)
-        if (WIN32 OR MINGW)
+        if (WIN32)
           set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${SZIP_INCLUDE_DIR_GEN};SZIP;ALL;/")
         else ()
           set (CPACK_INSTALL_CMAKE_PROJECTS "${CPACK_INSTALL_CMAKE_PROJECTS};${SZIP_INCLUDE_DIR_GEN};SZIP;libraries;/")

CMakeLists.txt

@@ -34,9 +34,13 @@ endif ()
 
 # CMake version 3.14 added option --ignore-eol to compare files
 #     cmake -E compare_files --ignore-eol file1 file2
-#if(CMAKE_VERSION VERSION_LESS "3.14.0" AND WIN32)
-#    MESSAGE(FATAL_ERROR "Windows builds requires a minimum of CMake 3.14")
-#endif()
+set (CMAKE_IGNORE_EOL "--ignore-eol")
+if (CMAKE_VERSION VERSION_LESS "3.14.0")
+  set (CMAKE_IGNORE_EOL "")
+#  if (WIN32)
+#    message (FATAL_ERROR "Windows builds require a minimum of CMake 3.14")
+#  endif()
+endif ()
 
 #-----------------------------------------------------------------------------
 # Instructions for use : Sub-Project Build
@@ -393,12 +397,11 @@ INCLUDE_DIRECTORIES (${HDF4_INCLUDE_DIRECTORIES} )
 # Certain systems may add /Debug or /Release to output paths
 # and we need to call the executable from inside the CMake configuration
 #-----------------------------------------------------------------------------
-set (EXE_EXT "")
-if (WIN32 OR MINGW)
-  set (EXE_EXT ".exe")
-  add_definitions (-D_BIND_TO_CURRENT_VCLIBS_VERSION=1)
-  add_definitions (-D_CRT_SECURE_NO_WARNINGS)
-  add_definitions (-D_CONSOLE)
+if (WIN32)
+  add_compile_definitions (_CRT_SECURE_NO_WARNINGS)
+  if (MSVC)
+    add_compile_definitions (_BIND_TO_CURRENT_VCLIBS_VERSION=1 _CONSOLE)
+  endif ()
 endif ()
 
 if (MSVC)
@@ -408,7 +411,7 @@ if (MSVC)
 endif ()
 
 set (MAKE_SYSTEM)
-if (CMAKE_BUILD_TOOL MATCHES "make")
+if (CMAKE_MAKE_PROGRAM MATCHES "make")
   set (MAKE_SYSTEM 1)
 endif ()
 

config/cmake_ext_mod/ConfigureChecks.cmake

@@ -147,7 +147,7 @@ CHECK_INCLUDE_FILE_CONCAT (stdbool.h    ${HDF_PREFIX}_HAVE_STDBOOL_H)
 CHECK_INCLUDE_FILE_CONCAT ("arpa/inet.h"     ${HDF_PREFIX}_HAVE_INET_H)
 CHECK_INCLUDE_FILE_CONCAT ("sys/param.h"     ${HDF_PREFIX}_HAVE_PARAM_H)
 
-## Check for non-standard extenstion quadmath.h
+## Check for non-standard extension quadmath.h
 
 CHECK_INCLUDE_FILES(quadmath.h C_HAVE_QUADMATH)
 if (${C_HAVE_QUADMATH})

config/cmake_ext_mod/runTest.cmake

@@ -222,7 +222,7 @@ if (NOT TEST_SKIP_COMPARE)
         list (SORT v1)
         list (SORT v2)
         if (NOT v1 STREQUAL v2)
-          set(TEST_COMPARE_RESULT 1)
+          set (TEST_COMPARE_RESULT 1)
         endif ()
       endif ()
 

java/src/jni/hdfsdsImp.c

@@ -1333,7 +1333,7 @@ Java_hdf_hdflib_HDFLibrary_SDwritedata(JNIEnv *env, jclass clss, jlong sdsid, ji
     if (stride != NULL)
         PIN_INT_ARRAY(ENVONLY, stride, strd, &isCopy, "SDwritedata:  stride not pinned");
 
-    if ((rval = SDwritedata(id, strt, strd, e, d)) == FAIL)
+    if ((rval = SDwritedata(id, strt, strd, e, (VOIDP)d)) == FAIL)
         H4_LIBRARY_ERROR(ENVONLY);
 
 done:

java/src/jni/hdfvgroupImp.c

@@ -298,7 +298,7 @@ Java_hdf_hdflib_HDFLibrary_Vntagrefs(JNIEnv *env, jclass clss, jlong vgroup_id)
     return (jint)rval;
 }
 
-JNIEXPORT jint
+JNIEXPORT jint JNICALL
 Java_hdf_hdflib_HDFLibrary_Vinqtagref(JNIEnv *env, jclass clss, jlong vgroup_id, jint tag, jint ref)
 {
     int32 rval = FAIL;
@@ -728,7 +728,7 @@ Java_hdf_hdflib_HDFLibrary_Vgetversion(JNIEnv *env, jclass clss, jlong id)
     return (jint)rval;
 }
 
-JNIEXPORT jint
+JNIEXPORT jint JNICALL
 Java_hdf_hdflib_HDFLibrary_Vnattrs(JNIEnv *env, jclass clss, jlong id)
 {
     int32 rval = FAIL;

java/test/TestH4Vparams.java

@@ -359,10 +359,10 @@ public void testVgetattrIllegalId() throws Throwable {
 //        HDFLibrary.Vgetversion(-1);
 //    }
 
-//    @Test(expected = HDFException.class)
-//    public void testVnattrsIllegalId() throws Throwable {
-//        HDFLibrary.Vnattrs(-1);
-//    }
+    @Test(expected = HDFException.class)
+    public void testVnattrsIllegalId() throws Throwable {
+        HDFLibrary.Vnattrs(-1);
+    }
 
     @Test(expected = NullPointerException.class)
     public void testVsetattrNullName() throws Throwable {

java/test/testfiles/JUnit-TestH4Vparams.txt

@@ -3,6 +3,7 @@ JUnit version 4.11
 .testVisvsIllegalId
 .testVsetattrNullName2
 .testVinquireIllegalNEntriesArgument
+.testVnattrsIllegalId
 .testVgetnameIllegalArgument
 .testVfindclassNullClassName
 .testVattrinfoNullArgv
@@ -50,5 +51,5 @@ JUnit version 4.11
 
 Time:  XXXX
 
-OK (48 tests)
+OK (49 tests)