[gentoo-commits] proj/dotnet:master commit in: dev-util/antlrcs/files/, dev-util/antlrcs/, dev-dotnet/antlr3-runtime/files/, ...

[Mikhail Pukhlikov]

commit:     788cdc40c78af8825c368a804bc018a6ad47779a
Author:     ArsenShnurkov <ArsenShnurkov <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Fri Oct 27 02:05:21 2017 +0000
Commit:     Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 02:05:21 2017 +0000
URL:        https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=788cdc40

fixes

 .../antlr3-runtime/antlr3-runtime-3.2.ebuild       |  69 --------------
 .../antlr3-runtime-3.5.2_beta1_p2017080216.ebuild  |  85 +++++++++++++++++
 .../antlr3-runtime/files/old-Antlr3.Runtime.csproj |  44 +++++++++
 .../antlrcs/antlrcs-3.5.2_beta1_p2017080216.ebuild | 101 +++++++++++++++++++++
 dev-util/antlrcs/antlrcs-3.5.2_beta1_p6.ebuild     |  74 ---------------
 dev-util/antlrcs/files/Antlr3.props                |  13 +++
 6 files changed, 243 insertions(+), 143 deletions(-)

diff --git a/dev-dotnet/antlr3-runtime/antlr3-runtime-3.2.ebuild b/dev-dotnet/antlr3-runtime/antlr3-runtime-3.2.ebuild
deleted file mode 100644
index 13059e8..0000000
--- a/dev-dotnet/antlr3-runtime/antlr3-runtime-3.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-RESTRICT="mirror"
-KEYWORDS="~amd64 ~ppc ~x86"
-SLOT="0"
-
-USE_DOTNET="net45"
-IUSE="+${USE_DOTNET} +gac developer debug doc"
-
-inherit gac dotnet
-
-GITHUB_ACCOUNT="Antlr"
-GITHUB_PROJECTNAME="antlr3"
-EGIT_COMMIT="5c2a916a10139cdb5c7c8851ee592ed9c3b3d4ff"
-SRC_URI="https://github.com/${GITHUB_ACCOUNT}/${GITHUB_PROJECTNAME}/archive/${EGIT_COMMIT}.tar.gz -> ${PN}-${PV}.tar.gz"
-S="${WORKDIR}/${GITHUB_PROJECTNAME}-${EGIT_COMMIT}"
-
-HOMEPAGE="http://www.antlr.org/"
-DESCRIPTION="C# runtime for ANTLR (ANother Tool for Language Recognition)"
-LICENSE="BSD" # https://github.com/antlr/antlr3/blob/master/runtime/CSharp2/LICENSE.TXT
-
-COMMON_DEPEND=">=dev-lang/mono-5.2.0.196
-"
-RDEPEND="${COMMON_DEPEND}
-"
-DEPEND="${COMMON_DEPEND}
-"
-
-PROJECT_FILE_DIR="${S}/runtime/CSharp2/Sources/Antlr3.Runtime"
-PROJECT_NAME="Antlr3.Runtime"
-
-src_prepare() {
-	sed -i "s/3.1.3.\*/3.2.0.0/g" "${PROJECT_FILE_DIR}/AssemblyInfo.cs" || die
-	cp "${FILESDIR}/${PROJECT_NAME}.csproj" "${PROJECT_FILE_DIR}/" || die
-	cp "${FILESDIR}/IAstRuleReturnScope\`1.cs" "${PROJECT_FILE_DIR}/Antlr.Runtime/" || die
-	eapply_user
-}
-
-src_compile() {
-	if use debug; then
-		CONFIGURATION=Debug
-	else
-		CONFIGURATION=Release
-	fi
-
-	if use developer; then
-		SARGS=DebugSymbols=True
-	else
-		SARGS=DebugSymbols=False
-	fi
-
-	exbuild_raw /v:detailed /p:TargetFrameworkVersion=v4.5 "/p:Configuration=${CONFIGURATION}" /p:${SARGS} /p:VersionNumber=3.2 "/p:RootPath=${S}" "${PROJECT_FILE_DIR}/${PROJECT_NAME}.csproj"
-}
-
-src_install() {
-	if use debug; then
-		CONFIGURATION=Debug
-	else
-		CONFIGURATION=Release
-	fi
-
-	DLLNAME="${PROJECT_FILE_DIR}/bin/${CONFIGURATION}/${PROJECT_NAME}.dll"
-	sn -R "${DLLNAME}" "${PROJECT_FILE_DIR}/../Antlr3_KeyPair.snk" || die
-	egacinstall ${DLLNAME}
-	einstall_pc_file "${PN}" "${PV}" "${PROJECT_NAME}"
-}

