mirror/netcdf-c
2
0
Fork 0
mirror of https://github.com/Unidata/netcdf-c.git synced 2025-01-12 15:45:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a couple ncdap tests when running on Windows.

Browse Source
This commit is contained in:
Ward Fisher 2012-08-27 18:38:47 +00:00
parent 3b76a69484
commit 9e2c434851
7 changed files with 473 additions and 479 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
my_static_32_nc4_dap_conf.sh
View File

@ -1,5 +1,5 @@
#!/bin/bash
set -x
./configure --disable-doxygen --disable-shared --enable-dap --enable-netcdf-4 --enable-diskless CFLAGS="-fno-stack-check -fno-stack-protector -mno-stack-arg-probe -ggdb -O0 -I/c/Users/wfisher/Desktop/hdf5-1.8.9/src -I/c/Users/wfisher/Desktop/hdf5-1.8.9/hl/src -I/c/Users/wfisher/Desktop/curl-7.25.0/build_win32/include/ -DCURL_STATICLIB" LDFLAGS="-ggdb -O0 -L/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win32_static/bin -L/c/Users/wfisher/Desktop/curl-7.25.0/build_win32/lib/.libs -L/c/Users/wfisher/Desktop/szip-2.1/build_win32/bin"
./configure --disable-doxygen --disable-shared --enable-dap --enable-netcdf-4 CFLAGS="-ggdb -O0 -I/c/Users/wfisher/Desktop/hdf5-1.8.9/src -I/c/Users/wfisher/Desktop/hdf5-1.8.9/hl/src -I/c/Users/wfisher/Desktop/curl-7.25.0/build_win32/include/ -DCURL_STATICLIB" LDFLAGS="-ggdb -O0 -L/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win32_static/bin -L/c/Users/wfisher/Desktop/curl-7.25.0/build_win32/lib/.libs -L/c/Users/wfisher/Desktop/szip-2.1/build_win32/bin"
#-L/c/Users/wfisher/Desktop/curl-7.25.0/lib/.libs/libcurl.a"

9
my_static_64_nc4_conf.sh
View File

