Swiftdiff options
| -rw-r--r-- | Makefile | 13 | ||||
| -rw-r--r-- | build.xml | 22 |
2 files changed, 28 insertions, 7 deletions
@@ -1,7 +1,6 @@ all: dist/lib/stroke.jar -DEFINES = -Dxpp-dir=third-party/xpp -Djzlib-dir=third-party/jzlib -Dicu4j-dir=third-party/ -Dstax2-dir=third-party/stax2/ -Daalto-dir=third-party/aalto/ -Dcobertura-jar=third-party/cobertura/cobertura.jar -Djakarta-oro-jar=third-party/cobertura/lib/jakarta-oro-2.0.8.jar -Dlog4j-jar=third-party/cobertura/lib/log4j-1.2.9.jar -Dasm-jar=third-party/cobertura/lib/asm-3.0.jar -Dasm-tree-jar=third-party/cobertura/lib/asm-tree-3.0.jar - +DEFINES = -Dxpp-dir=third-party/xpp -Djzlib-dir=third-party/jzlib -Dicu4j-dir=third-party/ -Dstax2-dir=third-party/stax2/ -Daalto-dir=third-party/aalto/ JUNIT ?= /usr/share/junit/junit.jar .PHONY : clean @@ -18,8 +17,8 @@ dist/lib/stroke.jar: third-party/jzlib/jzlib.jar third-party/icu4j.jar third-par ant ${DEFINES} .PHONY : test -test: dist/lib/stroke.jar third-party/cobertura/cobertura.jar - ant ${DEFINES} -DJUNIT_JAR=${JUNIT} test +test: dist/lib/stroke.jar third-party/cobertura/cobertura.jar third-party/findbugs/lib/findbugs.jar + ant ${DEFINES} -DJUNIT_JAR=${JUNIT} -Dcobertura-jar=third-party/cobertura/cobertura.jar -Djakarta-oro-jar=third-party/cobertura/lib/jakarta-oro-2.0.8.jar -Dlog4j-jar=third-party/cobertura/lib/log4j-1.2.9.jar -Dasm-jar=third-party/cobertura/lib/asm-3.0.jar -Dasm-tree-jar=third-party/cobertura/lib/asm-tree-3.0.jar -Dfindbugs.home=third-party/findbugs test third-party/aalto/aalto-xml.jar: mkdir -p third-party/aalto @@ -47,6 +46,12 @@ third-party/cobertura/cobertura.jar: tar -xvjf third-party/cobertura-1.9.4.1-bin.tar.bz2 -C third-party/ mv third-party/cobertura-1.9.4.1 third-party/cobertura +third-party/findbugs/lib/findbugs.jar: + mkdir -p third-party + curl -L 'http://prdownloads.sourceforge.net/findbugs/findbugs-2.0.1.tar.gz?download' -o third-party/findbugs-2.0.1.tar.gz + tar -xvzf third-party/findbugs-2.0.1.tar.gz -C third-party/ + mv third-party/findbugs-2.0.1 third-party/findbugs + .git/hooks/commit-msg: curl -k https://git.swift.im/review/tools/hooks/commit-msg -o .git/hooks/commit-msg chmod u+x .git/hooks/commit-msg @@ -110,7 +110,7 @@ <target name="coverage" if="cobertura-jar" depends="instrument, run-tests"> <delete dir="${coveragereport.dir}"/> <mkdir dir="${coveragereport.dir}"/> - <cobertura-report format="html" destdir="${coveragereport.dir}"> + <cobertura-report format="xml" destdir="${coveragereport.dir}"> <fileset dir="${src}"> <include name="**/*.java"/> </fileset> @@ -120,7 +120,23 @@ </cobertura-report> </target> - <target name="test" depends="compile-tests, instrument, run-tests, coverage"> + <target name="findbugs" if="findbugs.home" depends="dist"> + <path id="findbugs-jar"> + <pathelement path="${findbugs.home}/lib/findbugs-ant.jar" /> + </path> + <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpathref="findbugs-jar" /> + <findbugs home="${findbugs.home}" + output="xml" + outputFile="findbugs.xml" > + <auxClasspath> + <path refid="classpath" /> + </auxClasspath> + <sourcePath path="${src}" /> + <class location="${jar}" /> + </findbugs> + </target> + + <target name="test" depends="compile-tests, instrument, run-tests, coverage, findbugs"> </target> <target name="clean" @@ -137,7 +153,7 @@ <target name="javadoc" depends="init"> <!-- Note that this may stall if no network connection is available to the Oracle website --> - <javadoc packagenames="com.isode.**.**" + <javadoc packagenames="com.isode.**.**" sourcepath="${src}" destdir="${doc}" windowtitle="Stroke"> |