Maintenance: bump astyle to 2.04 and quieten report

diff --git a/scripts/formater.pl b/scripts/formater.pl
index 7df24ed4631ef6561bfe5f54db18c8f9fffe538d..ba1d77e1c8a61582af1cfc6aed8f0eaee3c54b50 100755 (executable)
--- a/scripts/formater.pl
+++ b/scripts/formater.pl
@@ -30,17 +30,17 @@ use strict;
 use IPC::Open2;
 
 #
-# NP: The Squid code requires astyle version 2.03 (exactly for now)
+# NP: The Squid code requires astyle version 2.04 (exactly for now)
 #
 my $ASTYLE_BIN="/usr/local/bin/astyle";
 if (! -x $ASTYLE_BIN) {
   $ASTYLE_BIN="/usr/bin/astyle";
 }
 if (! -x $ASTYLE_BIN) {
-  $ASTYLE_BIN="/usr/local/src/astyle-2.03/bin/astyle";
+  $ASTYLE_BIN="/usr/local/src/astyle-2.04/bin/astyle";
 }
 
-my $ASTYLE_ARGS ="--mode=c -s4 --convert-tabs --keep-one-line-blocks ";
+my $ASTYLE_ARGS ="--mode=c -s4 --convert-tabs --keep-one-line-blocks --lineend=linux";
 #$ASTYLE_ARGS="--mode=c -s4 -O --break-blocks -l";
 
 
@@ -169,9 +169,11 @@ sub input_filter{
 #          print "----->".$$line."\n";
        }
        elsif($$line =~ /\s*unsigned\s+([^:]*):\s*(\w+)\s*\;(.*)/s){
+#          print ">>>>> ".$$line."    ($1)\n";
             my ($name,$val,$extra)=($1,$2,$3);
             my $prx =~ s/\s*$//g;
            $$line= "unsigned ".$name."__FORASTYLE__".$val.";".$extra;
+#          print "----->".$$line."\n";
        }
        return 1;
     }

diff --git a/scripts/source-maintenance.sh b/scripts/source-maintenance.sh
index fd30e2dd82c141f3e8f67a9510ddd1471057ebff..51219b6fb27364ce094aad809a495305ee34f2ea 100755 (executable)
--- a/scripts/source-maintenance.sh
+++ b/scripts/source-maintenance.sh
@@ -32,8 +32,8 @@ fi
 ROOT=`bzr root`
 
 ASVER=`astyle --version 2>&1 | grep -o -E "[0-9.]+"`
-if test "${ASVER}" != "2.03" ; then
-       echo "Astyle version problem. You have ${ASVER} instead of 2.03"
+if test "${ASVER}" != "2.04" ; then
+       echo "Astyle version problem. You have ${ASVER} instead of 2.04"
        ASVER=""
 else
        echo "Found astyle ${ASVER}. Formatting..."