[gentoo-commits] proj/dotnet:master commit in: dev-util/tartool/, app-shells/pash/, app-shells/pash/files/

[Mikhail Pukhlikov]

commit:     6ebac73deda3d4116c9edee654375e0a2a4f17e8
Author:     ArsenShnurkov <ArsenShnurkov <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Fri Oct 13 10:16:58 2017 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Fri Oct 13 12:19:11 2017 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=6ebac73d

dependencies added

 app-shells/pash/files/template.csproj       | 47 +++++++++++++++
 app-shells/pash/pash-0.0_p2016060606.ebuild | 89 +++++++++++++++++++++++++----
 dev-util/tartool/tartool-1.0.0.0.ebuild     |  2 +-
 3 files changed, 127 insertions(+), 11 deletions(-)

diff --git a/app-shells/pash/files/template.csproj b/app-shells/pash/files/template.csproj
new file mode 100644
index 0000000..9c49b91
--- /dev/null
+++ b/app-shells/pash/files/template.csproj
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <AssemblyName>$(AssemblyName)</AssemblyName>
+    <OutputType>$(OutputType)</OutputType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <OutputPath>bin\Debug</OutputPath>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <DefineConstants>DEBUG</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <OutputPath>bin\Release</OutputPath>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <!-- Reference -->
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="**/*.cs" />
+    <Compile Include="AssemblyVersion.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <!-- ProjectReference -->
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\MSBuild.Community.Tasks.Targets" />
+  <Target Name="BeforeBuild">
+    <PropertyGroup Condition=" '$(VersionNumber)' == '' ">
+      <VersionNumber>1.0.0.0</VersionNumber>
+    </PropertyGroup>
+    <AssemblyInfo CodeLanguage="C#"
+      OutputFile="AssemblyVersion.cs" 
+      AssemblyVersion="$(VersionNumber)" 
+      AssemblyFileVersion="$(VersionNumber)"
+    />
+  </Target>
+</Project>

diff --git a/app-shells/pash/pash-0.0_p2016060606.ebuild b/app-shells/pash/pash-0.0_p2016060606.ebuild
index 3081245..0e02efd 100644
--- a/app-shells/pash/pash-0.0_p2016060606.ebuild
+++ b/app-shells/pash/pash-0.0_p2016060606.ebuild
@@ -22,23 +22,92 @@ EGIT_COMMIT="8d6a48f5ed70d64f9b49e6849b3ee35b887dc254"
 SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.tar.gz -> ${P}-${PR}.tar.gz"
 S="${WORKDIR}/${PROJECTNAME}-${EGIT_COMMIT}"
 
-CDEPEND="|| ( >=dev-lang/mono-5.4.0.167 <dev-lang/mono-9999 )"
-RDEPEND="${CDEPEND}"
-DEPEND="${CDEPEND}"
+CDEPEND="|| ( >=dev-lang/mono-5.4.0.167 <dev-lang/mono-9999 )
+	dev-dotnet/irony-framework
+	"
 
+RDEPEND="${CDEPEND}
+	"
+DEPEND="${CDEPEND}
+	"
 
