1. Add then remove some debugging info

for testing jna
2. add some personal scripts (*jna)
   to support creating jna dlls.

cf

@@ -21,11 +21,9 @@ CFLAGS=""
 #CFLAGS="-Wall -Wno-unused-variable -Wno-unused-parameter ${CFLAGS}"
 #CFLAGS="-Wconversion"
 
-FORCE="-i"
-
-#INSTALL=1
-#PREFIX=/usr/local
 PREFIX=/usr/local
+stddir="/usr/local"
+
 
 if test "x$cmds" = x ; then
 cmds=""
@@ -49,49 +47,11 @@ else
 CC=gcc
 fi
 
-# Default cases
-if test -f "/share/ed/local/${HOST}" ; then
-stddir="/share/ed/local/${HOST}"
-else
-stddir="/usr/local"
-fi
-#stddir="/machine/local_szlib"
-stddir="/usr/local"
-
-if test "x$INSTALL" = "x1" ; then
-  if test "x$PREFIX" = x ; then
-   PREFIX="$stddir/${HOST}"
-  fi
-else
-PREFIX="/tmp/local/${HOST}"
-fi
-
 MALLOC_CHECK=""
 
 CPPFLAGS=""
 LDFLAGS=""
 
-if test "x$PGI" = x1 ; then
-CFLAGS="-Msignextend -V -m64 $CFLAGS"
-CPPFLAGS="$CPPFLAGS -DNDEBUG -DpgiFortran"
-LD_LIBRARY_PATH="/usr/local/pgi/linux86-64/11.1/lib:$LD_LIBRARY_PATH"
-PREFIX=/tmp/install/pgi
-fi
-
-if test x$M32 = x1 ; then
-  PREFIX="/tmp/install32/${HOST}"
-  stddir="/share/ed/local/${HOST}_32"
-  CFLAGS="-m32 $CFLAGS"
-elif test x$M64 = x1 ; then
-  PREFIX="/tmp/install64/${HOST}"
-  stddir="/share/ed/local/${HOST}_64"
-  CFLAGS="-m64 $CFLAGS"
-fi
-
-if test "x$HOST" = xyakov ; then
-    stddir="/opt/local"
-fi
-
 CFLAGS="-g -O0 $CFLAGS"
 
 case "$HOST" in
@@ -172,7 +132,7 @@ FLAGS="$FLAGS --enable-dap-auth-tests"
 #FLAGS="$FLAGS --enable-valgrind-tests"
 
 #FLAGS="$FLAGS --disable-shared"
-#FLAGS="$FLAGS --enable-shared"
+FLAGS="$FLAGS --enable-shared"
 
 if test "x$HDF5" = "x" ; then
 FLAGS="$FLAGS --disable-netcdf-4"

jna

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+PREFIX=/home/dmh/opt/jna
+
+CFLAGS=""
+CPPFLAGS="-I/usr/local/include"
+
+LDFLAGS="-L${PREFIX}/lib -lhdf5_hl -lhdf5 -lz $LDFLAGS"
+LD_LIBRARY_PATH="${PREFIX}/lib:$LD_LIBRARY_PATH"
+
+MAKE=make
+
+FLAGS="--prefix ${PREFIX}"
+FLAGS="$FLAGS --disable-cxx"
+FLAGS="$FLAGS --disable-examples"
+FLAGS="$FLAGS --disable-utilities"
+
+export PATH
+export CC
+export CPPFLAGS
+export CFLAGS
+export LDFLAGS
+export LD_LIBRARY_PATH
+
+DISTCHECK_CONFIGURE_FLAGS="$FLAGS"
+export DISTCHECK_CONFIGURE_FLAGS
+
+if test -f Makefile ; then ${MAKE} distclean >/dev/null 2>&1 ; fi
+sh ./configure ${FLAGS}

libdispatch/dvarget.c

