1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
|
Index: hdf5/java/test/junit.sh.in
===================================================================
--- hdf5.orig/java/test/junit.sh.in
+++ hdf5/java/test/junit.sh.in
@@ -65,10 +65,10 @@ $top_builddir/src/.libs/libhdf5@FLAVOR@.
$top_builddir/java/src/jni/.libs/libhdf5_java.*
"
LIST_JAR_TESTFILES="
-$HDFLIB_HOME/hamcrest-core.jar
-$HDFLIB_HOME/junit.jar
-$HDFLIB_HOME/slf4j-api-2.0.6.jar
-$HDFLIB_HOME/ext/slf4j-simple-2.0.6.jar
+/usr/share/java/hamcrest.jar
+/usr/share/java/junit4.jar
+/usr/share/java/slf4j-api.jar
+/usr/share/java/slf4j-simple.jar
"
LIST_JAR_FILES="
$top_builddir/java/src/$JARFILE
@@ -163,30 +163,6 @@ COPY_LIBFILES_TO_BLDLIBDIR()
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
- # ignore '#' comment
- echo $tstfile | tr -d ' ' | grep '^#' > /dev/null
- RET=$?
- if [ $RET -eq 1 ]; then
- # skip cp if srcdir is same as destdir
- # this occurs when build/test performed in source dir and
- # make cp fail
- SDIR=`$DIRNAME $tstfile`
- INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
- INODE_DDIR=`$LS -i -d $BLDLIBDIR | $AWK -F' ' '{print $1}'`
- if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
- $CP -fR $tstfile $BLDLIBDIR
- if [ $? -ne 0 ]; then
- echo "Error: FAILED to copy $tstfile ."
-
- # Comment out this to CREATE expected file
- exit $EXIT_FAILURE
- fi
- fi
- fi
- done
for tstfile in $COPY_JARFILES
do
# ignore '#' comment
@@ -200,7 +176,7 @@ COPY_LIBFILES_TO_BLDLIBDIR()
INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
INODE_DDIR=`$LS -i -d $BLDLIBDIR | $AWK -F' ' '{print $1}'`
if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
- $CP -fR $tstfile $BLDLIBDIR
+ $CP -f $tstfile $BLDLIBDIR
if [ $? -ne 0 ]; then
echo "Error: FAILED to copy $tstfile ."
@@ -304,7 +280,7 @@ JAVAEXEFLAGS=@H5_JAVAFLAGS@
COPY_LIBFILES_TO_BLDLIBDIR
COPY_DATAFILES_TO_BLDDIR
-CPATH=".:"$BLDLIBDIR"/"$JARFILE":"$BLDLIBDIR"/junit.jar:"$BLDLIBDIR"/hamcrest-core.jar:"$BLDLIBDIR"/slf4j-api-2.0.6.jar:"$BLDLIBDIR"/slf4j-simple-2.0.6.jar:"$TESTJARFILE""
+CPATH=".:"$BLDLIBDIR"/"$JARFILE":/usr/share/java/junit4.jar:/usr/share/java/hamcrest.jar:/usr/share/java/slf4j-api.jar:/usr/share/java/slf4j-simple.jar:"$TESTJARFILE""
TEST=/usr/bin/test
if [ ! -x /usr/bin/test ]
Index: hdf5/java/src/Makefile.am
===================================================================
--- hdf5.orig/java/src/Makefile.am
+++ hdf5/java/src/Makefile.am
@@ -36,7 +36,7 @@ jarfile = jar$(PACKAGE_TARNAME)-$(PACKAG
hdf5_javadir = $(libdir)
pkgpath = hdf/hdf5lib
-CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-2.0.6.jar:$$CLASSPATH
+CLASSPATH_ENV=CLASSPATH=.:/usr/share/java/slf4j-api.jar:$$CLASSPATH
AM_JAVACFLAGS = $(H5_JAVACFLAGS) -deprecation
Index: hdf5/java/test/Makefile.am
===================================================================
--- hdf5.orig/java/test/Makefile.am
+++ hdf5/java/test/Makefile.am
@@ -27,7 +27,7 @@ classes:
pkgpath = test
hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
-CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/junit.jar:$(top_srcdir)/java/lib/hamcrest-core.jar:$(top_srcdir)/java/lib/slf4j-api-2.0.6.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-2.0.6.jar:$$CLASSPATH
+CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):/usr/share/java/junit4.jar:/usr/share/java/hamcrest.jar:/usr/share/java/slf4j-api.jar:/usr/share/java/ext/slf4j-simple.jar:$$CLASSPATH
jarfile = jar$(PACKAGE_TARNAME)test.jar
Index: hdf5/HDF5Examples/JAVA/H5D/JavaDatasetExample.sh.in
===================================================================
--- hdf5.orig/HDF5Examples/JAVA/H5D/JavaDatasetExample.sh.in
+++ hdf5/HDF5Examples/JAVA/H5D/JavaDatasetExample.sh.in
@@ -121,30 +121,6 @@ COPY_LIBFILES_TO_BLDLIBDIR()
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
- # ignore '#' comment
- echo $tstfile | tr -d ' ' | grep '^#' > /dev/null
- RET=$?
- if [ $RET -eq 1 ]; then
- # skip cp if srcdir is same as destdir
- # this occurs when build/test performed in source dir and
- # make cp fail
- SDIR=`$DIRNAME $tstfile`
- INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
- INODE_DDIR=`$LS -i -d $BLDLIBDIR | $AWK -F' ' '{print $1}'`
- if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
- $CP -fR $tstfile $BLDLIBDIR
- if [ $? -ne 0 ]; then
- echo "Error: FAILED to copy $tstfile ."
-
- # Comment out this to CREATE expected file
- exit $EXIT_FAILURE
- fi
- fi
- fi
- done
}
CLEAN_LIBFILES_AND_BLDLIBDIR()
Index: hdf5/HDF5Examples/JAVA/H5T/JavaDatatypeExample.sh.in
===================================================================
--- hdf5.orig/HDF5Examples/JAVA/H5T/JavaDatatypeExample.sh.in
+++ hdf5/HDF5Examples/JAVA/H5T/JavaDatatypeExample.sh.in
@@ -118,30 +118,6 @@ COPY_LIBFILES_TO_BLDLIBDIR()
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
- # ignore '#' comment
- echo $tstfile | tr -d ' ' | grep '^#' > /dev/null
- RET=$?
- if [ $RET -eq 1 ]; then
- # skip cp if srcdir is same as destdir
- # this occurs when build/test performed in source dir and
- # make cp fail
- SDIR=`$DIRNAME $tstfile`
- INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
- INODE_DDIR=`$LS -i -d $BLDLIBDIR | $AWK -F' ' '{print $1}'`
- if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
- $CP -fR $tstfile $BLDLIBDIR
- if [ $? -ne 0 ]; then
- echo "Error: FAILED to copy $tstfile ."
-
- # Comment out this to CREATE expected file
- exit $EXIT_FAILURE
- fi
- fi
- fi
- done
}
CLEAN_LIBFILES_AND_BLDLIBDIR()
Index: hdf5/HDF5Examples/JAVA/H5G/JavaGroupExample.sh.in
===================================================================
--- hdf5.orig/HDF5Examples/JAVA/H5G/JavaGroupExample.sh.in
+++ hdf5/HDF5Examples/JAVA/H5G/JavaGroupExample.sh.in
@@ -113,30 +113,6 @@ COPY_LIBFILES_TO_BLDLIBDIR()
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
- # ignore '#' comment
- echo $tstfile | tr -d ' ' | grep '^#' > /dev/null
- RET=$?
- if [ $RET -eq 1 ]; then
- # skip cp if srcdir is same as destdir
- # this occurs when build/test performed in source dir and
- # make cp fail
- SDIR=`$DIRNAME $tstfile`
- INODE_SDIR=`$LS -i -d $SDIR | $AWK -F' ' '{print $1}'`
- INODE_DDIR=`$LS -i -d $BLDLIBDIR | $AWK -F' ' '{print $1}'`
- if [ "$INODE_SDIR" != "$INODE_DDIR" ]; then
- $CP -fR $tstfile $BLDLIBDIR
- if [ $? -ne 0 ]; then
- echo "Error: FAILED to copy $tstfile ."
-
- # Comment out this to CREATE expected file
- exit $EXIT_FAILURE
- fi
- fi
- fi
- done
}
CLEAN_LIBFILES_AND_BLDLIBDIR()
|
