[packages/hdf-java] - new
qboosh
qboosh at pld-linux.org
Sun Apr 7 10:59:52 CEST 2013
commit 0da2b9db23f2504cc8d8e209a6b8e4535ff2c913
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Apr 7 10:59:49 2013 +0200
- new
hdf-java-configure.patch | 241 +++++++++++++++++++++++++++++++++++++++++++++++
hdf-java-hdfview.patch | 40 ++++++++
hdf-java-install.patch | 117 +++++++++++++++++++++++
hdf-java.spec | 161 +++++++++++++++++++++++++++++++
4 files changed, 559 insertions(+)
---
diff --git a/hdf-java.spec b/hdf-java.spec
new file mode 100644
index 0000000..4f94972
--- /dev/null
+++ b/hdf-java.spec
@@ -0,0 +1,161 @@
+# TODO: find fits.jar and netcdf.jar source, build separately
+Summary: HDF Java Products
+Summary(pl.UTF-8): Produkty HDF Java
+Name: hdf-java
+Version: 2.9
+Release: 1
+Group: Applications/File
+License: BSD-like, changed sources must be marked
+Source0: http://www.hdfgroup.org/ftp/HDF5/hdf-java/src/%{name}-%{version}-src.tar
+# Source0-md5: f8d53e7d51c9351f4b1c6d7573729558
+Patch0: %{name}-configure.patch
+Patch1: %{name}-install.patch
+Patch2: %{name}-hdfview.patch
+URL: http://www.hdfgroup.org/hdf-java-html/
+BuildRequires: autoconf
+BuildRequires: h4h5tools-devel
+BuildRequires: hdf-devel >= 4
+BuildRequires: hdf5-devel
+BuildRequires: szip-devel
+BuildRequires: zlib-devel
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+The HDF Java Products include HDFView, Java HDF Object Package, and
+Java HDF4 and HDF5 Interfaces.
+
+%description -l pl.UTF-8
+Produkty HDF Java obejmują HDFView, pakiet Java HDF Object oraz
+interfejsy Javy HDF4 i HDF5.
+
+%package -n java-hdf
+Summary: Java HDF Interface (JHI)
+Summary(pl.UTF-8): Interfejs HDF do Javy (JHI)
+Group: Libraries/Java
+URL: http://www.hdfgroup.org/hdf-java-html/JNI/jhi/index.html
+
+%description -n java-hdf
+The Java Native Interface to the standard HDF4 library.
+
+%description -n java-hdf -l pl.UTF-8
+Natywny interfejs Javy (JNI) do biblioteki standardowej HDF4.
+
+%package -n java-hdf5
+Summary: Java HDF5 Interface (JHI5)
+Summary(pl.UTF-8): Interfejs HDF5 do Javy (JHI5)
+Group: Libraries/Java
+URL: http://www.hdfgroup.org/hdf-java-html/JNI/jhi5/index.html
+
+%description -n java-hdf5
+The Java Native Interface to the standard HDF5 library.
+
+%description -n java-hdf5 -l pl.UTF-8
+Natywny interfejs Javy (JNI) do biblioteki standardowej HDF5.
+
+%package -n java-hdf-object
+Summary: Java HDF Object Package
+Summary(pl.UTF-8): Pakiet Javy HDF Object
+Group: Libraries/Java
+URL: http://www.hdfgroup.org/hdf-java-html/hdf-object/index.html
+Requires: java-hdf = %{version}-%{release}
+Requires: java-hdf5 = %{version}-%{release}
+
+%description -n java-hdf-object
+Java package that implements HDF4 and HDF5 data objects in an
+object-oriented form.
+
+%description -n java-hdf-object -l pl.UTF-8
+Pakiet Javy z implementacją obiektów danych HDF w postaci
+zorientowanej obiektowo.
+
+%package -n hdfview
+Summary: HDFView - visual tool for browsing and editing HDF4 and HDF5 files
+Summary(pl.UTF-8): HDFView - graficzne narzędzie do przeglądania i edycji plików HDF4 i HDF5
+Group: Applications/File
+URL: http://www.hdfgroup.org/hdf-java-html/hdfview/index.html
+Requires: java-hdf-object = %{version}-%{release}
+
+%description -n hdfview
+HDFView is a visual tool for browsing and editing HDF4 and HDF5 files.
+Using HDFView, you can:
+ - view a file hierarchy in a tree structure
+ - create new file, add or delete groups and datasets
+ - view and modify the content of a dataset
+ - add, delete and modify attributes
+ - replace I/O and GUI components such as table view, image view and
+ metadata view
+
+%description -n hdfview -l pl.UTF-8
+HDFView to graficzne narzędzie do przeglądania i edycji plików HDF4 i
+HDF5. Przy jego użyciu można:
+ - oglądać hierarchię pliku w strukturze drzewiastej
+ - utworzyć nowy plik, dodawać i usuwać grupy i zbiory danych
+ - oglądać i modyfikować zawartość zbioru danych
+ - dodawać, usuwać i modyfikować atrybuty
+ - podmieniać komponenty we/wy i GUI, takie jak widok tabeli, widok
+ obrazu czy widok metadanych.
+
+%prep
+%setup -q -n %{name}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+
+%build
+%{__autoconf}
+%configure \
+ --with-h4toh5 \
+ --with-hdf4=%{_includedir}/hdf,%{_libdir} \
+ --with-hdf5=%{_includedir},%{_libdir} \
+ --with-jdk=%{_jvmdir}/java/include,%{_jvmdir}/java/jre/lib \
+ --with-libjpeg \
+ --with-libsz \
+ --with-libz
+
+%{__make}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+ BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+ LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
+ JARDIR=$RPM_BUILD_ROOT%{_javadir}
+
+# see java-junit package
+%{__rm} $RPM_BUILD_ROOT%{_javadir}/junit.jar
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+
+%files -n java-hdf
+%defattr(644,root,root,755)
+%doc COPYING Readme.txt docs/*.{gif,html,js}
+%attr(755,root,root) %{_libdir}/libjhdf.so
+%{_javadir}/jhdf.jar
+
+%files -n java-hdf5
+%defattr(644,root,root,755)
+%doc COPYING Readme.txt docs/*.{gif,html,js}
+%attr(755,root,root) %{_libdir}/libjhdf5.so
+%{_javadir}/jhdf5.jar
+
+%files -n java-hdf-object
+%defattr(644,root,root,755)
+%{_javadir}/fitsobj.jar
+%{_javadir}/jhdfobj.jar
+%{_javadir}/jhdf4obj.jar
+%{_javadir}/jhdf5obj.jar
+%{_javadir}/nc2obj.jar
+# NOTE: external jars
+%{_javadir}/fits.jar
+%{_javadir}/netcdf.jar
+
+%files -n hdfview
+%defattr(644,root,root,755)
+%doc docs/hdfview/*
+%attr(755,root,root) %{_bindir}/hdfview.sh
+%{_javadir}/jhdfview.jar
diff --git a/hdf-java-configure.patch b/hdf-java-configure.patch
new file mode 100644
index 0000000..7c8decf
--- /dev/null
+++ b/hdf-java-configure.patch
@@ -0,0 +1,241 @@
+--- hdf-java/configure.in.orig 2012-11-13 00:12:03.000000000 +0100
++++ hdf-java/configure.in 2013-04-06 07:35:24.816310231 +0200
+@@ -112,21 +112,21 @@
+ LLEXT="a";
+ JSLEXT="so";
+ ;;
+-x86_64-pc-linux*) LD=$CC; LDOPT=-shared; SLEXT="so";
++x86_64-*-linux*) LD=$CC; LDOPT=-shared; SLEXT="so";
+ TARGETLIB="linux"
+ SLEXT="so";
+ LLEXT="a"; dnl the extension for the HDF and other libraries to link to
+ JSLEXT="so";
+ COPT="-shared -Dx86_64 -fPIC" ;
+ ;;
+-ia64-pc-linux*) LD=$CC; LDOPT=-shared; SLEXT="so";
++ia64-*-linux*) LD=$CC; LDOPT=-shared; SLEXT="so";
+ TARGETLIB="linux"
+ SLEXT="so";
+ LLEXT="a"; dnl the extension for the HDF and other libraries to link to
+ JSLEXT="so";
+ COPT="-shared -Dia64 -fPIC" ;
+ ;;
+-*-pc-linux*) LD=$CC; LDOPT=-shared; SLEXT="so";
++*-linux*) LD=$CC; LDOPT=-shared; SLEXT="so";
+ TARGETLIB="linux"
+ SLEXT="so";
+ LLEXT="a"; dnl the extension for the HDF and other libraries to link to
+@@ -167,8 +167,8 @@
+
+ case "$withval" in
+ yes)
+- ZLIB=""
+- HAVE_ZLIB="no"
++ ZLIB="-lz"
++ HAVE_ZLIB="yes"
+ ;;
+ no)
+ ZLIB=""
+@@ -202,7 +202,8 @@
+
+ case "$withval" in
+ yes)
+- HAVE_JPEG="no"
++ JPEGLIB="-ljpeg"
++ HAVE_JPEG="yes"
+ ;;
+ no)
+ JPEGLIB=""
+@@ -236,8 +237,8 @@
+
+ case "$withval" in
+ yes)
+- SZLIB=""
+- HAVE_SZIP="no"
++ SZLIB="-lsz"
++ HAVE_SZIP="yes"
+ ;;
+ no)
+ SZLIB=""
+@@ -277,8 +278,8 @@
+ case "$withval" in
+ yes)
+ dnl AC_MSG_ERROR(HDF4 library needed for compilation.)
+- HDF4LIB=""
+- HAVE_HDF4="no"
++ HDF4LIB="-ldf -lmfhdf"
++ HAVE_HDF4="yes"
+ ;;
+ no)
+ HDF4LIB=""
+@@ -292,7 +293,7 @@
+ fi
+ hdf4_lib="`echo $withval |cut -f2 -d, -s`"
+ if test -n "$hdf4_lib"; then
+- HDF4LIB=$hdf4_lib
++ HDF4LIB="-ldf -lmfhdf"
+ fi
+ HAVE_HDF4="yes"
+ else
+@@ -302,7 +303,7 @@
+ ;;
+ esac
+ if test -n "$HDF4LIB"; then
+- LIBS="$HDF4LIB/libdf.$LLEXT $HDF4LIB/libmfhdf.$LLEXT $LIBS"
++ LIBS="$HDF4LIB $LIBS"
+ HAVE_HDF4="yes"
+ fi
+ AC_MSG_RESULT([$HAVE_HDF4])
+@@ -353,8 +354,8 @@
+
+ case "$withval" in
+ yes)
+- HDF5LIB=""
+- HAVE_HDF5="no"
++ HDF5LIB="-lhdf5"
++ HAVE_HDF5="yes"
+ ;;
+ no)
+ HDF5LIB=""
+@@ -362,15 +363,13 @@
+ ;;
+ *)
+ if test -n "$withval" ; then
+- hdf5_lib="`echo $withval |cut -f2 -d, -s`"
+- HDF5LIB=$hdf5_lib"/libhdf.$LLEXT"
+ hdf5_inc="`echo $withval |cut -f1 -d,`"
+ if test -n "$hdf5_inc"; then
+ HDF5INC="$hdf5_inc"
+ fi
+ hdf5_lib="`echo $withval |cut -f2 -d, -s`"
+ if test -n "$hdf5_lib"; then
+- HDF5LIB=$hdf5_lib
++ HDF5LIB="-lhdf5"
+ fi
+ HAVE_HDF5="yes"
+ else
+@@ -380,7 +379,7 @@
+ ;;
+ esac
+ if test -n "$HDF5LIB"; then
+- LIBS="$HDF5LIB/libhdf5.$LLEXT $LIBS"
++ LIBS="$HDF5LIB $LIBS"
+ HAVE_HDF5="yes"
+ fi
+ AC_MSG_RESULT([$HAVE_HDF5])
+@@ -395,8 +394,14 @@
+ dnl
+ if test -n "$HDF5LIB"; then
+ AC_MSG_CHECKING([dependencies for HDF5 library])
++ if test "${HDF5LIB#/}" = "$HDF5LIB" ; then
++ eval eval ldir=$libdir
++ DFL=`grep 'filters (external)' $ldir"/libhdf5.settings" | grep deflate`
++ SZP=`grep 'filters (external)' $ldir"/libhdf5.settings" | grep szip`
++ else
+ DFL=`grep 'filters (external)' $HDF5LIB"/libhdf5.settings" | grep deflate`
+ SZP=`grep 'filters (external)' $HDF5LIB"/libhdf5.settings" | grep szip`
++ fi
+ if test -n "$DFL";
+ then
+ if test "$HAVE_ZLIB" != "yes"; then
+@@ -428,7 +433,8 @@
+ AC_ARG_WITH(h4toh5,[ --with-h4toh5=INC,LIB Path to the HDF 4 to 5 library (optional feature, if selected then path required is not in default path)],,)
+ case "$withval" in
+ yes)
+- USEH45="no"
++ USEH45="yes"
++ H45LIB="-lh4toh5"
+ ;;
+ no)
+ H45LIB=""
+@@ -451,14 +457,11 @@
+ hdf45_lib="`echo $withval | cut -f2 -d, -s`"
+
+ if test -n "$hdf45_lib"; then
+- HDF45LIB="$hdf45_lib"
+ saved_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -L$hdf45_lib"
++ fi
+ AC_CHECK_LIB(h4toh5, H4toh5open,, LDFLAGS="$saved_LDFLAGS"
+ AC_MSG_ERROR(cannot find HDF45 library.))
+- else
+- AC_MSG_ERROR(cannot find HDF45 library path.)
+- fi
+ USEH45="yes"
+ fi
+ ;;
+@@ -466,12 +469,11 @@
+
+ AC_MSG_RESULT([$USEH45])
+ if test -n "$H45LIB"; then
+- AC_MSG_RESULT([h4toh5 library found at: $HDF45LIB])
++ AC_MSG_RESULT([h4toh5 library found at: $H45LIB])
+ fi
+-H45LIB=$HDF45LIB
+ H45INC=$HDF45INC
+
+-ac_cv_lib_HDF45=$HDF45LIB
++ac_cv_lib_HDF45=$H45LIB
+ ac_cv_lib_HDF45INC=$HDF45INC
+
+ dnl find java stuff: use -with-jdk
+@@ -637,10 +639,6 @@
+ if test \( ! -d "$JH45INST" \); then
+ JH45INST_FOUND=0
+ fi
+- if test \( ! -w "$JH45INST" \); then
+- AC_MSG_ERROR( [ $JH45INST : not writable ])
+- JH45INST_FOUND=0
+- fi
+ fi
+ until test $JH45INST_FOUND -eq 1; do
+ echo "Please type the directory in which to install the JH45"
+@@ -711,7 +709,7 @@
+ JSLEXT="so";
+ JAVAINC2=$JAVAINC/irix; JAVATARG=irix-$OS;
+ ;;
+-x86_64-pc-linux*) LD=$CC; LDOPT=-shared;
++x86_64-*-linux*) LD=$CC; LDOPT=-shared;
+ SLEXT="so";
+ LLEXT="a"; # the extension for the HDF and other libraries to link to
+ JSLEXT="so";
+@@ -719,7 +717,7 @@
+ JAVAINC2=$JAVAINC/linux;
+ JAVATARG=linux;
+ ;;
+-ia64-pc-linux*) LD=$CC; LDOPT=-shared;
++ia64-*-linux*) LD=$CC; LDOPT=-shared;
+ SLEXT="so";
+ LLEXT="a"; # the extension for the HDF and other libraries to link to
+ JSLEXT="so";
+@@ -727,7 +725,7 @@
+ JAVAINC2=$JAVAINC/linux;
+ JAVATARG=linux;
+ ;;
+-*-pc-linux*) LD=$CC; LDOPT=-shared;
++*-linux*) LD=$CC; LDOPT=-shared;
+ SLEXT="so";
+ LLEXT="a"; # the extension for the HDF and other libraries to link to
+ JSLEXT="so";
+--- hdf-java/native/hdflib/Makefile.in.orig 2012-11-13 00:11:48.000000000 +0100
++++ hdf-java/native/hdflib/Makefile.in 2013-04-06 07:51:52.942956301 +0200
+@@ -41,7 +41,7 @@
+ CFLAGS = $(DEFS) -I. -I$(JAVAINC1) -I$(JAVAINC2) -I$(HDFINC)
+
+ # Be sure to add -lbsd if compiling in a SYSV environment
+-LIBS = $(HDFLIB)/libmfhdf.$(LLEXT) $(HDFLIB)/libdf.$(LLEXT) $(SZLIB) $(ZLIB) $(JPEGLIB) -lm
++LIBS = $(HDFLIB) $(SZLIB) $(ZLIB) $(JPEGLIB) -lm
+
+ # Macro def: object filename used
+ OBJECTS = hdfstructsutil.o \
+--- hdf-java/native/hdf5lib/Makefile.in.orig 2012-11-13 00:11:49.000000000 +0100
++++ hdf-java/native/hdf5lib/Makefile.in 2013-04-06 07:53:18.476287850 +0200
+@@ -35,7 +35,7 @@
+
+ CFLAGS = -D_FILE_OFFSET_BITS=64 $(DEFS) -I. -I$(HDF5INC) -I$(JAVAINC1) -I$(JAVAINC2)
+
+-LIBS = $(HDF5LIB)/libhdf5.$(LLEXT) $(ZLIB) $(SZLIB) -lm
++LIBS = $(HDF5LIB) $(ZLIB) $(SZLIB) -lm
+
+ # Macro def: object filename used
+ OBJECTS = exceptionImp.o h5Constants.o h5Imp.o h5aImp.o h5dImp.o h5eImp.o h5fImp.o h5gImp.o h5iImp.o h5lImp.o h5oImp.o h5pImp.o h5rImp.o h5sImp.o h5tImp.o nativeData.o h5util.o h5zImp.o
diff --git a/hdf-java-hdfview.patch b/hdf-java-hdfview.patch
new file mode 100644
index 0000000..1ec0178
--- /dev/null
+++ b/hdf-java-hdfview.patch
@@ -0,0 +1,40 @@
+--- hdf-java/bin/hdfview.sh.in.orig 2012-11-13 00:11:59.000000000 +0100
++++ hdf-java/bin/hdfview.sh.in 2013-04-07 10:30:34.507623660 +0200
+@@ -3,7 +3,7 @@
+ # Set up default variable values if not supplied by the user.
+
+ # where the HDFView is installed, e.g. /home/user1/hdfview
+-HDFJAVA=@JH45INST@
++HDFJAVA="/usr/share/java"
+ export HDFJAVA
+
+ # where Java is installed (requires jdk1.4.x or above), e.g. /usr/jdk1.4.2/bin
+@@ -14,10 +14,10 @@
+ # DO NOT MODIFY BELOW THIS LINE
+ ###############################################################################
+
+-CPATH=$HDFJAVA"/lib/jhdf.jar:"$HDFJAVA"/lib/jhdf5.jar:"$HDFJAVA"/lib/jhdfobj.jar"
+-CPATH=$CPATH":"$HDFJAVA"/lib/netcdf.jar:"$HDFJAVA"/lib/fits.jar:"$HDFJAVA"/lib/h5srb.jar"
+-CPATH=$CPATH":"$HDFJAVA"/lib/jhdf4obj.jar:"$HDFJAVA"/lib/jhdf5obj.jar:"$HDFJAVA"/lib/jhdfview.jar"
+-CPATH=$CPATH":"$HDFJAVA"/lib/jgraph.jar:"$HDFJAVA"/lib/ext/*"
++CPATH="$HDFJAVA/jhdf.jar:$HDFJAVA/jhdf5.jar:$HDFJAVA/jhdfobj.jar"
++CPATH="$CPATH:$HDFJAVA/netcdf.jar:$HDFJAVA/fits.jar"
++CPATH="$CPATH:$HDFJAVA/jhdf4obj.jar:$HDFJAVA/jhdf5obj.jar:$HDFJAVA/jhdfview.jar"
++CPATH="$CPATH:$HDFJAVA/fitsobj.jar:$HDFJAVA/nc2obj.jar"
+
+ TEST=/usr/bin/test
+ if [ ! -x /usr/bin/test ]
+@@ -60,7 +60,6 @@
+ LD_LIBRARY_PATH=$HDFJAVA/lib/solaris:$HDFJAVA/lib/ext:$LD_LIBRARY_PATH
+ ;;
+ Linux)
+- LD_LIBRARY_PATH=$HDFJAVA"/lib/linux:"$HDFJAVA"/lib/ext:"$LD_LIBRARY_PATH
+ ;;
+ IRIX*)
+ OSREV=`/bin/uname -r`
+@@ -89,4 +88,4 @@
+
+ export LD_LIBRARY_PATH
+
+-$JAVAHOME/java @JAVAX@ -Djava.library.path=$LD_LIBRARY_PATH ncsa.hdf.view.HDFView -root $HDFJAVA $*
++$JAVAHOME/java @JAVAX@ ncsa.hdf.view.HDFView -root $HDFJAVA $*
diff --git a/hdf-java-install.patch b/hdf-java-install.patch
new file mode 100644
index 0000000..99ca176
--- /dev/null
+++ b/hdf-java-install.patch
@@ -0,0 +1,117 @@
+--- hdf-java/Makefile.in.orig 2012-11-13 00:12:03.000000000 +0100
++++ hdf-java/Makefile.in 2013-04-06 08:14:52.316260883 +0200
+@@ -32,6 +32,7 @@
+ #make this relative to the source root...
+ LIBDIR=$(JH45INSTALLDIR)/lib
+ BINDIR=$(JH45INSTALLDIR)/bin
++JARDIR=$(JH45INSTALLDIR)/share/java
+ DOCDIR= $(JH45INSTALLDIR)/docs
+ UGDIR= $(JH45INSTALLDIR)/UsersGuide
+
+@@ -284,15 +285,12 @@
+
+ install-lib: natives
+ -mkdir -p $(LIBDIR);
+- -mkdir -p $(LIBDIR)/@JAVATARG@
+ @if test x'$(H5INC)' != x'' ; then \
+- cp $(CLASS_DIR)/@JAVATARG@/libjhdf5.$(JSLEXT) $(LIBDIR)/@JAVATARG@ ; \
+- cp $(H5INC)/../lib/*.settings $(LIBDIR)/@JAVATARG@ ; fi
++ cp $(CLASS_DIR)/@JAVATARG@/libjhdf5.$(JSLEXT) $(LIBDIR) ; fi
+ @if test x'$(H4INC)' != x'' ; then \
+- cp $(CLASS_DIR)/@JAVATARG@/libjhdf.$(JSLEXT) $(LIBDIR)/@JAVATARG@ ; \
+- cp $(H4INC)/../lib/*.settings $(LIBDIR)/@JAVATARG@ ; fi
++ cp $(CLASS_DIR)/@JAVATARG@/libjhdf.$(JSLEXT) $(LIBDIR) ; fi
+ @if test x'$(H45INC)' != x'' ; then \
+- cp $(CLASS_DIR)/@JAVATARG@/libjh4toh5.$(JSLEXT) $(LIBDIR)/@JAVATARG@ ; fi
++ cp $(CLASS_DIR)/@JAVATARG@/libjh4toh5.$(JSLEXT) $(LIBDIR) ; fi
+ @echo "Install Natives complete"
+
+ install-hdflib:
+@@ -300,8 +298,7 @@
+
+ do-install-hdflib: hdflib
+ -mkdir -p $(LIBDIR);
+- -mkdir -p $(LIBDIR)/@JAVATARG@
+- cp $(CLASS_DIR)/@JAVATARG@/libjhdf.$(JSLEXT) $(LIBDIR)/@JAVATARG@
++ cp $(CLASS_DIR)/@JAVATARG@/libjhdf.$(JSLEXT) $(LIBDIR)
+ @echo "Install Native HDF complete"
+
+ install-hdf5lib: hdf5lib
+@@ -309,8 +306,7 @@
+
+ do-install-hdf5lib: hdf5lib
+ -mkdir -p $(LIBDIR);
+- -mkdir -p $(LIBDIR)/@JAVATARG@
+- cp $(CLASS_DIR)/@JAVATARG@/libjhdf5.$(JSLEXT) $(LIBDIR)/@JAVATARG@
++ cp $(CLASS_DIR)/@JAVATARG@/libjhdf5.$(JSLEXT)
+ echo "Install Native HDF5 complete"
+
+ uninstall-lib:
+@@ -323,50 +319,44 @@
+ @if test x'$(H4INC)' != x'' ; then $(MAKE) do-install-jhdf ; fi
+
+ do-install-jhdf: jhdf-packages
+- -mkdir -p $(LIBDIR);
+- $(JAR) cf $(JH45INSTALLDIR)/lib/jhdf.jar -C $(CLASS_DIR) $(JHICLASSES)
++ -mkdir -p $(JARDIR);
++ $(JAR) cf $(JARDIR)/jhdf.jar -C $(CLASS_DIR) $(JHICLASSES)
+ @echo "Install JHI complete"
+
+ install-jhdf5:
+ @if test x'$(H5INC)' != x'' ; then $(MAKE) do-install-jhdf5 ; fi
+
+ do-install-jhdf5: jhdf5-packages
+- -mkdir -p $(LIBDIR);
+- $(JAR) cf $(JH45INSTALLDIR)/lib/jhdf5.jar -C $(CLASS_DIR) $(JHI5CLASSES)
++ -mkdir -p $(JARDIR);
++ $(JAR) cf $(JARDIR)/jhdf5.jar -C $(CLASS_DIR) $(JHI5CLASSES)
+ @echo "Install JHI5 complete"
+
+ install-jhdfobj: ncsa.hdf.object
+- -mkdir -p $(LIBDIR);
+- $(JAR) cf $(JH45INSTALLDIR)/lib/jhdfobj.jar -C $(CLASS_DIR) $(HDFOBJCLASSES)
++ -mkdir -p $(JARDIR);
++ $(JAR) cf $(JARDIR)/jhdfobj.jar -C $(CLASS_DIR) $(HDFOBJCLASSES)
+ @if test x'$(H4INC)' != x'' ; then $(MAKE) do-install-jhdf4obj ; fi
+ @if test x'$(H5INC)' != x'' ; then $(MAKE) do-install-jhdf5obj ; fi
+ @echo "Install HDFOBJ complete"
+
+ do-install-jhdf4obj: ncsa.hdf.object.h4
+- -mkdir -p $(LIBDIR);
+- $(JAR) cf $(JH45INSTALLDIR)/lib/jhdf4obj.jar -C $(CLASS_DIR) $(H4OBJCLASSES)
++ -mkdir -p $(JARDIR);
++ $(JAR) cf $(JARDIR)/jhdf4obj.jar -C $(CLASS_DIR) $(H4OBJCLASSES)
+ @echo "Install JHDF4 complete"
+
+ do-install-jhdf5obj: ncsa.hdf.object.h5
+- -mkdir -p $(LIBDIR);
+- $(JAR) cf $(JH45INSTALLDIR)/lib/jhdf5obj.jar -C $(CLASS_DIR) $(H5OBJCLASSES)
++ -mkdir -p $(JARDIR);
++ $(JAR) cf $(JARDIR)/jhdf5obj.jar -C $(CLASS_DIR) $(H5OBJCLASSES)
+ @echo "Install JHDF4 complete"
+
+ install-jhdfview: ncsa.hdf.view
+- -mkdir -p $(LIBDIR);
+- $(JAR) cf $(JH45INSTALLDIR)/lib/jhdfview.jar -C $(CLASS_DIR) $(HDFVIEWCLASSES) $(HDFVIEWICONS)
+- -mkdir -p $(LIBDIR)/ext
+- $(JAR) cf $(JH45INSTALLDIR)/lib/ext/nc2obj.jar -C $(CLASS_DIR) $(NC2OBJCLASSES)
+- $(JAR) cf $(JH45INSTALLDIR)/lib/ext/fitsobj.jar -C $(CLASS_DIR) $(FITSOBJCLASSES)
+- $(RM) -rf $(UGDIR);
+- -mkdir -p $(UGDIR);
+- cp -R docs/hdfview/UsersGuide/* $(UGDIR);
+- $(RM) -rf $(UGDIR)/.svn
+- $(RM) -rf $(UGDIR)/images/.svn
++ -mkdir -p $(JARDIR);
++ $(JAR) cf $(JARDIR)/jhdfview.jar -C $(CLASS_DIR) $(HDFVIEWCLASSES) $(HDFVIEWICONS)
++ $(JAR) cf $(JARDIR)//nc2obj.jar -C $(CLASS_DIR) $(NC2OBJCLASSES)
++ $(JAR) cf $(JARDIR)//fitsobj.jar -C $(CLASS_DIR) $(FITSOBJCLASSES)
+ -mkdir -p $(BINDIR);
+- cp lib/netcdf.jar $(LIBDIR)
+- cp lib/fits.jar $(LIBDIR)
+- cp lib/junit.jar $(LIBDIR)
++ cp lib/netcdf.jar $(JARDIR)
++ cp lib/fits.jar $(JARDIR)
++ cp lib/junit.jar $(JARDIR)
+ cp bin/hdfview.sh $(BINDIR)
+ chmod a+x $(BINDIR)/hdfview.sh
+ @echo "Install HDFVIEW complete"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/hdf-java.git/commitdiff/0da2b9db23f2504cc8d8e209a6b8e4535ff2c913
More information about the pld-cvs-commit
mailing list