119 строки
4.8 KiB
Diff
119 строки
4.8 KiB
Diff
diff --git a/HDF5Examples/JAVA/H5D/JavaDatasetExample.sh.in b/HDF5Examples/JAVA/H5D/JavaDatasetExample.sh.in
|
|
index f29739a..fc9cddb 100644
|
|
--- a/HDF5Examples/JAVA/H5D/JavaDatasetExample.sh.in
|
|
+++ b/HDF5Examples/JAVA/H5D/JavaDatasetExample.sh.in
|
|
@@ -39,7 +39,7 @@ HDFLIB_HOME="$top_srcdir/java/lib"
|
|
BLDDIR="."
|
|
BLDLIBDIR="$BLDDIR/testlibs"
|
|
HDFTEST_HOME="$top_srcdir/java/examples/datasets"
|
|
-JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar
|
|
+JARFILE=@PACKAGE_TARNAME@.jar
|
|
TESTJARFILE=jar@PACKAGE_TARNAME@datasets.jar
|
|
test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR
|
|
|
|
diff --git a/HDF5Examples/JAVA/H5D/Makefile.am b/HDF5Examples/JAVA/H5D/Makefile.am
|
|
index 41a914b..195201a 100644
|
|
--- a/HDF5Examples/JAVA/H5D/Makefile.am
|
|
+++ b/HDF5Examples/JAVA/H5D/Makefile.am
|
|
@@ -26,7 +26,7 @@ classes:
|
|
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
|
|
|
|
pkgpath = examples/datasets
|
|
-hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
|
+hdfjarfile = $(PACKAGE_TARNAME).jar
|
|
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$$CLASSPATH
|
|
|
|
jarfile = jar$(PACKAGE_TARNAME)datasets.jar
|
|
diff --git a/HDF5Examples/JAVA/H5T/JavaDatatypeExample.sh.in b/HDF5Examples/JAVA/H5T/JavaDatatypeExample.sh.in
|
|
index e26d8c0..f6a9d87 100644
|
|
--- a/HDF5Examples/JAVA/H5T/JavaDatatypeExample.sh.in
|
|
+++ b/HDF5Examples/JAVA/H5T/JavaDatatypeExample.sh.in
|
|
@@ -36,7 +36,7 @@ HDFLIB_HOME="$top_srcdir/java/lib"
|
|
BLDDIR="."
|
|
BLDLIBDIR="$BLDDIR/testlibs"
|
|
HDFTEST_HOME="$top_srcdir/java/examples/datatypes"
|
|
-JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar
|
|
+JARFILE=@PACKAGE_TARNAME@.jar
|
|
TESTJARFILE=jar@PACKAGE_TARNAME@datatypes.jar
|
|
test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR
|
|
|
|
diff --git a/HDF5Examples/JAVA/H5T/Makefile.am b/HDF5Examples/JAVA/H5T/Makefile.am
|
|
index 90790f7..450edef 100644
|
|
--- a/HDF5Examples/JAVA/H5T/Makefile.am
|
|
+++ b/HDF5Examples/JAVA/H5T/Makefile.am
|
|
@@ -26,7 +26,7 @@ classes:
|
|
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
|
|
|
|
pkgpath = examples/datatypes
|
|
-hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
|
+hdfjarfile = $(PACKAGE_TARNAME).jar
|
|
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$$CLASSPATH
|
|
|
|
jarfile = jar$(PACKAGE_TARNAME)datatypes.jar
|
|
diff --git a/HDF5Examples/JAVA/H5G/JavaGroupExample.sh.in b/HDF5Examples/JAVA/H5G/JavaGroupExample.sh.in
|
|
index 3b0e9d1..416c69f 100644
|
|
--- a/HDF5Examples/JAVA/H5G/JavaGroupExample.sh.in
|
|
+++ b/HDF5Examples/JAVA/H5G/JavaGroupExample.sh.in
|
|
@@ -37,7 +37,7 @@ BLDDIR="."
|
|
BLDLIBDIR="$BLDDIR/testlibs"
|
|
BLDITERDIR="./groups"
|
|
HDFTEST_HOME="$top_srcdir/java/examples/groups"
|
|
-JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar
|
|
+JARFILE=@PACKAGE_TARNAME@.jar
|
|
TESTJARFILE=jar@PACKAGE_TARNAME@groups.jar
|
|
test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR
|
|
test -d $BLDITERDIR || mkdir -p $BLDITERDIR
|
|
diff --git a/HDF5Examples/JAVA/H5G/Makefile.am b/HDF5Examples/JAVA/H5G/Makefile.am
|
|
index bfde9ae..f48a5b9 100644
|
|
--- a/HDF5Examples/JAVA/H5G/Makefile.am
|
|
+++ b/HDF5Examples/JAVA/H5G/Makefile.am
|
|
@@ -26,7 +26,7 @@ classes:
|
|
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
|
|
|
|
pkgpath = examples/groups
|
|
-hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
|
+hdfjarfile = $(PACKAGE_TARNAME).jar
|
|
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$$CLASSPATH
|
|
|
|
jarfile = jar$(PACKAGE_TARNAME)groups.jar
|
|
diff --git a/java/src/Makefile.am b/java/src/Makefile.am
|
|
index 98630e6..fd8d057 100644
|
|
--- a/java/src/Makefile.am
|
|
+++ b/java/src/Makefile.am
|
|
@@ -32,8 +32,8 @@ JAVAROOT = .classes
|
|
classes:
|
|
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
|
|
|
|
-jarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
|
-hdf5_javadir = $(libdir)
|
|
+jarfile = $(PACKAGE_TARNAME).jar
|
|
+hdf5_javadir = $(prefix)/lib/java
|
|
|
|
pkgpath = hdf/hdf5lib
|
|
CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-2.0.6.jar:$$CLASSPATH
|
|
diff --git a/java/test/Makefile.am b/java/test/Makefile.am
|
|
index 08e79e3..b336c2f 100644
|
|
--- a/java/test/Makefile.am
|
|
+++ b/java/test/Makefile.am
|
|
@@ -26,7 +26,7 @@ classes:
|
|
test -d $(@D)/$(JAVAROOT) || $(MKDIR_P) $(@D)/$(JAVAROOT)
|
|
|
|
pkgpath = test
|
|
-hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
|
+hdfjarfile = $(PACKAGE_TARNAME).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
|
|
|
|
jarfile = jar$(PACKAGE_TARNAME)test.jar
|
|
diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in
|
|
index 39db296..83d6c7c 100644
|
|
--- a/java/test/junit.sh.in
|
|
+++ b/java/test/junit.sh.in
|
|
@@ -47,7 +47,7 @@ BLDLIBDIR="$BLDDIR/testlibs"
|
|
HDFTEST_HOME="$top_srcdir/java/test"
|
|
DUMP_TESTFILES="$top_srcdir/tools/test/h5dump/testfiles"
|
|
|
|
-JARFILE=jar@PACKAGE_TARNAME@-@PACKAGE_VERSION@.jar
|
|
+JARFILE=@PACKAGE_TARNAME@.jar
|
|
TESTJARFILE=jar@PACKAGE_TARNAME@test.jar
|
|
test -d $BLDLIBDIR || mkdir -p $BLDLIBDIR
|