From c3f93fbf0df88628c7e4c5b26e41f0f47747ecf9 Mon Sep 17 00:00:00 2001 From: ArsenShnurkov Date: Mon, 29 Jan 2018 20:36:42 +0300 Subject: dependency removed, version fixed --- dev-util/msbuild/files/mono-MSBuild.csproj | 16 ++- dev-util/msbuild/files/mono-Microsoft.Build.csproj | 16 ++- dev-util/msbuild/msbuild-15.3-r2.ebuild | 112 --------------------- dev-util/msbuild/msbuild-15.3-r3.ebuild | 112 +++++++++++++++++++++ 4 files changed, 138 insertions(+), 118 deletions(-) delete mode 100644 dev-util/msbuild/msbuild-15.3-r2.ebuild create mode 100644 dev-util/msbuild/msbuild-15.3-r3.ebuild (limited to 'dev-util') diff --git a/dev-util/msbuild/files/mono-MSBuild.csproj b/dev-util/msbuild/files/mono-MSBuild.csproj index e3134a1..d442f00 100644 --- a/dev-util/msbuild/files/mono-MSBuild.csproj +++ b/dev-util/msbuild/files/mono-MSBuild.csproj @@ -181,11 +181,21 @@ - - 15.3 + 15.3.0.0 - + + + <_Parameter1>$(VersionNumber) + + + <_Parameter1>$(VersionNumber) + + + <_Parameter1>$(VersionNumber) + + + diff --git a/dev-util/msbuild/files/mono-Microsoft.Build.csproj b/dev-util/msbuild/files/mono-Microsoft.Build.csproj index 1501cb1..20892e1 100644 --- a/dev-util/msbuild/files/mono-Microsoft.Build.csproj +++ b/dev-util/msbuild/files/mono-Microsoft.Build.csproj @@ -624,11 +624,21 @@ - - 15.3 + 15.3.0.0 - + + + <_Parameter1>$(VersionNumber) + + + <_Parameter1>$(VersionNumber) + + + <_Parameter1>$(VersionNumber) + + + diff --git a/dev-util/msbuild/msbuild-15.3-r2.ebuild b/dev-util/msbuild/msbuild-15.3-r2.ebuild deleted file mode 100644 index 8f0e41a..0000000 --- a/dev-util/msbuild/msbuild-15.3-r2.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 -RESTRICT="mirror" -KEYWORDS="~amd64" -SLOT="0" - -USE_DOTNET="net46" -IUSE="+${USE_DOTNET} +gac developer debug doc +roslyn" - -inherit dotnet gac - -GITHUB_ACCOUNT="mono" -GITHUB_PROJECTNAME="linux-packaging-msbuild" -EGIT_COMMIT="e08c20fd277b9de1e3a97c5bd9a5dcf95fcff926" -SRC_URI="https://github.com/${GITHUB_ACCOUNT}/${GITHUB_PROJECTNAME}/archive/${EGIT_COMMIT}.tar.gz -> ${GITHUB_PROJECTNAME}-${GITHUB_ACCOUNT}-${PV}.tar.gz - https://github.com/mono/mono/raw/master/mcs/class/mono.snk" -S="${WORKDIR}/${GITHUB_PROJECTNAME}-${EGIT_COMMIT}" - -HOMEPAGE="https://docs.microsoft.com/visualstudio/msbuild/msbuild" -DESCRIPTION="Microsoft Build Engine (MSBuild), XML-based platform for building applications" -LICENSE="MIT" # https://github.com/mono/linux-packaging-msbuild/blob/master/LICENSE - -COMMON_DEPEND=">=dev-lang/mono-5.2.0.196 - dev-dotnet/msbuild-tasks-api developer? ( dev-dotnet/msbuild-tasks-api[developer] ) - dev-dotnet/msbuild-defaulttasks developer? ( dev-dotnet/msbuild-defaulttasks[developer] ) - roslyn? ( dev-dotnet/msbuild-roslyn-csc ) -" -RDEPEND="${COMMON_DEPEND} -" -DEPEND="${COMMON_DEPEND} - dev-dotnet/buildtools - >=dev-dotnet/msbuildtasks-1.5.0.240-r1 -" - -KEY2="${DISTDIR}/mono.snk" - -PROJ1=Microsoft.Build -PROJ1_DIR=src/Build -PROJ2=MSBuild -PROJ2_DIR=src/MSBuild - -src_prepare() { - eapply "${FILESDIR}/dir.props.diff" - eapply "${FILESDIR}/dir.targets.diff" - eapply "${FILESDIR}/src-dir.targets.diff" - eapply "${FILESDIR}/tasks.patch" - eapply "${FILESDIR}/Microsoft.CSharp.targets.patch" - eapply "${FILESDIR}/Microsoft.Common.targets.patch" - sed -i 's/CurrentAssemblyVersion = "15.1.0.0"/CurrentAssemblyVersion = "15.3.0.0"/g' "${S}/src/Shared/Constants.cs" || die - sed -i 's/Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a/Microsoft.Build.Tasks.Core, Version=15.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756/g' "${S}/src/Tasks/Microsoft.Common.tasks" || die - sed -i 's/PublicKeyToken=b03f5f7f11d50a3a/PublicKeyToken=0738eb9f132ed756/g' "${S}/src/Build/Resources/Constants.cs" || die - cp "${FILESDIR}/mono-${PROJ1}.csproj" "${S}/${PROJ1_DIR}/" || die - cp "${FILESDIR}/mono-${PROJ2}.csproj" "${S}/${PROJ2_DIR}/" || die - eapply_user -} - -src_compile() { - if use developer; then - SARGS=/p:DebugSymbols=True - else - SARGS=/p:DebugSymbols=False - fi - - if use debug; then - CONFIGURATION=Debug - if use developer; then - SARGS=${SARGS} /p:DebugType=full - fi - else - CONFIGURATION=Release - if use developer; then - SARGS=${SARGS} /p:DebugType=pdbonly - fi - fi - - VER=1.0.27.0 - - exbuild_raw /v:detailed /p:TargetFrameworkVersion=v4.6 "/p:Configuration=${CONFIGURATION}" ${SARGS} "/p:VersionNumber=${VER}" "/p:RootPath=${S}" "/p:SignAssembly=true" "/p:AssemblyOriginatorKeyFile=${KEY2}" "${S}/${PROJ2_DIR}/mono-${PROJ2}.csproj" - sn -R "${PROJ1_DIR}/bin/${CONFIGURATION}/${PROJ1}.dll" "${KEY2}" || die -} - -src_install() { - if use debug; then - CONFIGURATION=Debug - else - CONFIGURATION=Release - fi - - egacinstall "${PROJ1_DIR}/bin/${CONFIGURATION}/${PROJ1}.dll" - - insinto "/usr/share/${PN}" - newins "${PROJ2_DIR}/bin/${CONFIGURATION}/${PROJ2}.exe" MSBuild.exe - doins "${S}/src/Tasks/Microsoft.Common.props" - doins "${S}/src/Tasks/Microsoft.Common.targets" - doins "${S}/src/Tasks/Microsoft.Common.overridetasks" - doins "${S}/src/Tasks/Microsoft.CSharp.targets" - doins "${S}/src/Tasks/Microsoft.CSharp.CurrentVersion.targets" - doins "${S}/src/Tasks/Microsoft.Common.CurrentVersion.targets" - doins "${S}/src/Tasks/Microsoft.NETFramework.props" - doins "${S}/src/Tasks/Microsoft.NETFramework.CurrentVersion.props" - doins "${S}/src/Tasks/Microsoft.NETFramework.targets" - doins "${S}/src/Tasks/Microsoft.NETFramework.CurrentVersion.targets" - - if use debug; then - make_wrapper msbuild "/usr/bin/mono --debug /usr/share/${PN}/MSBuild.exe" - else - make_wrapper msbuild "/usr/bin/mono /usr/share/${PN}/MSBuild.exe" - fi -} diff --git a/dev-util/msbuild/msbuild-15.3-r3.ebuild b/dev-util/msbuild/msbuild-15.3-r3.ebuild new file mode 100644 index 0000000..b6768b0 --- /dev/null +++ b/dev-util/msbuild/msbuild-15.3-r3.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +RESTRICT="mirror" +KEYWORDS="~amd64" +SLOT="0" + +USE_DOTNET="net46" +IUSE="+${USE_DOTNET} +gac developer debug doc +roslyn" + +inherit dotnet xbuild gac + +GITHUB_ACCOUNT="mono" +GITHUB_PROJECTNAME="linux-packaging-msbuild" +EGIT_COMMIT="e08c20fd277b9de1e3a97c5bd9a5dcf95fcff926" +SRC_URI="https://github.com/${GITHUB_ACCOUNT}/${GITHUB_PROJECTNAME}/archive/${EGIT_COMMIT}.tar.gz -> ${GITHUB_PROJECTNAME}-${GITHUB_ACCOUNT}-${PV}.tar.gz + https://github.com/mono/mono/raw/master/mcs/class/mono.snk" +S="${WORKDIR}/${GITHUB_PROJECTNAME}-${EGIT_COMMIT}" + +HOMEPAGE="https://docs.microsoft.com/visualstudio/msbuild/msbuild" +DESCRIPTION="Microsoft Build Engine (MSBuild), XML-based platform for building applications" +LICENSE="MIT" # https://github.com/mono/linux-packaging-msbuild/blob/master/LICENSE + +COMMON_DEPEND=">=dev-lang/mono-5.2.0.196 + dev-dotnet/msbuild-tasks-api developer? ( dev-dotnet/msbuild-tasks-api[developer] ) + dev-dotnet/msbuild-defaulttasks developer? ( dev-dotnet/msbuild-defaulttasks[developer] ) + roslyn? ( dev-dotnet/msbuild-roslyn-csc ) +" +RDEPEND="${COMMON_DEPEND} +" +DEPEND="${COMMON_DEPEND} + dev-dotnet/buildtools +" + +KEY2="${DISTDIR}/mono.snk" + +PROJ1=Microsoft.Build +PROJ1_DIR=src/Build +PROJ2=MSBuild +PROJ2_DIR=src/MSBuild + +VER=15.3.0.0 + +src_prepare() { + eapply "${FILESDIR}/dir.props.diff" + eapply "${FILESDIR}/dir.targets.diff" + eapply "${FILESDIR}/src-dir.targets.diff" + eapply "${FILESDIR}/tasks.patch" + eapply "${FILESDIR}/Microsoft.CSharp.targets.patch" + eapply "${FILESDIR}/Microsoft.Common.targets.patch" + sed -i 's/CurrentAssemblyVersion = "15.1.0.0"/CurrentAssemblyVersion = "15.3.0.0"/g' "${S}/src/Shared/Constants.cs" || die + sed -i 's/Microsoft.Build.Tasks.Core, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a/Microsoft.Build.Tasks.Core, Version=15.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756/g' "${S}/src/Tasks/Microsoft.Common.tasks" || die + sed -i 's/PublicKeyToken=b03f5f7f11d50a3a/PublicKeyToken=0738eb9f132ed756/g' "${S}/src/Build/Resources/Constants.cs" || die + cp "${FILESDIR}/mono-${PROJ1}.csproj" "${S}/${PROJ1_DIR}/" || die + cp "${FILESDIR}/mono-${PROJ2}.csproj" "${S}/${PROJ2_DIR}/" || die + eapply_user +} + +src_compile() { + if use developer; then + SARGS=/p:DebugSymbols=True + else + SARGS=/p:DebugSymbols=False + fi + + if use debug; then + CONFIGURATION=Debug + if use developer; then + SARGS=${SARGS} /p:DebugType=full + fi + else + CONFIGURATION=Release + if use developer; then + SARGS=${SARGS} /p:DebugType=pdbonly + fi + fi + + + exbuild_raw /v:detailed /p:TargetFrameworkVersion=v4.6 "/p:Configuration=${CONFIGURATION}" ${SARGS} "/p:VersionNumber=${VER}" "/p:RootPath=${S}" "/p:SignAssembly=true" "/p:AssemblyOriginatorKeyFile=${KEY2}" "${S}/${PROJ2_DIR}/mono-${PROJ2}.csproj" + sn -R "${PROJ1_DIR}/bin/${CONFIGURATION}/${PROJ1}.dll" "${KEY2}" || die +} + +src_install() { + if use debug; then + CONFIGURATION=Debug + else + CONFIGURATION=Release + fi + + egacinstall "${PROJ1_DIR}/bin/${CONFIGURATION}/${PROJ1}.dll" + + insinto "/usr/share/${PN}" + newins "${PROJ2_DIR}/bin/${CONFIGURATION}/${PROJ2}.exe" MSBuild.exe + doins "${S}/src/Tasks/Microsoft.Common.props" + doins "${S}/src/Tasks/Microsoft.Common.targets" + doins "${S}/src/Tasks/Microsoft.Common.overridetasks" + doins "${S}/src/Tasks/Microsoft.CSharp.targets" + doins "${S}/src/Tasks/Microsoft.CSharp.CurrentVersion.targets" + doins "${S}/src/Tasks/Microsoft.Common.CurrentVersion.targets" + doins "${S}/src/Tasks/Microsoft.NETFramework.props" + doins "${S}/src/Tasks/Microsoft.NETFramework.CurrentVersion.props" + doins "${S}/src/Tasks/Microsoft.NETFramework.targets" + doins "${S}/src/Tasks/Microsoft.NETFramework.CurrentVersion.targets" + + if use debug; then + make_wrapper msbuild "/usr/bin/mono --debug /usr/share/${PN}/MSBuild.exe" + else + make_wrapper msbuild "/usr/bin/mono /usr/share/${PN}/MSBuild.exe" + fi +} -- cgit v1.2.3-65-gdbad