diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2010-08-18 09:55:34 +0000 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2010-08-18 09:55:34 +0000 |
| commit | 9e2074f1996f787f8099ab102f3fa5558eeb3b49 (patch) | |
| tree | 058b6fa3fd03b4521ccbf4ab354afbe6563bc04d | |
| parent | f194a8aa9346c1265a9cf47166743b782febd408 (diff) | |
| download | nixlib-9e2074f1996f787f8099ab102f3fa5558eeb3b49.tar nixlib-9e2074f1996f787f8099ab102f3fa5558eeb3b49.tar.gz nixlib-9e2074f1996f787f8099ab102f3fa5558eeb3b49.tar.bz2 nixlib-9e2074f1996f787f8099ab102f3fa5558eeb3b49.tar.lz nixlib-9e2074f1996f787f8099ab102f3fa5558eeb3b49.tar.xz nixlib-9e2074f1996f787f8099ab102f3fa5558eeb3b49.tar.zst nixlib-9e2074f1996f787f8099ab102f3fa5558eeb3b49.zip | |
remove mvncobertura phase
svn path=/nixpkgs/trunk/; revision=23219
| -rw-r--r-- | pkgs/build-support/release/maven-build.nix | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/pkgs/build-support/release/maven-build.nix b/pkgs/build-support/release/maven-build.nix index 2fa42dd1b101..acd74eb194e0 100644 --- a/pkgs/build-support/release/maven-build.nix +++ b/pkgs/build-support/release/maven-build.nix @@ -17,7 +17,7 @@ in stdenv.mkDerivation ( rec { inherit name src; - phases = "setupPhase unpackPhase patchPhase mvnCompile ${if doTestCompile then "mvnTestCompile mvnTestJar" else ""} ${if doTest then "mvnTest mvnCobertura" else ""} ${if doJavadoc then "mvnJavadoc" else ""} ${if doCheckstyle then "mvnCheckstyle" else ""} mvnJar mvnAssembly mvnRelease finalPhase"; + phases = "setupPhase unpackPhase patchPhase mvnCompile ${if doTestCompile then "mvnTestCompile mvnTestJar" else ""} ${if doTest then "mvnTest" else ""} ${if doJavadoc then "mvnJavadoc" else ""} ${if doCheckstyle then "mvnCheckstyle" else ""} mvnJar mvnAssembly mvnRelease finalPhase"; setupPhase = '' runHook preSetupPhase @@ -44,6 +44,16 @@ stdenv.mkDerivation ( rec { mvnTest = '' mvn test ${mvnFlags} + + if [ -d target/site/cobertura ] ; then + cp -R target/site/cobertura $out/cobertura + echo "report cobertura $out/cobertura" >> $out/nix-support/hydra-build-products + fi + + if [ -d target/target/surefire-reports ] ; then + cp -R target/target/surefire-reports $out/surefire + echo "report surefire $out/surefire" >> $out/nix-support/hydra-build-products + fi ''; mvnJavadoc = '' @@ -52,12 +62,6 @@ stdenv.mkDerivation ( rec { echo "report javadoc $out/apidocs" >> $out/nix-support/hydra-build-products ''; - mvnCobertura = '' - mvn cobertura:cobertura ${mvnFlags} - cp -R target/site/cobertura $out/cobertura - echo "report cobertura $out/cobertura" >> $out/nix-support/hydra-build-products - ''; - mvnCheckstyle = '' mvn checkstyle:checkstyle ${mvnFlags} ensureDir $out/checkstyle |