From aa3b8f7d2df27cdaca31df005aa757de3eb21189 Mon Sep 17 00:00:00 2001 From: Dennis Heimbigner Date: Mon, 10 Feb 2025 19:05:30 -0700 Subject: [PATCH 1/6] Step 2 in splitting PR 3068 re: PR https://github.com/Unidata/netcdf-c/pull/3068 1. Fix a namespace problem in tinyxml2.cpp. Note that this is a visual studio problem hence use of _MSC_VER. --- libncxml/ncxml_tinyxml2.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libncxml/ncxml_tinyxml2.cpp b/libncxml/ncxml_tinyxml2.cpp index 4307fa630a..3f150d26df 100644 --- a/libncxml/ncxml_tinyxml2.cpp +++ b/libncxml/ncxml_tinyxml2.cpp @@ -14,6 +14,10 @@ using namespace tinyxml2; +#ifdef _MSC_VER /*Do not use _WIN32 since this is a visual studio issue */ +#define XMLDocument tinyxml2::XMLDocument +#endif + static int ncxml_initialized = 0; void From 4473755de396311237d532e781809902b09f673e Mon Sep 17 00:00:00 2001 From: Dennis Heimbigner Date: Tue, 11 Feb 2025 15:55:38 -0700 Subject: [PATCH 2/6] Step 2 in splitting PR 3068 re: PR https://github.com/Unidata/netcdf-c/pull/3068 1. Fix a namespace problem in tinyxml2.cpp. Note that this is a visual studio problem hence use of _MSC_VER. --- RELEASE_NOTES.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index a1a0d87667..44f03198ff 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -5,6 +5,10 @@ Release Notes {#RELEASE_NOTES} This file contains a high-level description of this package's evolution. Releases are in reverse chronological order (most recent first). Note that, as of netcdf 4.2, the `netcdf-c++` and `netcdf-fortran` libraries have been separated into their own libraries. +## 4.9.4 - TBD + +* Step 2 in splitting PR [Github #3068](https://github.com/Unidata/netcdf-c/pull/3068). Fix a namespace problem in tinyxml2.cpp. Note that this is a visual studio problem hence use of _MSC_VER. See [Github #????](https://github.com/Unidata/netcdf-c/pull/????) for more information. + ## 4.9.3 - February 7, 2025 ## Known Issues From 58b4dfbc8d2870c9365643027fad99098c173400 Mon Sep 17 00:00:00 2001 From: Dennis Heimbigner Date: Tue, 11 Feb 2025 16:43:14 -0700 Subject: [PATCH 3/6] Update RELEASE_NOTES --- RELEASE_NOTES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 44f03198ff..cfe26ef574 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -7,7 +7,7 @@ This file contains a high-level description of this package's evolution. Release ## 4.9.4 - TBD -* Step 2 in splitting PR [Github #3068](https://github.com/Unidata/netcdf-c/pull/3068). Fix a namespace problem in tinyxml2.cpp. Note that this is a visual studio problem hence use of _MSC_VER. See [Github #????](https://github.com/Unidata/netcdf-c/pull/????) for more information. +* Step 2 in splitting PR [Github #3068](https://github.com/Unidata/netcdf-c/pull/3068). Fix a namespace problem in tinyxml2.cpp. Note that this is a visual studio problem hence use of _MSC_VER. See [Github #3089](https://github.com/Unidata/netcdf-c/pull/3089) for more information. ## 4.9.3 - February 7, 2025 From ab31b1c98405efc8de161d22d577eb4542253323 Mon Sep 17 00:00:00 2001 From: Dennis Heimbigner Date: Tue, 11 Feb 2025 19:08:17 -0700 Subject: [PATCH 4/6] fix test_hyrax.sh --- dap4_test/test_hyrax.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dap4_test/test_hyrax.sh b/dap4_test/test_hyrax.sh index c370e41150..5360f8192f 100755 --- a/dap4_test/test_hyrax.sh +++ b/dap4_test/test_hyrax.sh @@ -3,6 +3,7 @@ if test "x$srcdir" = "x"; then srcdir=`dirname $0`; fi export srcdir; + . ../test_common.sh . ${srcdir}/d4test_common.sh @@ -61,7 +62,8 @@ hyraxsplit() { PREFIX=`dirname $P` } -if test "x${RESET}" = x1 ; then rm -fr ${BASELINEHY}/*.hyrax ; fi +# Turn on only if regenerating test baseline +#if test "x${RESET}" = x1 ; then rm -fr ${BASELINEHY}/*.hyrax ; fi for f in $F ; do hyraxsplit $f makehyraxurl From 6b9dc4ce1782b1b2409134357c4bb21f4bc3b802 Mon Sep 17 00:00:00 2001 From: Dennis Heimbigner Date: Tue, 11 Feb 2025 20:02:25 -0700 Subject: [PATCH 5/6] Suppress hyrax tests until reconciled --- dap4_test/CMakeLists.txt | 2 +- dap4_test/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dap4_test/CMakeLists.txt b/dap4_test/CMakeLists.txt index cd9be513c3..5d538ccda1 100644 --- a/dap4_test/CMakeLists.txt +++ b/dap4_test/CMakeLists.txt @@ -52,7 +52,7 @@ ENDIF() IF(NETCDF_ENABLE_DAP_REMOTE_TESTS) add_sh_test(dap4_test test_remote) - add_sh_test(dap4_test test_hyrax) +#Suppress until reconciled with hyrax: add_sh_test(dap4_test test_hyrax) add_sh_test(dap4_test test_dap4url) IF(RUN_MANUAL_TESTS) # The following test can only be run by hand. diff --git a/dap4_test/Makefile.am b/dap4_test/Makefile.am index a6b1c9f566..418238d12a 100644 --- a/dap4_test/Makefile.am +++ b/dap4_test/Makefile.am @@ -47,7 +47,7 @@ if NETCDF_ENABLE_DAP_REMOTE_TESTS TESTS += test_remote.sh TESTS += test_constraints.sh -TESTS += test_hyrax.sh +#Suppress until reconciled with hyrax: TESTS += test_hyrax.sh TESTS += test_dap4url.sh # The following test can only be run by hand. From 98067db0bd0b5111051b956b5cf8060dd74d59d3 Mon Sep 17 00:00:00 2001 From: Dennis Heimbigner Date: Wed, 12 Feb 2025 12:24:26 -0700 Subject: [PATCH 6/6] Turn off Hyrax testing for DAP4 --- RELEASE_NOTES.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index cfe26ef574..da5fc0c772 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -7,7 +7,7 @@ This file contains a high-level description of this package's evolution. Release ## 4.9.4 - TBD -* Step 2 in splitting PR [Github #3068](https://github.com/Unidata/netcdf-c/pull/3068). Fix a namespace problem in tinyxml2.cpp. Note that this is a visual studio problem hence use of _MSC_VER. See [Github #3089](https://github.com/Unidata/netcdf-c/pull/3089) for more information. +* Step 2 in splitting PR [Github #3068](https://github.com/Unidata/netcdf-c/pull/3068). Fix a namespace problem in tinyxml2.cpp. Note that this is a visual studio problem hence use of _MSC_VER. Also turn off DAP4 tests against Hyrax server until DAP4 spec problems are fixed. See [Github #3089](https://github.com/Unidata/netcdf-c/pull/3089) for more information. ## 4.9.3 - February 7, 2025