Report warnings as deprecations + non-deprecations

Change-Id: I0be37863d3478705ded21275829ee9fef0b6d613
Reviewed-on: http://gerrit.dmdirc.com/3165
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

.gitignore

@@ -33,7 +33,7 @@ __history
 /reports/report-pmd.*
 /reports/checkstyle.*
 /reports/deadcode.txt
-/reports/warnings.txt
+/reports/warnings*.txt
 /reports/build-log.txt
 /etc/clover.license
 /etc/clover/clover.license

build-reports.xml

@@ -213,14 +213,37 @@
 
         <copy file="reports/build-log.txt" tofile="reports/warnings.txt">
             <filterchain>
+                <!-- Pick out the warnings generated for source files -->
                 <linecontainsregexp>
                     <regexp pattern="java:[0-9]+: warning: .*"/>
                 </linecontainsregexp>
+                <!-- Trim whitespace and boilerplate -->
                 <trim/>
                 <replacestring from="[javac] ${basedir}${file.separator}" to=""/>
+                <!-- Ignore anything that's not from a source directory (e.g. dagger generated code) -->
+                <linecontainsregexp>
+                    <regexp pattern="^(modules${file.separator}[a-z]+${file.separator})?src.*"/>
+                </linecontainsregexp>
+                <!-- Sort the results in file order -->
                 <sortfilter/>
             </filterchain>
         </copy>
+
+        <copy file="reports/warnings.txt" tofile="reports/warnings-deprecations.txt">
+            <filterchain>
+                <linecontainsregexp>
+                    <regexp pattern=".*: warning: \[deprecation\] .*"/>
+                </linecontainsregexp>
+           </filterchain>
+        </copy>
+
+        <copy file="reports/warnings.txt" tofile="reports/warnings-other.txt">
+            <filterchain>
+                <linecontainsregexp negate="true">
+                    <regexp pattern=".*: warning: \[deprecation\] .*"/>
+                </linecontainsregexp>
+           </filterchain>
+        </copy>
     </target>
 
     <target name="teamcity-warnings-report">