diff options
| -rwxr-xr-x | bin/buildhdf5 | 6 | ||||
| -rwxr-xr-x | bin/cmakehdf5 | 11 | ||||
| -rw-r--r-- | test/dt_arith.c | 2 | ||||
| -rw-r--r-- | test/test_error.sh.in | 2 |
4 files changed, 18 insertions, 3 deletions
diff --git a/bin/buildhdf5 b/bin/buildhdf5 index 4c84884..a2a13cb 100755 --- a/bin/buildhdf5 +++ b/bin/buildhdf5 @@ -25,7 +25,7 @@ can continue from a previous build. Command Syntax ============== -buildhdf5 [-config] [-szlib] [-help] [-n] [-srcdir dir] [-fortran] [-cxx] [-pp] config-arguments ... +buildhdf5 [-config] [-szlib] [-help] [-n] [-srcdir dir] [-fortran] [-cxx] [-java] [-pp] config-arguments ... -config: run configure only. [default to do build too] -szlib: configure in the szlib option -help: show this help page @@ -35,6 +35,7 @@ buildhdf5 [-config] [-szlib] [-help] [-n] [-srcdir dir] [-fortran] [-cxx] [-pp] which will be passed to configure] -fortran: add --enable-fortran -cxx: add --enable-cxx + -java: add --enable-java -pp: add --enable-parallel all other arguments are passed to configure @@ -251,6 +252,9 @@ while [ $# -gt 0 ]; do -cxx) CONFIG_OP="$CONFIG_OP --enable-cxx" ;; + -java) + CONFIG_OP="$CONFIG_OP --enable-java" + ;; -fortran) CONFIG_OP="$CONFIG_OP --enable-fortran" ;; diff --git a/bin/cmakehdf5 b/bin/cmakehdf5 index e59c772..f17b9c4 100755 --- a/bin/cmakehdf5 +++ b/bin/cmakehdf5 @@ -45,6 +45,7 @@ fi cacheinit=$srcdir/config/cmake/cacheinit.cmake build_cpp_lib=-DHDF5_BUILD_CPP_LIB:BOOL=OFF # C++ interface default off build_fortran=-DHDF5_BUILD_FORTRAN:BOOL=OFF # Fortran interface default off +build_java=-DHDF5_BUILD_JAVA:BOOL=OFF # Java interface default off build_hl_lib=-DHDF5_BUILD_HL_LIB:BOOL=ON # High Level interface default on build_threadsafe=-DHDF5_ENABLE_THREADSAFE:BOOL=OFF # Threadsafe feature default off build_testing=-DBUILD_TESTING:BOOL=ON # Build tests default on @@ -82,6 +83,8 @@ Usage: $progname [<options>] enable or disable fortran API. Default is off. --enable-cxx | --disable-cxx: enable or disable c++ API. Default is off. + --enable-java | --disable-java: + enable or disable Java API. Default is off. --enable-hl | --disable-hl: enable or disable high level API. Default is on. --enable-threadsafe | --disable-threadsafe: @@ -210,6 +213,7 @@ fi # XXX can be: # fortran Fortran interface # cxx C++ interface +# java Java interface # hl Highlevel interface # testing Build tests # tools Build tools @@ -227,6 +231,12 @@ while [ $# -gt 0 ]; do --disable-cxx) build_cpp_lib=-DHDF5_BUILD_CPP_LIB:BOOL=OFF ;; + --enable-java) + build_java=-DHDF5_BUILD_JAVA:BOOL=ON + ;; + --disable-java) + build_java=-DHDF5_BUILD_JAVA:BOOL=OFF + ;; --enable-hl) build_hl_lib=-DHDF5_BUILD_HL_LIB:BOOL=ON ;; @@ -345,6 +355,7 @@ STEP "Configure..." \ -C $cacheinit \ $build_cpp_lib \ $build_fortran \ + $build_java \ $build_hl_lib \ $build_threadsafe \ $shared_lib \ diff --git a/test/dt_arith.c b/test/dt_arith.c index 3acf4b6..8e5b521 100644 --- a/test/dt_arith.c +++ b/test/dt_arith.c @@ -2851,7 +2851,7 @@ test_conv_flt_1(const char *name, int run_test, hid_t src, hid_t dst) int status; /*child exit status */ /* - * Some systems generage SIGFPE during floating point overflow and we + * Some systems generate SIGFPE during floating point overflow and we * cannot assume that we can continue from such a signal. Therefore, we * fork here and let the child run the test and return the number of * failures with the exit status. diff --git a/test/test_error.sh.in b/test/test_error.sh.in index 49c8884..e1f25b1 100644 --- a/test/test_error.sh.in +++ b/test/test_error.sh.in @@ -14,7 +14,7 @@ srcdir=@srcdir@ -# Determine backward compatibility options eneabled +# Check if backward compatibility options are enabled DEPRECATED_SYMBOLS="@DEPRECATED_SYMBOLS@" CMP='cmp -s' |