Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add java options to build scripts #3127

Merged
merged 3 commits into from
Jun 15, 2023
Merged

Add java options to build scripts #3127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
564eb02
Add java options to build scripts
mattjala Jun 14, 2023
c21f900
Codespell
mattjala Jun 14, 2023
d3c953f
Merge branch 'develop' into build_script_java
derobins Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion bin/buildhdf5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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"
;;
Expand Down
11 changes: 11 additions & 0 deletions bin/cmakehdf5
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
;;
Expand Down Expand Up @@ -345,6 +355,7 @@ STEP "Configure..." \
-C $cacheinit \
$build_cpp_lib \
$build_fortran \
$build_java \
$build_hl_lib \
$build_threadsafe \
$shared_lib \
Expand Down