commit: dea962fd4c5399248238d54917a81bd4eb305d9c
Author: ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com>
AuthorDate: Fri Sep 30 08:22:16 2016 +0000
Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Fri Sep 30 08:22:16 2016 +0000
URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=dea962fd
added patch for gac version number
.../castle-core/castle-core-4.0.0_beta1.ebuild | 6 ++--
.../files/add-version-property-handling.patch | 36 ++++++++++++++++++++++
.../remove-warnings-as-errors-4.0.0_beta1.patch | 16 +++++-----
dev-dotnet/castle-core/metadata.xml | 4 ---
4 files changed, 48 insertions(+), 14 deletions(-)
diff --git a/dev-dotnet/castle-core/castle-core-4.0.0_beta1.ebuild
b/dev-dotnet/castle-core/castle-core-4.0.0_beta1.ebuild
index f9c44e7..c77dd4e 100644
--- a/dev-dotnet/castle-core/castle-core-4.0.0_beta1.ebuild
+++ b/dev-dotnet/castle-core/castle-core-4.0.0_beta1.ebuild
@@ -27,7 +27,8 @@ DEPEND="${COMMON_DEPEND}
"
src_prepare() {
- epatch "${FILESDIR}/remove-warnings-as-errors-${PV}.patch"
+ eapply "${FILESDIR}/add-version-property-handling.patch"
+ eapply "${FILESDIR}/remove-warnings-as-errors-${PV}.patch"
eapply_user
}
@@ -44,7 +45,7 @@ src_compile() {
SARGS=/p:DebugSymbols=False
fi
- exbuild_raw /v:detailed /tv:4.0 /p:TargetFrameworkVersion=v4.5 ${CARGS}
${SARGS} "/p:RootPath=${S}" "Castle.Core.sln"
+ exbuild_raw /v:detailed /tv:4.0 /p:TargetFrameworkVersion=v4.5 ${CARGS}
${SARGS} /p:VersionNumber=4.0.0.0 "/p:RootPath=${S}" "Castle.Core.sln"
}
src_install() {
@@ -54,4 +55,5 @@ src_install() {
CONFIGURATION=NET45-Release
fi
egacinstall "src/Castle.Core/bin/${CONFIGURATION}/Castle.Core.dll"
+ einstall_pc_file "${PN}" "${PV}" "Castle.Core.dll"
}
diff --git a/dev-dotnet/castle-core/files/add-version-property-handling.patch
b/dev-dotnet/castle-core/files/add-version-property-handling.patch
new file mode 100644
index 0000000..202f5f2
--- /dev/null
+++ b/dev-dotnet/castle-core/files/add-version-property-handling.patch
@@ -0,0 +1,36 @@
+--- a/src/Castle.Core/Castle.Core.csproj
++++ b/src/Castle.Core/Castle.Core.csproj
+@@ -552,11 +555,29 @@
+ <DefineConstants>$(DefineConstants)
$(AdditionalDefineConstants)</DefineConstants>
+ </PropertyGroup>
+ <Import Project="$(BuildScriptsPath)\Castle.Common.targets" />
+- <!-- To modify your build process, add your task inside one of the targets
below and uncomment it.
+- Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
++ <ItemGroup>
++ <AssemblyAttributes Include="AssemblyProduct">
++ <_Parameter1>Castle Core for .NET Framework 4.5</_Parameter1>
++ </AssemblyAttributes>
++ <AssemblyAttributes Include="AssemblyCompany">
++ <_Parameter1>Castle Project</_Parameter1>
++ </AssemblyAttributes>
++ <AssemblyAttributes Include="AssemblyCopyright">
++ <_Parameter1>Copyright (c) 2004-2016 Castle Project -
http://www.castleproject.org</_Parameter1>
++ </AssemblyAttributes>
++ <AssemblyAttributes Include="AssemblyVersion">
++ <_Parameter1>$(VersionNumber)</_Parameter1>
++ </AssemblyAttributes>
++ <AssemblyAttributes Include="AssemblyFileVersion">
++ <_Parameter1>$(VersionNumber)</_Parameter1>
++ </AssemblyAttributes>
++ <AssemblyAttributes Include="AssemblyInformationalVersion">
++ <_Parameter1>$(VersionNumber)</_Parameter1>
++ </AssemblyAttributes>
++ </ItemGroup>
++ <WriteCodeFragment Language="C#"
OutputFile="../../buildscripts/CommonAssemblyInfo.cs"
AssemblyAttributes="@(AssemblyAttributes)" />
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
+- -->
+ </Project>
+\ No newline at end of file
diff --git
a/dev-dotnet/castle-core/files/remove-warnings-as-errors-4.0.0_beta1.patch
b/dev-dotnet/castle-core/files/remove-warnings-as-errors-4.0.0_beta1.patch
index 6b69fa9..7fa31b9 100644
--- a/dev-dotnet/castle-core/files/remove-warnings-as-errors-4.0.0_beta1.patch
+++ b/dev-dotnet/castle-core/files/remove-warnings-as-errors-4.0.0_beta1.patch
@@ -1,5 +1,5 @@
---- src/Castle.Core.Tests/Castle.Core.Tests.csproj
-+++ src/Castle.Core.Tests/Castle.Core.Tests.csproj
+--- a/src/Castle.Core.Tests/Castle.Core.Tests.csproj
++++ b/src/Castle.Core.Tests/Castle.Core.Tests.csproj
@@ -29,7 +29,6 @@
<Optimize>false</Optimize>
<DefineConstants>TRACE;DEBUG;DOTNET40</DefineConstants>
@@ -48,8 +48,8 @@
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
---- src/Castle.Core/Castle.Core.csproj
-+++ src/Castle.Core/Castle.Core.csproj
+--- a/src/Castle.Core/Castle.Core.csproj
++++ b/src/Castle.Core/Castle.Core.csproj
@@ -27,7 +27,6 @@
<Optimize>false</Optimize>
<DefineConstants>TRACE;DEBUG;DOTNET40</DefineConstants>
@@ -98,8 +98,8 @@
<NoWarn>1591</NoWarn>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
----
src/Castle.Services.Logging.NLogIntegration/Castle.Services.Logging.NLogIntegration.csproj
-+++
src/Castle.Services.Logging.NLogIntegration/Castle.Services.Logging.NLogIntegration.csproj
+---
a/src/Castle.Services.Logging.NLogIntegration/Castle.Services.Logging.NLogIntegration.csproj
++++
b/src/Castle.Services.Logging.NLogIntegration/Castle.Services.Logging.NLogIntegration.csproj
@@ -41,7 +41,6 @@
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
@@ -148,8 +148,8 @@
<FileAlignment>4096</FileAlignment>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
----
src/Castle.Services.Logging.log4netIntegration/Castle.Services.Logging.log4netIntegration.csproj
-+++
src/Castle.Services.Logging.log4netIntegration/Castle.Services.Logging.log4netIntegration.csproj
+---
a/src/Castle.Services.Logging.log4netIntegration/Castle.Services.Logging.log4netIntegration.csproj
++++
b/src/Castle.Services.Logging.log4netIntegration/Castle.Services.Logging.log4netIntegration.csproj
@@ -53,7 +53,6 @@
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
diff --git a/dev-dotnet/castle-core/metadata.xml
b/dev-dotnet/castle-core/metadata.xml
index 166e76b..60328c2 100644
--- a/dev-dotnet/castle-core/metadata.xml
+++ b/dev-dotnet/castle-core/metadata.xml
@@ -5,8 +5,4 @@
<email>[email protected]</email>
<description>Gentoo Dotnet Project</description>
</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>
