1 |
commit: dea962fd4c5399248238d54917a81bd4eb305d9c |
2 |
Author: ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Sep 30 08:22:16 2016 +0000 |
4 |
Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 30 08:22:16 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=dea962fd |
7 |
|
8 |
added patch for gac version number |
9 |
|
10 |
.../castle-core/castle-core-4.0.0_beta1.ebuild | 6 ++-- |
11 |
.../files/add-version-property-handling.patch | 36 ++++++++++++++++++++++ |
12 |
.../remove-warnings-as-errors-4.0.0_beta1.patch | 16 +++++----- |
13 |
dev-dotnet/castle-core/metadata.xml | 4 --- |
14 |
4 files changed, 48 insertions(+), 14 deletions(-) |
15 |
|
16 |
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 |
17 |
index f9c44e7..c77dd4e 100644 |
18 |
--- a/dev-dotnet/castle-core/castle-core-4.0.0_beta1.ebuild |
19 |
+++ b/dev-dotnet/castle-core/castle-core-4.0.0_beta1.ebuild |
20 |
@@ -27,7 +27,8 @@ DEPEND="${COMMON_DEPEND} |
21 |
" |
22 |
|
23 |
src_prepare() { |
24 |
- epatch "${FILESDIR}/remove-warnings-as-errors-${PV}.patch" |
25 |
+ eapply "${FILESDIR}/add-version-property-handling.patch" |
26 |
+ eapply "${FILESDIR}/remove-warnings-as-errors-${PV}.patch" |
27 |
eapply_user |
28 |
} |
29 |
|
30 |
@@ -44,7 +45,7 @@ src_compile() { |
31 |
SARGS=/p:DebugSymbols=False |
32 |
fi |
33 |
|
34 |
- exbuild_raw /v:detailed /tv:4.0 /p:TargetFrameworkVersion=v4.5 ${CARGS} ${SARGS} "/p:RootPath=${S}" "Castle.Core.sln" |
35 |
+ 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" |
36 |
} |
37 |
|
38 |
src_install() { |
39 |
@@ -54,4 +55,5 @@ src_install() { |
40 |
CONFIGURATION=NET45-Release |
41 |
fi |
42 |
egacinstall "src/Castle.Core/bin/${CONFIGURATION}/Castle.Core.dll" |
43 |
+ einstall_pc_file "${PN}" "${PV}" "Castle.Core.dll" |
44 |
} |
45 |
|
46 |
diff --git a/dev-dotnet/castle-core/files/add-version-property-handling.patch b/dev-dotnet/castle-core/files/add-version-property-handling.patch |
47 |
new file mode 100644 |
48 |
index 0000000..202f5f2 |
49 |
--- /dev/null |
50 |
+++ b/dev-dotnet/castle-core/files/add-version-property-handling.patch |
51 |
@@ -0,0 +1,36 @@ |
52 |
+--- a/src/Castle.Core/Castle.Core.csproj |
53 |
++++ b/src/Castle.Core/Castle.Core.csproj |
54 |
+@@ -552,11 +555,29 @@ |
55 |
+ <DefineConstants>$(DefineConstants) $(AdditionalDefineConstants)</DefineConstants> |
56 |
+ </PropertyGroup> |
57 |
+ <Import Project="$(BuildScriptsPath)\Castle.Common.targets" /> |
58 |
+- <!-- To modify your build process, add your task inside one of the targets below and uncomment it. |
59 |
+- Other similar extension points exist, see Microsoft.Common.targets. |
60 |
+ <Target Name="BeforeBuild"> |
61 |
++ <ItemGroup> |
62 |
++ <AssemblyAttributes Include="AssemblyProduct"> |
63 |
++ <_Parameter1>Castle Core for .NET Framework 4.5</_Parameter1> |
64 |
++ </AssemblyAttributes> |
65 |
++ <AssemblyAttributes Include="AssemblyCompany"> |
66 |
++ <_Parameter1>Castle Project</_Parameter1> |
67 |
++ </AssemblyAttributes> |
68 |
++ <AssemblyAttributes Include="AssemblyCopyright"> |
69 |
++ <_Parameter1>Copyright (c) 2004-2016 Castle Project - http://www.castleproject.org</_Parameter1> |
70 |
++ </AssemblyAttributes> |
71 |
++ <AssemblyAttributes Include="AssemblyVersion"> |
72 |
++ <_Parameter1>$(VersionNumber)</_Parameter1> |
73 |
++ </AssemblyAttributes> |
74 |
++ <AssemblyAttributes Include="AssemblyFileVersion"> |
75 |
++ <_Parameter1>$(VersionNumber)</_Parameter1> |
76 |
++ </AssemblyAttributes> |
77 |
++ <AssemblyAttributes Include="AssemblyInformationalVersion"> |
78 |
++ <_Parameter1>$(VersionNumber)</_Parameter1> |
79 |
++ </AssemblyAttributes> |
80 |
++ </ItemGroup> |
81 |
++ <WriteCodeFragment Language="C#" OutputFile="../../buildscripts/CommonAssemblyInfo.cs" AssemblyAttributes="@(AssemblyAttributes)" /> |
82 |
+ </Target> |
83 |
+ <Target Name="AfterBuild"> |
84 |
+ </Target> |
85 |
+- --> |
86 |
+ </Project> |
87 |
+\ No newline at end of file |
88 |
|
89 |
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 |
90 |
index 6b69fa9..7fa31b9 100644 |
91 |
--- a/dev-dotnet/castle-core/files/remove-warnings-as-errors-4.0.0_beta1.patch |
92 |
+++ b/dev-dotnet/castle-core/files/remove-warnings-as-errors-4.0.0_beta1.patch |
93 |
@@ -1,5 +1,5 @@ |
94 |
---- src/Castle.Core.Tests/Castle.Core.Tests.csproj |
95 |
-+++ src/Castle.Core.Tests/Castle.Core.Tests.csproj |
96 |
+--- a/src/Castle.Core.Tests/Castle.Core.Tests.csproj |
97 |
++++ b/src/Castle.Core.Tests/Castle.Core.Tests.csproj |
98 |
@@ -29,7 +29,6 @@ |
99 |
<Optimize>false</Optimize> |
100 |
<DefineConstants>TRACE;DEBUG;DOTNET40</DefineConstants> |
101 |
@@ -48,8 +48,8 @@ |
102 |
<DebugType>pdbonly</DebugType> |
103 |
<PlatformTarget>AnyCPU</PlatformTarget> |
104 |
<ErrorReport>prompt</ErrorReport> |
105 |
---- src/Castle.Core/Castle.Core.csproj |
106 |
-+++ src/Castle.Core/Castle.Core.csproj |
107 |
+--- a/src/Castle.Core/Castle.Core.csproj |
108 |
++++ b/src/Castle.Core/Castle.Core.csproj |
109 |
@@ -27,7 +27,6 @@ |
110 |
<Optimize>false</Optimize> |
111 |
<DefineConstants>TRACE;DEBUG;DOTNET40</DefineConstants> |
112 |
@@ -98,8 +98,8 @@ |
113 |
<NoWarn>1591</NoWarn> |
114 |
<DebugType>pdbonly</DebugType> |
115 |
<PlatformTarget>AnyCPU</PlatformTarget> |
116 |
---- src/Castle.Services.Logging.NLogIntegration/Castle.Services.Logging.NLogIntegration.csproj |
117 |
-+++ src/Castle.Services.Logging.NLogIntegration/Castle.Services.Logging.NLogIntegration.csproj |
118 |
+--- a/src/Castle.Services.Logging.NLogIntegration/Castle.Services.Logging.NLogIntegration.csproj |
119 |
++++ b/src/Castle.Services.Logging.NLogIntegration/Castle.Services.Logging.NLogIntegration.csproj |
120 |
@@ -41,7 +41,6 @@ |
121 |
<Optimize>false</Optimize> |
122 |
<RegisterForComInterop>false</RegisterForComInterop> |
123 |
@@ -148,8 +148,8 @@ |
124 |
<FileAlignment>4096</FileAlignment> |
125 |
<DebugType>pdbonly</DebugType> |
126 |
<PlatformTarget>AnyCPU</PlatformTarget> |
127 |
---- src/Castle.Services.Logging.log4netIntegration/Castle.Services.Logging.log4netIntegration.csproj |
128 |
-+++ src/Castle.Services.Logging.log4netIntegration/Castle.Services.Logging.log4netIntegration.csproj |
129 |
+--- a/src/Castle.Services.Logging.log4netIntegration/Castle.Services.Logging.log4netIntegration.csproj |
130 |
++++ b/src/Castle.Services.Logging.log4netIntegration/Castle.Services.Logging.log4netIntegration.csproj |
131 |
@@ -53,7 +53,6 @@ |
132 |
<Optimize>false</Optimize> |
133 |
<RegisterForComInterop>false</RegisterForComInterop> |
134 |
|
135 |
diff --git a/dev-dotnet/castle-core/metadata.xml b/dev-dotnet/castle-core/metadata.xml |
136 |
index 166e76b..60328c2 100644 |
137 |
--- a/dev-dotnet/castle-core/metadata.xml |
138 |
+++ b/dev-dotnet/castle-core/metadata.xml |
139 |
@@ -5,8 +5,4 @@ |
140 |
<email>dotnet@g.o</email> |
141 |
<description>Gentoo Dotnet Project</description> |
142 |
</maintainer> |
143 |
- <use> |
144 |
- <flag name='developer'>enables debug information for any of debug and release builds</flag> |
145 |
- <flag name='nupkg'>creates local nuget package</flag> |
146 |
- </use> |
147 |
</pkgmetadata> |