o Moved a couple more scripts around to use a uniform

naming convention. o Modified ncdump shell, test scripts so that the extra digit in an exponent on windows wouldn't be a problem. o Modified configure.ac to check for the zlib dll provided by the zlib group; they recommend using the official dll for windows builds.
2024-11-27 07:30:33 +08:00 · 2012-05-25 21:22:09 +00:00 · 2012-05-25 21:22:09 +00:00 · a5c4bf581f
commit a5c4bf581f
parent 47425e1145
11 changed files with 29 additions and 28 deletions
--- a/configure.ac
+++ b/configure.ac
@ -632,7 +632,7 @@ AC_CHECK_SIZEOF(off_t)
 AC_CHECK_SIZEOF(size_t)

 if test "x$enable_netcdf_4" = xyes || test "x$enable_dap" = xyes; then
-   AC_SEARCH_LIBS([deflate], [zlib zlib1 z], [], [
+   AC_SEARCH_LIBS([deflate], [zlib zlib1 z zlibwapi], [], [
     AC_MSG_ERROR([Can't find or link to the z library. Turn off netCDF-4 and \
     opendap with --disable-netcdf-4 --disable-dap, or see config.log for errors.])])
 fi
--- a/my_shared_32_min_conf.sh
+++ b/my_shared_32_min_conf.sh
@ -1,5 +1,5 @@
 #!/bin/bash
 set -x
-./configure --disable-dap --disable-doxygen --enable-shared --disable-static --enable-dll --disable-netcdf-4 CFLAGS="-ggdb -O0" LDFLAGS=""
+./configure --disable-dap --disable-doxygen --enable-shared --disable-static --enable-dll --disable-netcdf-4 CFLAGS="-ggdb -O0" LDFLAGS="-ggdb -O0"

 #./configure --disable-dap --disable-doxygen --enable-shared --disable-static --enable-dll --disable-netcdf-4 --disable-utilities --host=x86_64-w64-mingw32 CFLAGS="-ggdb -O0" LDFLAGS="-ggdb -O0"
--- a/my_shared_32_netcdf4_conf.sh
+++ b/my_shared_32_netcdf4_conf.sh
@ -1,6 +1,4 @@
 #!/bin/bash
 set -x
-./configure --disable-static --disable-doxygen --enable-shared --disable-dap --enable-netcdf-4 --enable-utilities --enable-dll CFLAGS="-ggdb -O0 -I/c/Users/wfisher/Desktop/hdf5-1.8.9/src" LDFLAGS="-ggdb -O0 -L/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win32_dll/bin -L/c/Users/wfisher/Desktop/szip-2.1/build_win/bin"
-
-
+./configure --disable-static --disable-doxygen --enable-shared --disable-dap --enable-netcdf-4 --enable-utilities --enable-dll CFLAGS="-ggdb -O0 -I/c/Users/wfisher/Desktop/hdf5-1.8.9/src" LDFLAGS="-ggdb -O0 -L/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win32_dll/bin -L/c/Users/wfisher/Desktop/szip-2.1/build_win32_dll/bin"

--- a/my_shared_64_min_conf.sh
+++ b/my_shared_64_min_conf.sh
@ -1,5 +1,5 @@
 #!/bin/bash
 set -x
-./configure --disable-dap --disable-doxygen --enable-shared --disable-static --enable-dll --disable-netcdf-4 CFLAGS="-ggdb -O0" LDFLAGS=""
+./configure --disable-dap --disable-doxygen --enable-shared --disable-static --enable-dll --disable-netcdf-4 --host=x86_64-w64-mingw32 CFLAGS="-ggdb -O0" LDFLAGS="" 

 #./configure --disable-dap --disable-doxygen --enable-shared --disable-static --enable-dll --disable-netcdf-4 --disable-utilities --host=x86_64-w64-mingw32 CFLAGS="-ggdb -O0" LDFLAGS="-ggdb -O0"
--- a/my_shared_64_nc4_conf.sh
+++ b/my_shared_64_nc4_conf.sh
@ -0,0 +1,8 @@
+#!/bin/bash
+set -x
+
+./configure --disable-dap --disable-doxygen --enable-shared --disable-static --enable-dll --enable-netcdf-4 --enable-utilities --host=x86_64-w64-mingw32 CFLAGS="-ggdb -gdwarf-2 -O0 -I/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win64_dll -I/c/Users/wfisher/Desktop/hdf5-1.8.9/src" LDFLAGS="-ggdb -gdwarf-2 -O0 -L/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win64_dll/bin -L/c/Users/wfisher/Desktop/zlib125dll/dllx64 -L/c/Users/wfisher/Desktop/szip-2.1/build_win64_dll/bin"
+
+#./configure --disable-dap --disable-doxygen --enable-shared --disable-static --enable-dll --enable-netcdf-4 --enable-utilities --host=x86_64-w64-mingw32 CFLAGS="-ggdb -gdwarf-2 -O0 -I/c/HDF5189/include" LDFLAGS="-ggdb -gdwarf-2 -O0 -L/c/HDF5189/bin"
+
+#./configure --disable-dap --disable-doxygen --enable-shared --disable-static --enable-dll --enable-netcdf-4 --disable-utilities --host=x86_64-w64-mingw32 CFLAGS="-ggdb -O0 -I/c/HDF5189/include" LDFLAGS="-ggdb -O0 -L/home/wfisher/mypath/x86_64-w64-mingw32/lib -L/home/wfisher/zlib-1.2.5 -L/c/Users/wfisher/Desktop/szip-2.1/build_win64/bin -L/c/HDF5189/bin"
--- a/my_shared_64_netcdf4_conf.sh
+++ b/my_shared_64_netcdf4_conf.sh
@ -1,6 +0,0 @@
-#!/bin/bash
-set -x
-
-./configure --disable-dap --disable-doxygen --enable-shared --disable-static --enable-dll --enable-netcdf-4 --enable-utilities --host=x86_64-w64-mingw32 CFLAGS="-ggdb -gdwarf-2 -O0 -I/c/HDF5189/include" LDFLAGS="-ggdb -gdwarf-2 -O0 -L/c/HDF5189/bin -L/c/HDF5189/lib"
-
-#./configure --disable-dap --disable-doxygen --enable-shared --disable-static --enable-dll --enable-netcdf-4 --disable-utilities --host=x86_64-w64-mingw32 CFLAGS="-ggdb -O0 -I/c/HDF5189/include" LDFLAGS="-ggdb -O0 -L/home/wfisher/mypath/x86_64-w64-mingw32/lib -L/home/wfisher/zlib-1.2.5 -L/c/Users/wfisher/Desktop/szip-2.1/build_win64/bin -L/c/HDF5189/bin"
--- a/my_static_32_netcdf4_conf.sh
+++ b/my_static_32_netcdf4_conf.sh
--- a/my_static_64_netcdf4_conf.sh
+++ b/my_static_64_netcdf4_conf.sh
--- a/ncdump/ncdump.c
+++ b/ncdump/ncdump.c
@ -2322,7 +2322,7 @@ main(int argc, char *argv[])
    boolean xml_out = false;    /* if true, output NcML instead of CDL */
    boolean kind_out = false;	/* if true, just output kind of netCDF file */

-#if defined(WIN32) || defined(msdos)
+#if defined(WIN32) || defined(msdos) || defined(WIN64)
    putenv("PRINTF_EXPONENT_DIGITS=2"); /* Enforce unix/linux style exponent formatting. */
 #endif

--- a/ncdump/tst_ncgen4_diff.sh
+++ b/ncdump/tst_ncgen4_diff.sh
@ -33,7 +33,8 @@ for x in ${TESTSET} ; do
  rm -f ${x}.nc ${x}.dmp
  ${builddir}/../ncgen/ncgen -b -k${KFLAG} -o ${x}.nc ${cdl}/${x}.cdl
  # dump .nc file
-  ${builddir}/../ncdump/ncdump ${headflag} ${specflag} ${x}.nc > ${x}.dmp
+  # if windows, we need to remove any leading 0's in exponents.
+  ${builddir}/../ncdump/ncdump ${headflag} ${specflag} ${x}.nc | sed 's/e+0/e+/g' > ${x}.dmp
  # compare the expected (silently if XFAIL)
  if test "x$isxfail" = "x1" -a "x$SHOWXFAILS" = "x" ; then
    if diff -b -bw ${expected}/${x}.dmp ${x}.dmp >/dev/null 2>&1; then ok=1; else ok=0; fi
--- a/ncdump/tst_netcdf4.sh
+++ b/ncdump/tst_netcdf4.sh
@ -14,7 +14,7 @@ echo "*** Testing ncgen and ncdump test output for netCDF-4 format."
 echo "*** creating netcdf-4 file c0.nc from c0.cdl..."
 ../ncgen/ncgen -k3 -b -o c0.nc $srcdir/../ncgen/c0.cdl
 echo "*** creating c1.cdl from c0.nc..."
-./ncdump -n c1 c0.nc > c1.cdl
+./ncdump -n c1 c0.nc | sed 's/e+0/e+/g' > c1.cdl
 echo "*** comparing c1.cdl with ref_ctest1_nc4.cdl..."
 diff -b c1.cdl $srcdir/ref_ctest1_nc4.cdl

@ -23,22 +23,22 @@ echo "*** Testing ncgen and ncdump test output for netCDF-4 classic format."
 echo "*** creating netcdf-4 classic file c0.nc from c0.cdl..."
 ../ncgen/ncgen -k4 -b -o c0.nc $srcdir/../ncgen/c0.cdl
 echo "*** creating c1.cdl from c0.nc..."
-./ncdump -n c1 c0.nc > c1.cdl
+./ncdump -n c1 c0.nc | sed 's/e+0/e+/g' > c1.cdl
 echo "*** comparing c1.cdl with ref_ctest1_nc4c.cdl..."
 diff -b c1.cdl $srcdir/ref_ctest1_nc4c.cdl

 echo
 echo "*** Testing ncdump output for netCDF-4 features."
 echo "*** dumping tst_solar_1.nc to tst_solar_1.cdl..."
-./ncdump tst_solar_1.nc > tst_solar_1.cdl
+./ncdump tst_solar_1.nc | sed 's/e+0/e+/g' > tst_solar_1.cdl
 echo "*** comparing tst_solar_1.cdl with ref_tst_solar_1.cdl..."
 diff -b tst_solar_1.cdl $srcdir/ref_tst_solar_1.cdl
 echo "*** dumping tst_solar_2.nc to tst_solar_2.cdl..."
-./ncdump tst_solar_2.nc > tst_solar_2.cdl
+./ncdump tst_solar_2.nc | sed 's/e+0/e+/g' > tst_solar_2.cdl
 echo "*** comparing tst_solar_2.cdl with ref_tst_solar_2.cdl..."
 diff -b tst_solar_2.cdl $srcdir/ref_tst_solar_2.cdl
 echo "*** dumping tst_group_data.nc to tst_group_data.cdl..."
-./ncdump tst_group_data.nc > tst_group_data.cdl
+./ncdump tst_group_data.nc | sed 's/e+0/e+/g' > tst_group_data.cdl
 echo "*** comparing tst_group_data.cdl with ref_tst_group_data.cdl..."
 diff -b tst_group_data.cdl $srcdir/ref_tst_group_data.cdl

@ -49,48 +49,48 @@ diff -b tst_group_data.cdl $srcdir/ref_tst_group_data.cdl

 if [[ "$OSTYPE" != 'msys' ]]; then
 echo "*** testing -v option with absolute name and groups..."
-./ncdump -v /g2/g3/var tst_group_data.nc > tst_group_data.cdl
+./ncdump -v /g2/g3/var tst_group_data.nc | sed 's/e+0/e+/g' > tst_group_data.cdl
 echo "*** comparing tst_group_data.cdl with ref_tst_group_data_v23.cdl..."
 diff -b tst_group_data.cdl $srcdir/ref_tst_group_data_v23.cdl
 fi


 echo "*** testing -v option with relative name and groups..."
-./ncdump -v var,var2 tst_group_data.nc > tst_group_data.cdl
+./ncdump -v var,var2 tst_group_data.nc | sed 's/e+0/e+/g' > tst_group_data.cdl
 echo "*** comparing tst_group_data.cdl with ref_tst_group_data.cdl..."
 diff -b tst_group_data.cdl $srcdir/ref_tst_group_data.cdl
 echo "*** dumping tst_enum_data.nc to tst_enum_data.cdl..."
-./ncdump tst_enum_data.nc > tst_enum_data.cdl
+./ncdump tst_enum_data.nc | sed 's/e+0/e+/g' > tst_enum_data.cdl
 echo "*** comparing tst_enum_data.cdl with ref_tst_enum_data.cdl..."
 diff -b tst_enum_data.cdl $srcdir/ref_tst_enum_data.cdl
 echo "*** dumping tst_opaque_data.nc to tst_opaque_data.cdl..."
-./ncdump tst_opaque_data.nc > tst_opaque_data.cdl
+./ncdump tst_opaque_data.nc | sed 's/e+0/e+/g' > tst_opaque_data.cdl
 echo "*** comparing tst_opaque_data.cdl with ref_tst_opaque_data.cdl..."
 diff -b tst_opaque_data.cdl $srcdir/ref_tst_opaque_data.cdl
 echo "*** dumping tst_vlen_data.nc to tst_vlen_data.cdl..."
-./ncdump tst_vlen_data.nc > tst_vlen_data.cdl
+./ncdump tst_vlen_data.nc | sed 's/e+0/e+/g' > tst_vlen_data.cdl
 echo "*** comparing tst_vlen_data.cdl with ref_tst_vlen_data.cdl..."
 diff -b tst_vlen_data.cdl $srcdir/ref_tst_vlen_data.cdl
 echo "*** dumping tst_comp.nc to tst_comp.cdl..."
-./ncdump tst_comp.nc > tst_comp.cdl
+./ncdump tst_comp.nc | sed 's/e+0/e+/g' > tst_comp.cdl
 echo "*** comparing tst_comp.cdl with ref_tst_comp.cdl..."
 diff -b tst_comp.cdl $srcdir/ref_tst_comp.cdl
 echo "*** creating tst_nans.cdl from tst_nans.nc"
-./ncdump tst_nans.nc > tst_nans.cdl
+./ncdump tst_nans.nc | sed 's/e+0/e+/g' > tst_nans.cdl
 echo "*** comparing ncdump of generated file with ref_tst_nans.cdl ..."
 diff -b tst_nans.cdl $srcdir/ref_tst_nans.cdl
 # Do unicode test only if it exists => BUILD_UTF8 is true
 if test -f ./tst_unicode -o -f ./tst_unicode.exe ; then
  echo "*** dumping tst_unicode.nc to tst_unicode.cdl..."
  ./tst_unicode
-  ./ncdump tst_unicode.nc > tst_unicode.cdl
+  ./ncdump tst_unicode.nc | sed 's/e+0/e+/g' > tst_unicode.cdl
  #echo "*** comparing tst_unicode.cdl with ref_tst_unicode.cdl..."
  #diff -b tst_unicode.cdl $srcdir/ref_tst_unicode.cdl
  echo "*** generating tst_nans.nc"
 fi
 ./tst_special_atts
 echo "*** dumping tst_special_atts.nc to tst_special_atts.cdl..."
-./ncdump -c -s tst_special_atts.nc > tst_special_atts.cdl
+./ncdump -c -s tst_special_atts.nc | sed 's/e+0/e+/g' > tst_special_atts.cdl
 echo "*** comparing tst_special_atts.cdl with ref_tst_special_atts.cdl..."
 diff -b tst_special_atts.cdl $srcdir/ref_tst_special_atts.cdl