Merge delete the noerror- variants of the compiler flags files #1033 (#…

…1093)
HDFGroup · Oct 19, 2021 · e5e108d · e5e108d
1 parent a19923d
commit e5e108d
Show file tree

Hide file tree

Showing 16 changed files with 73 additions and 348 deletions.
diff --git a/MANIFEST b/MANIFEST
@@ -153,7 +153,6 @@
 ./config/clang-warnings/error-general
 ./config/clang-warnings/general
 ./config/clang-warnings/no-developer-general
-./config/clang-warnings/noerror-general
 ./config/gnu-warnings/4.8-4.last
 ./config/gnu-warnings/4.8
 ./config/gnu-warnings/4.9
@@ -170,8 +169,6 @@
 ./config/gnu-warnings/cxx-9
 ./config/gnu-warnings/cxx-error-5
 ./config/gnu-warnings/cxx-error-general
-./config/gnu-warnings/cxx-noerror-5
-./config/gnu-warnings/cxx-noerror-general
 ./config/gnu-warnings/developer-4.8
 ./config/gnu-warnings/developer-7
 ./config/gnu-warnings/developer-8
@@ -189,9 +186,6 @@
 ./config/gnu-warnings/no-developer-4.8
 ./config/gnu-warnings/no-developer-8
 ./config/gnu-warnings/no-developer-general
-./config/gnu-warnings/noerror-5
-./config/gnu-warnings/noerror-8
-./config/gnu-warnings/noerror-general
 ./config/intel-warnings/15
 ./config/intel-warnings/18
 ./config/intel-warnings/developer-general

diff --git a/config/clang-cxxflags b/config/clang-cxxflags
@@ -20,15 +20,15 @@
 #
 # For now, do not promote any warnings to errors.
 #
-PROMOTE_ERRORS_DFLT=no
+WARNINGS_AS_ERRORS_DFLT=no
 
 #
 # This filter rewrites -Werror= as -W, in that way demoting warnings
