diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2010-09-09 07:19:12 +0000 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2010-09-09 07:19:12 +0000 |
| commit | b601947bcb1fce96dba1eae8ffa2271872d7b1bf (patch) | |
| tree | a6ff90796a95fcf3d073167efa20f80b8461fe5c /pkgs/build-support | |
| parent | 7b4678b6d807e45cab7b6260b873e644dc4a57b4 (diff) | |
| download | nixlib-b601947bcb1fce96dba1eae8ffa2271872d7b1bf.tar nixlib-b601947bcb1fce96dba1eae8ffa2271872d7b1bf.tar.gz nixlib-b601947bcb1fce96dba1eae8ffa2271872d7b1bf.tar.bz2 nixlib-b601947bcb1fce96dba1eae8ffa2271872d7b1bf.tar.lz nixlib-b601947bcb1fce96dba1eae8ffa2271872d7b1bf.tar.xz nixlib-b601947bcb1fce96dba1eae8ffa2271872d7b1bf.tar.zst nixlib-b601947bcb1fce96dba1eae8ffa2271872d7b1bf.zip | |
maven-build: copy whole site dir and adapted hydra-build-products
svn path=/nixpkgs/trunk/; revision=23691
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/release/maven-build.nix | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/pkgs/build-support/release/maven-build.nix b/pkgs/build-support/release/maven-build.nix index 90596b76942e..5a470a726720 100644 --- a/pkgs/build-support/release/maven-build.nix +++ b/pkgs/build-support/release/maven-build.nix @@ -46,30 +46,23 @@ stdenv.mkDerivation ( rec { mvn test ${mvnFlags} if [ -d target/site/cobertura ] ; then - cp -R target/site/cobertura $out/cobertura - echo "report coverage $out/cobertura" >> $out/nix-support/hydra-build-products + echo "report coverage $out/site/cobertura" >> $out/nix-support/hydra-build-products fi if [ -d target/surefire-reports ] ; then mvn surefire-report:report-only - cp -vR target/surefire-reports $out/surefire - cp -v target/site/surefire-report.html $out/surefire/index.html - echo "report coverage $out/surefire/index.html" >> $out/nix-support/hydra-build-products + echo "report coverage $out/site/surefire-report.html" >> $out/nix-support/hydra-build-products fi ''; mvnJavadoc = '' mvn javadoc:javadoc ${mvnFlags} - cp -R target/site/apidocs $out/apidocs - echo "report javadoc $out/apidocs" >> $out/nix-support/hydra-build-products + echo "report javadoc $out/site/apidocs" >> $out/nix-support/hydra-build-products ''; mvnCheckstyle = '' mvn checkstyle:checkstyle ${mvnFlags} - ensureDir $out/checkstyle - cp -R target/site/checkstyle.* $out/checkstyle/ - cp -R target/site/images $out/checkstyle/images - echo "report checkstyle $out/checkstyle/checkstyle.html" >> $out/nix-support/hydra-build-products + echo "report checkstyle $out/site/checkstyle.html" >> $out/nix-support/hydra-build-products ''; mvnJar = '' @@ -82,7 +75,7 @@ stdenv.mkDerivation ( rec { mvnRelease = '' ensureDir $out/release -ls -l target/ + zip=$(ls target/*.zip| head -1) releaseName=$(basename $zip .zip) releaseName="$releaseName-r${toString src.rev}" @@ -96,8 +89,7 @@ ls -l target/ ''; finalPhase = '' - ensureDir $out/site - cp -R src/test/site/* $out/site + cp -R target/site $out/ ''; } // args ) |