commit: b1035b67bc6a27889acb7c294be707e2d9430923 Author: ArsenShnurkov <Arsen.Shnurkov <AT> gmail <DOT> com> AuthorDate: Wed Jan 6 04:57:53 2016 +0000 Commit: Heather Cynede <cynede <AT> gentoo <DOT> org> CommitDate: Wed Jan 6 04:57:53 2016 +0000 URL: https://gitweb.gentoo.org/proj/dotnet.git/commit/?id=b1035b67
nuspec upgraded to 2.0 scheme ...ild => deveeldb-2.0_pre_alpha_p20160101.ebuild} | 35 ++++---- dev-dotnet/deveeldb/files/color.png | Bin 33264 -> 2944 bytes .../files/deveeldb-nuget-dependencies.patch | 90 +++++++++++++++++++++ dev-dotnet/deveeldb/files/deveeldb.csproj.patch | 17 ---- dev-dotnet/deveeldb/files/deveeldb.nuspec | 27 +++++++ 5 files changed, 136 insertions(+), 33 deletions(-) diff --git a/dev-dotnet/deveeldb/deveeldb-2.0_pre_alpha_p20160101-r0.ebuild b/dev-dotnet/deveeldb/deveeldb-2.0_pre_alpha_p20160101.ebuild similarity index 84% rename from dev-dotnet/deveeldb/deveeldb-2.0_pre_alpha_p20160101-r0.ebuild rename to dev-dotnet/deveeldb/deveeldb-2.0_pre_alpha_p20160101.ebuild index 5ad39ff..3db0d51 100644 --- a/dev-dotnet/deveeldb/deveeldb-2.0_pre_alpha_p20160101-r0.ebuild +++ b/dev-dotnet/deveeldb/deveeldb-2.0_pre_alpha_p20160101.ebuild @@ -55,7 +55,7 @@ EGIT_COMMIT="7ad0b1563ae111535715dbf6d1f25034887720c5" # SRC_URI A list of source URIs for the package. # Can contain USE-conditional parts, see https://devmanual.gentoo.org/ebuild-writing/variables/index.html#src_uri # PF Full package name, ${PN}-${PVR}, for example vim-6.3-r1 -SRC_URI="${REPOSITORY_URL}/archive/${EGIT_COMMIT}.zip -> ${PF}.zip +SRC_URI="${REPOSITORY_URL}/archive/${EGIT_COMMIT}.zip -> ${PN}-${PV}.zip mirror://gentoo/mono.snk.bz2" NAME=${PN} @@ -65,24 +65,25 @@ S="${WORKDIR}/${NAME}-${EGIT_COMMIT}" #EGIT_BRANCH="mono-attempt-3" METAFILETOBUILD="src/deveeldb/deveeldb.csproj" -NUSPEC_FILE_NAME=nuget/deveeldb.nuspec +NUSPEC_FILE_NAME=deveeldb.nuspec -# get_version_component_range is from inherit versionator -# PR Package revision, or r0 if no revision exists. -NUSPEC_VERSION=$(get_version_component_range 1-3)"${PR//r/.}" - -# >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> - #https://raw.githubusercontent.com/ArsenShnurkov/dotnet/deveeldb/dev-dotnet/deveeldb/files/color.png EBUILD_REPOSITORY_NAME="ArsenShnurkov/deveeldb" 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"; # rm -rf rm -rf /var/tmp/portage/dev-dotnet/deveeldb-* # emerge -v =deveeldb-2.0_pre_alpha_p20160101-r0 # leafpad /var/tmp/portage/dev-dotnet/deveeldb-2.0_pre_alpha_p20160101-r0/temp/build.log & +# get_version_component_range is from inherit versionator +# PR Package revision, or r0 if no revision exists. +COMMIT_DATE_INDEX=$(get_version_component_count ${PV} ) +COMMIT_DATE=$(get_version_component_range $COMMIT_DATE_INDEX ${PV} ) +NUSPEC_VERSION=$(get_version_component_range 1-2)"${COMMIT_DATE//p/.}${PR//r/.}" + src_unpack() { default @@ -111,13 +112,15 @@ src_prepare() { # /var/tmp/portage/dev-dotnet/deveeldb-2.0_pre_alpha_p20160101-r0/work/deveeldb-7ad0b1563ae111535715dbf6d1f25034887720c5 einfo "patching project files" - eapply "${FILESDIR}/deveeldb.csproj.patch" + 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" fi einfo "restoring packages (Deveel.Math, DryIoc)" - #enuget_restore "${METAFILETOBUILD}" + enuget_restore "${METAFILETOBUILD}" #enuget_restore "src/nuget-config/packages.config" #<package id="coveralls.net" version="0.5.0" /> @@ -126,8 +129,8 @@ src_prepare() { # irony-framework should be packaged before continuing with this ebuild - #cp "${FILESDIR}/${NUSPEC_FILE_NAME}" "${S}/${NUSPEC_FILE_NAME}" || die - #patch_nuspec_file "${S}/${NUSPEC_FILE_NAME}" + cp "${FILESDIR}/${NUSPEC_FILE_NAME}" "${S}/${NUSPEC_FILE_NAME}" || die + patch_nuspec_file "${S}/${NUSPEC_FILE_NAME}" } src_configure() { @@ -149,7 +152,7 @@ src_test() { src_install() { enupkg "${WORKDIR}/${NAME}.${NUSPEC_VERSION}.nupkg" - egacinstall "bin/${DIR}/DeveelDB.dll" + egacinstall "src/deveeldb/bin/${DIR}/deveeldb.dll" install_pc_file } @@ -161,8 +164,8 @@ patch_nuspec_file() DIR="Debug" FILES_STRING=`cat <<-EOF || die "${DIR} files at patch_nuspec_file()" <files> <!-- https://docs.nuget.org/create/nuspec-reference --> - <file src="bin/${DIR}/DeveelDB.dll" target="lib\net45\" /> - <file src="bin/${DIR}/DeveelDB.dll.mdb" target="lib\net45\" /> + <file src="src/deveeldb/bin/${DIR}/deveeldb.dll" target="lib\net45\" /> + <file src="src/deveeldb/bin/${DIR}/deveeldb.dll.mdb" target="lib\net45\" /> </files> EOF ` @@ -170,7 +173,7 @@ EOF DIR="Release" FILES_STRING=`cat <<-EOF || die "${DIR} files at patch_nuspec_file()" <files> <!-- https://docs.nuget.org/create/nuspec-reference --> - <file src="bin/${DIR}/DeveelDB.dll" target="lib\net45\" /> + <file src="src/deveeldb/bin/${DIR}/deveeldb.dll" target="lib\net45\" /> </files> EOF ` diff --git a/dev-dotnet/deveeldb/files/color.png b/dev-dotnet/deveeldb/files/color.png index 9cfee89..0e608bf 100644 Binary files a/dev-dotnet/deveeldb/files/color.png and b/dev-dotnet/deveeldb/files/color.png differ diff --git a/dev-dotnet/deveeldb/files/deveeldb-nuget-dependencies.patch b/dev-dotnet/deveeldb/files/deveeldb-nuget-dependencies.patch new file mode 100644 index 0000000..57a5505 --- /dev/null +++ b/dev-dotnet/deveeldb/files/deveeldb-nuget-dependencies.patch @@ -0,0 +1,90 @@ +--- 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 +@@ -8,11 +8,13 @@ + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>Deveel.Data</RootNamespace> + <AssemblyName>deveeldb</AssemblyName> +- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> ++ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + <TargetFrameworkProfile /> + <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> + <RestorePackages>true</RestorePackages> ++ <ProductVersion>8.0.30703</ProductVersion> ++ <SchemaVersion>2.0</SchemaVersion> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> +@@ -63,23 +65,21 @@ + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <ItemGroup> +- <Reference Include="DryIoc, Version=2.0.0.356, Culture=neutral, processorArchitecture=MSIL"> +- <HintPath>..\packages\DryIoc.dll.2.0.0\lib\net35\DryIoc.dll</HintPath> +- <Private>True</Private> +- </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> + <Reference Include="System" /> + <Reference Include="System.Configuration.Install" /> + <Reference Include="System.Data" /> + <Reference Include="System.Transactions" /> + <Reference Include="System.Xml.Linq" /> +- <Reference Include="Deveel.Math, Version=1.5.64.0, Culture=neutral, PublicKeyToken=null"> +- <HintPath>..\packages\dmath.1.5.64\lib\net20\Deveel.Math.pdb\Deveel.Math.dll</HintPath> +- </Reference> + <Reference Include="System.Xml" /> ++ <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 @@ + <PreBuildEvent> + </PreBuildEvent> + </PropertyGroup> +- <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'))" /> +- <Error Condition="!Exists('..\packages\ILRepack.MSBuild.Task.1.0.9\build\ILRepack.MSBuild.Task.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILRepack.MSBuild.Task.1.0.9\build\ILRepack.MSBuild.Task.targets'))" /> +- </Target> + <!-- + <Target Name="AfterBuild"> + <MakeDir Directories="$(SolutionDir)..\dist\$(PlatformName)"/> +@@ -1014,10 +1006,6 @@ + /> + </Target> + --> +- <PropertyGroup> +- <PostBuildEvent>IF NOT EXIST "$(SolutionDir)..\dist\$(PlatformName)" MKDIR "$(SolutionDir)..\dist\$(PlatformName)" +-$(SolutionDir)..\util\ilrepack\ILRepack.exe /internalize /targetplatform:v2 /xmldocs /out:"$(SolutionDir)..\dist\$(PlatformName)\$(TargetFileName)" "$(TargetPath)" "$(TargetDir)\irony.dll" "$(TargetDir)\Deveel.Math.dll" "$(TargetDir)\DryIoc.dll"</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"> diff --git a/dev-dotnet/deveeldb/files/deveeldb.csproj.patch b/dev-dotnet/deveeldb/files/deveeldb.csproj.patch deleted file mode 100644 index c21c4b1..0000000 --- a/dev-dotnet/deveeldb/files/deveeldb.csproj.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/src/deveeldb/deveeldb.csproj 2016-01-01 04:52:00.000000000 +0300 -+++ b/src/deveeldb/deveeldb.csproj 2016-01-02 19:02:23.661749782 +0300 -@@ -983,14 +983,6 @@ - <PreBuildEvent> - </PreBuildEvent> - </PropertyGroup> -- <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'))" /> -- <Error Condition="!Exists('..\packages\ILRepack.MSBuild.Task.1.0.9\build\ILRepack.MSBuild.Task.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILRepack.MSBuild.Task.1.0.9\build\ILRepack.MSBuild.Task.targets'))" /> -- </Target> - <!-- - <Target Name="AfterBuild"> - <MakeDir Directories="$(SolutionDir)..\dist\$(PlatformName)"/> diff --git a/dev-dotnet/deveeldb/files/deveeldb.nuspec b/dev-dotnet/deveeldb/files/deveeldb.nuspec new file mode 100644 index 0000000..1f19a71 --- /dev/null +++ b/dev-dotnet/deveeldb/files/deveeldb.nuspec @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd";> + <metadata minClientVersion="2.0"> <!-- NuGet 2.0 was released on 2012-06-19 --> + <id>deveeldb</id> + <version>$version$</version> + <title>DeveelDB Kernel</title> + <authors>Antonello Provenzano</authors> + <owners>antonello</owners> + <licenseUrl>http://www.apache.org/licenses/LICENSE-2.0.txt</licenseUrl> + <projectUrl>http://github.com/deveel/deveeldb</projectUrl> + <iconUrl>$package_iconUrl$</iconUrl> + <requireLicenseAcceptance>false</requireLicenseAcceptance> + <description>This is the kernel library of DeveelDB SQL System + + DeveelDB is an embeddable SQL-99 Relational Database Management System oriented to the .NET/Mono frameworks, providing rich functionalities and high performances managing SQL databases within applications.</description> + <releaseNotes></releaseNotes> + <copyright>(c) 2010-2016 Deveel</copyright> + <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" /> + </group> + </dependencies> + </metadata> +</package>
![https://raw.githubusercontent.com/${EBUILD_REPOSITORY_NAME}/${EBUILD_BRANCH}/${CATEGORY}/${P}/files/color.png"](https://raw.githubusercontent.com/${EBUILD_REPOSITORY_NAME}/${EBUILD_BRANCH}/${CATEGORY}/${P}/files/color.png"){kind=link}