diff --git a/cf b/cf index f8b820b97..68db7e9c3 100644 --- a/cf +++ b/cf @@ -105,7 +105,7 @@ FLAGS="$FLAGS --enable-extreme-numbers" #FLAGS="$FLAGS --disable-testsets" #FLAGS="$FLAGS --disable-dap-remote-tests" #FLAGS="$FLAGS --enable-dap-auth-tests" -- requires a new remotetest server -FLAGS="$FLAGS --enable-doxygen --enable-internal-docs" +#FLAGS="$FLAGS --enable-doxygen --enable-internal-docs" FLAGS="$FLAGS --enable-logging" #FLAGS="$FLAGS --disable-diskless" #FLAGS="$FLAGS --enable-mmap" diff --git a/docs/Doxyfile.in b/docs/Doxyfile.in index 5ab6147e6..1646a08b7 100644 --- a/docs/Doxyfile.in +++ b/docs/Doxyfile.in @@ -750,6 +750,7 @@ INPUT = \ @abs_top_srcdir@/docs/install-fortran.md \ @abs_top_srcdir@/docs/types.dox \ @abs_top_srcdir@/docs/internal.dox \ + @abs_top_srcdir@/docs/indexing.dox \ @abs_top_srcdir@/docs/windows-binaries.md \ @abs_top_srcdir@/docs/guide.dox \ @abs_top_srcdir@/docs/OPeNDAP.dox \ @@ -760,6 +761,8 @@ INPUT = \ @abs_top_srcdir@/docs/filters.md \ @abs_top_srcdir@/docs/inmemory.md \ @abs_top_srcdir@/docs/notes.md \ + @abs_top_srcdir@/docs/auth.md \ + @abs_top_srcdir@/docs/filters.md \ @abs_top_srcdir@/docs/all-error-codes.md \ @abs_top_srcdir@/docs/FAQ.md \ @abs_top_srcdir@/docs/known_problems.md \ diff --git a/docs/Makefile.am b/docs/Makefile.am index a1934377d..4f7ad0d95 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -9,7 +9,7 @@ mainpage.dox tutorial.dox guide.dox types.dox cdl.dox \ architecture.dox internal.dox windows-binaries.md \ building-with-cmake.md CMakeLists.txt groups.dox install.md notes.md \ install-fortran.md all-error-codes.md credits.md auth.md \ -obsolete/fan_utils.html bestpractices.md filters.md indexing.md \ +obsolete/fan_utils.html bestpractices.md filters.md indexing.dox \ inmemory.md DAP4.dox OPeNDAP.dox attribute_conventions.md FAQ.md \ file_format_specifications.md known_problems.md \ COPYRIGHT.dox diff --git a/nc_test4/perftest.sh b/nc_test4/perftest.sh index 3257851c2..1dd0704e1 100644 --- a/nc_test4/perftest.sh +++ b/nc_test4/perftest.sh @@ -1,6 +1,5 @@ #!/bin/sh -BUILD=1 #PROF=1 #DEBUG=1 #MEM=1 @@ -8,6 +7,7 @@ BUILD=1 if test "x$srcdir" = x ; then srcdir=`pwd`; fi . ../test_common.sh +set -x set -e echo "Testing performance of nc_create and nc_open on file with large metadata" @@ -27,28 +27,10 @@ elif test "x$DEBUG" = x1 ; then CMD="gdb --args " fi -if test "x$BUILD" = x1 ; then -CFLAGS="-Wall -Wno-unused-variable -Wno-unused-function -I.. -I../include" -LDFLAGS="../liblib/.libs/libnetcdf.a -L/usr/local/lib -lhdf5_hl -lhdf5 -lz -ldl -lcurl -lm -lmfhdf -ldf" -CC=gcc -if test "x$PROF" = x1 ; then -CFLAGS="-pg $CFLAGS" -LDFLAGS="-pg $LDFLAGS" -fi -if test "x$DEBUG" = x1 ; then -CFLAGS="-g -O0 $CFLAGS" -LDFLAGS="-g -O0 $LDFLAGS" -fi -LLP="/usr/local/lib:${LD_LIBRARY_PATH}" -export LD_LIBRARY_PATH=${LLP}; export CFLAGS; export LDFLAGS -${CC} -o bigmeta ${CFLAGS} bigmeta.c ${LDFLAGS} -${CC} -o openbigmeta ${CFLAGS} openbigmeta.c ${LDFLAGS} -fi - echo "timing bigmeta:" -${CMD} ./bigmeta $ARGS +${execdir}/bigmeta $ARGS echo "timing openbigmeta:" -${CMD} ./openbigmeta +${execdir}/openbigmeta if test "x$PROF" = x1 ; then rm -f perftest.txt gprof openbigmeta gmon.out >perftest.txt