From e6de172371ea203f6393d745641d66c82b5b13e2 Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 19 Dec 2018 12:25:33 +0100
Subject: cpp conversion: move source files in apps/ iso19111/ conversions/
 projections/ transformations/ tests/ subdirectories

---
 scripts/doxygen.sh      | 2 +-
 scripts/reformat_cpp.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts')

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
-- 
cgit v1.2.3


From df574ae332d57f556fd56314883b3354cab1d0ff Mon Sep 17 00:00:00 2001
From: Even Rouault <even.rouault@spatialys.com>
Date: Wed, 19 Dec 2018 13:00:37 +0100
Subject: cpp conversion: remove useless pj_, PJ_ and proj_ filename prefixes

---
 scripts/cppcheck.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

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
-- 
cgit v1.2.3