diff --git a/dev-dotnet/antlr3-runtime/antlr3-runtime-3.5.2_beta1_p2017080216.ebuild b/dev-dotnet/antlr3-runtime/antlr3-runtime-3.5.2_beta1_p2017080216.ebuild
new file mode 100644
index 0000000..d7baf8d
--- /dev/null
+++ b/dev-dotnet/antlr3-runtime/antlr3-runtime-3.5.2_beta1_p2017080216.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror"
+
+SLOT="0"
+
+USE_DOTNET="net45"
+
+inherit dotnet msbuild gac
+
+NAME="antlrcs"
+HOMEPAGE="https://github.com/antlr/${NAME}"
+EGIT_COMMIT="ca331b7109e1faa5a6aa7336bb6281ce9363e62b"
+SRC_URI="https://github.com/ArsenShnurkov/shnurise-tarballs/raw/dev-utils/${PN}-${SLOT}/${PN}-${PV}.tar.gz -> ${NAME}-${PV}.tar.gz
+	https://github.com/mono/mono/raw/master/mcs/class/mono.snk"
+S="${WORKDIR}"
+
+DESCRIPTION="The C# port of ANTLR 3 (Rubtime library)"
+LICENSE="BSD" # https://github.com/antlr/antlrcs/blob/master/LICENSE.txt
+
+IUSE="+${USE_DOTNET} debug developer doc"
+
+COMMON_DEPEND=">=dev-lang/mono-5.4.0.167 <dev-lang/mono-9999
+"
+RDEPEND="${COMMON_DEPEND}
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-dotnet/msbuildtasks-1.5.0.240
+"
+
+PATH_TO_PROJ="Runtime/Antlr3.Runtime"
+METAFILE_TO_BUILD="old-Antlr3.Runtime.csproj"
+ASSEMBLY_NAME="Antlr3.Runtime"
+
+KEY2="${DISTDIR}/mono.snk"
+ASSEMBLY_VERSION="3.5.1.26"
+
+function output_filename ( ) {
+	local DIR=""
+	if use debug; then
+		DIR="Debug"
+	else
+		DIR="Release"
+	fi
+	echo "${PATH_TO_PROJ}/bin/${DIR}/${ASSEMBLY_NAME}.dll"
+}
+
+src_prepare() {
+	cp "${FILESDIR}/${METAFILE_TO_BUILD}" "${S}/${PATH_TO_PROJ}/" || die
+	eapply_user
+}
+
+src_compile() {
+	emsbuild /p:TargetFrameworkVersion=v4.6 "/p:SignAssembly=true" "/p:PublicSign=true" "/p:AssemblyOriginatorKeyFile=${KEY2}" /p:VersionNumber="${ASSEMBLY_VERSION}" "${S}/${PATH_TO_PROJ}/${METAFILE_TO_BUILD}"
+	sn -R "$(output_filename)" "${KEY2}" || die
+}
+
+src_install() {
+	insinto "/gac"
+	doins "$(output_filename)"
+}
+
+pkg_preinst()
+{
+	echo mv "${D}/gac/${ASSEMBLY_NAME}.dll" "${T}/${ASSEMBLY_NAME}.dll"
+	mv "${D}/gac/${ASSEMBLY_NAME}.dll" "${T}/${ASSEMBLY_NAME}.dll" || die
+	echo rm -rf "${D}/gac"
+	rm -rf "${D}/gac" || die
+}
+
+pkg_postinst()
+{
+	egacadd "${T}/${ASSEMBLY_NAME}.dll"
+	rm "${T}/${ASSEMBLY_NAME}.dll" || die
+}
+
+pkg_prerm()
+{
+	egacdel "${ASSEMBLY_NAME}, Version=${ASSEMBLY_VERSION}, Culture=neutral, PublicKeyToken=0738eb9f132ed756"
+}

