commit: c842f3ecc6b9abddf85ca932076f93ebd9162c85 Author: ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com> AuthorDate: Wed Jan 6 14:35:34 2016 +0000 Commit: Heather Cynede <cynede <AT> gentoo <DOT> org> CommitDate: Wed Jan 6 14:35:34 2016 +0000 URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=c842f3ec
tests added .../deveel-irony-1.0.0_p20150328.ebuild | 147 ++++++++++++++ dev-dotnet/deveel-irony/files/Irony.nuspec | 16 ++ .../files/csproj.patch | 23 ++- dev-dotnet/deveel-irony/files/deveel-irony.png | Bin 0 -> 10457 bytes dev-dotnet/deveel-irony/files/deveel-irony.svg | 222 +++++++++++++++++++++ dev-dotnet/deveel-irony/metadata.xml | 22 ++ .../deveeldb-2.0_pre_alpha_p20160101.ebuild | 39 +++- .../deveeldb/files/deveeldb-nunit.csproj.patch | 125 ++++++++++++ dev-dotnet/deveeldb/files/deveeldb-nunit.sln.patch | 47 +++++ ...et-dependencies.patch => deveeldb.csproj.patch} | 40 ++-- dev-dotnet/deveeldb/files/deveeldb.nuspec | 4 +- .../files/packages.deveeldb-nunit.config.patch | 35 ++++ .../deveeldb/files/packages.deveeldb.config.patch | 30 +++ .../deveeldb/files/repositories.config.patch | 22 ++ dev-dotnet/irony-framework/files/csproj.patch | 38 ++-- 15 files changed, 756 insertions(+), 54 deletions(-) diff --git a/dev-dotnet/deveel-irony/deveel-irony-1.0.0_p20150328.ebuild b/dev-dotnet/deveel-irony/deveel-irony-1.0.0_p20150328.ebuild new file mode 100644 index 0000000..fe96a2c --- /dev/null +++ b/dev-dotnet/deveel-irony/deveel-irony-1.0.0_p20150328.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +# >=portage-2.2.25 + +# debug = debug configuration (symbols and defines for debugging) +# developer = generate symbols information (to view line numbers in stack traces, either in debug or release configuration) +# test = allow NUnit tests to run +# nupkg = create .nupkg file from .nuspec +# gac = install into gac +# pkg-config = register in pkg-config database +IUSE="net45 debug +developer test +nupkg +gac +pkg-config" +USE_DOTNET="net45" + +KEYWORDS="~amd64 ~x86" + +inherit versionator dotnet nupkg + +HOMEPAGE=https://github.com/deveel/irony +NAME=irony +EGIT_COMMIT=7bc3f3e70af5bdd6a095ba06de31e0929751b48e +# P Package name and version (excluding revision, if any), for example vim-6.3. +SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.zip -> ${P}.zip + mirror://gentoo/mono.snk.bz2" + +SLOT="0" + +S="${WORKDIR}/${NAME}-${EGIT_COMMIT}" + +METAFILETOBUILD="Irony/010.Irony.2012.csproj" + +src_unpack() +{ + default + # delete untrusted binaries + find "${S}" -iname "*.exe" -print -delete || die + find "${S}" -iname "*.dll" -print -delete || die + # Libraries/FastColoredTextBox/FastColoredTextBox.dll +} + +src_prepare() { + default + einfo "patching project files" + eapply "${FILESDIR}/csproj.patch" + if ! use test ; then + einfo "removing unit tests from solution" + fi + + cp "${FILESDIR}/${NUSPEC_FILE_NAME}" "${S}/${NUSPEC_FILE_NAME}" || die + epatch_nuspec_file "${S}/${NUSPEC_FILE_NAME}" +} + +# PR Package revision, or r0 if no revision exists. +NUSPEC_VERSION=$(get_version_component_range 1-3)"${PR//r/.}" +ICON_URL=https://raw.githubusercontent.com/ArsenShnurkov/dotnet/deveeldb/dev-dotnet/${PN}/files/deveel-irony.png +NUSPEC_FILE_NAME="Irony.nuspec" +NUSPEC_ID="deveel-irony" + +src_compile() { + exbuild /p:SignAssembly=true "/p:AssemblyOriginatorKeyFile=${WORKDIR}/mono.snk" "${METAFILETOBUILD}" + + # run nuget_pack + einfo ".nuspec version is ${NUSPEC_VERSION}" + enuspec -Prop "version=${NUSPEC_VERSION};package_iconUrl=${ICON_URL}" "${S}/${NUSPEC_FILE_NAME}" + # /var/tmp/portage/dev-dotnet/irony-framework-1.0.0_p20131212-r1/work/Irony.1.0.0.1.nupkg +} + +epatch_nuspec_file() +{ + if use nupkg; then + if use debug; then + DIR="Debug" +FILES_STRING=`cat <<-EOF || die "${DIR} files at patch_nuspec_file()" + <files> <!-- https://docs.nuget.org/create/nuspec-reference --> + <file src="Irony/bin/${DIR}/Irony.dll" target="lib\net45\" /> + <file src="Irony/bin/${DIR}/Irony.dll.mdb" target="lib\net45\" /> + </files> +EOF +` + else + DIR="Release" +FILES_STRING=`cat <<-EOF || die "${DIR} files at patch_nuspec_file()" + <files> <!-- https://docs.nuget.org/create/nuspec-reference --> + <file src="Irony/bin/${DIR}/Irony.dll" target="lib\net45\" /> + </files> +EOF +` + fi + + einfo ${FILES_STRING} + replace "</package>" "${FILES_STRING}</package>" -- $1 || die "replace at patch_nuspec_file()" + fi +} + +src_install() { + enupkg "${WORKDIR}/${NUSPEC_ID}.${NUSPEC_VERSION}.nupkg" + + egacinstall "Irony/bin/${DIR}/Irony.dll" + + install_pc_file +} + +PC_FILE_NAME=${PN} + +install_pc_file() +{ + if use pkg-config; then + dodir /usr/$(get_libdir)/pkgconfig + ebegin "Installing ${PC_FILE_NAME}.pc file" + sed \ + -e "s:@LIBDIR@:$(get_libdir):" \ + -e "s:@PACKAGENAME@:${PC_FILE_NAME}:" \ + -e "s:@DESCRIPTION@:${DESCRIPTION}:" \ + -e "s:@VERSION@:${PV}:" \ + -e 's*@LIBS@*-r:${libdir}'"/mono/${PC_FILE_NAME}/Irony.dll"'*' \ + <<\EOF >"${D}/usr/$(get_libdir)/pkgconfig/${PC_FILE_NAME}.pc" || die +prefix=${pcfiledir}/../.. +exec_prefix=${prefix} +libdir=${exec_prefix}/@LIBDIR@ +Name: @PACKAGENAME@ +Description: @DESCRIPTION@ +Version: @VERSION@ +Libs: @LIBS@ +EOF + + einfo PKG_CONFIG_PATH="${D}/usr/$(get_libdir)/pkgconfig/" pkg-config --exists "${PC_FILE_NAME}" + PKG_CONFIG_PATH="${D}/usr/$(get_libdir)/pkgconfig/" pkg-config --exists "${PC_FILE_NAME}" || die ".pc file failed to validate." + eend $? + fi +} + +LICENSE="MIT" + +COMMON_DEPEND=">=dev-lang/mono-4.0.2.5 +" + +RDEPEND="${COMMON_DEPEND} +" + +DEPEND="${COMMON_DEPEND} + test? ( dev-dotnet/nunit:2[nupkg] ) + virtual/pkgconfig +" + +DESCRIPTION="parsing framework for C# on LALR(1)" diff --git a/dev-dotnet/deveel-irony/files/Irony.nuspec b/dev-dotnet/deveel-irony/files/Irony.nuspec new file mode 100644 index 0000000..c9e0d3d --- /dev/null +++ b/dev-dotnet/deveel-irony/files/Irony.nuspec @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> + <metadata> + <id>deveel-irony</id> + <version>$version$</version> + <authors>Roman Ivantsov, Antonello Provenzano</authors> + <licenseUrl>https://raw.githubusercontent.com/deveel/irony/master/License.txt</licenseUrl> + <projectUrl>https://github.com/deveel/irony</projectUrl> + <iconUrl>$package_iconUrl$</iconUrl> + <requireLicenseAcceptance>false</requireLicenseAcceptance> + <description>Irony is a development kit for implementing languages on .NET platform. In Irony the target language grammar is coded directly in c# using operator overloading to express grammar constructs. Irony's scanner and parser modules use the grammar encoded as c# class to control the parsing process.</description> + <copyright>Copyright (c) 2013 Roman Ivantsov, 2016 Antonello Provenzano</copyright> + <language>en-US</language> + <tags>irony ast grammar bnf</tags> + </metadata> +</package> diff --git a/dev-dotnet/irony-framework/files/csproj.patch b/dev-dotnet/deveel-irony/files/csproj.patch similarity index 77% copy from dev-dotnet/irony-framework/files/csproj.patch copy to dev-dotnet/deveel-irony/files/csproj.patch index bd65ec5..86e8bf0 100644 --- a/dev-dotnet/irony-framework/files/csproj.patch +++ b/dev-dotnet/deveel-irony/files/csproj.patch @@ -1,5 +1,5 @@ ---- a/Irony/010.Irony.2012.csproj 2013-12-12 22:41:50.000000000 +0400 -+++ b/Irony/010.Irony.2012.csproj 2016-01-05 21:02:12.000000000 +0300 +--- a/Irony/010.Irony.2012.csproj 2016-01-06 12:14:44.452410233 +0300 ++++ b/Irony/010.Irony.2012.csproj 2016-01-06 12:15:10.298409321 +0300 @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> @@ -9,6 +9,15 @@ <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{D81F5C91-D7DB-46E5-BC99-49488FB6814C}</ProjectGuid> <OutputType>Library</OutputType> +@@ -24,7 +24,7 @@ + </SccAuxPath> + <SccProvider> + </SccProvider> +- <SignAssembly>true</SignAssembly> ++ <SignAssembly>false</SignAssembly> + <AssemblyOriginatorKeyFile>irony.snk</AssemblyOriginatorKeyFile> + <PublishUrl>publish\</PublishUrl> + <Install>true</Install> @@ -60,8 +60,6 @@ <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> @@ -54,3 +63,13 @@ </ItemGroup> <ItemGroup> <EmbeddedResource Include="Resources.resx"> +@@ -172,9 +168,6 @@ + </EmbeddedResource> + </ItemGroup> + <ItemGroup> +- <None Include="irony.snk" /> +- </ItemGroup> +- <ItemGroup> + <Content Include="Parsing\Data\Construction\_about_parser_construction.txt" /> + </ItemGroup> + <ItemGroup /> diff --git a/dev-dotnet/deveel-irony/files/deveel-irony.png b/dev-dotnet/deveel-irony/files/deveel-irony.png new file mode 100644 index 0000000..61db031 Binary files /dev/null and b/dev-dotnet/deveel-irony/files/deveel-irony.png differ diff --git a/dev-dotnet/deveel-irony/files/deveel-irony.svg b/dev-dotnet/deveel-irony/files/deveel-irony.svg new file mode 100644 index 0000000..ca33c19 --- /dev/null +++ b/dev-dotnet/deveel-irony/files/deveel-irony.svg @@ -0,0 +1,222 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + height="383.133" + id="Layer_1" + inkscape:version="0.91 r13725" + sodipodi:docname="deveel-irony.svg" + sodipodi:version="0.32" + style="overflow:visible;enable-background:new 0 0 217.819 383.133;" + version="1.0" + viewBox="0 0 217.819 383.133" + width="217.819" + xml:space="preserve" + inkscape:export-filename="/var/lib/layman/dotnet/dev-dotnet/deveel-irony/files/deveel-irony.png" + inkscape:export-xdpi="47.348438" + inkscape:export-ydpi="47.348438"><metadata + id="metadata4314"><rdf:RDF><cc:Work + rdf:about=""><dc:title></dc:title><dc:description /><dc:subject><rdf:Bag><rdf:li>unsorted</rdf:li></rdf:Bag></dc:subject><dc:publisher><cc:Agent + rdf:about="http://www.openclipart.org"><dc:title>Architetto Francesco Rollandin</dc:title></cc:Agent></dc:publisher><dc:creator><cc:Agent><dc:title>Architetto Francesco Rollandin</dc:title></cc:Agent></dc:creator><dc:rights><cc:Agent><dc:title>Architetto Francesco Rollandin</dc:title></cc:Agent></dc:rights><dc:date /><dc:format>image/svg+xml</dc:format><dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><cc:license + rdf:resource="http://web.resource.org/cc/PublicDomain" /><dc:language>en</dc:language></cc:Work><cc:License + rdf:about="http://web.resource.org/cc/PublicDomain"><cc:permits + rdf:resource="http://web.resource.org/cc/Reproduction" /><cc:permits + rdf:resource="http://web.resource.org/cc/Distribution" /><cc:permits + rdf:resource="http://web.resource.org/cc/DerivativeWorks" /></cc:License></rdf:RDF></metadata><defs + id="defs272" /><sodipodi:namedview + bordercolor="#666666" + borderopacity="1.0" + id="base" + inkscape:current-layer="Layer_1" + inkscape:cx="125.65949" + inkscape:cy="269.92477" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:window-height="1123" + inkscape:window-width="1920" + inkscape:window-x="0" + inkscape:window-y="25" + inkscape:zoom="2" + pagecolor="#ffffff" + showgrid="false" + inkscape:window-maximized="1" /><path + d="m 65.649,0 c 10.74,5.291 17.417,20.327 29.721,25.439 6.541,2.718 23.1,5.501 27.201,11.418 10.078,-14.817 28.613,-4.199 37.529,4.702 13.475,13.453 14.766,33.698 17.707,52.14 1.176,7.361 2.59,14.679 3.449,22.161 0.707,6.15 4.246,17.909 3.189,23.172 -0.992,4.944 5.734,9.697 2.604,14.693 -3.268,5.213 -20.576,4.896 -21.029,-1.974 -0.559,-8.446 0.539,-15.677 -0.379,-24.389 -0.719,-6.83 -2.086,-14.271 -3.527,-20.737 -1.963,-8.802 -2.865,-17.434 -5.625,-26.782 -1.176,-3.987 -7.584,-18.525 -13.35,-9.655 -4.053,6.237 9.068,20.177 9.697,27.075 0.789,8.642 2.959,17.551 5.457,25.565 2.896,9.282 2.781,19.839 3.15,28.461 0.359,8.389 5.664,22.87 -2.604,28.126 5.455,2.382 10.357,3.319 16.162,4.659 6.48,1.496 6.24,6.308 10.535,9.444 3.576,2.611 14.775,4.873 14.775,4.873 l -2.202,8.725 c 0,0 -13.588,-5.828 -17.441,-5.703 -2.396,0.078 -4.004,2.164 -6.129,2.268 -2.85,0.139 -4.58,-1.412 -7.221,-2.436 -4.205,-1.631 -7.572,-1.666 -10.83,-2.182 -2.871,-0.457 -5.73,-1.318 -8.666,-2.197 -7.848,-2.355 -10.457,0.895 -16.436,6.184 -6.004,5.313 -11.264,9.336 -16.121,15.492 -1.371,1.738 -9.088,10.979 -11.248,8.814 -2.418,-2.416 -8.21,-2.699 -11.335,-3.357 -8.563,-1.805 -17.542,-2.479 -25.942,-4.574 -11.314,-2.828 -20.326,-3.777 -31.526,-6.215 -6.736,-1.467 -25.489,-9.402 -31.526,-5.584 -3.328,-3.842 1.639,-5.451 3.485,-8.73 1.485,-2.641 2.145,-5.578 2.476,-8.564 0.536,-4.814 -2.842,-2.872 -5.457,-4.786 C -4.046,179.516 2.121,162.61 3.688,153.811 5.66,142.738 9.182,129.725 10.489,119.724 12.453,104.687 20.575,88.953 25.685,74.22 30.571,60.134 37.445,48.029 44.182,34.779 48.5,26.289 57.227,3.782 65.649,0" + id="path5" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccccccccccsccscccccccccccccccccscccc" /><path + inkscape:connector-curvature="0" + style="fill:#bfbfbf" + id="path7" + d="m 70.184,6.632 c 4.686,5.836 9.441,9.461 13.098,15.449 7.012,11.481 14.248,22.674 19.728,35.009 7.08,15.931 14.742,31.26 18.639,47.183 7.252,29.629 7.23,61.74 -0.672,91.513 -3.398,12.805 -15.33,7.834 -25.574,5.783 -10.413,-2.084 -20.929,-4.107 -31.264,-6.539 -15.083,-3.549 -31.643,-3.637 -46.428,-8.227 -3.667,-1.139 -8.586,-2.766 -12.425,-4.366 -4.975,-2.073 -2.674,-6.002 -2.099,-9.907 0.43,-2.916 1.157,-6.233 1.679,-9.319 1.551,-9.156 3.146,-19.16 4.953,-28.377 3.049,-15.54 8.29,-34.198 14.861,-50.207 C 30.5,70.445 37.901,54.662 44.871,39.795 50.014,28.826 57.567,18.865 63.3,8.353 65.195,4.878 67.22,3.996 70.184,6.632" /><path + inkscape:connector-curvature="0" + id="path9" + d="m 72.199,29.217 c 0.317,2.929 2.506,11.372 0.755,13.265 -2.16,2.337 -3.321,-0.957 -3.778,-2.099 2.318,-3.14 0.365,-6.856 -1.008,-10.075 -4.385,2.686 0.411,14.608 -7.052,12.089 0.768,-3.252 5.186,-25.907 11.083,-13.18" /><path + inkscape:connector-curvature="0" + style="fill:#808080" + id="path11" + d="m 93.859,28.797 c 0,0.671 0,1.343 0,2.015 -1.742,-1.097 -2.443,-2.053 -3.021,-4.029 1.334,0.361 2.046,1.088 3.021,2.014" /><path + inkscape:connector-curvature="0" + style="fill:#808080" + id="path13" + d="m 101.414,31.82 c 3.068,-0.052 5.705,1.088 8.396,2.434 3.912,1.957 1.555,2.21 3.023,4.618 -0.42,-0.688 -1.875,1.18 0,2.351 2.832,1.768 3.479,-1.882 3.693,-4.366 2.021,1.265 2.127,2.13 1.889,4.534 -0.277,2.803 2.684,0.806 3.316,2.183 0.842,1.831 0.234,2.632 1.512,4.869 -0.426,-0.744 2.949,2.473 3.359,2.938 0.904,1.024 -0.254,1.901 0,2.351 1.539,2.74 4.084,3.535 5.707,7.136 0.4,0.887 0.479,3.373 0.42,3.274 0.564,0.956 2.941,2.375 3.443,3.442 1.629,3.456 0.096,4.434 1.092,7.053 0.682,1.794 2.813,1.766 3.986,4.449 1.143,2.607 2.639,5.031 3.779,7.64 2.496,5.715 5.688,12.488 6.76,18.638 -4.807,-1.172 -2.369,5.634 0,1.008 0.34,5.395 0.359,13.186 1.174,16.455 0.193,0.773 2.311,0.362 2.604,2.434 0.244,1.732 0.465,3.469 0.67,5.207 0.387,3.259 0.768,6.463 1.092,9.655 -4.576,1.46 0.268,3.177 0.504,4.533 0.275,1.581 -1.781,2.388 -1.51,3.526 0.6,2.504 2.4,3.862 2.014,7.053 -3.775,-0.175 -3.645,3.354 0,3.022 0.625,5.622 0.238,8.872 -0.754,12.677 -0.625,2.391 0.842,5.664 -3.779,5.961 0.84,- 0.336 1.68,-0.672 2.52,-1.008 -0.645,-4.168 -4.727,-3.408 -3.527,0.505 -2.191,-1.781 -4.873,-3.023 -7.725,-3.023 -2.297,0 -3.742,-2.125 -4.365,-2.014 -3.547,0.634 -4.119,3.543 0,3.526 -4.145,1.753 -3.68,6.905 -7.557,8.06 -0.813,-3.462 -7.877,-2.775 -4.197,1.847 1.064,1.339 3.943,0.734 5.457,2.016 1.643,1.391 2.32,4.579 4.283,6.211 -1.848,1.344 -3.695,2.688 -5.543,4.031 -2.545,-5.455 -6.711,1.023 -2.014,1.51 -2.182,2.016 -4.365,4.031 -6.549,6.045 -0.777,-2.664 -1.934,-5.928 -0.504,-8.563 4.775,1.516 1.152,-2.986 1.26,-3.441 1.131,-4.777 0.906,-7.387 1.301,-12.175 0.854,-10.354 4.76,-21.472 3.482,-32.239 10.143,5.886 2.646,-6.433 0,-2.014 -1.838,-5.876 -0.078,-11.983 -1.174,-17.463 -1.998,-9.992 -2.217,-20.824 -4.869,-29.385 6.055,2.12 2.563,-6.641 -0.504,-1.007 -2.67,-4.044 -2.762,-9.171 -5.037,-13.601 3.717,-1.245 2.65,-5.183 -1.008,-3.022 -2.391,-4.065 -3.021,-8.82 -5.205,-12.971 -1.254,-2.381 -4.809,-5.731 -4.871,-8.69 -0.014,-0.67 3.184,-10.43 -1.51,-5.037 -0.648,-1.477 -1.406,-2 .709 -2.225,-4.114 -1.398,-2.396 1.666,-4.089 1.721,-3.945 -0.961,-2.585 -1.775,-1.686 -3.525,-1.008 -2.563,-4.508 -5.113,-9.028 -7.556,-13.601 4.104,1.949 2.678,-6.165 7.051,-0.505" /><path + inkscape:connector-curvature="0" + id="path15" + d="m 100.912,34.842 c -2.028,3.19 -3.8,0.259 0,0" /><path + inkscape:connector-curvature="0" + id="path17" + d="m 110.482,37.277 c -1.736,3.919 -3.691,-0.646 0,0" /><path + inkscape:connector-curvature="0" + id="path19" + d="m 107.458,40.887 c -9.031,3.937 -0.947,-7.248 0,0" /><path + inkscape:connector-curvature="0" + id="path21" + d="m 115.015,52.389 c -4.058,2.591 -2.408,-4.313 0,0" /><path + inkscape:connector-curvature="0" + id="path23" + d="m 89.83,57.006 c 0.417,4.109 3.318,13.493 -2.435,6.38 -3.985,-4.927 -2.604,-9.791 -4.283,-0.167 -1.935,11.086 -5.634,0.491 -3.609,-5.877 2.345,-7.371 6.759,-5.491 10.327,-0.336" /><path + inkscape:connector-curvature="0" + id="path25" + d="m 55.575,54.991 c 0.02,1.881 2.334,19.448 -2.015,15.449 -0.534,-0.491 -0.419,-10.233 -1.007,-12.426 -1.903,2.101 -6.68,13.989 -7.892,7.557 -0.767,-4.073 6.323,-15.265 10.914,-10.58" /><path + inkscape:connector-curvature="0" + id="path27" + d="m 113.505,59.441 c -1.459,4.288 -3.906,0.337 0,0" /><path + inkscape:connector-curvature="0" + id="path29" + d="m 116.023,65.486 c -1.287,4.781 -4.76,-2.411 0,0" /><path + inkscape:connector-curvature="0" + id="path31" + d="m 120.556,75.561 c -1.352,-0.005 -2.203,1.11 -2.014,-1.931 2.067,0.031 1.618,0.912 2.014,1.931" /><path + inkscape:connector-curvature="0" + id="path33" + d="m 99.904,87.651 c 0.84,2.882 1.68,5.765 2.52,8.647 -0.701,0.41 -0.992,0.622 -1.512,1.008 -2.902,-1.647 -5.148,-14.004 -8.731,-11.167 -2.45,1.941 3.761,11.214 -1.259,11.712 -4.8,0.476 -2.512,-11.716 -1.092,-14.021 4.21,-6.836 6.781,0.893 10.074,3.821" /><path + inkscape:connector-curvature="0" + id="path35" + d="m 42.982,84.208 c 1.304,4.175 1.613,12.149 -3.022,13.601 0.004,-1.88 2.812,-10.905 0,-12.091 -4.73,-1.995 -3.219,8.375 -7.052,8.565 -2.116,0.105 1.93,-18.481 10.074,-10.075" /><path + inkscape:connector-curvature="0" + id="path37" + d="m 127.609,82.613 c -1.711,4.734 -4.041,0.251 0,0" /><path + inkscape:connector-curvature="0" + id="path39" + d="m 141.714,85.636 c -1.939,-0.345 -3.076,-0.177 -2.016,-2.939 1.952,0.525 1.831,1.535 2.016,2.939" /><path + inkscape:connector-curvature="0" + id="path41" + d="m 126.099,90.672 c -2.039,4.035 -3.514,-1.049 0,0" /><path + inkscape:connector-curvature="0" + id="path43" + d="m 146.248,94.284 c -0.492,0.878 -0.564,1.671 -2.014,2.014 -0.723,-2.721 -0.332,-3.344 2.014,-2.014" /><path + inkscape:connector-curvature="0" + id="path45" + d="m 132.142,101.335 c -0.672,0.671 -1.342,1.344 -2.016,2.015 -0.964,-3.073 0.325,-1.978 2.016,-2.015" /><path + inkscape:connector-curvature="0" + id="path47" + d="m 129.121,104.358 c -0.1,1.351 0.141,2.142 -1.008,3.022 -0.168,-1.007 -0.336,-2.015 -0.504,-3.022 0.504,0 1.01,0 1.512,0" /><path + inkscape:connector-curvature="0" + id="path49" + d="m 107.962,109.814 c 0.873,3.68 2.211,17.653 -1.51,9.403 -1.086,-2.408 -2.465,-14.191 -5.5,-4.113 -0.563,1.87 0.732,4.511 -0.125,6.044 -1.262,2.254 -2.839,2.876 -3.19,-0.798 -0.573,-5.994 3.392,-20.195 10.325,-10.536" /><path + inkscape:connector-curvature="0" + id="path51" + d="m 34.922,110.402 c 0.404,3.37 -2.236,18.071 -4.366,12.215 -1.167,-3.208 2.903,-7.186 0.335,-9.193 0.184,-6.477 -5.735,7.185 -6.8,7.22 -4.159,0.14 -0.091,-8.807 1.637,-10.536 3.078,-3.08 6.112,-2.992 9.194,0.294" /><path + inkscape:connector-curvature="0" + id="path53" + d="m 137.683,112.838 c -1.459,1.088 -2.027,1.912 -1.51,-1.427 0.19,0.203 1.44,1.422 1.51,1.427" /><path + inkscape:connector-curvature="0" + id="path55" + d="m 151.287,112.417 c -1.981,3.051 -3.604,-0.32 0,0" /><path + inkscape:connector-curvature="0" + id="path57" + d="m 132.142,112.417 c 1.266,6.006 -5.51,1.192 0,0" /><path + inkscape:connector-curvature="0" + id="path59" + d="m 133.656,122.493 c -1.1,3.962 -3.174,0.221 0,0" /><path + inkscape:connector-curvature="0" + id="path61" + d="m 140.707,125.514 c -3.155,2.933 -4.133,-1.707 0,0" /><path + inkscape:connector-curvature="0" + id="path63" + d="m 133.656,129.964 c -0.672,0.028 -1.344,0.057 -2.016,0.084 0.477,-3.578 1.649,-3.087 2.016,-0.084" /><path + inkscape:connector-curvature="0" + id="path65" + d="m 155.314,130.552 c -2.408,4.303 -3.938,-2.054 0,0" /><path + inkscape:connector-curvature="0" + id="path67" + d="m 114.511,136.597 c 2.486,3.671 3.119,12.7 -2.518,13.601 3.225,3.45 7.047,13.611 1.006,16.12 -0.309,-1.146 -1.828,-16.853 -4.07,-9.403 -1.045,3.466 0.541,9.816 -2.98,10.41 -3.928,-7.673 2.018,-12.094 5.289,-17.379 1.219,-1.968 2.332,-13.202 -3.609,-12.929 -5.045,0.231 -2.422,6.549 -3.527,8.312 -1.365,2.181 -3.922,1.798 -4.617,-2.352 -1.364,-8.144 11.052,-15.998 15.026,-6.38" /><path + inkscape:connector-curvature="0" + id="path69" + d="m 135.669,132.987 c -0.133,2.912 -3.855,9.031 -3.945,4.449 -0.043,-2.095 1.041,-6.508 3.945,-4.449" /><path + inkscape:connector-curvature="0" + id="path71" + d="m 26.862,140.039 c 1.913,3.494 1.24,11.221 -3.022,12.174 0.488,-3.661 2.193,-7.782 -0.756,-11.167 -6.41,-7.355 -3.723,5.263 -6.549,7.641 -4.9,4.124 -2.161,-8.064 0,-10.411 3.67,-3.985 8.325,-3.361 10.327,1.763" /><path + inkscape:connector-curvature="0" + id="path73" + d="m 139.699,146.672 c -0.52,0.452 -0.908,0.823 -1.006,1.511 -2.023,-1.436 -1.781,-0.92 -1.01,-3.526 0.674,0.671 1.344,1.343 2.016,2.015" /><path + inkscape:connector-curvature="0" + id="path75" + d="m 138.187,156.158 c -0.271,3.44 -2.709,1.575 0,0" /><path + inkscape:connector-curvature="0" + id="path77" + d="m 133.15,157.754 c -0.965,1.454 -0.855,2.504 -3.023,1.511 0.511,-2.302 1.445,-1.613 3.023,-1.511" /><path + inkscape:connector-curvature="0" + id="path79" + d="m 148.767,163.799 c -2.225,0.309 -2.846,-0.384 -1.512,-3.022 1.618,0.586 1.401,1.53 1.512,3.022" /><path + inkscape:connector-curvature="0" + id="path81" + d="m 156.324,161.784 c -1.045,4.861 -4.516,0.335 0,0" /><path + inkscape:connector-curvature="0" + id="path83" + d="m 139.699,164.219 c 3.078,-0.005 0.564,0.398 1.596,2.099 -0.413,-0.681 -4.292,-0.72 -1.596,-2.099" /><path + inkscape:connector-curvature="0" + id="path85" + d="m 132.142,164.806 c 0.289,0.586 0.352,1.105 1.008,1.512 -3.303,2.902 -5.201,-0.831 -1.008,-1.512" /><path + inkscape:connector-curvature="0" + id="path87" + d="m 22.329,169.844 c 0.399,3.927 2.982,10.878 -2.015,12.593 -0.087,-3.431 0.455,-16.885 -6.464,-12.005 -3.656,2.578 0.626,8.095 -3.61,9.991 -3.938,-8.743 5.01,-21.63 12.089,-10.579" /><path + inkscape:connector-curvature="0" + id="path89" + d="m 146.751,171.271 c -3.884,3.185 -3.308,-3.5 0,0" /><path + inkscape:connector-curvature="0" + id="path91" + d="m 152.292,169.844 c -0.297,1.939 0.322,3.379 -2.518,1.512 0.477,-1.588 1.216,-1.222 2.518,-1.512" /><path + inkscape:connector-curvature="0" + id="path93" + d="m 137.181,171.271 c -3.416,3.412 -3.521,-1.281 0,0" /><path + inkscape:connector-curvature="0" + id="path95" + d="m 134.662,176.309 c -6.35,4.809 -4.362,-9.117 0,0" /><path + inkscape:connector-curvature="0" + id="path97" + d="m 114.009,176.309 c 1.211,4.178 3.096,18.212 -3.527,17.716 0.547,-2.262 2.006,-21.131 -2.057,-15.911 -3.037,3.903 -1.934,9.599 -2.477,13.895 -0.184,0.053 -2.438,0.424 -3.023,0.502 -0.445,-2.707 -1.063,-6.343 -0.502,-9.066 0.957,-4.658 7.674,-15.295 11.586,-7.136" /><path + inkscape:connector-curvature="0" + id="path99" + d="m 130.126,190.999 c -0.961,3.039 -1.98,2.555 -2.518,-1.006 0.841,0.336 1.681,0.672 2.518,1.006" /><path + inkscape:connector-curvature="0" + id="path101" + d="m 136.173,193.015 c -1.742,1.211 -2.709,1.645 -4.031,-1.006 2.147,-1.164 2.824,-0.268 4.031,1.006" /><path + inkscape:connector-curvature="0" + id="path107" + d="m 128.113,198.474 c -3.256,2.892 -3.928,-0.823 0,0" /><path + inkscape:connector-curvature="0" + style="fill:#808080" + id="path115" + d="m 123.58,205.524 c -3.311,2.827 -3.743,-1.187 0,0" /><path + style="opacity:0.98999999;fill:none;fill-opacity:1;stroke:#000000;stroke-width:2.0775001;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" + d="m 53.25976,167.81168 c -0.46009,-0.29247 -0.37545,-1.89146 0.36351,-6.86735 0.52978,-3.56736 0.96841,-6.76735 0.97473,-7.1111 0.009,-0.46444 -1.46571,-0.625 -5.73851,-0.625 l -5.75,0 0,-1.5 0,-1.5 6.15437,0 6.15436,0 0.62912,-4.625 c 0.34601,-2.54375 0.74171,-5.01875 0.87932,-5.5 0.21975,-0.76846 -0.14067,-0.875 -2.96013,-0.875 -1.76569,0 -4.59335,-0.14456 -6.28369,-0.32123 l -3.07335,-0.32123 0,-1.97999 0,-1.98 6.68177,0.35787 6.68177,0.35788 0.69323,-6.18165 c 0.69273,-6.17723 0.69421,-6.18177 2.06823,-6.33986 1.291837,-0.14865 1.37313,-0.0428 1.344088,1.75 -0.017,1.04951 -0.19446,3.53946 -0.394352,5.53321 l -0.36344,3.625 3.593024,0 3.593025,0 0.534791,-3.125 c 0.294135,-1.71875 0.679534,-4.05652 0.856441,-5.19503 l 0.321651,-2.07003 2.069886,0.26382 c 1.138437,0.1451 2.138178,0.31991 2.221647,0.38846 0.08347,0.0686 -0.193753,2.10412 -0.616047,4.52349 -0.422294,2.41937 -0.710674,4.45599 -0.640843,4.52582 0.06983,0.0698 2.433148,0.2858 5.251818,0.47994 4.363931,0.30056 5.0 92027,0.47216 4.903757,1.15575 -0.904731,3.28495 -0.378112,3.03667 -5.747197,2.70957 l -4.893667,-0.29813 -0.337272,5.14652 c -0.185499,2.83059 -0.249968,5.23382 -0.143264,5.34053 0.106703,0.1067 2.13507,0.33099 4.50748,0.49841 4.662222,0.32902 4.819236,0.46768 3.998331,3.53088 -0.285494,1.06531 -0.550386,1.125 -4.993173,1.125 -2.81491,0 -4.691684,0.20132 -4.691684,0.50329 0,0.54455 -1.308836,9.70764 -1.769687,12.38949 -0.273039,1.5889 -0.342939,1.63182 -2.131305,1.30867 -1.016955,-0.18376 -1.903772,-0.37778 -1.970705,-0.43115 -0.06693,-0.0534 0.438091,-3.00477 1.122276,-6.55867 0.684186,-3.5539 1.245199,-6.51788 1.246697,-6.58663 0.0015,-0.0687 -2.022276,-0.125 -4.497276,-0.125 -2.475,0 -4.5,0.0679 -4.5,0.1508 0,0.083 -0.56154,3.2892 -1.24787,7.125 -0.68634,3.83581 -1.24884,7.14295 -1.25,7.3492 -0.003,0.48719 -2.07619,0.47153 -2.85186,-0.0215 z m 14.077786,-19.16484 c 0.115745,-0.11575 0.368947,-2.51179 0.562672,-5.32453 l 0.352226,-5.11408 -3.780045,0 -3.780049,0 -0.56558,2.625 c -1.77037,8.21675 -1.62835,8.57781 3.250835,8.26468 2.062222,-0.13234 3.844196,-0.33533 3.959941,-0.45107 z" + id="path4600" + inkscape:connector-curvature="0" /><path + style="opacity:0.98999999;fill:#ff0000;fill-opacity:1;stroke:#f70303;stroke-width:1.7825098;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" + d="M 25.922231,57.497975 C 15.970502,42.018613 8.4744893,18.46558 5.7975564,-5.7352559 4.5447526,-17.061186 4.4803924,-16.836643 6.9825384,-9.8695439 15.427512,13.645087 25.637582,31.54247 34.107422,37.67808 c 1.043793,0.756129 4.898129,4.013126 4.898523,4.182214 0.0013,0.564513 -9.90301,18.776699 -10.227781,19.182512 -0.175964,0.21987 -1.461134,-1.375304 -2.855933,-3.544831 z" + id="path3394" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssscss" /><path + style="overflow:visible;opacity:0.98999999;fill:#ff0000;fill-opacity:1;stroke:#f70303;stroke-width:2.0775001;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" + d="m 118.19526,72.502377 c 12.41952,-16.84864 21.77437,-42.485134 25.11512,-68.826734 1.56347,-12.327802 1.64379,-12.083396 -1.47883,-4.499999 -10.53913,25.594694 -23.28106,45.075249 -33.85122,51.753604 -1.30263,0.823015 -2.36882,1.646975 -2.36931,1.83102 -0.002,0.614449 11.61479,23.158799 12.0201,23.600509 0.2196,0.23932 -1.17654,-1.49696 0.56414,-3.8584 z" + id="path3394-8" + inkscape:connector-curvature="0" + sodipodi:nodetypes="sssscss" /></svg> \ No newline at end of file diff --git a/dev-dotnet/deveel-irony/metadata.xml b/dev-dotnet/deveel-irony/metadata.xml new file mode 100644 index 0000000..bc15339 --- /dev/null +++ b/dev-dotnet/deveel-irony/metadata.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>dotnet</herd> + <maintainer> <!-- https://wiki.gentoo.org/wiki/User:Cynede --> + <email>[email protected]</email> + <name>Heather Cynede</name> + </maintainer> + <upstream> + <bugs-to>https://github.com/atsushieno/irony</bugs-to> + <remote-id type="github">deveel/irony</remote-id> + </upstream> + <use> + <flag name='pkg-config'>create .pc file(s) for .dll(s) installed to gac</flag> + </use> + <longdescription lang="en"> + parsing framework for C# on LALR(1) + </longdescription> + <longdescription lang="ru"> + фреймворк для написания LALR(1) парсеров на C# + </longdescription> +</pkgmetadata> diff --git a/dev-dotnet/deveeldb/deveeldb-2.0_pre_alpha_p20160101.ebuild b/dev-dotnet/deveeldb/deveeldb-2.0_pre_alpha_p20160101.ebuild index 3db0d51..1889100 100644 --- a/dev-dotnet/deveeldb/deveeldb-2.0_pre_alpha_p20160101.ebuild +++ b/dev-dotnet/deveeldb/deveeldb-2.0_pre_alpha_p20160101.ebuild @@ -46,6 +46,9 @@ RDEPEND="${COMMON_DEPEND} DEPEND="${COMMON_DEPEND} test? ( dev-dotnet/nunit:2[nupkg] ) + dev-dotnet/deveel-irony[nupkg] + dev-dotnet/deveel-math[nupkg] + dev-dotnet/dryioc[nupkg] virtual/pkgconfig " @@ -69,10 +72,10 @@ NUSPEC_FILE_NAME=deveeldb.nuspec #https://raw.githubusercontent.com/ArsenShnurkov/dotnet/deveeldb/dev-dotnet/deveeldb/files/color.png -EBUILD_REPOSITORY_NAME="ArsenShnurkov/deveeldb" +EBUILD_REPOSITORY_NAME="ArsenShnurkov/dotnet" EBUILD_BRANCH="deveeldb" #https://raw.githubusercontent.com/ArsenShnurkov/dotnet/deveeldb/dev-dotnet/deveeldb/files/color.png -ICON_URL="https://raw.githubusercontent.com/${EBUILD_REPOSITORY_NAME}/${EBUILD_BRANCH}/${CATEGORY}/${P}/files/color.png" +ICON_URL="https://raw.githubusercontent.com/${EBUILD_REPOSITORY_NAME}/${EBUILD_BRANCH}/${CATEGORY}/${PN}/files/color.png" # rm -rf rm -rf /var/tmp/portage/dev-dotnet/deveeldb-* # emerge -v =deveeldb-2.0_pre_alpha_p20160101-r0 @@ -112,15 +115,21 @@ src_prepare() { # /var/tmp/portage/dev-dotnet/deveeldb-2.0_pre_alpha_p20160101-r0/work/deveeldb-7ad0b1563ae111535715dbf6d1f25034887720c5 einfo "patching project files" - eapply "${FILESDIR}/deveeldb-nuget-dependencies.patch" - # git diff /var/calculate/remote/distfiles/egit-src/deveeldb.git/src/deveeldb/packages.deveeldb.config - # git diff /var/calculate/remote/distfiles/egit-src/deveeldb.git/src/deveeldb/deveeldb.csproj - if ! use test ; then - einfo "removing unit tests from solution" + eapply "${FILESDIR}/repositories.config.patch" + eapply "${FILESDIR}/packages.deveeldb.config.patch" + eapply "${FILESDIR}/deveeldb.csproj.patch" + + if use test ; then + eapply "${FILESDIR}/packages.deveeldb-nunit.config.patch" + eapply "${FILESDIR}/deveeldb-nunit.csproj.patch" + eapply "${FILESDIR}/deveeldb-nunit.sln.patch" fi einfo "restoring packages (Deveel.Math, DryIoc)" enuget_restore "${METAFILETOBUILD}" + if use test ; then + enuget_restore "src/deveeldb-nunit.sln" + fi #enuget_restore "src/nuget-config/packages.config" #<package id="coveralls.net" version="0.5.0" /> @@ -138,7 +147,11 @@ src_configure() { } src_compile() { - exbuild /p:SignAssembly=true "/p:AssemblyOriginatorKeyFile=${WORKDIR}/mono.snk" "${METAFILETOBUILD}" + if use test ; then + exbuild /p:SignAssembly=true "/p:AssemblyOriginatorKeyFile=${WORKDIR}/mono.snk" "src/deveeldb-nunit.sln" + else + exbuild /p:SignAssembly=true "/p:AssemblyOriginatorKeyFile=${WORKDIR}/mono.snk" "${METAFILETOBUILD}" + fi # run nuget_pack einfo "setting .nupkg version to ${NUSPEC_VERSION}" @@ -147,6 +160,12 @@ src_compile() { src_test() { default + if use debug; then + DIR="Debug" + else + DIR="Release" + fi + /usr/bin/nunit264 "${S}/src/deveeldb-nunit/bin/${DIR}/deveeldb-nunit.dll" || die } src_install() { @@ -169,8 +188,8 @@ FILES_STRING=`cat <<-EOF || die "${DIR} files at patch_nuspec_file()" </files> EOF ` - else - DIR="Release" + else + DIR="Release" FILES_STRING=`cat <<-EOF || die "${DIR} files at patch_nuspec_file()" <files> <!-- https://docs.nuget.org/create/nuspec-reference --> <file src="src/deveeldb/bin/${DIR}/deveeldb.dll" target="lib\net45\" /> diff --git a/dev-dotnet/deveeldb/files/deveeldb-nunit.csproj.patch b/dev-dotnet/deveeldb/files/deveeldb-nunit.csproj.patch new file mode 100644 index 0000000..9fb2401 --- /dev/null +++ b/dev-dotnet/deveeldb/files/deveeldb-nunit.csproj.patch @@ -0,0 +1,125 @@ +--- a/src/deveeldb-nunit/deveeldb-nunit.csproj 2016-01-01 04:52:00.000000000 +0300 ++++ b/src/deveeldb-nunit/deveeldb-nunit.csproj 2016-01-06 17:25:00.360752902 +0300 +@@ -10,7 +10,7 @@ + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>Deveel.Data</RootNamespace> + <AssemblyName>deveeldb-nunit</AssemblyName> +- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> ++ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> + <RestorePackages>true</RestorePackages> +@@ -37,52 +37,53 @@ + <Prefer32Bit>false</Prefer32Bit> + </PropertyGroup> + <PropertyGroup> +- <SignAssembly>false</SignAssembly> +- </PropertyGroup> +- <PropertyGroup> + <AssemblyOriginatorKeyFile>deveeldb-nunit.snk</AssemblyOriginatorKeyFile> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'"> + <PlatformTarget>x86</PlatformTarget> + <OutputPath>bin\x86\Debug\</OutputPath> + <Prefer32Bit>false</Prefer32Bit> ++ <WarningLevel>4</WarningLevel> ++ <Optimize>false</Optimize> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'"> + <PlatformTarget>x86</PlatformTarget> + <OutputPath>bin\x86\Release\</OutputPath> + <Prefer32Bit>false</Prefer32Bit> ++ <WarningLevel>4</WarningLevel> ++ <Optimize>false</Optimize> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'"> + <PlatformTarget>x64</PlatformTarget> + <OutputPath>bin\x64\Debug\</OutputPath> + <Prefer32Bit>false</Prefer32Bit> ++ <WarningLevel>4</WarningLevel> ++ <Optimize>false</Optimize> + </PropertyGroup> + <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> + <PlatformTarget>x64</PlatformTarget> + <OutputPath>bin\x64\Release\</OutputPath> + <DefineConstants>X64</DefineConstants> + <Prefer32Bit>false</Prefer32Bit> ++ <WarningLevel>4</WarningLevel> ++ <Optimize>false</Optimize> + </PropertyGroup> + <ItemGroup> +- <Reference Include="Deveel.Math, Version=1.5.64.0, Culture=neutral, processorArchitecture=MSIL"> +- <HintPath>..\packages\dmath.1.5.64\lib\net20\Deveel.Math.pdb\Deveel.Math.dll</HintPath> +- <Private>True</Private> ++ <Reference Include="System" /> ++ <Reference Include="System.Data" /> ++ <Reference Include="System.Xml" /> ++ <Reference Include="nunit.framework"> ++ <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath> + </Reference> +- <Reference Include="Irony, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ca48ace7223ead47, processorArchitecture=MSIL"> +- <SpecificVersion>False</SpecificVersion> +- <HintPath>..\..\lib\irony.net35\Irony.dll</HintPath> ++ <Reference Include="DryIoc"> ++ <HintPath>..\packages\DryIoc.2.1.0.201512110\lib\net45\DryIoc.dll</HintPath> + </Reference> +- <Reference Include="Moq, Version=4.2.1507.118, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL"> +- <HintPath>..\packages\Moq.4.2.1507.0118\lib\net35\Moq.dll</HintPath> +- <Private>True</Private> ++ <Reference Include="Irony"> ++ <HintPath>..\packages\deveel-irony.1.0.0.0\lib\net45\Irony.dll</HintPath> + </Reference> +- <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL"> +- <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath> +- <Private>True</Private> ++ <Reference Include="Deveel.Math"> ++ <HintPath>..\packages\dmath.1.5.66.201512290\lib\net45\Deveel.Math.dll</HintPath> + </Reference> +- <Reference Include="System" /> +- <Reference Include="System.Data" /> +- <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <Compile Include="Deveel.Data.Caching\MemoryCacheTests.cs" /> +@@ -169,35 +170,16 @@ + </ItemGroup> + <ItemGroup> + <None Include="deveeldb-nunit.licenseheader" /> +- <None Include="deveeldb-nunit.snk" /> + <None Include="packages.deveeldb-nunit.config" /> + </ItemGroup> + <ItemGroup> ++ <Folder Include="Deveel.Data.Linq\" /> ++ </ItemGroup> ++ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> ++ <ItemGroup> + <ProjectReference Include="..\deveeldb\deveeldb.csproj"> +- <Project>{a14222ae-1b48-4863-a0ca-1d6c2ab2190b}</Project> ++ <Project>{A14222AE-1B48-4863-A0CA-1D6C2AB2190B}</Project> + <Name>deveeldb</Name> + </ProjectReference> + </ItemGroup> +- <ItemGroup> +- <Folder Include="Deveel.Data.Linq\" /> +- </ItemGroup> +- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> +- <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" /> +- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> +- <PropertyGroup> +- <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> +- </PropertyGroup> +- <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" /> +- </Target> +- <PropertyGroup> +- <PostBuildEvent> +- </PostBuildEvent> +- </PropertyGroup> +- <!-- 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"> +- </Target> +- <Target Name="AfterBuild"> +- </Target> +- --> + </Project> +\ No newline at end of file diff --git a/dev-dotnet/deveeldb/files/deveeldb-nunit.sln.patch b/dev-dotnet/deveeldb/files/deveeldb-nunit.sln.patch new file mode 100644 index 0000000..9efd7ed --- /dev/null +++ b/dev-dotnet/deveeldb/files/deveeldb-nunit.sln.patch @@ -0,0 +1,47 @@ +diff -u -r -N a/src/deveeldb-nunit.sln b/src/deveeldb-nunit.sln +--- a/src/deveeldb-nunit.sln 1970-01-01 03:00:00.000000000 +0300 ++++ b/src/deveeldb-nunit.sln 2016-01-06 16:29:49.000000000 +0300 +@@ -0,0 +1,43 @@ ++ ++Microsoft Visual Studio Solution File, Format Version 11.00 ++# Visual Studio 2010 ++Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "deveeldb-nunit", "deveeldb-nunit\deveeldb-nunit.csproj", "{F583D8C8-97A2-4460-9C03-40E48A9A2B3A}" ++EndProject ++Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "deveeldb", "deveeldb\deveeldb.csproj", "{A14222AE-1B48-4863-A0CA-1D6C2AB2190B}" ++EndProject ++Global ++ GlobalSection(SolutionConfigurationPlatforms) = preSolution ++ Debug|Any CPU = Debug|Any CPU ++ Release|Any CPU = Release|Any CPU ++ Debug|x86 = Debug|x86 ++ Release|x86 = Release|x86 ++ Debug|x64 = Debug|x64 ++ Release|x64 = Release|x64 ++ EndGlobalSection ++ GlobalSection(ProjectConfigurationPlatforms) = postSolution ++ {A14222AE-1B48-4863-A0CA-1D6C2AB2190B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU ++ {A14222AE-1B48-4863-A0CA-1D6C2AB2190B}.Debug|Any CPU.Build.0 = Debug|Any CPU ++ {A14222AE-1B48-4863-A0CA-1D6C2AB2190B}.Debug|x64.ActiveCfg = Debug|x64 ++ {A14222AE-1B48-4863-A0CA-1D6C2AB2190B}.Debug|x64.Build.0 = Debug|x64 ++ {A14222AE-1B48-4863-A0CA-1D6C2AB2190B}.Debug|x86.ActiveCfg = Debug|x86 ++ {A14222AE-1B48-4863-A0CA-1D6C2AB2190B}.Debug|x86.Build.0 = Debug|x86 ++ {A14222AE-1B48-4863-A0CA-1D6C2AB2190B}.Release|Any CPU.ActiveCfg = Release|Any CPU ++ {A14222AE-1B48-4863-A0CA-1D6C2AB2190B}.Release|Any CPU.Build.0 = Release|Any CPU ++ {A14222AE-1B48-4863-A0CA-1D6C2AB2190B}.Release|x64.ActiveCfg = Release|x64 ++ {A14222AE-1B48-4863-A0CA-1D6C2AB2190B}.Release|x64.Build.0 = Release|x64 ++ {A14222AE-1B48-4863-A0CA-1D6C2AB2190B}.Release|x86.ActiveCfg = Release|x86 ++ {A14222AE-1B48-4863-A0CA-1D6C2AB2190B}.Release|x86.Build.0 = Release|x86 ++ {F583D8C8-97A2-4460-9C03-40E48A9A2B3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU ++ {F583D8C8-97A2-4460-9C03-40E48A9A2B3A}.Debug|Any CPU.Build.0 = Debug|Any CPU ++ {F583D8C8-97A2-4460-9C03-40E48A9A2B3A}.Debug|x64.ActiveCfg = Debug|x64 ++ {F583D8C8-97A2-4460-9C03-40E48A9A2B3A}.Debug|x64.Build.0 = Debug|x64 ++ {F583D8C8-97A2-4460-9C03-40E48A9A2B3A}.Debug|x86.ActiveCfg = Debug|x86 ++ {F583D8C8-97A2-4460-9C03-40E48A9A2B3A}.Debug|x86.Build.0 = Debug|x86 ++ {F583D8C8-97A2-4460-9C03-40E48A9A2B3A}.Release|Any CPU.ActiveCfg = Release|Any CPU ++ {F583D8C8-97A2-4460-9C03-40E48A9A2B3A}.Release|Any CPU.Build.0 = Release|Any CPU ++ {F583D8C8-97A2-4460-9C03-40E48A9A2B3A}.Release|x64.ActiveCfg = Release|x64 ++ {F583D8C8-97A2-4460-9C03-40E48A9A2B3A}.Release|x64.Build.0 = Release|x64 ++ {F583D8C8-97A2-4460-9C03-40E48A9A2B3A}.Release|x86.ActiveCfg = Release|x86 ++ {F583D8C8-97A2-4460-9C03-40E48A9A2B3A}.Release|x86.Build.0 = Release|x86 ++ EndGlobalSection ++EndGlobal diff --git a/dev-dotnet/deveeldb/files/deveeldb-nuget-dependencies.patch b/dev-dotnet/deveeldb/files/deveeldb.csproj.patch similarity index 83% rename from dev-dotnet/deveeldb/files/deveeldb-nuget-dependencies.patch rename to dev-dotnet/deveeldb/files/deveeldb.csproj.patch index 57a5505..c9e5aa8 100644 --- a/dev-dotnet/deveeldb/files/deveeldb-nuget-dependencies.patch +++ b/dev-dotnet/deveeldb/files/deveeldb.csproj.patch @@ -1,19 +1,5 @@ ---- a/src/deveeldb/packages.deveeldb.config -+++ b/src/deveeldb/packages.deveeldb.config -@@ -17,7 +17,7 @@ - // - --> - <packages> -- <package id="dmath" version="1.5.64" targetFramework="net35" /> -- <package id="DryIoc.dll" version="2.0.0" targetFramework="net35" /> -- <package id="ILRepack.MSBuild.Task" version="1.0.9" targetFramework="net35" /> -+ <package id="dmath" version="1.5.66.201512290" targetFramework="net45" /> -+ <package id="DryIoc" version="2.1.0.201512110" targetFramework="net45" /> -+ <package id="Irony" version="1.0.0.1" targetFramework="net45" /> - </packages> -\ No newline at end of file ---- a/src/deveeldb/deveeldb.csproj -+++ b/src/deveeldb/deveeldb.csproj +--- a/src/deveeldb/deveeldb.csproj 2016-01-01 04:52:00.000000000 +0300 ++++ b/src/deveeldb/deveeldb.csproj 2016-01-06 14:50:58.000000000 +0300 @@ -8,11 +8,13 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>Deveel.Data</RootNamespace> @@ -50,19 +36,29 @@ - <HintPath>..\packages\dmath.1.5.64\lib\net20\Deveel.Math.pdb\Deveel.Math.dll</HintPath> - </Reference> <Reference Include="System.Xml" /> ++ <Reference Include="Irony"> ++ <HintPath>packages\deveel-irony.1.0.0.0\lib\net45\Irony.dll</HintPath> ++ </Reference> + <Reference Include="Deveel.Math"> + <HintPath>packages\dmath.1.5.66.201512290\lib\net45\Deveel.Math.dll</HintPath> + </Reference> -+ <Reference Include="Irony"> -+ <HintPath>packages\Irony.1.0.0.1\lib\net45\Irony.dll</HintPath> -+ </Reference> + <Reference Include="DryIoc"> + <HintPath>packages\DryIoc.2.1.0.201512110\lib\net45\DryIoc.dll</HintPath> + </Reference> </ItemGroup> <ItemGroup> <Compile Include="Deveel.Data.Caching\Cache.cs" /> -@@ -983,14 +983,6 @@ +@@ -974,8 +974,7 @@ + <ItemGroup> + <Compile Include="Deveel.Data.Sql\Query.Objects.cs" /> + <None Include="deveeldb.licenseheader" /> +- <None Include="deveeldb.snk" /> +- <None Include="packages.deveeldb.config" /> ++ <None Include="packages.config" /> + </ItemGroup> + <ItemGroup /> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> +@@ -983,14 +982,6 @@ <PreBuildEvent> </PreBuildEvent> </PropertyGroup> @@ -77,7 +73,7 @@ <!-- <Target Name="AfterBuild"> <MakeDir Directories="$(SolutionDir)..\dist\$(PlatformName)"/> -@@ -1014,10 +1006,6 @@ +@@ -1014,10 +1005,6 @@ /> </Target> --> @@ -88,3 +84,5 @@ <!-- 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"> + + diff --git a/dev-dotnet/deveeldb/files/deveeldb.nuspec b/dev-dotnet/deveeldb/files/deveeldb.nuspec index 1f19a71..12f3095 100644 --- a/dev-dotnet/deveeldb/files/deveeldb.nuspec +++ b/dev-dotnet/deveeldb/files/deveeldb.nuspec @@ -18,9 +18,9 @@ <tags>sql db database data embedded deveel sql-92 sql-99 select query mono</tags> <dependencies> <group targetFramework="net45"> - <dependency id="dmath" /> <dependency id="DryIoc" /> - <dependency id="Irony" /> + <dependency id="dmath" /> + <dependency id="deveel-irony" /> </group> </dependencies> </metadata> diff --git a/dev-dotnet/deveeldb/files/packages.deveeldb-nunit.config.patch b/dev-dotnet/deveeldb/files/packages.deveeldb-nunit.config.patch new file mode 100644 index 0000000..07aae25 --- /dev/null +++ b/dev-dotnet/deveeldb/files/packages.deveeldb-nunit.config.patch @@ -0,0 +1,35 @@ +--- a/src/deveeldb-nunit/packages.deveeldb-nunit.config 2016-01-01 04:52:00.000000000 +0300 ++++ b/src/deveeldb-nunit/packages.deveeldb-nunit.config 2016-01-06 16:19:53.000000000 +0300 +@@ -1,27 +1,7 @@ + <?xml version="1.0" encoding="utf-8"?> +- +-<!-- +-// +-// Copyright 2010-2014 Deveel +-// +-// Licensed under the Apache License, Version 2.0 (the "License"); +-// you may not use this file except in compliance with the License. +-// You may obtain a copy of the License at +-// +-// http://www.apache.org/licenses/LICENSE-2.0 +-// +-// Unless required by applicable law or agreed to in writing, software +-// distributed under the License is distributed on an "AS IS" BASIS, +-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-// See the License for the specific language governing permissions and +-// limitations under the License. +---> + <packages> +- <package id="coveralls.io" version="1.3.4" targetFramework="net35" /> +- <package id="coveralls.net" version="0.6.0" targetFramework="net35" /> +- <package id="dmath" version="1.5.64" targetFramework="net35" /> +- <package id="Moq" version="4.2.1507.0118" targetFramework="net35" /> +- <package id="NUnit" version="2.6.4" targetFramework="net35" /> +- <package id="NUnit.Runners" version="2.6.4" targetFramework="net35" /> +- <package id="OpenCover" version="4.6.166" targetFramework="net35" /> ++ <package id="deveel-irony" version="1.0.0.0" targetFramework="net45" /> ++ <package id="dmath" version="1.5.66.201512290" targetFramework="net45" /> ++ <package id="DryIoc" version="2.1.0.201512110" targetFramework="net45" /> ++ <package id="NUnit" version="2.6.4" targetFramework="net45" /> + </packages> +\ No newline at end of file diff --git a/dev-dotnet/deveeldb/files/packages.deveeldb.config.patch b/dev-dotnet/deveeldb/files/packages.deveeldb.config.patch new file mode 100644 index 0000000..21e016e --- /dev/null +++ b/dev-dotnet/deveeldb/files/packages.deveeldb.config.patch @@ -0,0 +1,30 @@ +--- a/src/deveeldb/packages.deveeldb.config 2016-01-01 04:52:00.000000000 +0300 ++++ b/src/deveeldb/packages.deveeldb.config 2016-01-06 16:46:25.000000000 +0300 +@@ -1,23 +1,6 @@ + <?xml version="1.0" encoding="utf-8"?> +-<!-- +-// +-// Copyright 2010-2015 Deveel +-// +-// Licensed under the Apache License, Version 2.0 (the "License"); +-// you may not use this file except in compliance with the License. +-// You may obtain a copy of the License at +-// +-// http://www.apache.org/licenses/LICENSE-2.0 +-// +-// Unless required by applicable law or agreed to in writing, software +-// distributed under the License is distributed on an "AS IS" BASIS, +-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-// See the License for the specific language governing permissions and +-// limitations under the License. +-// +---> + <packages> +- <package id="dmath" version="1.5.64" targetFramework="net35" /> +- <package id="DryIoc.dll" version="2.0.0" targetFramework="net35" /> +- <package id="ILRepack.MSBuild.Task" version="1.0.9" targetFramework="net35" /> ++ <package id="deveel-irony" version="1.0.0.0" targetFramework="net45" /> ++ <package id="dmath" version="1.5.66.201512290" targetFramework="net45" /> ++ <package id="DryIoc" version="2.1.0.201512110" targetFramework="net45" /> + </packages> +\ No newline at end of file diff --git a/dev-dotnet/deveeldb/files/repositories.config.patch b/dev-dotnet/deveeldb/files/repositories.config.patch new file mode 100644 index 0000000..51320ef --- /dev/null +++ b/dev-dotnet/deveeldb/files/repositories.config.patch @@ -0,0 +1,22 @@ +--- a/src/packages/repositories.config 2016-01-01 04:52:00.000000000 +0300 ++++ b/src/packages/repositories.config 2016-01-06 16:51:14.000000000 +0300 +@@ -1,16 +1,5 @@ + <?xml version="1.0" encoding="utf-8"?> + <repositories> +- <repository path="..\deveeldb.gis.nunit\packages.deveeldb.gis.nunit.config" /> +- <repository path="..\deveeldb.linq.nunit\packages.deveeldb.linq.nunit.config" /> +- <repository path="..\deveeldb.log4net\packages.config" /> +- <repository path="..\deveeldb.xml.nunit\packages.deveeldb.xml.nunit.config" /> +- <repository path="..\deveeldb\packages.config" /> +- <repository path="..\deveeldb\packages.deveeldb.config" /> +- <repository path="..\deveeldb\packages.deveeldb.pcl.config" /> +- <repository path="..\deveeldb-gis\packages.config" /> +- <repository path="..\deveeldb-gis\packages.deveeldb-gis.config" /> +- <repository path="..\deveeldb-lucene\packages.config" /> +- <repository path="..\deveeldb-lucene\packages.deveeldb-lucene.config" /> +- <repository path="..\deveeldb-nunit\packages.config" /> +- <repository path="..\deveeldb-nunit\packages.deveeldb-nunit.config" /> ++ <repository path="../deveeldb/packages.deveeldb.config" /> ++ <repository path="../deveeldb-nunit/packages.deveeldb-nunit.config" /> + </repositories> +\ No newline at end of file diff --git a/dev-dotnet/irony-framework/files/csproj.patch b/dev-dotnet/irony-framework/files/csproj.patch index bd65ec5..aa89d1c 100644 --- a/dev-dotnet/irony-framework/files/csproj.patch +++ b/dev-dotnet/irony-framework/files/csproj.patch @@ -1,56 +1,56 @@ ---- a/Irony/010.Irony.2012.csproj 2013-12-12 22:41:50.000000000 +0400 -+++ b/Irony/010.Irony.2012.csproj 2016-01-05 21:02:12.000000000 +0300 +--- 010.Irony.2012.csproj 2016-01-06 12:12:51.564414219 +0300 ++++ 010.Irony.2012.csproj.old 2015-03-28 01:21:49.000000000 +0300 @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> -- <ProductVersion>9.0.30729</ProductVersion> -+ <ProductVersion>8.0.30703</ProductVersion> +- <ProductVersion>8.0.30703</ProductVersion> ++ <ProductVersion>9.0.30729</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{D81F5C91-D7DB-46E5-BC99-49488FB6814C}</ProjectGuid> <OutputType>Library</OutputType> -@@ -60,8 +60,6 @@ +@@ -60,6 +60,8 @@ <DebugType>pdbonly</DebugType> <Optimize>true</Optimize> <OutputPath>bin\Release\</OutputPath> -- <DefineConstants> -- </DefineConstants> ++ <DefineConstants> ++ </DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> -@@ -69,9 +67,7 @@ +@@ -67,7 +69,9 @@ </PropertyGroup> <ItemGroup> <Reference Include="System" /> -- <Reference Include="System.Core"> -- <RequiredTargetFramework>3.5</RequiredTargetFramework> -- </Reference> -+ <Reference Include="System.Core" /> +- <Reference Include="System.Core" /> ++ <Reference Include="System.Core"> ++ <RequiredTargetFramework>3.5</RequiredTargetFramework> ++ </Reference> <Reference Include="System.Data" /> <Reference Include="System.Drawing" /> <Reference Include="System.Numerics" /> -@@ -110,7 +106,6 @@ +@@ -106,6 +110,7 @@ <Compile Include="Parsing\Terminals\ImpliedSymbolTerminal.cs" /> <Compile Include="Parsing\Terminals\LineContinuationTerminal.cs" /> <Compile Include="Parsing\Terminals\QuotedValueLiteral.cs" /> -- <Compile Include="Parsing\Terminals\RegexLiteral.cs" /> ++ <Compile Include="Parsing\Terminals\RegexLiteral.cs" /> <Compile Include="Parsing\Terminals\FreeTextLiteral.cs" /> <Compile Include="Parsing\Terminals\WikiTerminals\WikiBlockTerminal.cs" /> <Compile Include="Parsing\Terminals\WikiTerminals\WikiTagTerminal.cs" /> -@@ -151,7 +146,6 @@ +@@ -146,6 +151,7 @@ <Compile Include="Parsing\Terminals\_Terminal.cs" /> <Compile Include="Parsing\Scanner\Token.cs" /> <Compile Include="Parsing\Scanner\Scanner.cs" /> -- <Compile Include="Parsing\Terminals\RegexBasedTerminal.cs" /> ++ <Compile Include="Parsing\Terminals\RegexBasedTerminal.cs" /> <Compile Include="Parsing\Grammar\BnfTerm.cs" /> <Compile Include="Parsing\Grammar\Grammar.cs" /> <Compile Include="Parsing\Terminals\TerminalFactory.cs" /> -@@ -163,6 +157,8 @@ +@@ -157,8 +163,6 @@ <DesignTime>True</DesignTime> <DependentUpon>Resources.resx</DependentUpon> </Compile> -+ <Compile Include="Parsing\Terminals\RegExLiteral.cs" /> -+ <Compile Include="Parsing\Terminals\RegExBasedTerminal.cs" /> +- <Compile Include="Parsing\Terminals\RegExLiteral.cs" /> +- <Compile Include="Parsing\Terminals\RegExBasedTerminal.cs" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="Resources.resx">