@ -1,13 +1,6 @@
#!/bin/bash
CTMP=""
if [ $# -gt 0 ]; then
CTMP="-fno-stack-check -fno-stack-protector -mno-stack-arg-probe"
echo "Building with additional flags: $CTMP"
fi
set -x
./configure --enable-static --disable-doxygen --disable-shared --disable-dap --enable-netcdf-4 --host=x86_64-w64-mingw32 CFLAGS="$CTMP -ggdb -O0 -I/c/Users/wfisher/Desktop/hdf5-1.8.9/src -I/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win64/" LDFLAGS="-ggdb -O0 -L/c/Users/wfisher/Desktop/szip-2.1/build_win64/bin -L/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win64/bin -L/c/Users/wfisher/Desktop/zlib125dll/staticx64"
./configure --enable-static --disable-doxygen --disable-shared --disable-dap --enable-netcdf-4 --host=x86_64-w64-mingw32 CFLAGS="-ggdb -O0 -I/c/Users/wfisher/Desktop/hdf5-1.8.9/src" LDFLAGS="-ggdb -O0 -L/c/Users/wfisher/Desktop/szip-2.1/build_win64/bin -L/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win64/bin -L/c/Users/wfisher/Desktop/zlib125dll/staticx64"
#./configure --enable-static --disable-doxygen --disable-shared --disable-dap --enable-netcdf-4 --host=x86_64-w64-mingw32 CFLAGS="-ggdb -O0 -I/c/Users/wfisher/Desktop/hdf5-1.8.9/src" LDFLAGS="-ggdb -O0 -L/c/Users/wfisher/Desktop/szip-2.1/build_win64/bin -L/c/Users/wfisher/Desktop/hdf5-1.8.9/build_win64_static/bin -L/c/Users/wfisher/Desktop/zlib125dll/staticx64"

12
ncdap_test/t_dap3a.c
View File

@ -113,8 +113,9 @@ int main()
char* url;
char* topsrcdir = (char*)malloc(1024*sizeof(char));
size_t len;
int i;
#ifndef USE_NETCDF4
int i,j;
int j;
#endif
/* location of our target url: use file:// to avoid remote
@ -125,6 +126,15 @@ int main()
//topsrcdir = getenv("TOPSRCDIR");
char cwd[1024];
getcwd(cwd,sizeof(cwd));
#ifdef __MINGW32__
/* Convert to MinGW-style paths if need be. */
for(i = 0; i < strlen(cwd); i++) {
if(cwd[i] == '\\')
cwd[i] = '/';
}
#endif
sprintf(topsrcdir,"%s/..",cwd);
if(topsrcdir == NULL) {
fprintf(stderr,"*** FAIL: $abs_top_srcdir not defined: location= %s:%d\n",__FILE__,__LINE__);

8
ncdap_test/test_cvt.c
View File

@ -122,6 +122,14 @@ int main()
//topsrcdir = getenv("TOPSRCDIR");
char cwd[1024];
getcwd(cwd,sizeof(cwd));
#ifdef __MINGW32__
/* Convert to MinGW-style paths if need be. */
for(i = 0; i < strlen(cwd); i++) {
if(cwd[i] == '\\')
cwd[i] = '/';
}
#endif
sprintf(topsrcdir,"%s/..",cwd);
if(topsrcdir == NULL) {
fprintf(stderr,"*** FAIL: $abs_top_srcdir not defined: location= %s:%d\n",__FILE__,__LINE__);

10
ncdap_test/test_vara.c
View File

@ -77,11 +77,19 @@ main()
size_t count[RANK];
char* topsrcdir = (char*)malloc(sizeof(char)*1024);
char url[4096];
int i;
/* Assume that TESTS_ENVIRONMENT was set */
//topsrcdir = getenv("TOPSRCDIR");
char cwd[1024];
getcwd(cwd,sizeof(cwd));
#ifdef __MINGW32__
/* Convert to MinGW-style paths if need be. */
for(i = 0; i < strlen(cwd); i++) {
if(cwd[i] == '\\')
cwd[i] = '/';
}
#endif
sprintf(topsrcdir,"%s/..",cwd);
if(topsrcdir == NULL) {
fprintf(stderr,"*** FAIL: $abs_top_srcdir not defined: location= %s:%d\n",__FILE__,__LINE__);

880
ncgen3/ncgentab.c
View File

File diff suppressed because it is too large Load Diff

31
ncgen3/ncgentab.h
View File

@ -1,8 +1,9 @@
/* A Bison parser, made by GNU Bison 2.6.2. */
/* A Bison parser, made by GNU Bison 2.4.2. */
/* Bison interface for Yacc-like parsers in C
/* Skeleton interface for Bison's Yacc-like parsers in C
Copyright (C) 1984, 1989-1990, 2000-2012 Free Software Foundation, Inc.
Copyright (C) 1984, 1989-1990, 2000-2006, 2009-2010 Free Software
Foundation, Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -30,15 +31,6 @@
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
#ifndef NCG_NCGEN_TAB_H
# define NCG_NCGEN_TAB_H
/* Enabling traces. */
#ifndef YYDEBUG
# define YYDEBUG 0
#endif
#if YYDEBUG
extern int ncgdebug;
#endif
/* Tokens. */
#ifndef YYTOKENTYPE
@ -70,6 +62,7 @@ extern int ncgdebug;
#endif
#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
typedef int YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
@ -79,18 +72,4 @@ typedef int YYSTYPE;
extern YYSTYPE ncglval;
#ifdef YYPARSE_PARAM
#if defined __STDC__ || defined __cplusplus
int ncgparse (void *YYPARSE_PARAM);
#else
int ncgparse ();
#endif
#else /* ! YYPARSE_PARAM */
#if defined __STDC__ || defined __cplusplus
int ncgparse (void);
#else
int ncgparse ();
#endif
#endif /* ! YYPARSE_PARAM */
#endif /* !NCG_NCGEN_TAB_H */