Swiftdiff options
| author | Nick Hudson <nick.hudson@isode.com> | 2015-07-24 15:04:11 (GMT) |
|---|---|---|
| committer | Nick Hudson <nick.hudson@isode.com> | 2015-07-27 14:12:56 (GMT) |
| commit | 9a419f5fff0701e672e241a515ce3e91438b3e1b (patch) | |
| tree | 43c2f555f78a0cc6f7e430957eb9b82d65a7b8fa /Makefile | |
| parent | 9ead0fdcca595df9dc3f4143122776b398dbe405 (diff) | |
| download | stroke-9a419f5fff0701e672e241a515ce3e91438b3e1b.zip stroke-9a419f5fff0701e672e241a515ce3e91438b3e1b.tar.bz2 | |
Update findbugs version, and fix Makefile to fetch it
Version 3.0.1 of findbugs works with java 8 (the current version being used
breaks if you run tests under java 8). This change updates the Makefile so
that it fetches 3.0.1.
This change also updates the findbugs rules so that the findbugs
version is taken into account when checking to see if a version of
findbugs needs to be fetched. So this means that when this patch is
applied, a "make test" in existing checkouts will pull in the new
version of findbugs.
The same mechanism could be used for other 3rd party libraries when they get
changed.
Test-information:
Tested that new version of findbugs is fetched on a clean checkout, and for a
checkout that already has the previous findbugs. Also tested that it won't
re-fetch findbugs if you've already got the right version.
Ran unit test under java 8, works OK
Ran unit test under java 7, works OK
Change-Id: I3515e62f6b663ec3d56619ab18d2bb262bb6cd25
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -16,9 +16,11 @@ distclean: clean dist/lib/stroke.jar: third-party/jzlib/jzlib.jar third-party/icu4j.jar third-party/aalto/aalto-xml.jar third-party/stax2/stax2-api.jar third-party/dnsjava/dnsjava.jar ant ${DEFINES} +FINDBUGS_VERSION=3.0.1 + .PHONY : test -test: dist/lib/stroke.jar third-party/cobertura/cobertura.jar third-party/findbugs/lib/findbugs.jar third-party/pmd/lib/pmd-5.0.0.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 -Dicu4j-jar=third-party/icu4j.jar -Dfindbugs.home=third-party/findbugs -Dpmd.home=third-party/pmd test +test: dist/lib/stroke.jar third-party/cobertura/cobertura.jar third-party/findbugs-$(FINDBUGS_VERSION)/lib/findbugs.jar third-party/pmd/lib/pmd-5.0.0.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 -Dicu4j-jar=third-party/icu4j.jar -Dfindbugs.home=third-party/findbugs-$(FINDBUGS_VERSION) -Dpmd.home=third-party/pmd test third-party/aalto/aalto-xml.jar: mkdir -p third-party/aalto @@ -50,11 +52,11 @@ 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: +third-party/findbugs-$(FINDBUGS_VERSION)/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 + curl -L 'http://prdownloads.sourceforge.net/findbugs/findbugs-$(FINDBUGS_VERSION).tar.gz?download' -o third-party/findbugs-$(FINDBUGS_VERSION).tar.gz + tar -xvzf third-party/findbugs-$(FINDBUGS_VERSION).tar.gz -C third-party/ + third-party/pmd/lib/pmd-5.0.0.jar: mkdir -p third-party |