diff --git a/dev-dotnet/antlr3-runtime/files/old-Antlr3.Runtime.csproj b/dev-dotnet/antlr3-runtime/files/old-Antlr3.Runtime.csproj
new file mode 100644
index 0000000..6633d1c
--- /dev/null
+++ b/dev-dotnet/antlr3-runtime/files/old-Antlr3.Runtime.csproj
@@ -0,0 +1,44 @@
+<?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>
+    <OutputType>Library</OutputType>
+    <AssemblyName>Antlr3.Runtime</AssemblyName>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <ProjectGuid>{5EE27A90-B023-42C9-AAF1-52B0424C5D0B}</ProjectGuid>
+  </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" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="**/*.cs" />
+    <Compile Include="Properties/AssemblyVersion.cs" />
+  </ItemGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <Import Project="$(MSBuildExtensionsPath)\MSBuild.Community.Tasks.Targets" />
+   <Target Name="BeforeBuild">
+    <PropertyGroup Condition=" '$(VersionNumber)' == '' ">
+      <VersionNumber>3.5.1.26</VersionNumber>
+    </PropertyGroup>
+    <AssemblyInfo CodeLanguage="C#"
+      OutputFile="$(MSBuildThisFileDirectory)/Properties/AssemblyVersion.cs" 
+      AssemblyVersion="$(VersionNumber)" 
+      AssemblyFileVersion="$(VersionNumber)"
+    />
+   </Target>  
+</Project>

diff --git a/dev-util/antlrcs/antlrcs-3.5.2_beta1_p2017080216.ebuild b/dev-util/antlrcs/antlrcs-3.5.2_beta1_p2017080216.ebuild
new file mode 100644
index 0000000..37cf6de
--- /dev/null
+++ b/dev-util/antlrcs/antlrcs-3.5.2_beta1_p2017080216.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror"
+
+SLOT="1"
+
+USE_DOTNET="net45"
+
+inherit multilib dotbuildtask eutils
+
+NAME="antlrcs"
+HOMEPAGE="https://github.com/antlr/${NAME}"
+EGIT_COMMIT="ca331b7109e1faa5a6aa7336bb6281ce9363e62b"
+SRC_URI="https://github.com/ArsenShnurkov/shnurise-tarballs/raw/dev-utils/${PN}-${SLOT}/${PN}-${PV}.tar.gz -> ${NAME}-${PV}.tar.gz"
+S="${WORKDIR}"
+
+DESCRIPTION="The C# port of ANTLR 3"
+LICENSE="BSD" # https://github.com/antlr/antlrcs/blob/master/LICENSE.txt
+
+IUSE="+${USE_DOTNET} debug developer doc"
+
+COMMON_DEPEND=">=dev-lang/mono-5.4.0.167 <dev-lang/mono-9999
+"
+RDEPEND="${COMMON_DEPEND}
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-dotnet/antlr3-runtime-${PV}
+"
+
+OUTPUT_PATH="${PN}-${SLOT}"
+ASSEMBLY_VERSION="3.5.1.26"
+
+src_prepare() {
+	sed "s#\$(AntlrBuildTaskPath)#/usr/$(get_libdir)/mono/${EBUILD_FRAMEWORK}/${PN}-${SLOT}#;s#\$(AntlrToolPath)#/usr/share/${PN}-${SLOT}/Antlr3.exe#" "${FILESDIR}/Antlr3.props" >"${S}/AntlrBuildTask/Antlr3.props" || die
+	local ATEXT="[assembly:System.Reflection.AssemblyVersion(\"${ASSEMBLY_VERSION}\")]"
+	echo "${ATEXT}" >"${S}/AntlrBuildTask/AV.cs" || die
+	echo "${ATEXT}" >"${S}/Runtime/Antlr3.Runtime/AV.cs" || die
+	echo "${ATEXT}" >"${S}/Runtime/Antlr3.Runtime.Debug/AV.cs" || die
+	echo "${ATEXT}" >"${S}/Antlr4.StringTemplate/AV.cs" || die
+	echo "${ATEXT}" >"${S}/Antlr3/AV.cs" || die
+	echo "${ATEXT}" >"${S}/Antlr3.Targets/Antlr3.Targets.CSharp3/AV.cs" || die
+	eapply_user
+}
+
+src_compile() {
+	GAC_PATH=/usr/$(get_libdir)/mono/gac
+
+	mkdir -p "${OUTPUT_PATH}" || die
+	mkdir -p "${S}/${OUTPUT_PATH}/Targets" || die
+
+	FW_PATH="/usr/lib64/mono/4.6-api"
+
+	COMMON_KEYS="/utf8output /subsystemversion:6.00 /noconfig /nowarn:1701,1702 /nostdlib+  /highentropyva+ /reference:${FW_PATH}/mscorlib.dll /reference:${FW_PATH}/System.dll /recurse:*.cs"
+	if use debug; then
+	COMMON_KEYS="${COMMON_KEYS} /define:DEBUG /debug+ /debug:full /optimize-"
+	fi
+
+	cd "${S}/AntlrBuildTask" || die
+	mono /usr/lib/mono/4.5/csc.exe /target:library "/out:${S}/${OUTPUT_PATH}/AntlrBuildTask.dll" /reference:${FW_PATH}/System.Core.dll /reference:${GAC_PATH}/Microsoft.Build.Framework/15.3.0.0__0738eb9f132ed756/Microsoft.Build.Framework.dll /reference:${GAC_PATH}/Microsoft.Build.Utilities.Core/15.3.0.0__0738eb9f132ed756/Microsoft.Build.Utilities.Core.dll ${COMMON_KEYS} || die
+
+	cd "${S}/Runtime/Antlr3.Runtime" || die
+	mono /usr/lib/mono/4.5/csc.exe /target:library "/out:${S}/${OUTPUT_PATH}/Antlr.Runtime.dll" /reference:${FW_PATH}/System.Core.dll ${COMMON_KEYS} || die
+
+	cd "${S}/Runtime/Antlr3.Runtime.Debug" || die
+	mono /usr/lib/mono/4.5/csc.exe /target:library "/out:${S}/${OUTPUT_PATH}/Antlr.Runtime.Debug.dll" "/reference:${FW_PATH}/System.Core.dll" "/reference:${S}/${OUTPUT_PATH}/Antlr.Runtime.dll" ${COMMON_KEYS} || die
+
+	cd "${S}/Antlr4.StringTemplate" || die
+	mono /usr/lib/mono/4.5/csc.exe /target:library "/out:${S}/${OUTPUT_PATH}/Antlr4.StringTemplate.dll" "/reference:${FW_PATH}/System.Core.dll" "/reference:${S}/${OUTPUT_PATH}/Antlr.Runtime.dll" ${COMMON_KEYS} || die
+
+	cd "${S}/Antlr3" || die
+	mono /usr/lib/mono/4.5/csc.exe /target:exe "/out:${S}/${OUTPUT_PATH}/Antlr3.exe" /define:NETSTANDARD "/reference:${FW_PATH}/System.Core.dll" "/reference:${FW_PATH}/System.Xml.Linq.dll" "/reference:${S}/${OUTPUT_PATH}/Antlr.Runtime.dll" "/reference:${S}/${OUTPUT_PATH}/Antlr.Runtime.Debug.dll" "/reference:${S}/${OUTPUT_PATH}/Antlr4.StringTemplate.dll" ${COMMON_KEYS} || die
+
+	cd "${S}/Antlr3.Targets/Antlr3.Targets.CSharp3" || die
+	mono /usr/lib/mono/4.5/csc.exe /target:library "/out:${S}/${OUTPUT_PATH}/Targets/Antlr3.Targets.CSharp3.dll" /define:NETSTANDARD "/reference:${FW_PATH}/System.Core.dll" "/reference:${S}/${OUTPUT_PATH}/Antlr3.exe" "/reference:${S}/${OUTPUT_PATH}/Antlr4.StringTemplate.dll" ${COMMON_KEYS} || die
+
+	cd "${S}" || die
+}
+
+src_install() {
+	insinto "usr/share"
+	doins -r "${S}/${OUTPUT_PATH}"
+
+	insinto "usr/share/${OUTPUT_PATH}"
+	doins -r "${S}/Reference/antlr3/tool/src/main/resources/org/antlr/Tool"
+	doins -r "${S}/Reference/antlr3/tool/src/main/resources/org/antlr/Codegen"
+
+	local TASKS_PROPS_FILE="${S}/AntlrBuildTask/Antlr3.props"
+	local TASKS_TARGETS_FILE="${S}/AntlrBuildTask/Antlr3.targets"
+	einstask "${OUTPUT_PATH}/AntlrBuildTask.dll" "${TASKS_PROPS_FILE}" "${TASKS_TARGETS_FILE}"
+
+	if use debug; then
+		make_wrapper antlrcs "/usr/bin/mono --debug \${MONO_OPTIONS} /usr/share/${PN}-${SLOT}/Antlr3.exe"
+	else
+		make_wrapper antlrcs "/usr/bin/mono \${MONO_OPTIONS} /usr/share/${PN}-${SLOT}/Antlr3.exe"
+	fi
+}

diff --git a/dev-util/antlrcs/antlrcs-3.5.2_beta1_p6.ebuild b/dev-util/antlrcs/antlrcs-3.5.2_beta1_p6.ebuild
deleted file mode 100644
index 6845e31..0000000
--- a/dev-util/antlrcs/antlrcs-3.5.2_beta1_p6.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-KEYWORDS="~amd64 ~ppc ~x86"
-RESTRICT="mirror"
-
-SLOT="0"
-
-USE_DOTNET="net45"
-
-inherit dotnet msbuild gac
-
-NAME="antlrcs"
-HOMEPAGE="https://github.com/antlr/${NAME}"
-SRC_URI="https://github.com/ArsenShnurkov/shnurise-tarballs/raw/dev-utils/antlrcs/antlrcs-3.5.2_beta1.tar.gz -> ${NAME}-${PV}.tar.gz"
-
-DESCRIPTION="The C# port of ANTLR 3"
-LICENSE="BSD" # https://github.com/antlr/antlrcs/blob/master/LICENSE.txt
-
-IUSE="+${USE_DOTNET} debug developer doc"
-
-COMMON_DEPEND=">=dev-lang/mono-5.4.0.167 <dev-lang/mono-9999
-"
-RDEPEND="${COMMON_DEPEND}
-"
-DEPEND="${COMMON_DEPEND}
-	dev-dotnet/antlr3-runtime
-"
-
-TASKSASSEMBLY="AntlrBuildTask/old-AntlrBuildTask.csproj"
-ASSEMBLY_NAME="AntlrBuildTask"
-EXECUTABLE_PROJ="Antlr3/old-Antlr3.csproj"
-EXECUTABLE_NAME="Antlr3"
-
-function tasksassembly_file ( ) {
-	local DIR=""
-	if use debug; then
-		DIR="Debug"
-	else
-		DIR="Release"
-	fi
-	echo "AntlrBuildTask/bin/${DIR}/${ASSEMBLY_NAME}.dll"
-}
-
-function executable_file ( ) {
-	local DIR=""
-	if use debug; then
-		DIR="Debug"
-	else
-		DIR="Release"
-	fi
-	echo "Antlr3/bin/${DIR}/${EXECUTABLE}.exe"
-}
-
-src_prepare() {
-	cp "${FILESDIR}/old-AntlrBuildTask.csproj" "${S}/${TASKSASSEMBLY}" || die
-	cp "${FILESDIR}/old-Antlr3.csproj" "${S}/${EXECUTABLE_PROJ}" || die
-	eapply_user
-}
-
-src_compile() {
-	emsbuild /p:TargetFrameworkVersion=v4.6 "${S}/${TASKSASSEMBLY}"
-	emsbuild /p:TargetFrameworkVersion=v4.6 "${S}/${EXECUTABLE_PROJ}"
-}
-
-TASKS_PROPS_FILE="AntlrBuildTask/Antlr3.props"
-TASKS_TARGETS_FILE="AntlrBuildTask/Antlr3.targets"
-
-src_install() {
-	einstask "${S}/$(tasksassembly_file)" "${S}/${TASKS_PROPS_FILE}" "${S}/${TASKS_TARGETS_FILE}"
-}

diff --git a/dev-util/antlrcs/files/Antlr3.props b/dev-util/antlrcs/files/Antlr3.props
new file mode 100644
index 0000000..562a801
--- /dev/null
+++ b/dev-util/antlrcs/files/Antlr3.props
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- Folder containing AntlrBuildTask.dll -->
+    <AntlrBuildTaskPath>$(AntlrBuildTaskPath)</AntlrBuildTaskPath>
+    <!-- Path to the ANTLR tool itself -->
+    <AntlrToolPath>$(AntlrToolPath)</AntlrToolPath>
+  </PropertyGroup>
+</Project>