1 |
commit: 04bf2b189f2b25cea595313621d27d9281d5bef9 |
2 |
Author: ArsenShnurkov <ArsenShnurkov <AT> users <DOT> noreply <DOT> github <DOT> com> |
3 |
AuthorDate: Fri Oct 13 14:04:51 2017 +0000 |
4 |
Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 13 14:04:51 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=04bf2b18 |
7 |
|
8 |
build completed |
9 |
|
10 |
app-shells/pash/files/template.csproj | 8 ++-- |
11 |
app-shells/pash/pash-0.0_p2016060606.ebuild | 59 +++++++++++++++-------------- |
12 |
2 files changed, 35 insertions(+), 32 deletions(-) |
13 |
|
14 |
diff --git a/app-shells/pash/files/template.csproj b/app-shells/pash/files/template.csproj |
15 |
index 9c49b91..c6ed1aa 100644 |
16 |
--- a/app-shells/pash/files/template.csproj |
17 |
+++ b/app-shells/pash/files/template.csproj |
18 |
@@ -26,8 +26,7 @@ |
19 |
<!-- Reference --> |
20 |
</ItemGroup> |
21 |
<ItemGroup> |
22 |
- <Compile Include="**/*.cs" /> |
23 |
- <Compile Include="AssemblyVersion.cs" /> |
24 |
+ <Compile Include="**/*.cs" Exclude="AssemblyVersion.cs" /> |
25 |
</ItemGroup> |
26 |
<ItemGroup> |
27 |
<!-- ProjectReference --> |
28 |
@@ -39,9 +38,12 @@ |
29 |
<VersionNumber>1.0.0.0</VersionNumber> |
30 |
</PropertyGroup> |
31 |
<AssemblyInfo CodeLanguage="C#" |
32 |
- OutputFile="AssemblyVersion.cs" |
33 |
+ OutputFile="$(MSBuildThisFileDirectory)/AssemblyVersion.cs" |
34 |
AssemblyVersion="$(VersionNumber)" |
35 |
AssemblyFileVersion="$(VersionNumber)" |
36 |
/> |
37 |
+ <CreateItem Include="$(MSBuildThisFileDirectory)/AssemblyVersion.cs"> |
38 |
+ <Output TaskParameter="Include" ItemName="Compile"/> |
39 |
+ </CreateItem> |
40 |
</Target> |
41 |
</Project> |
42 |
|
43 |
diff --git a/app-shells/pash/pash-0.0_p2016060606.ebuild b/app-shells/pash/pash-0.0_p2016060606.ebuild |
44 |
index 2afadef..dc9136e 100644 |
45 |
--- a/app-shells/pash/pash-0.0_p2016060606.ebuild |
46 |
+++ b/app-shells/pash/pash-0.0_p2016060606.ebuild |
47 |
@@ -10,7 +10,7 @@ SLOT="0" |
48 |
USE_DOTNET="net45" |
49 |
IUSE="+${USE_DOTNET}" |
50 |
|
51 |
-inherit msbuild eutils |
52 |
+inherit dotnet msbuild eutils |
53 |
|
54 |
DESCRIPTION="An Open Source reimplementation of Windows PowerShell" |
55 |
|
56 |
@@ -31,13 +31,13 @@ RDEPEND="${CDEPEND} |
57 |
DEPEND="${CDEPEND} |
58 |
" |
59 |
|
60 |
-PROJECT1_PATH=Source/Microsoft.PowerShell.Security |
61 |
-PROJECT1_NAME=Microsoft.PowerShell.Security |
62 |
-PROJECT1_OUT=Microsoft.PowerShell.Security |
63 |
+PROJECT1_PATH=Source/System.Management |
64 |
+PROJECT1_NAME=System.Management |
65 |
+PROJECT1_OUT=System.Management |
66 |
|
67 |
-PROJECT2_PATH=Source/System.Management |
68 |
-PROJECT2_NAME=System.Management |
69 |
-PROJECT2_OUT=System.Management |
70 |
+PROJECT2_PATH=Source/Microsoft.PowerShell.Security |
71 |
+PROJECT2_NAME=Microsoft.PowerShell.Security |
72 |
+PROJECT2_OUT=Microsoft.PowerShell.Security |
73 |
|
74 |
PROJECT3_PATH=Source/Microsoft.PowerShell.Commands.Utility |
75 |
PROJECT3_NAME=Microsoft.PowerShell.Commands.Utility |
76 |
@@ -49,7 +49,7 @@ PROJECT4_OUT=Microsoft.PowerShell.Commands.Management |
77 |
|
78 |
PROJECT5_PATH=Source/PashConsole |
79 |
PROJECT5_NAME=PashConsole |
80 |
-PROJECT5_OUT=PashConsole |
81 |
+PROJECT5_OUT=Pash |
82 |
|
83 |
src_prepare() { |
84 |
sed -i "/Version/d" "${S}/${PROJECT1_PATH}/Properties/AssemblyInfo.cs" || die |
85 |
@@ -57,37 +57,38 @@ src_prepare() { |
86 |
sed -i "/Version/d" "${S}/${PROJECT3_PATH}/Properties/AssemblyInfo.cs" || die |
87 |
sed -i "/Version/d" "${S}/${PROJECT4_PATH}/Properties/AssemblyInfo.cs" || die |
88 |
sed -i "/Version/d" "${S}/${PROJECT5_PATH}/Properties/AssemblyInfo.cs" || die |
89 |
- cp "${FILESDIR}/template.csproj" "${S}/${PROJECT1_PATH}/${PROJECT1_NAME}.csproj" || die |
90 |
- cp "${FILESDIR}/template.csproj" "${S}/${PROJECT2_PATH}/${PROJECT2_NAME}.csproj" || die |
91 |
- sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="Irony" />#' "${S}/${PROJECT2_PATH}/${PROJECT2_NAME}.csproj" || die |
92 |
- sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="Microsoft.CSharp" />#' "${S}/${PROJECT2_PATH}/${PROJECT2_NAME}.csproj" || die |
93 |
- sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="System.Data" />#' "${S}/${PROJECT2_PATH}/${PROJECT2_NAME}.csproj" || die |
94 |
- sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="System.Xml" />#' "${S}/${PROJECT2_PATH}/${PROJECT2_NAME}.csproj" || die |
95 |
- sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="System.Configuration" />#' "${S}/${PROJECT2_PATH}/${PROJECT2_NAME}.csproj" || die |
96 |
- cp "${FILESDIR}/template.csproj" "${S}/${PROJECT3_PATH}/${PROJECT3_NAME}.csproj" || die |
97 |
+ sed "s/\$(OutputType)/Library/; s/\$(AssemblyName)/${PROJECT1_OUT}/" "${FILESDIR}/template.csproj" > "${S}/${PROJECT1_PATH}/${PROJECT1_NAME}.csproj" || die |
98 |
+ sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="Irony" />#' "${S}/${PROJECT1_PATH}/${PROJECT1_NAME}.csproj" || die |
99 |
+ sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="Microsoft.CSharp" />#' "${S}/${PROJECT1_PATH}/${PROJECT1_NAME}.csproj" || die |
100 |
+ sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="System.Data" />#' "${S}/${PROJECT1_PATH}/${PROJECT1_NAME}.csproj" || die |
101 |
+ sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="System.Xml" />#' "${S}/${PROJECT1_PATH}/${PROJECT1_NAME}.csproj" || die |
102 |
+ sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="System.Configuration" />#' "${S}/${PROJECT1_PATH}/${PROJECT1_NAME}.csproj" || die |
103 |
+ sed "s/\$(OutputType)/Library/; s/\$(AssemblyName)/${PROJECT2_OUT}/" "${FILESDIR}/template.csproj" > "${S}/${PROJECT2_PATH}/${PROJECT2_NAME}.csproj" || die |
104 |
+ sed -i "s#^.*-- ProjectReference --.*\$#&\\n<ProjectReference Include=\"../../${PROJECT1_PATH}/${PROJECT1_NAME}.csproj\" />#" "${S}/${PROJECT2_PATH}/${PROJECT2_NAME}.csproj" || die |
105 |
+ sed "s/\$(OutputType)/Library/; s/\$(AssemblyName)/${PROJECT3_OUT}/" "${FILESDIR}/template.csproj" > "${S}/${PROJECT3_PATH}/${PROJECT3_NAME}.csproj" || die |
106 |
sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="System.Data" />#' "${S}/${PROJECT3_PATH}/${PROJECT3_NAME}.csproj" || die |
107 |
sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="System.Xml" />#' "${S}/${PROJECT3_PATH}/${PROJECT3_NAME}.csproj" || die |
108 |
sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="System.Net" />#' "${S}/${PROJECT3_PATH}/${PROJECT3_NAME}.csproj" || die |
109 |
- sed -i 's#^.*-- ProjectReference --.*$#&\n<ProjectReference Include="../${PROJECT1_PATH}/${PROJECT1_NAME}.csproj" />#' "${S}/${PROJECT3_PATH}/${PROJECT3_NAME}.csproj" || die |
110 |
- cp "${FILESDIR}/template.csproj" "${S}/${PROJECT4_PATH}/${PROJECT4_NAME}.csproj" || die |
111 |
+ sed -i "s#^.*-- ProjectReference --.*\$#&\\n<ProjectReference Include=\"../../${PROJECT1_PATH}/${PROJECT1_NAME}.csproj\" />#" "${S}/${PROJECT3_PATH}/${PROJECT3_NAME}.csproj" || die |
112 |
+ sed "s/\$(OutputType)/Library/; s/\$(AssemblyName)/${PROJECT4_OUT}/" "${FILESDIR}/template.csproj" > "${S}/${PROJECT4_PATH}/${PROJECT4_NAME}.csproj" || die |
113 |
sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="System.Data" />#' "${S}/${PROJECT4_PATH}/${PROJECT4_NAME}.csproj" || die |
114 |
sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="System.Xml" />#' "${S}/${PROJECT4_PATH}/${PROJECT4_NAME}.csproj" || die |
115 |
sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="System.ServiceProcess" />#' "${S}/${PROJECT4_PATH}/${PROJECT4_NAME}.csproj" || die |
116 |
- sed -i 's#^.*-- ProjectReference --.*$#&\n<ProjectReference Include="../${PROJECT1_PATH}/${PROJECT1_NAME}.csproj" />#' "${S}/${PROJECT4_PATH}/${PROJECT4_NAME}.csproj" || die |
117 |
- cp "${FILESDIR}/template.csproj" "${S}/${PROJECT5_PATH}/${PROJECT5_NAME}.csproj" || die |
118 |
- sed -i 's#^.*-- ProjectReference --.*$#&\n<ProjectReference Include="../${PROJECT1_PATH}/${PROJECT1_NAME}.csproj" />#' "${S}/${PROJECT5_PATH}/${PROJECT5_NAME}.csproj" || die |
119 |
- sed -i 's#^.*-- ProjectReference --.*$#&\n<ProjectReference Include="../${PROJECT2_PATH}/${PROJECT2_NAME}.csproj" />#' "${S}/${PROJECT5_PATH}/${PROJECT5_NAME}.csproj" || die |
120 |
- sed -i 's#^.*-- ProjectReference --.*$#&\n<ProjectReference Include="../${PROJECT3_PATH}/${PROJECT3_NAME}.csproj" />#' "${S}/${PROJECT5_PATH}/${PROJECT5_NAME}.csproj" || die |
121 |
- sed -i 's#^.*-- ProjectReference --.*$#&\n<ProjectReference Include="../${PROJECT4_PATH}/${PROJECT4_NAME}.csproj" />#' "${S}/${PROJECT5_PATH}/${PROJECT5_NAME}.csproj" || die |
122 |
+ sed -i "s#^.*-- ProjectReference --.*\$#&\\n<ProjectReference Include=\"../../${PROJECT1_PATH}/${PROJECT1_NAME}.csproj\" />#" "${S}/${PROJECT4_PATH}/${PROJECT4_NAME}.csproj" || die |
123 |
+ sed "s/\$(OutputType)/Exe/; s/\$(AssemblyName)/${PROJECT5_OUT}/" "${FILESDIR}/template.csproj" > "${S}/${PROJECT5_PATH}/${PROJECT5_NAME}.csproj" || die |
124 |
+ sed -i "s#^.*-- ProjectReference --.*\$#&\\n<ProjectReference Include=\"../../${PROJECT1_PATH}/${PROJECT1_NAME}.csproj\" />#" "${S}/${PROJECT5_PATH}/${PROJECT5_NAME}.csproj" || die |
125 |
+ sed -i "s#^.*-- ProjectReference --.*\$#&\\n<ProjectReference Include=\"../../${PROJECT2_PATH}/${PROJECT2_NAME}.csproj\" />#" "${S}/${PROJECT5_PATH}/${PROJECT5_NAME}.csproj" || die |
126 |
+ sed -i "s#^.*-- ProjectReference --.*\$#&\\n<ProjectReference Include=\"../../${PROJECT3_PATH}/${PROJECT3_NAME}.csproj\" />#" "${S}/${PROJECT5_PATH}/${PROJECT5_NAME}.csproj" || die |
127 |
+ sed -i "s#^.*-- ProjectReference --.*\$#&\\n<ProjectReference Include=\"../../${PROJECT4_PATH}/${PROJECT4_NAME}.csproj\" />#" "${S}/${PROJECT5_PATH}/${PROJECT5_NAME}.csproj" || die |
128 |
eapply_user |
129 |
} |
130 |
|
131 |
src_compile() { |
132 |
- emsbuild "/p:AssemblyName=${PROJECT1_OUT}" "/p:OutputType=Library" "${S}/${PROJECT1_PATH}/${PROJECT1_NAME}.csproj" |
133 |
- emsbuild "/p:AssemblyName=${PROJECT1_OUT}" "/p:OutputType=Library" "${S}/${PROJECT1_PATH}/${PROJECT2_NAME}.csproj" |
134 |
- emsbuild "/p:AssemblyName=${PROJECT1_OUT}" "/p:OutputType=Library" "${S}/${PROJECT1_PATH}/${PROJECT3_NAME}.csproj" |
135 |
- emsbuild "/p:AssemblyName=${PROJECT1_OUT}" "/p:OutputType=Library" "${S}/${PROJECT1_PATH}/${PROJECT4_NAME}.csproj" |
136 |
- emsbuild "/p:AssemblyName=${PROJECT1_OUT}" "/p:OutputType=Exe" "${S}/${PROJECT1_PATH}/${PROJECT5_NAME}.csproj" |
137 |
+ #emsbuild "/p:AssemblyName=${PROJECT1_OUT}" "${S}/${PROJECT1_PATH}/${PROJECT1_NAME}.csproj" |
138 |
+ #emsbuild "/p:AssemblyName=${PROJECT2_OUT}" "${S}/${PROJECT2_PATH}/${PROJECT2_NAME}.csproj" |
139 |
+ #emsbuild "/p:AssemblyName=${PROJECT3_OUT}" "${S}/${PROJECT3_PATH}/${PROJECT3_NAME}.csproj" |
140 |
+ #emsbuild "/p:AssemblyName=${PROJECT4_OUT}" "${S}/${PROJECT4_PATH}/${PROJECT4_NAME}.csproj" |
141 |
+ emsbuild "/p:VersionNumber=1.0.2016.606" "${S}/${PROJECT5_PATH}/${PROJECT5_NAME}.csproj" |
142 |
} |
143 |
|
144 |
src_install() { |