-METAFILETOBUILD=${PROJECTNAME}.proj
+PROJECT1_PATH=Source/Microsoft.PowerShell.Security
+PROJECT1_NAME=Microsoft.PowerShell.Security
+PROJECT1_OUT=Microsoft.PowerShell.Security
+
+PROJECT2_PATH=Source/System.Management
+PROJECT2_NAME=System.Management
+PROJECT2_OUT=System.Management
+
+PROJECT3_PATH=Source/Microsoft.PowerShell.Commands.Utility
+PROJECT3_NAME=Microsoft.PowerShell.Commands.Utility
+PROJECT3_OUT=Microsoft.PowerShell.Commands.Utility
+
+PROJECT4_PATH=Source/Microsoft.PowerShell.Commands.Management
+PROJECT4_NAME=Microsoft.Commands.Management
+PROJECT4_OUT=Microsoft.PowerShell.Commands.Management
+
+PROJECT5_PATH=Source/PashConsole
+PROJECT5_NAME=PashConsole
+PROJECT5_OUT=PashConsole
+
+src_prepare() {
+	cp "${FILESDIR}/template.csproj" "${S}/${PROJECT1_PATH}/${PROJECT1_NAME}.csproj" || die
+	cp "${FILESDIR}/template.csproj" "${S}/${PROJECT2_PATH}/${PROJECT2_NAME}.csproj" || die
+	sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="Irony" />#' "${S}/${PROJECT2_PATH}/${PROJECT2_NAME}.csproj" || die
+	sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="Microsoft.CSharp" />#' "${S}/${PROJECT2_PATH}/${PROJECT2_NAME}.csproj" || die
+	sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="System.Data" />#' "${S}/${PROJECT2_PATH}/${PROJECT2_NAME}.csproj" || die
+	sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="System.Xml" />#' "${S}/${PROJECT2_PATH}/${PROJECT2_NAME}.csproj" || die
+	sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="System.Configuration" />#' "${S}/${PROJECT2_PATH}/${PROJECT2_NAME}.csproj" || die
+	cp "${FILESDIR}/template.csproj" "${S}/${PROJECT3_PATH}/${PROJECT3_NAME}.csproj" || die
+	sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="System.Data" />#' "${S}/${PROJECT3_PATH}/${PROJECT3_NAME}.csproj" || die
+	sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="System.Xml" />#' "${S}/${PROJECT3_PATH}/${PROJECT3_NAME}.csproj" || die
+	sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="System.Net" />#' "${S}/${PROJECT3_PATH}/${PROJECT3_NAME}.csproj" || die
+	sed -i 's#^.*-- ProjectReference --.*$#&\n<ProjectReference Include="../${PROJECT1_PATH}/${PROJECT1_NAME}.csproj" />#' "${S}/${PROJECT3_PATH}/${PROJECT3_NAME}.csproj" || die
+	cp "${FILESDIR}/template.csproj" "${S}/${PROJECT4_PATH}/${PROJECT4_NAME}.csproj" || die
+	sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="System.Data" />#' "${S}/${PROJECT4_PATH}/${PROJECT4_NAME}.csproj" || die
+	sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="System.Xml" />#' "${S}/${PROJECT4_PATH}/${PROJECT4_NAME}.csproj" || die
+	sed -i 's#^.*-- Reference --.*$#&\n<Reference Include="System.ServiceProcess" />#' "${S}/${PROJECT4_PATH}/${PROJECT4_NAME}.csproj" || die
+	sed -i 's#^.*-- ProjectReference --.*$#&\n<ProjectReference Include="../${PROJECT1_PATH}/${PROJECT1_NAME}.csproj" />#' "${S}/${PROJECT4_PATH}/${PROJECT4_NAME}.csproj" || die
+	cp "${FILESDIR}/template.csproj" "${S}/${PROJECT5_PATH}/${PROJECT5_NAME}.csproj" || die
+	sed -i 's#^.*-- ProjectReference --.*$#&\n<ProjectReference Include="../${PROJECT1_PATH}/${PROJECT1_NAME}.csproj" />#' "${S}/${PROJECT5_PATH}/${PROJECT5_NAME}.csproj" || die
+	sed -i 's#^.*-- ProjectReference --.*$#&\n<ProjectReference Include="../${PROJECT2_PATH}/${PROJECT2_NAME}.csproj" />#' "${S}/${PROJECT5_PATH}/${PROJECT5_NAME}.csproj" || die
+	sed -i 's#^.*-- ProjectReference --.*$#&\n<ProjectReference Include="../${PROJECT3_PATH}/${PROJECT3_NAME}.csproj" />#' "${S}/${PROJECT5_PATH}/${PROJECT5_NAME}.csproj" || die
+	sed -i 's#^.*-- ProjectReference --.*$#&\n<ProjectReference Include="../${PROJECT4_PATH}/${PROJECT4_NAME}.csproj" />#' "${S}/${PROJECT5_PATH}/${PROJECT5_NAME}.csproj" || die
+	eapply_user
+}
 
 src_compile() {
-	emsbuild "${METAFILETOBUILD}"
+	emsbuild "/p:AssemblyName=${PROJECT1_OUT}" "/p:OutputType=Library" "${S}/${PROJECT1_PATH}/${PROJECT1_NAME}.csproj"
+	emsbuild "/p:AssemblyName=${PROJECT1_OUT}" "/p:OutputType=Library" "${S}/${PROJECT1_PATH}/${PROJECT2_NAME}.csproj"
+	emsbuild "/p:AssemblyName=${PROJECT1_OUT}" "/p:OutputType=Library" "${S}/${PROJECT1_PATH}/${PROJECT3_NAME}.csproj"
+	emsbuild "/p:AssemblyName=${PROJECT1_OUT}" "/p:OutputType=Library" "${S}/${PROJECT1_PATH}/${PROJECT4_NAME}.csproj"
+	emsbuild "/p:AssemblyName=${PROJECT1_OUT}" "/p:OutputType=Exe" "${S}/${PROJECT1_PATH}/${PROJECT5_NAME}.csproj"
 }
 
 src_install() {
-	insinto /usr/lib/pash/
-	doins Source/PashConsole/bin/Release/Pash.exe
-	doins Source/PashConsole/bin/Release/*.dll
+	if [ "${SLOT}"="0" ] ;
+	then
+		SLOTTEDDIR="/usr/share/${PN}"
+	else
+		SLOTTEDDIR="/usr/share/${PN}-${SLOT}"
+	fi
+	insinto "${SLOTTEDDIR}"
+
+	if use debug; then
+		DIR="Debug"
+	else
+		DIR="Release"
+	fi
+	doins Source/PashConsole/bin/${DIR}/Pash.exe
+	doins Source/PashConsole/bin/${DIR}/*.dll
 	if use developer; then
-		doins Source/PashConsole/bin/Release/*.pdb
+		doins Source/PashConsole/bin/${DIR}/*.pdb
+	fi
+	if use debug; then
+		make_wrapper --debug pash "mono ${SLOTTEDDIR}/Pash.exe"
+	else
+		make_wrapper pash "mono ${SLOTTEDDIR}/Pash.exe"
 	fi
-	make_wrapper pash "mono /usr/lib/pash/Pash.exe"
 }
+

diff --git a/dev-util/tartool/tartool-1.0.0.0.ebuild b/dev-util/tartool/tartool-1.0.0.0.ebuild
index 890dff7..d5492bf 100644
--- a/dev-util/tartool/tartool-1.0.0.0.ebuild
+++ b/dev-util/tartool/tartool-1.0.0.0.ebuild
@@ -62,7 +62,7 @@ src_compile() {
 }
 
 src_install() {
-	if [ "${SLOT}" == "0" ] ;
+	if [ "${SLOT}"="0" ] ;
 	then
 		SLOTTEDDIR="/usr/share/${PN}/"
 	else