Warnings_count fix (#186)

* warnings_count fix

* Split rom and compress in check_new_warnings.sh

* Jenkinsfile

* Fix full check

* A couple more small fixes

4 files changed, 17 insertions, 11 deletions

diff --git a/Jenkinsfile b/Jenkinsfile
index 2c7791e..89e587c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -62,12 +62,12 @@ pipeline {
         }
         stage('Build') {
             steps {
-                sh 'bash -c "make WARNINGS_CHECK=1 -j rom 2> >(tee tools/warnings_count/warnings_uncompressed_new.txt)"'
+                sh 'bash -c "make WARNINGS_CHECK=1 -j rom 2> >(tee tools/warnings_count/warnings_build_new.txt)"'
             }
         }
         stage('Check build uncompressed warnings') {
             steps {
-                sh 'bash -c "./tools/warnings_count/compare_warnings.sh uncompressed"'
+                sh 'bash -c "./tools/warnings_count/compare_warnings.sh build"'
             }
         }
         stage('Build compressed') {
diff --git a/tools/warnings_count/check_new_warnings.sh b/tools/warnings_count/check_new_warnings.sh
index 27cda1b..ebf7477 100755
--- a/tools/warnings_count/check_new_warnings.sh
+++ b/tools/warnings_count/check_new_warnings.sh
@@ -40,7 +40,7 @@ Optional arguments:
 jobs=1
 full=
 run="make clean
-    make uncompressed"
+    make rom"
 
 
 
@@ -53,8 +53,10 @@ do
     f)  full="true"
         run="make distclean
     make setup
-    make disasm
-    make all"
+    make extract
+    make lib
+    make rom
+    make compress"
         ;;
     j)  j_option_arg="$OPTARG"
         if [[ ! "${j_option_arg}" =~ ^[0-9]*$ ]]
@@ -94,7 +96,7 @@ remove_ansi_codes () {
 
 
 make_warnings () {
-    make $1 -j$jobs 2> >(tee tools/warnings_count/warnings_temp.txt) \
+    make WERROR=0 WARNINGS_CHECK=1 $1 -j$jobs 2> >(tee tools/warnings_count/warnings_temp.txt) \
     && remove_ansi_codes tools/warnings_count/warnings_temp.txt > tools/warnings_count/warnings_$2_new.txt \
     && rm tools/warnings_count/warnings_temp.txt
 }
@@ -102,17 +104,21 @@ make_warnings () {
 if [[ $full ]]; then
     make distclean
     make_warnings setup setup
-    make_warnings disasm disasm
-    make_warnings all build
+    make_warnings extract extract
+    make_warnings lib lib
+    make_warnings rom build
+    make_warnings compress compress
 else
     make clean
-    make_warnings uncompressed build
+    make_warnings rom build
 fi
 
 
 if [[ $full ]]; then
     $COMPARE_WARNINGS setup
-    $COMPARE_WARNINGS disasm
+    $COMPARE_WARNINGS extract
+    $COMPARE_WARNINGS lib
+    $COMPARE_WARNINGS compress
 fi
 $COMPARE_WARNINGS build
 
diff --git a/tools/warnings_count/update_current_warnings.sh b/tools/warnings_count/update_current_warnings.sh
index cec449f..7a7953f 100755
--- a/tools/warnings_count/update_current_warnings.sh
+++ b/tools/warnings_count/update_current_warnings.sh
@@ -10,5 +10,5 @@ make distclean
 make WERROR=0 WARNINGS_CHECK=1 setup 2> tools/warnings_count/warnings_setup_current.txt
 make WERROR=0 WARNINGS_CHECK=1 lib 2> tools/warnings_count/warnings_lib_current.txt
 make WERROR=0 WARNINGS_CHECK=1 extract 2> tools/warnings_count/warnings_extract_current.txt
-make WERROR=0 WARNINGS_CHECK=1 rom 2> tools/warnings_count/warnings_uncompressed_current.txt
+make WERROR=0 WARNINGS_CHECK=1 rom 2> tools/warnings_count/warnings_build_current.txt
 make WERROR=0 WARNINGS_CHECK=1 compress 2> tools/warnings_count/warnings_compress_current.txt
diff --git a/tools/warnings_count/warnings_uncompressed_current.txt b/tools/warnings_count/warnings_build_current.txt
index e69de29..e69de29 100644
--- a/tools/warnings_count/warnings_uncompressed_current.txt
+++ b/tools/warnings_count/warnings_build_current.txt