-# promoted to errors back to warnings, if PROMOTE_ERRORS is no.
+# promoted to errors back to warnings, if WARNINGS_AS_ERRORS is no.
 #
 demote_errors()
 {
-    if [ ${PROMOTE_ERRORS:-${PROMOTE_ERRORS_DFLT}} = no ]; then
+    if [ ${WARNINGS_AS_ERRORS:-${WARNINGS_AS_ERRORS_DFLT}} = no ]; then
         sed 's,-Werror=,-W,g'
     else
         cat
@@ -44,7 +44,7 @@ demote_errors()
 load_clang_arguments()
 {
     set -- $(for arg; do
-        sed 's,#.*$,,' $srcdir/config/clang-warnings/${arg}
+        sed 's,#.*$,,' $srcdir/config/clang-warnings/${arg} | demote_errors
     done)
     IFS=' ' echo "$*"
 }
@@ -161,7 +161,6 @@ if test "X-clang" = "X-$cxx_vendor" -o "X-Apple LLVM" = "X-$cxx_vendor"; then
 
     H5_CXXFLAGS="$H5_CXXFLAGS $(load_clang_arguments general)"
     H5_ECXXFLAGS="$H5_ECXXFLAGS $(load_clang_arguments error-general)"
-    H5_NECXXFLAGS="$H5_NECXXFLAGS $(load_clang_arguments noerror-general)"
 
     ######################
     # Developer warnings #

diff --git a/config/clang-flags b/config/clang-flags
@@ -20,15 +20,15 @@
 #
 # For now, do not promote any warnings to errors.
 #
-PROMOTE_ERRORS_DFLT=no
+WARNINGS_AS_ERRORS_DFLT=no
 
 #
 # This filter rewrites -Werror= as -W, in that way demoting warnings
-# promoted to errors back to warnings, if PROMOTE_ERRORS is no.
+# promoted to errors back to warnings, if WARNINGS_AS_ERRORS is no.
 #
 demote_errors()
 {
-    if [ ${PROMOTE_ERRORS:-${PROMOTE_ERRORS_DFLT}} = no ]; then
+    if [ ${WARNINGS_AS_ERRORS:-${WARNINGS_AS_ERRORS_DFLT}} = no ]; then
         sed 's,-Werror=,-W,g'
     else
         cat
@@ -44,7 +44,7 @@ demote_errors()
 load_clang_arguments()
 {
     set -- $(for arg; do
-        sed 's,#.*$,,' $srcdir/config/clang-warnings/${arg}
+        sed 's,#.*$,,' $srcdir/config/clang-warnings/${arg} | demote_errors
     done)
     IFS=' ' echo "$*"
 }
@@ -183,7 +183,6 @@ if test "X-clang" = "X-$cc_vendor" -o "X-Apple LLVM" = "X-$cc_vendor"; then
 
     H5_CFLAGS="$H5_CFLAGS $(load_clang_arguments general)"
     H5_ECFLAGS="$H5_ECFLAGS $(load_clang_arguments error-general)"
-    H5_NECFLAGS="$H5_NECFLAGS $(load_clang_arguments noerror-general)"
 
     ######################
     # Developer warnings #

diff --git a/config/clang-warnings/noerror-general b/config/clang-warnings/noerror-general
diff --git a/config/cmake/HDFCXXCompilerFlags.cmake b/config/cmake/HDFCXXCompilerFlags.cmake
@@ -131,11 +131,7 @@ else ()
         AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
       # add the general CXX flags for g++ compiler versions 4.8 and above.
       ADD_H5_FLAGS (HDF5_CMAKE_CXX_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-general")
-      if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
-        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-error-general")
-      else ()
-        ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-noerror-general")
-      endif ()
+      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-error-general")
     endif ()
   elseif (CMAKE_CXX_COMPILER_ID MATCHES "[Cc]lang")
     ADD_H5_FLAGS (HDF5_CMAKE_CXX_FLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/general")
@@ -199,11 +195,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
   if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
     # autotools always add the C flags with the CXX flags
     ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-5")
-    if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-error-5")
-    else ()
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-noerror-5")
-    endif ()
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/cxx-error-5")
   endif ()
 
   # Append more extra warning flags that only gcc 6.x+ knows about
@@ -228,11 +220,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
   if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0)
     # Use the C warnings as CXX warnings are the same
     ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/8")
-    if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-8")
-    else ()
-      ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/noerror-8")
-    endif ()
+    ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-8")
     if (HDF5_ENABLE_DEV_WARNINGS)
       # Use the C warnings as CXX warnings are the same
       ADD_H5_FLAGS (H5_CXXFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-8")

diff --git a/config/cmake/HDFCompilerFlags.cmake b/config/cmake/HDFCompilerFlags.cmake
@@ -153,22 +153,14 @@ else ()
     # Add general CFlags for GCC versions 4.8 and above
     if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 4.8)
       ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/general")
-      if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
-        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-general")
-      else ()
-        ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/noerror-general")
-      endif ()
+      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-general")
     endif ()
     # gcc automatically inlines based on the optimization level
     # this is just a failsafe
     list (APPEND H5_CFLAGS "-finline-functions")
   elseif (CMAKE_C_COMPILER_ID MATCHES "[Cc]lang")
     ADD_H5_FLAGS (HDF5_CMAKE_C_FLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/general")
-    if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/error-general")
-    else ()
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/noerror-general")
-    endif ()
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/clang-warnings/error-general")
   elseif (CMAKE_C_COMPILER_ID STREQUAL "PGI")
     list (APPEND HDF5_CMAKE_C_FLAGS "-Minform=inform")
   endif ()
@@ -228,11 +220,7 @@ if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
   # Append more extra warning flags that only gcc 5.x+ knows about
   if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5.0)
     ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/5")
-    if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-5")
-    else ()
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-5")
-    endif ()
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-5")
   endif ()
 
   # Append more extra warning flags that only gcc 6.x+ knows about
@@ -253,9 +241,7 @@ if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
   # Append more extra warning flags that only gcc 8.x+ knows about
   if (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 8.0)
     ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/8")
-    if (HDF5_ENABLE_WARNINGS_AS_ERRORS)
-      ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-8")
-    endif ()
+    ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/error-8")
     if (HDF5_ENABLE_DEV_WARNINGS)
       ADD_H5_FLAGS (H5_CFLAGS "${HDF5_SOURCE_DIR}/config/gnu-warnings/developer-8")
     else ()

diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake
@@ -464,6 +464,9 @@ macro (ADD_H5_FLAGS h5_flag_var infile)
       list (GET TEST_FLAG_STREAM ${line} str_flag)
       string (REGEX REPLACE "^#.*" "" str_flag "${str_flag}")
       #message (TRACE "str_flag=${str_flag}")
+      if (NOT HDF5_ENABLE_WARNINGS_AS_ERRORS)
+        string (REGEX REPLACE "-Werror=" "-W" str_flag "${str_flag}")
+      endif ()
       if (str_flag)
         list (APPEND ${h5_flag_var} "${str_flag}")
       endif ()

diff --git a/config/gnu-cxxflags b/config/gnu-cxxflags
@@ -20,15 +20,15 @@
 #
 # For now, do not promote any warnings to errors.
 #
-PROMOTE_ERRORS_DFLT=no
+WARNINGS_AS_ERRORS_DFLT=no
 
 #
 # This filter rewrites -Werror= as -W, in that way demoting warnings
-# promoted to errors back to warnings, if PROMOTE_ERRORS is no.
+# promoted to errors back to warnings, if WARNINGS_AS_ERRORS is no.
 #
 demote_errors()
 {
-    if [ ${PROMOTE_ERRORS:-${PROMOTE_ERRORS_DFLT}} = no ]; then
+    if [ ${WARNINGS_AS_ERRORS:-${WARNINGS_AS_ERRORS_DFLT}} = no ]; then
         sed 's,-Werror=,-W,g'
     else
         cat
@@ -44,7 +44,7 @@ demote_errors()
 load_gnu_arguments()
 {
     set -- $(for arg; do
-        sed 's,#.*$,,' $srcdir/config/gnu-warnings/${arg}
+        sed 's,#.*$,,' $srcdir/config/gnu-warnings/${arg} | demote_errors
     done)
     IFS=' ' echo "$*"
 }
@@ -192,7 +192,6 @@ if test "X-g++" = "X-$cxx_vendor"; then
     if test $cxx_vers_major -eq 4 -a $cxx_vers_minor -ge 8 -o $cxx_vers_major -ge 5; then
         H5_CXXFLAGS="$H5_CXXFLAGS $(load_gnu_arguments cxx-general)"
         H5_ECXXFLAGS="$H5_ECXXFLAGS $(load_gnu_arguments cxx-error-general)"
-        H5_NECXXFLAGS="$H5_NECXXFLAGS $(load_gnu_arguments cxx-noerror-general)"
 
         ######################
         # Developer warnings #
@@ -235,7 +234,6 @@ if test "X-g++" = "X-$cxx_vendor"; then
     if test $cxx_vers_major -ge 5; then
         H5_CXXFLAGS="$H5_CXXFLAGS $(load_gnu_arguments cxx-5)"
         H5_ECXXFLAGS="$H5_ECXXFLAGS $(load_gnu_arguments cxx-error-5)"
-        H5_NECXXFLAGS="$H5_NECXXFLAGS $(load_gnu_arguments cxx-noerror-5)"
     fi
 
     # gcc >= 6
@@ -256,7 +254,6 @@ if test "X-g++" = "X-$cxx_vendor"; then
         # Use the C warnings as CXX warnings are the same
         H5_CXXFLAGS="$H5_CXXFLAGS $(load_gnu_arguments 8)"
         #H5_ECXXFLAGS="$H5_ECXXFLAGS $(load_gnu_arguments error-8)"
-        #H5_NECXXFLAGS="$H5_NECXXFLAGS $(load_gnu_arguments noerror-8)"
         # Use the C warnings as CXX warnings are the same
         DEVELOPER_WARNING_CXXFLAGS="$DEVELOPER_WARNING_CXXFLAGS $(load_gnu_arguments developer-8)"
         NO_DEVELOPER_WARNING_CXXFLAGS="$NO_DEVELOPER_WARNING_CXXFLAGS $(load_gnu_arguments no-developer-8)"

diff --git a/config/gnu-flags b/config/gnu-flags
@@ -20,15 +20,15 @@
 #
 # For now, do not promote any warnings to errors.
 #
-PROMOTE_ERRORS_DFLT=no
+WARNINGS_AS_ERRORS_DFLT=no
 
 #
 # This filter rewrites -Werror= as -W, in that way demoting warnings
-# promoted to errors back to warnings, if PROMOTE_ERRORS is no.
+# promoted to errors back to warnings, if WARNINGS_AS_ERRORS is no.
 #
 demote_errors()
 {
-    if [ ${PROMOTE_ERRORS:-${PROMOTE_ERRORS_DFLT}} = no ]; then
+    if [ ${WARNINGS_AS_ERRORS:-${WARNINGS_AS_ERRORS_DFLT}} = no ]; then
         sed 's,-Werror=,-W,g'
     else
         cat
@@ -44,7 +44,7 @@ demote_errors()
 load_gnu_arguments()
 {
     set -- $(for arg; do
-        sed 's,#.*$,,' $srcdir/config/gnu-warnings/${arg}
+        sed 's,#.*$,,' $srcdir/config/gnu-warnings/${arg} | demote_errors
     done)
     IFS=' ' echo "$*"
 }
@@ -205,7 +205,6 @@ if test "X-gcc" = "X-$cc_vendor"; then
     if test $cc_vers_major -eq 4 -a $cc_vers_minor -ge 8 -o $cc_vers_major -gt 4; then
         H5_CFLAGS="$H5_CFLAGS $(load_gnu_arguments general)"
         H5_ECFLAGS="$H5_ECFLAGS $(load_gnu_arguments error-general)"
-        H5_NECFLAGS="$H5_NECFLAGS $(load_gnu_arguments noerror-general)"
 
         ######################
         # Developer warnings #
@@ -245,7 +244,6 @@ if test "X-gcc" = "X-$cc_vendor"; then
     if test $cc_vers_major -ge 5; then
         H5_CFLAGS="$H5_CFLAGS $(load_gnu_arguments 5)"
         H5_ECFLAGS="$H5_ECFLAGS $(load_gnu_arguments error-5)"
-        H5_NECFLAGS="$H5_NECFLAGS $(load_gnu_arguments noerror-5)"
     fi
 
     # gcc >= 6
@@ -263,7 +261,6 @@ if test "X-gcc" = "X-$cc_vendor"; then
     if test $cc_vers_major -ge 8; then
         H5_CFLAGS="$H5_CFLAGS $(load_gnu_arguments 8)"
         H5_ECFLAGS="$H5_ECFLAGS $(load_gnu_arguments error-8)"
-        H5_NECFLAGS="$H5_NECFLAGS $(load_gnu_arguments noerror-8)"
         DEVELOPER_WARNING_CFLAGS="$DEVELOPER_WARNING_CFLAGS $(load_gnu_arguments developer-8)"
         NO_DEVELOPER_WARNING_CFLAGS="$NO_DEVELOPER_WARNING_CFLAGS $(load_gnu_arguments no-developer-8)"
     fi

diff --git a/config/gnu-warnings/cxx-noerror-5 b/config/gnu-warnings/cxx-noerror-5