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

Modify temporary rpath for testing in java example scripts. #230

Merged
merged 1 commit into from
Dec 29, 2020
Merged

Modify temporary rpath for testing in java example scripts. #230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 9 additions & 1 deletion java/examples/datasets/JavaDatasetExample.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
top_builddir=@top_builddir@
top_srcdir=@top_srcdir@
srcdir=@srcdir@
IS_DARWIN="@H5_IS_DARWIN@"

USE_FILTER_SZIP="@USE_FILTER_SZIP@"
USE_FILTER_DEFLATE="@USE_FILTER_DEFLATE@"
Expand All @@ -36,8 +37,8 @@ nerrors=0

# where the libs exist
HDFLIB_HOME="$top_srcdir/java/lib"
BLDLIBDIR="$top_builddir/hdf5/lib"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changing BLDLIBDIR isn't really necessary; lines 39 - 41 could stay as they were. The rpath change added in lines 117- 123 is what's needed to make the examples tests pass on macOS.

BLDDIR="."
BLDLIBDIR="$BLDDIR/testlibs"
HDFTEST_HOME="$top_srcdir/java/examples/datasets"
JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar
TESTJARFILE=jar@PACKAGE_TARNAME@datasets.jar
Expand Down Expand Up @@ -113,6 +114,13 @@ COPY_LIBFILES_TO_BLDLIBDIR()
fi
fi
done
if [ "$IS_DARWIN" = "yes" ]; then
(cd $BLDLIBDIR; \
install_name_tool -add_rpath @loader_path libhdf5_java.dylib; \
exist_path=` otool -l libhdf5_java.dylib | grep libhdf5 | grep -v java | awk '{print $2}'`; \
echo $exist_path; \
install_name_tool -change $exist_path @rpath/libhdf5.dylib libhdf5_java.dylib)
fi
# copy jar files. Used -f to make sure get a new copy
for tstfile in $COPY_JARTESTFILES
do
Expand Down
10 changes: 9 additions & 1 deletion java/examples/datatypes/JavaDatatypeExample.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
top_builddir=@top_builddir@
top_srcdir=@top_srcdir@
srcdir=@srcdir@
IS_DARWIN="@H5_IS_DARWIN@"

TESTNAME=EX_Datatypes
EXIT_SUCCESS=0
Expand All @@ -33,8 +34,8 @@ nerrors=0

# where the libs exist
HDFLIB_HOME="$top_srcdir/java/lib"
BLDLIBDIR="$top_builddir/hdf5/lib"
BLDDIR="."
BLDLIBDIR="$BLDDIR/testlibs"
HDFTEST_HOME="$top_srcdir/java/examples/datatypes"
JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar
TESTJARFILE=jar@PACKAGE_TARNAME@datatypes.jar
Expand Down Expand Up @@ -110,6 +111,13 @@ COPY_LIBFILES_TO_BLDLIBDIR()
fi
fi
done
if [ "$IS_DARWIN" = "yes" ]; then
(cd $BLDLIBDIR; \
install_name_tool -add_rpath @loader_path libhdf5_java.dylib; \
exist_path=` otool -l libhdf5_java.dylib | grep libhdf5 | grep -v java | awk '{print $2}'`; \
echo $exist_path; \
install_name_tool -change $exist_path @rpath/libhdf5.dylib libhdf5_java.dylib)
fi
# copy jar files. Used -f to make sure get a new copy
for tstfile in $COPY_JARTESTFILES
do
Expand Down
12 changes: 10 additions & 2 deletions java/examples/groups/JavaGroupExample.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
top_builddir=@top_builddir@
top_srcdir=@top_srcdir@
srcdir=@srcdir@
IS_DARWIN="@H5_IS_DARWIN@"

TESTNAME=EX_Groups
EXIT_SUCCESS=0
Expand All @@ -33,9 +34,9 @@ nerrors=0

# where the libs exist
HDFLIB_HOME="$top_srcdir/java/lib"
BLDLIBDIR="$top_builddir/hdf5/lib"
BLDITERDIR="./groups"
BLDDIR="."
BLDLIBDIR="$BLDDIR/testlibs"
BLDITERDIR="./groups"
HDFTEST_HOME="$top_srcdir/java/examples/groups"
JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar
TESTJARFILE=jar@PACKAGE_TARNAME@groups.jar
Expand Down Expand Up @@ -105,6 +106,13 @@ COPY_LIBFILES_TO_BLDLIBDIR()
fi
fi
done
if [ "$IS_DARWIN" = "yes" ]; then
(cd $BLDLIBDIR; \
install_name_tool -add_rpath @loader_path libhdf5_java.dylib; \
exist_path=` otool -l libhdf5_java.dylib | grep libhdf5 | grep -v java | awk '{print $2}'`; \
echo $exist_path; \
install_name_tool -change $exist_path @rpath/libhdf5.dylib libhdf5_java.dylib)
fi
# copy jar files. Used -f to make sure get a new copy
for tstfile in $COPY_JARTESTFILES
do
Expand Down
10 changes: 9 additions & 1 deletion java/examples/intro/JavaIntroExample.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
top_builddir=@top_builddir@
top_srcdir=@top_srcdir@
srcdir=@srcdir@
IS_DARWIN="@H5_IS_DARWIN@"

TESTNAME=EX_Intro
EXIT_SUCCESS=0
Expand All @@ -33,8 +34,8 @@ nerrors=0

# where the libs exist
HDFLIB_HOME="$top_srcdir/java/lib"
BLDLIBDIR="$top_builddir/hdf5/lib"
BLDDIR="."
BLDLIBDIR="$BLDDIR/testlibs"
HDFTEST_HOME="$top_srcdir/java/examples/intro"
JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar
TESTJARFILE=jar@PACKAGE_TARNAME@intro.jar
Expand Down Expand Up @@ -99,6 +100,13 @@ COPY_LIBFILES_TO_BLDLIBDIR()
fi
fi
done
if [ "$IS_DARWIN" = "yes" ]; then
(cd $BLDLIBDIR; \
install_name_tool -add_rpath @loader_path libhdf5_java.dylib; \
exist_path=` otool -l libhdf5_java.dylib | grep libhdf5 | grep -v java | awk '{print $2}'`; \
echo $exist_path; \
install_name_tool -change $exist_path @rpath/libhdf5.dylib libhdf5_java.dylib)
fi
# copy jar files. Used -f to make sure get a new copy
for tstfile in $COPY_JARTESTFILES
do
Expand Down