diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-12-26 10:53:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-26 10:53:01 +0100 |
| commit | 81ec8c0b58d66333fccd3703dab62a11132a0331 (patch) | |
| tree | 41b4675d169f849516649700ab4f50d4cffa4c02 /scripts | |
| parent | 355d681ed88019e97742344bd642c2fd97e700a1 (diff) | |
| parent | 80dad6ef2bed4a83008db06986dc168918d48476 (diff) | |
| download | PROJ-81ec8c0b58d66333fccd3703dab62a11132a0331.tar.gz PROJ-81ec8c0b58d66333fccd3703dab62a11132a0331.zip | |
Merge pull request #1203 from rouault/cpp_conversion
Conversion of most C files to C++
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/cppcheck.sh | 2 | ||||
| -rwxr-xr-x | scripts/doxygen.sh | 2 | ||||
| -rwxr-xr-x | scripts/reformat_cpp.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scripts/cppcheck.sh b/scripts/cppcheck.sh index b0f8598a..f21c74e7 100755 --- a/scripts/cppcheck.sh +++ b/scripts/cppcheck.sh @@ -34,7 +34,7 @@ done ret_code=0 -grep -v "unmatchedSuppression" ${LOG_FILE} | grep -v "nn.hpp" | grep -v "pj_wkt1_generated_parser" | grep -v "pj_wkt2_generated_parser" > ${LOG_FILE}.tmp +grep -v "unmatchedSuppression" ${LOG_FILE} | grep -v "nn.hpp" | grep -v "wkt1_generated_parser" | grep -v "wkt2_generated_parser" > ${LOG_FILE}.tmp mv ${LOG_FILE}.tmp ${LOG_FILE} if grep "null pointer" ${LOG_FILE} ; then diff --git a/scripts/doxygen.sh b/scripts/doxygen.sh index 2f44dca8..0a477c14 100755 --- a/scripts/doxygen.sh +++ b/scripts/doxygen.sh @@ -34,7 +34,7 @@ fi mkdir -p docs/build/tmp_breathe python scripts/generate_breathe_friendly_general_doc.py rm -rf docs/build/xml/ -(cat Doxyfile; printf "GENERATE_HTML=NO\nGENERATE_XML=YES\nINPUT= src include/proj src/proj.h docs/build/tmp_breathe/general_doc.dox.reworked.h") | doxygen - > /tmp/docs_log.txt 2>&1 +(cat Doxyfile; printf "GENERATE_HTML=NO\nGENERATE_XML=YES\nINPUT= src/iso19111 include/proj src/proj.h docs/build/tmp_breathe/general_doc.dox.reworked.h") | doxygen - > /tmp/docs_log.txt 2>&1 if grep -i warning /tmp/docs_log.txt; then echo "Doxygen warnings found" && cat /tmp/docs_log.txt && /bin/false; else diff --git a/scripts/reformat_cpp.sh b/scripts/reformat_cpp.sh index b50fa1e1..b3140ebe 100755 --- a/scripts/reformat_cpp.sh +++ b/scripts/reformat_cpp.sh @@ -15,7 +15,7 @@ esac TOPDIR="$SCRIPT_DIR/.." -for i in "$TOPDIR"/include/proj/*.hpp "$TOPDIR"/include/proj/internal/*.hpp "$TOPDIR"/src/*.cpp "$TOPDIR"/test/unit/*.cpp; do +for i in "$TOPDIR"/include/proj/*.hpp "$TOPDIR"/include/proj/internal/*.hpp "$TOPDIR"/src/iso19111/*.cpp "$TOPDIR"/test/unit/*.cpp; do if ! echo "$i" | grep -q "lru_cache.hpp"; then "$SCRIPT_DIR"/reformat.sh "$i"; fi |