|
 |
71f737 |
diff -up hdf5-1.10.7/java/examples/datasets/JavaDatasetExample.sh.in.build hdf5-1.10.7/java/examples/datasets/JavaDatasetExample.sh.in
|
|
|
71f737 |
--- hdf5-1.10.7/java/examples/datasets/JavaDatasetExample.sh.in.build 2020-08-27 21:38:23.000000000 -0600
|
|
|
71f737 |
+++ hdf5-1.10.7/java/examples/datasets/JavaDatasetExample.sh.in 2020-10-07 20:27:26.540707493 -0600
|
|
|
71f737 |
@@ -39,7 +39,7 @@ HDFLIB_HOME="$top_srcdir/java/lib"
|
|
|
71f737 |
BLDLIBDIR="$top_builddir/hdf5/lib"
|
|
|
71f737 |
BLDDIR="."
|
|
|
71f737 |
HDFTEST_HOME="$top_srcdir/java/examples/datasets"
|
|
|
71f737 |
-JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar
|
|
|
71f737 |
+JARFILE=@PACKAGE_TARNAME@.jar
|
|
|
71f737 |
TESTJARFILE=jar@PACKAGE_TARNAME@datasets.jar
|
|
|
71f737 |
test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR
|
|
|
71f737 |
|
|
|
71f737 |
diff -up hdf5-1.10.7/java/examples/datasets/Makefile.am.build hdf5-1.10.7/java/examples/datasets/Makefile.am
|
|
|
71f737 |
--- hdf5-1.10.7/java/examples/datasets/Makefile.am.build 2020-08-27 21:38:23.000000000 -0600
|
|
|
71f737 |
+++ hdf5-1.10.7/java/examples/datasets/Makefile.am 2020-10-07 20:27:26.540707493 -0600
|
|
|
71f737 |
@@ -27,7 +27,7 @@ classes:
|
|
|
71f737 |
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
|
|
|
71f737 |
|
|
|
71f737 |
pkgpath = examples/datasets
|
|
|
71f737 |
-hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
|
|
71f737 |
+hdfjarfile = $(PACKAGE_TARNAME).jar
|
|
|
71f737 |
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-1.7.25.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.25.jar:$$CLASSPATH
|
|
|
71f737 |
|
|
|
71f737 |
jarfile = jar$(PACKAGE_TARNAME)datasets.jar
|
|
|
71f737 |
diff -up hdf5-1.10.7/java/examples/datatypes/JavaDatatypeExample.sh.in.build hdf5-1.10.7/java/examples/datatypes/JavaDatatypeExample.sh.in
|
|
|
71f737 |
--- hdf5-1.10.7/java/examples/datatypes/JavaDatatypeExample.sh.in.build 2020-02-05 19:04:23.000000000 -0700
|
|
|
71f737 |
+++ hdf5-1.10.7/java/examples/datatypes/JavaDatatypeExample.sh.in 2020-10-07 20:27:26.541707501 -0600
|
|
|
71f737 |
@@ -36,7 +36,7 @@ HDFLIB_HOME="$top_srcdir/java/lib"
|
|
|
71f737 |
BLDLIBDIR="$top_builddir/hdf5/lib"
|
|
|
71f737 |
BLDDIR="."
|
|
|
71f737 |
HDFTEST_HOME="$top_srcdir/java/examples/datatypes"
|
|
|
71f737 |
-JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar
|
|
|
71f737 |
+JARFILE=@PACKAGE_TARNAME@.jar
|
|
|
71f737 |
TESTJARFILE=jar@PACKAGE_TARNAME@datatypes.jar
|
|
|
71f737 |
test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR
|
|
|
71f737 |
|
|
|
71f737 |
diff -up hdf5-1.10.7/java/examples/datatypes/Makefile.am.build hdf5-1.10.7/java/examples/datatypes/Makefile.am
|
|
|
71f737 |
--- hdf5-1.10.7/java/examples/datatypes/Makefile.am.build 2020-08-27 21:38:23.000000000 -0600
|
|
|
71f737 |
+++ hdf5-1.10.7/java/examples/datatypes/Makefile.am 2020-10-07 20:27:26.541707501 -0600
|
|
|
71f737 |
@@ -27,7 +27,7 @@ classes:
|
|
|
71f737 |
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
|
|
|
71f737 |
|
|
|
71f737 |
pkgpath = examples/datatypes
|
|
|
71f737 |
-hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
|
|
71f737 |
+hdfjarfile = $(PACKAGE_TARNAME).jar
|
|
|
71f737 |
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-1.7.25.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.25.jar:$$CLASSPATH
|
|
|
71f737 |
|
|
|
71f737 |
jarfile = jar$(PACKAGE_TARNAME)datatypes.jar
|
|
|
71f737 |
diff -up hdf5-1.10.7/java/examples/groups/JavaGroupExample.sh.in.build hdf5-1.10.7/java/examples/groups/JavaGroupExample.sh.in
|
|
|
71f737 |
--- hdf5-1.10.7/java/examples/groups/JavaGroupExample.sh.in.build 2020-02-05 19:04:23.000000000 -0700
|
|
|
71f737 |
+++ hdf5-1.10.7/java/examples/groups/JavaGroupExample.sh.in 2020-10-07 20:27:26.541707501 -0600
|
|
|
71f737 |
@@ -37,7 +37,7 @@ BLDLIBDIR="$top_builddir/hdf5/lib"
|
|
|
71f737 |
BLDITERDIR="./groups"
|
|
|
71f737 |
BLDDIR="."
|
|
|
71f737 |
HDFTEST_HOME="$top_srcdir/java/examples/groups"
|
|
|
71f737 |
-JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar
|
|
|
71f737 |
+JARFILE=@PACKAGE_TARNAME@.jar
|
|
|
71f737 |
TESTJARFILE=jar@PACKAGE_TARNAME@groups.jar
|
|
|
71f737 |
test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR
|
|
|
71f737 |
test -d $BLDITERDIR || mkdir -p $BLDITERDIR
|
|
|
71f737 |
diff -up hdf5-1.10.7/java/examples/groups/Makefile.am.build hdf5-1.10.7/java/examples/groups/Makefile.am
|
|
|
71f737 |
--- hdf5-1.10.7/java/examples/groups/Makefile.am.build 2020-08-27 21:38:23.000000000 -0600
|
|
|
71f737 |
+++ hdf5-1.10.7/java/examples/groups/Makefile.am 2020-10-07 20:27:26.542707509 -0600
|
|
|
71f737 |
@@ -27,7 +27,7 @@ classes:
|
|
|
71f737 |
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
|
|
|
71f737 |
|
|
|
71f737 |
pkgpath = examples/groups
|
|
|
71f737 |
-hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
|
|
71f737 |
+hdfjarfile = $(PACKAGE_TARNAME).jar
|
|
|
71f737 |
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-1.7.25.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.25.jar:$$CLASSPATH
|
|
|
71f737 |
|
|
|
71f737 |
jarfile = jar$(PACKAGE_TARNAME)groups.jar
|
|
|
71f737 |
diff -up hdf5-1.10.7/java/examples/intro/JavaIntroExample.sh.in.build hdf5-1.10.7/java/examples/intro/JavaIntroExample.sh.in
|
|
|
71f737 |
--- hdf5-1.10.7/java/examples/intro/JavaIntroExample.sh.in.build 2020-02-05 19:04:23.000000000 -0700
|
|
|
71f737 |
+++ hdf5-1.10.7/java/examples/intro/JavaIntroExample.sh.in 2020-10-07 20:27:26.542707509 -0600
|
|
|
71f737 |
@@ -36,7 +36,7 @@ HDFLIB_HOME="$top_srcdir/java/lib"
|
|
|
71f737 |
BLDLIBDIR="$top_builddir/hdf5/lib"
|
|
|
71f737 |
BLDDIR="."
|
|
|
71f737 |
HDFTEST_HOME="$top_srcdir/java/examples/intro"
|
|
|
71f737 |
-JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar
|
|
|
71f737 |
+JARFILE=@PACKAGE_TARNAME@.jar
|
|
|
71f737 |
TESTJARFILE=jar@PACKAGE_TARNAME@intro.jar
|
|
|
71f737 |
test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR
|
|
|
71f737 |
|
|
|
71f737 |
diff -up hdf5-1.10.7/java/examples/intro/Makefile.am.build hdf5-1.10.7/java/examples/intro/Makefile.am
|
|
|
71f737 |
--- hdf5-1.10.7/java/examples/intro/Makefile.am.build 2020-08-27 21:38:23.000000000 -0600
|
|
|
71f737 |
+++ hdf5-1.10.7/java/examples/intro/Makefile.am 2020-10-07 20:27:26.542707509 -0600
|
|
|
71f737 |
@@ -27,7 +27,7 @@ classes:
|
|
|
71f737 |
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
|
|
|
71f737 |
|
|
|
71f737 |
pkgpath = examples/intro
|
|
|
71f737 |
-hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
|
|
71f737 |
+hdfjarfile = $(PACKAGE_TARNAME).jar
|
|
|
71f737 |
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-1.7.25.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.25.jar:$$CLASSPATH
|
|
|
71f737 |
|
|
|
71f737 |
jarfile = jar$(PACKAGE_TARNAME)intro.jar
|
|
|
71f737 |
diff -up hdf5-1.10.7/java/src/Makefile.am.build hdf5-1.10.7/java/src/Makefile.am
|
|
|
71f737 |
--- hdf5-1.10.7/java/src/Makefile.am.build 2020-09-04 15:50:58.000000000 -0600
|
|
|
71f737 |
+++ hdf5-1.10.7/java/src/Makefile.am 2020-10-07 20:27:26.542707509 -0600
|
|
|
71f737 |
@@ -33,8 +33,8 @@ JAVAROOT = .classes
|
|
|
71f737 |
classes:
|
|
|
71f737 |
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
|
|
|
71f737 |
|
|
|
71f737 |
-jarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
|
|
71f737 |
-hdf5_javadir = $(libdir)
|
|
|
71f737 |
+jarfile = $(PACKAGE_TARNAME).jar
|
|
|
71f737 |
+hdf5_javadir = $(prefix)/lib/java
|
|
|
71f737 |
|
|
|
71f737 |
pkgpath = hdf/hdf5lib
|
|
|
71f737 |
CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-1.7.25.jar:$$CLASSPATH
|
|
|
71f737 |
diff -up hdf5-1.10.7/java/test/junit.sh.in.build hdf5-1.10.7/java/test/junit.sh.in
|
|
|
71f737 |
--- hdf5-1.10.7/java/test/junit.sh.in.build 2020-09-04 15:50:58.000000000 -0600
|
|
|
71f737 |
+++ hdf5-1.10.7/java/test/junit.sh.in 2020-10-07 22:14:59.047682005 -0600
|
|
|
71f737 |
@@ -46,7 +46,7 @@ HDFLIB_HOME="$top_srcdir/java/lib"
|
|
|
71f737 |
BLDDIR="."
|
|
|
71f737 |
BLDLIBDIR="$BLDDIR/testlibs"
|
|
|
71f737 |
HDFTEST_HOME="$top_srcdir/java/test"
|
|
|
71f737 |
-JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar
|
|
|
71f737 |
+JARFILE=@PACKAGE_TARNAME@.jar
|
|
|
71f737 |
TESTJARFILE=jar@PACKAGE_TARNAME@test.jar
|
|
|
71f737 |
test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR
|
|
|
71f737 |
|
|
|
71f737 |
diff -up hdf5-1.10.7/java/test/Makefile.am.build hdf5-1.10.7/java/test/Makefile.am
|
|
|
71f737 |
--- hdf5-1.10.7/java/test/Makefile.am.build 2020-09-04 15:50:58.000000000 -0600
|
|
|
71f737 |
+++ hdf5-1.10.7/java/test/Makefile.am 2020-10-07 20:27:26.543707517 -0600
|
|
|
71f737 |
@@ -27,7 +27,7 @@ classes:
|
|
|
71f737 |
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
|
|
|
71f737 |
|
|
|
71f737 |
pkgpath = test
|
|
|
71f737 |
-hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
|
|
71f737 |
+hdfjarfile = $(PACKAGE_TARNAME).jar
|
|
|
71f737 |
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-1.7.25.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.25.jar:$$CLASSPATH
|
|
|
71f737 |
|
|
|
71f737 |
jarfile = jar$(PACKAGE_TARNAME)test.jar
|