Author: rob
Date: Thu Sep 9 07:19:12 2010
New Revision: 23691
URL: https://svn.nixos.org/websvn/nix/?rev=23691&sc=1
Log:
maven-build: copy whole site dir and adapted hydra-build-products
Modified:
nixpkgs/trunk/pkgs/build-support/release/maven-build.nix
Modified: nixpkgs/trunk/pkgs/build-support/release/maven-build.nix
==============================================================================
--- nixpkgs/trunk/pkgs/build-support/release/maven-build.nix Wed Sep 8
17:15:31 2010 (r23690)
+++ nixpkgs/trunk/pkgs/build-support/release/maven-build.nix Thu Sep 9
07:19:12 2010 (r23691)
@@ -46,30 +46,23 @@
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 @@
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 @@
'';
finalPhase = ''
- ensureDir $out/site
- cp -R src/test/site/* $out/site
+ cp -R target/site $out/
'';
} // args
)
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
