Add cpplint to products for checking Jenkins build procedure

diff --git a/env_linux.sh b/env_linux.sh
index 8148a14623f91950419ba7f343308a66afabe0a7..e75fec9c530f14e3a3b15c3aa4d550bc3cc173b0 100644 (file)
--- a/env_linux.sh
+++ b/env_linux.sh
@@ -2,7 +2,7 @@
 
 # This script uses:
 #
-# SHAPER_PDIR - path of PRODUCTS for SHAPER (SolveSpace, lcov)
+# SHAPER_PDIR - path of PRODUCTS for SHAPER (SolveSpace, lcov, cpplint)
 # SHAPER_ROOT_DIR - path of SHAPER installation
 
 for path in SHAPER_PDIR SHAPER_ROOT_DIR; do
@@ -36,6 +36,11 @@ export LCOV_ROOT_DIR=${SHAPER_PDIR}/lcov-1.11
 export PATH=${LCOV_ROOT_DIR}/bin:${PATH}
 ##
 
+#------ cpplint ------
+export CPPLINT_ROOT_DIR=${SHAPER_PDIR}/cpplint-1.3.0
+export PATH=${CPPLINT_ROOT_DIR}:${PATH}
+##
+
 #------ OCCT ------
 # Defaults
 export CSF_PluginDefaults=${CAS_ROOT_DIR}/src/StdResource

diff --git a/findEndLines.sh b/findEndLines.sh
index b6e51e28224ecdcdbc71f9b70f11073a6ad45b26..4f3a19fa69cb0009c781b4ca001a377544ed7efb 100755 (executable)
--- a/findEndLines.sh
+++ b/findEndLines.sh
@@ -1,7 +1,9 @@
 #!/bin/bash
 
+source env.sh
+
 find . \( -name "*.h" -o -name "*.cpp" \) -exec cpplint.py --filter=-,+whitespace/end_of_line  --verbose=0 --counting=detailed {} \+ 2>&1 | grep -v Done | tee ./tofix
 
-python correction_auto_2.py --cpplint_output_file ./tofix
+#python correction_auto_2.py --cpplint_output_file ./tofix
 
-rm ./tofix
\ No newline at end of file
+rm ./tofix