[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/system-web/files/, dev-dotnet/system-web/
commit: a5cc83c1a83841b8a54e9501a12df6a04f73252b Author: ArsenShnurkov gmail com> AuthorDate: Tue Sep 27 07:28:49 2016 + Commit: Mikhail Pukhlikov gentoo org> CommitDate: Tue Sep 27 07:28:49 2016 + URL:https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=a5cc83c1 patch for AutoFac dev-dotnet/system-web/files/autofac.patch | 24 + .../system-web/system-web-4.6.0.182-r1.ebuild | 108 + 2 files changed, 132 insertions(+) diff --git a/dev-dotnet/system-web/files/autofac.patch b/dev-dotnet/system-web/files/autofac.patch new file mode 100644 index 000..1983c1d --- /dev/null +++ b/dev-dotnet/system-web/files/autofac.patch @@ -0,0 +1,24 @@ +--- a/mcs/class/System.Web/System.Web.Hosting/HostingEnvironment.cs b/mcs/class/System.Web/System.Web.Hosting/HostingEnvironment.cs +@@ -156,9 +156,18 @@ + + HttpContext context = HttpContext.Current; + HttpRequest req = context == null ? null : context.Request; +- if (req == null) +- return null; +- ++ if (req == null) // ADDED for Orchard ++ { ++ var pp = HostingEnvironment.ApplicationPhysicalPath; ++ String vp=virtualPath; ++ if (vp.IndexOf("~/") == 0) ++ { ++ vp = pp + virtualPath.Substring(2); ++ } ++ // TODO: if not "~/" then what? ++ return vp; ++ } // END added for Orchard ++ else + return req.MapPath (virtualPath); + } + diff --git a/dev-dotnet/system-web/system-web-4.6.0.182-r1.ebuild b/dev-dotnet/system-web/system-web-4.6.0.182-r1.ebuild new file mode 100644 index 000..4bf29d9 --- /dev/null +++ b/dev-dotnet/system-web/system-web-4.6.0.182-r1.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +USE_DOTNET="net45" +inherit gac dotnet +IUSE+=" +net45 +pkg-config debug" + +DESCRIPTION="Framework for developing web-applications" +HOMEPAGE="https://www.asp.net/; +SRC_URI="https://github.com/ArsenShnurkov/shnurise-tarballs/archive/dev-dotnet/system-web/system-web-4.6.0.182.tar.gz; +RESTRICT="mirror" +S="${WORKDIR}/shnurise-tarballs-${CATEGORY}-${PN}-${PN}-${PV}" + +NAME=System.Web + +LICENSE="Apache-2.0" +SLOT="0" + +KEYWORDS="~amd64 ~x86" + +# dependency on mono is included in dotnet.eclass which is inherited with nupkg.eclass (so no need to include >=dev-lang/mono-4.0.2.5 here) +# dependency on nuget is included in nupkg.eclass when USE="nupkg" is set +COMMONDEPEND=" +" +RDEPEND="${COMMONDEPEND} +" +DEPEND="${COMMONDEPEND} +" + +CSPROJ=${NAME}.csproj + +src_prepare() +{ + sed -i 's/public const string FxVersion = "4.0.0.0";/public const string FxVersion = "'${PV}'";/g' "${S}/mcs/build/common/Consts.cs" || die + sed "s/4.6.0.150/4.6.0.182/g" "${FILESDIR}/policy.4.0.System.Web.config" > "${S}/policy.4.0.System.Web.config" || die + eapply "${FILESDIR}/add-system-diagnostics-namespace.patch" + eapply "${FILESDIR}/autofac.patch" + eapply_user +} + +src_configure() +{ + :; +} + +KEYFILE1=${S}/mcs/class/msfinal.pub +KEYFILE2=${S}/mcs/class/mono.snk + +src_compile() +{ + # System.Web.dll + exbuild /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=${KEYFILE1} /p:DelaySign=true "${S}/mcs/class/${NAME}/${CSPROJ}" + if use debug; then + DIR="Debug" + else + DIR="Release" + fi + sn -R "${S}/mcs/class/${NAME}/obj/${DIR}/${NAME}.dll" ${KEYFILE2} || die + + # Policy file + al "/link:${S}/policy.4.0.System.Web.config" "/out:${S}/policy.4.0.System.Web.dll" "/keyfile:${KEYFILE1}" /delaysign+ || die + sn -R "${S}/policy.4.0.System.Web.dll" ${KEYFILE2} || die +} + +src_install() +{ + if use debug; then + DIR="Debug" + else + DIR="Release" + fi + egacinstall "${S}/mcs/class/${NAME}/obj/${DIR}/${NAME}.dll" + egacinstall "${S}/policy.4.0.System.Web.dll" + install_pc_file "${PN}" "${NAME}.dll" +} + +# The file format contains predefined metadata keywords and freeform variables (like ${prefix} and ${exec_prefix}) +# $1 = ${PN} +# $2 = myassembly.dll +install_pc_file() +{ + if use pkg-config; then + dodir /usr/$(get_libdir)/pkgconfig + ebegin "Installing ${PC_FILE_NAME}.pc file" + sed \ + -e "s:@LIBDIR@:$(get_libdir):" \ + -e "s:@PACKAGENAME@:$1:" \ + -e "s:@DESCRIPTION@:${DESCRIPTION}:" \ + -e
[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/system-web/files/, dev-dotnet/system-web/, ...
commit: 1fc621bbb94982673c4fc39e1e586e70cfde3acb Author: ArsenShnurkov gmail com> AuthorDate: Tue Sep 6 12:00:08 2016 + Commit: Mikhail Pukhlikov gentoo org> CommitDate: Tue Sep 6 12:00:08 2016 + URL:https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=1fc621bb initial version .../system-web-razor-3.2.3_p2014092400.ebuild | 2 +- dev-dotnet/system-web/files/System.Web.csproj.gz | Bin 0 -> 11207 bytes dev-dotnet/system-web/metadata.xml | 20 dev-dotnet/system-web/system-web-4.6.0.150.ebuild | 57 + 4 files changed, 78 insertions(+), 1 deletion(-) diff --git a/dev-dotnet/system-web-razor/system-web-razor-3.2.3_p2014092400.ebuild b/dev-dotnet/system-web-razor/system-web-razor-3.2.3_p2014092400.ebuild index 947f6be..1b01a5f 100644 --- a/dev-dotnet/system-web-razor/system-web-razor-3.2.3_p2014092400.ebuild +++ b/dev-dotnet/system-web-razor/system-web-razor-3.2.3_p2014092400.ebuild @@ -74,7 +74,7 @@ patch_nuspec_file() src_compile() { exbuild "${METAFILETOBUILD}" sn -R "${DLL_PATH}/${DIR}/${DLL_NAME}.dll" /var/lib/layman/dotnet/eclass/mono.snk || die - + exbuild "${S}/src/System.Web.WebPages.Razor/System.Web.WebPages.Razor.csproj" sn -R "${DLL_PATH}/${DIR}/System.Web.WebPages.Razor.dll" /var/lib/layman/dotnet/eclass/mono.snk || die diff --git a/dev-dotnet/system-web/files/System.Web.csproj.gz b/dev-dotnet/system-web/files/System.Web.csproj.gz new file mode 100644 index 000..056406a Binary files /dev/null and b/dev-dotnet/system-web/files/System.Web.csproj.gz differ diff --git a/dev-dotnet/system-web/metadata.xml b/dev-dotnet/system-web/metadata.xml new file mode 100644 index 000..5875c6f --- /dev/null +++ b/dev-dotnet/system-web/metadata.xml @@ -0,0 +1,20 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + dot...@gentoo.org + Gentoo Dotnet Project + + + https://github.com/gentoo/dotnet/issues + mono/mono + + + + + This package contains the Microsoft.Web.Infrastructure assembly that lets you dynamically register HTTP modules at run time. + + + Сборка Microsoft.Web.Infrastructure.dll позволяет регистрировать модули HTTP динамически во время выполнения. + + diff --git a/dev-dotnet/system-web/system-web-4.6.0.150.ebuild b/dev-dotnet/system-web/system-web-4.6.0.150.ebuild new file mode 100644 index 000..c33e70f --- /dev/null +++ b/dev-dotnet/system-web/system-web-4.6.0.150.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +USE_DOTNET="net45" +inherit gac nupkg +IUSE+=" +net45 debug" + +DESCRIPTION="assembly that lets you dynamically register HTTP modules at run time" +HOMEPAGE="https://www.asp.net/; +SRC_URI="http://download.mono-project.com/sources/mono/mono-4.6.0.150.tar.bz2; + +NAME=System.Web + +LICENSE="Apache-2.0" +SLOT="0" + +KEYWORDS="~amd64 ~x86" + +# dependency on mono is included in dotnet.eclass which is inherited with nupkg.eclass (so no need to include >=dev-lang/mono-4.0.2.5 here) +# dependency on nuget is included in nupkg.eclass when USE="nupkg" is set +COMMONDEPEND=" +" +RDEPEND="${COMMONDEPEND} +" +DEPEND="${COMMONDEPEND} +" + +S="${WORKDIR}/mono-4.6.0" + +CSPROJ=${NAME}.csproj + +src_prepare() +{ + gunzip --decompress --stdout "${FILESDIR}/${CSPROJ}.gz" >"${S}/mcs/class/${NAME}/${CSPROJ}" || die + sed -i 's/public const string FxVersion = "4.0.0.0";/public const string FxVersion = "'${PV}'";/g' "${S}/mcs/build/common/Consts.cs" || die + eapply_user +} + +src_configure() +{ + :; +} + +src_compile() +{ + exbuild "${S}/mcs/class/${NAME}/${CSPROJ}" + sn -R "${S}/mcs/class/${NAME}/${NAME}.dll" "${S}/mcs/class/mono.snk" || die +} + +src_install() +{ + # installation to GAC will cause file collision with mono package + egacinstall "${S}/mcs/class/${NAME}/${NAME}.dll" +}
[gentoo-commits] proj/dotnet:master commit in: dev-dotnet/system-web/files/, dev-dotnet/system-web/
commit: 975824cde6ff903b49aafdd8a67ecfd1cded6a4e Author: ArsenShnurkov gmail com> AuthorDate: Tue Sep 6 15:10:31 2016 + Commit: Mikhail Pukhlikov gentoo org> CommitDate: Tue Sep 6 15:10:31 2016 + URL:https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=975824cd policy added dev-dotnet/system-web/files/policy.4.0.System.Web.config | 10 ++ dev-dotnet/system-web/system-web-4.6.0.150.ebuild| 14 +++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dev-dotnet/system-web/files/policy.4.0.System.Web.config b/dev-dotnet/system-web/files/policy.4.0.System.Web.config new file mode 100644 index 000..8788fe9 --- /dev/null +++ b/dev-dotnet/system-web/files/policy.4.0.System.Web.config @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/dev-dotnet/system-web/system-web-4.6.0.150.ebuild b/dev-dotnet/system-web/system-web-4.6.0.150.ebuild index c33e70f..c7bcc87 100644 --- a/dev-dotnet/system-web/system-web-4.6.0.150.ebuild +++ b/dev-dotnet/system-web/system-web-4.6.0.150.ebuild @@ -5,7 +5,7 @@ EAPI=6 USE_DOTNET="net45" -inherit gac nupkg +inherit gac dotnet IUSE+=" +net45 debug" DESCRIPTION="assembly that lets you dynamically register HTTP modules at run time" @@ -36,6 +36,7 @@ src_prepare() { gunzip --decompress --stdout "${FILESDIR}/${CSPROJ}.gz" >"${S}/mcs/class/${NAME}/${CSPROJ}" || die sed -i 's/public const string FxVersion = "4.0.0.0";/public const string FxVersion = "'${PV}'";/g' "${S}/mcs/build/common/Consts.cs" || die + cp "${FILESDIR}/policy.4.0.System.Web.config" "${S}/policy.4.0.System.Web.config" || die eapply_user } @@ -44,14 +45,21 @@ src_configure() :; } +KEYFILE1=${S}/mcs/class/msfinal.pub +KEYFILE2=${S}/mcs/class/mono.snk + src_compile() { - exbuild "${S}/mcs/class/${NAME}/${CSPROJ}" - sn -R "${S}/mcs/class/${NAME}/${NAME}.dll" "${S}/mcs/class/mono.snk" || die + #exbuild "${S}/mcs/class/${NAME}/${CSPROJ}" + exbuild /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=${KEYFILE1} /p:DelaySign=true "${S}/mcs/class/${NAME}/${CSPROJ}" + sn -R "${S}/mcs/class/${NAME}/${NAME}.dll" ${KEYFILE2} || die + al "/link:${S}/policy.4.0.System.Web.config" "/out:${S}/policy.4.0.System.Web.dll" "/keyfile:${KEYFILE1}" /delaysign+ || die + sn -R "${S}/policy.4.0.System.Web.dll" ${KEYFILE2} || die } src_install() { # installation to GAC will cause file collision with mono package egacinstall "${S}/mcs/class/${NAME}/${NAME}.dll" + egacinstall "${S}/policy.4.0.System.Web.dll" }