@@ -71,6 +71,7 @@ NC_get_vara(int ncid, int varid,
 #ifdef USE_NETCDF4
    if(memtype >= NC_FIRSTUSERTYPEID) memtype = NC_NAT;
 #endif
+
    if(edges == NULL) {
       size_t shape[NC_MAX_VAR_DIMS];
       int ndims;
@@ -78,9 +79,10 @@ NC_get_vara(int ncid, int varid,
       if(stat != NC_NOERR) return stat;
       stat = NC_getshape(ncid,varid,ndims,shape);
       if(stat != NC_NOERR) return stat;
-      return ncp->dispatch->get_vara(ncid,varid,start,shape,value,memtype);
+      stat = ncp->dispatch->get_vara(ncid,varid,start,shape,value,memtype);
    } else
-      return ncp->dispatch->get_vara(ncid,varid,start,edges,value,memtype);
+      stat =  ncp->dispatch->get_vara(ncid,varid,start,edges,value,memtype);
+   return stat;
 }
 
 /** \ingroup variables 

ljna

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+PREFIX=/home/dmh/opt/jna
+#LIBDIR="${PREFIX}/lib"
+LIBDIR="/usr/local/lib"
+
+CFLAGS=""
+CPPFLAGS="-I/usr/local/include"
+
+LDFLAGS="-L${LIBDIR} -lhdf5_hl -lhdf5 -lz $LDFLAGS"
+LD_LIBRARY_PATH="${LIBDIR}:$LD_LIBRARY_PATH"
+
+MAKE=make
+
+FLAGS="--prefix ${PREFIX}"
+FLAGS="$FLAGS --disable-examples"
+FLAGS="$FLAGS --disable-utilities"
+FLAGS="$FLAGS --enable-shared"
+
+export PATH
+export CC
+export CPPFLAGS
+export CFLAGS
+export LDFLAGS
+export LD_LIBRARY_PATH
+
+DISTCHECK_CONFIGURE_FLAGS="$FLAGS"
+export DISTCHECK_CONFIGURE_FLAGS
+
+if test -f Makefile ; then ${MAKE} distclean >/dev/null 2>&1 ; fi
+sh ./configure ${FLAGS}

ncgen/Make0

@@ -1,5 +1,5 @@
 # Test c output
-T=test
+T=test_opaque
 K=1
 #VG=valgrind --leak-check=full
 

wjna

@@ -1,53 +1,28 @@
 #!/bin/bash
 
-JNADIR="c:/Users/dmh/opt/jna"
+JNADIR="c:/opt/jna"
 
 PREFIX="${JNADIR}"
 
-# CMAKE Prefix Path
-CPP="${JNADIR}"
-
-CMP="${CPP}/deps/shared/share/cmake"
-
-INCLUDES="${JNADIR}/deps/shared/include"
+CPP="${JNADIR}/deps/shared"
 
 FLAGS=""
 
-# Why does this not work?
-#FLAGS="-DHDF5_LIBRARY=${CPP} ${FLAGS}"
-#FLAGS="-DHDF5_INCLUDE_DIR=${INCLUDES} ${FLAGS}"
-
-# But this does
-#CPP="${CPP};${CMP}"
-
 FLAGS="-DCMAKE_INSTALL_PREFIX=${PREFIX} ${FLAGS}"
-#FLAGS="-DCMAKE_PREFIX_PATH=${CPP} ${FLAGS}"
+FLAGS="-DCMAKE_PREFIX_PATH=${CPP} ${FLAGS}"
 
-FLAGS="-DHDF5_LIB=${CPP}/hdf5.dll ${FLAGS}"
-FLAGS="-DHDF5_HL_LIB=${CPP}/hdf5_hl.dll ${FLAGS}"
-FLAGS="-DHDF5_INCLUDE_DIR=${INCLUDES} ${FLAGS}"
+FLAGS="-DHDF5_DIR=${CPP}/cmake/hdf5 ${FLAGS}"
 
-FLAGS="-DZLIB_LIBRARY=${CPP}/zlib.dll ${FLAGS}"
-FLAGS="-DZLIB_INCLUDE_DIR=${INCLUDES} ${FLAGS}"
-
-FLAGS="-DCURL_LIBRARY=${CPP}/libcurl.dll ${FLAGS}"
-FLAGS="-DCURL_INCLUDE_DIR=${INCLUDES} ${FLAGS}"
-
-FLAGS="-ENABLE_CONVERSION_WARNINGS=OFF ${FLAGS}"
+FLAGS="-DENABLE_CONVERSION_WARNINGS=OFF ${FLAGS}"
 FLAGS="-DBUILD_UTILITIES=OFF ${FLAGS}"
 FLAGS="-DENABLE_EXAMPLES=OFF ${FLAGS}"
-FLAGS="-BUILD_V2=OFF ${FLAGS}"
 
 rm -fr ./build
 mkdir build
 pushd build
 cmake -G"Visual Studio 10" ${FLAGS} ..
 cmake --build . --config Release
+cmake --build . --target INSTALL
 popd
 
 exit
-
-# heap
-#FLAGS="-DHDF5_LIBRARY=${CPP} ${FLAGS}"
-#FLAGS="-DHDF5_INCLUDE_DIRS=/usr/local/include ${FLAGS}"
-#CPP="${JNADIR}/deps/shared/share/cmake"