commit: 6d5fcbd2c4d9c41f8fcd519738ebf014a279f875 Author: ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com> AuthorDate: Mon Aug 17 15:28:04 2015 +0000 Commit: Heather Cynede <cynede <AT> gentoo <DOT> org> CommitDate: Tue Aug 18 08:26:06 2015 +0000 URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=6d5fcbd2
initial attempt dev-dotnet/nant/nant-0.93.5019-r201504210.ebuild | 2 +- dev-dotnet/nunit/metadata.xml | 13 +++++++ .../nunit-3.0.0-r201508170.ebuild} | 32 ++++++++--------- eclass/dotnet.eclass | 31 ---------------- eclass/nuget.eclass | 41 ++++++++++++++++++++++ 5 files changed, 71 insertions(+), 48 deletions(-) diff --git a/dev-dotnet/nant/nant-0.93.5019-r201504210.ebuild b/dev-dotnet/nant/nant-0.93.5019-r201504210.ebuild index 67adc8f..adde289 100644 --- a/dev-dotnet/nant/nant-0.93.5019-r201504210.ebuild +++ b/dev-dotnet/nant/nant-0.93.5019-r201504210.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=5 -inherit mono-env dotnet +inherit mono-env nuget dotnet NAME="nant" HOMEPAGE="https://github.com/nant/${NAME}"; diff --git a/dev-dotnet/nunit/metadata.xml b/dev-dotnet/nunit/metadata.xml new file mode 100644 index 0000000..5c0862c --- /dev/null +++ b/dev-dotnet/nunit/metadata.xml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> +<pkgmetadata> + <herd>dotnet</herd> + <maintainer> + <email>dot...@gentoo.org</email> + <name>dotnet</name> + </maintainer> + <use> + <flag name='developer'>enables debug information for any of debug and release builds</flag> + <flag name='nupkg'>creates local nuget package</flag> + </use> +</pkgmetadata> diff --git a/dev-dotnet/nant/nant-0.93.5019-r201504210.ebuild b/dev-dotnet/nunit/nunit-3.0.0-r201508170.ebuild similarity index 52% copy from dev-dotnet/nant/nant-0.93.5019-r201504210.ebuild copy to dev-dotnet/nunit/nunit-3.0.0-r201508170.ebuild index 67adc8f..dd4cbbe 100644 --- a/dev-dotnet/nant/nant-0.93.5019-r201504210.ebuild +++ b/dev-dotnet/nunit/nunit-3.0.0-r201508170.ebuild @@ -3,33 +3,35 @@ # $Id$ EAPI=5 -inherit mono-env dotnet +inherit mono-env nuget dotnet -NAME="nant" -HOMEPAGE="https://github.com/nant/${NAME}"; +NAME="nunit" +HOMEPAGE="https://github.com/nunit/${NAME}"; -EGIT_COMMIT="45ec8aa9ad3247f340731f4e8b953c498ad3019e" +EGIT_COMMIT="f23c6a0c27c37472e12dfc6703998fbab7ed6505" SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.zip -> ${PF}.zip" S="${WORKDIR}/${NAME}-${EGIT_COMMIT}" SLOT="0" -DESCRIPTION=".NET build tool" -LICENSE="GPL-2" +DESCRIPTION="NUnit test suite for mono applications" +LICENSE="MIT" # https://github.com/nunit/nunit/blob/master/LICENSE.txt KEYWORDS="~amd64 ~ppc ~x86" IUSE="developer nupkg debug" -RDEPEND=">=dev-lang/mono-4.0.2.5" +RDEPEND=">=dev-lang/mono-4.0.2.5 + dev-dotnet/nant[nupkg] +" DEPEND="${RDEPEND} - virtual/pkgconfig " S="${WORKDIR}/${NAME}-${EGIT_COMMIT}" -SLN_FILE=NAnt.sln +SLN_FILE=nunit.linux.sln METAFILETOBUILD="${S}/${SLN_FILE}" -# This build is not parallel build friendly -#MAKEOPTS="${MAKEOPTS} -j1" +src_prepare() { + enuget_restore "${METAFILETOBUILD}" +} src_compile() { exbuild "${METAFILETOBUILD}" @@ -44,12 +46,10 @@ src_install() { DIR="Release" fi - insinto "/usr/share/nant/" + insinto "/usr/share/nunit/" doins build/${DIR}/* - make_wrapper nant "mono /usr/share/nant/NAnt.exe" - - enupkg "${WORKDIR}/NAnt.0.93.5019.nupkg" + make_wrapper nunit "mono /usr/share/nunit/NUnit.exe" - dodoc README.txt + enupkg "${WORKDIR}/NUnit.3.0.0.nupkg" } diff --git a/eclass/dotnet.eclass b/eclass/dotnet.eclass index 6222540..2bf9f72 100644 --- a/eclass/dotnet.eclass +++ b/eclass/dotnet.eclass @@ -97,37 +97,6 @@ exbuild() { xbuild /tv:4.0 "/p:TargetFrameworkVersion=v${FRAMEWORK}" "${CARGS}" "${SARGS}" "$@" || die } -# @FUNCTION: enuspec -# @DESCRIPTION: run nuget pack -enuspec() { - if use nupkg; then - if use debug; then - PROPS=Configuration=Debug - else - PROPS=Configuration=Release - fi - nuget pack -Properties "${PROPS}" -BasePath "${S}" -OutputDirectory "${WORKDIR}" -NonInteractive -Verbosity detailed "$@" || die - fi -} - -# @FUNCTION: enupkg -# @DESCRIPTION: installs .nupkg into local repository -enupkg() { - if use nupkg; then - if [ -d "/var/calculate/remote/distfiles" ]; then - # Control will enter here if the directory exist. - # this is necessary to handle calculate linux profiles feature (for corporate users) - elog "Installing .nupkg into /var/calculate/remote/packages/NuGet" - insinto /var/calculate/remote/packages/NuGet - else - # this is for all normal gentoo-based distributions - elog "Installing .nupkg into /usr/local/nuget/nupkg" - insinto /usr/local/nuget/nupkg - fi - doins "$@" - fi -} - # @FUNCTION: egacinstall # @DESCRIPTION: install package to GAC egacinstall() { diff --git a/eclass/nuget.eclass b/eclass/nuget.eclass index 2df0eb9..c7a3da2 100644 --- a/eclass/nuget.eclass +++ b/eclass/nuget.eclass @@ -9,6 +9,46 @@ inherit dotnet +# @FUNCTION: enuget_restore +# @DESCRIPTION: run nuget restore +# accepts path to .sln or .proj or .csproj file to restore as parameter +enuget_restore() { + nuget restore "$@" || die +} + +# @FUNCTION: enuspec +# @DESCRIPTION: run nuget pack +# accepts path to .nuspec file as parameter +enuspec() { + if use nupkg; then + if use debug; then + PROPS=Configuration=Debug + else + PROPS=Configuration=Release + fi + nuget pack -Properties "${PROPS}" -BasePath "${S}" -OutputDirectory "${WORKDIR}" -NonInteractive -Verbosity detailed "$@" || die + fi +} + +# @FUNCTION: enupkg +# @DESCRIPTION: installs .nupkg into local repository +# accepts path to .nupkg file as parameter +enupkg() { + if use nupkg; then + if [ -d "/var/calculate/remote/distfiles" ]; then + # Control will enter here if the directory exist. + # this is necessary to handle calculate linux profiles feature (for corporate users) + elog "Installing .nupkg into /var/calculate/remote/packages/NuGet" + insinto /var/calculate/remote/packages/NuGet + else + # this is for all normal gentoo-based distributions + elog "Installing .nupkg into /usr/local/nuget/nupkg" + insinto /usr/local/nuget/nupkg + fi + doins "$@" + fi +} + # @ECLASS_VARIABLE: NUGET_DEPEND # @DESCRIPTION Set false to net depend on nuget : ${NUGET_NO_DEPEND:=} @@ -28,6 +68,7 @@ fi # @FUNCTION: nuget_src_unpack # @DESCRIPTION: Runs nuget. nuget_src_unpack() { + default nuget install "${NPN}" -Version "${NPV}" -OutputDirectory "${P}" }
