From 7fd59c4f108bdb8d3fc896b869918032e89347db Mon Sep 17 00:00:00 2001
From: kytv <kytv@mail.i2p>
Date: Fri, 21 Dec 2012 20:45:05 +0000
Subject: [PATCH] add more excludes to 'sloccount.report' and make the report
 location configurable

---
 build.properties |  3 +++
 build.xml        | 13 +++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/build.properties b/build.properties
index e139ca6f2..5f84fcb93 100644
--- a/build.properties
+++ b/build.properties
@@ -19,6 +19,9 @@ junitdocs.url=http://junit.org/apidocs/
 # This will go in the jar manifests
 build.built-by=unknown	
 
+# filename of the sloccount report
+sloccount.report.file=sloccount.sc
+
 # Building EXEs in x64 Linux requires that 32bit libraries are installed. In Debian,
 # for example, installing the libc6-i386 package will satisfy this requirement.
 
diff --git a/build.xml b/build.xml
index c35c7a6f1..7c5e6a508 100644
--- a/build.xml
+++ b/build.xml
@@ -588,7 +588,7 @@
         <delete file="installer/lib/izpack/patches.jar" failonerror="false" quiet="true" />
         <delete file="syndie-standalone.zip" failonerror="false" quiet="true" />
         <delete failonerror="false" quiet="true">
-            <fileset dir="." includes="i2pinstall*jar i2p.fba sloccount.sc javadoc.zip i2pinstall*.exe i2pinstall*bz2" />
+            <fileset dir="." includes="i2pinstall*jar i2p.fba ${sloccount.report.file} javadoc.zip i2pinstall*.exe i2pinstall*bz2" />
         </delete>
         <delete file="i2psnark-standalone.zip" failonerror="false" quiet="true" />
         <delete file="BOB-one.jar" failonerror="false" quiet="true" />
@@ -1335,19 +1335,24 @@
     </target>
 
     <target name="sloccount.report">
-        <echo message="Generating sloccount report" />
+        <property name="sloccount.report.file" value="sloccount.sc" />
+        <echo message="Generating sloccount report (this will take awhile)" />
         <exec executable="sloccount" failonerror="true">
             <arg value="--details"/>
             <arg value="--wide"/>
         <arg value="${basedir}"/>
-            <redirector output="sloccount.sc">
+            <redirector output="${sloccount.report.file}">
                 <outputfilterchain>
                     <linecontainsregexp negate="true">
-                        <regexp pattern="(_MTN|reports|pkg-temp|licenses|i2p\.fba|sloccount\.sc)" />
+                        <regexp pattern="(Warning: |lib/launch4j|_MTN|reports|pkg-temp|licenses|i2p\.fba|gmp-|WEB-INF)" />
                     </linecontainsregexp>
+		    <linecontains negate="true">
+			    <contains value="${sloccount.report.file}" />
+		    </linecontains>
                 </outputfilterchain>
             </redirector>
         </exec>
+        <echo message="sloccount report saved to the file &quot;${sloccount.report.file}&quot;" />
     </target>
 
     <target name="findbugs" depends="build2">