Skip to content

Commit

Permalink
Preparations for next release.
Browse files Browse the repository at this point in the history
  • Loading branch information
cesarsouza committed Apr 26, 2015
1 parent 7afab8b commit 83f3126
Show file tree
Hide file tree
Showing 10 changed files with 560 additions and 48 deletions.
7 changes: 5 additions & 2 deletions README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,14 @@
---------------------------

# Install Mono
sudo apt-get install mono-complete
sudo apt-get install mono-complete monodevelop monodevelop-nunit

# Clone the repository
git clone https://github.com/accord-net/framework.git

# Enter the directory
cd framework

# Build the framework solution using Mono
xbuild framework/Sources/Accord.NET.Mono.sln
mdtool build -c:"NET40" Sources/Accord.NET.Mono.sln

24 changes: 13 additions & 11 deletions Samples/Imaging/Classification (BoW)/Classification (BoW).csproj
Original file line number Diff line number Diff line change
Expand Up @@ -40,27 +40,25 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Accord">
<HintPath>..\..\packages\Accord.2.14.0\lib\net40\Accord.dll</HintPath>
<HintPath>..\..\packages\Accord.2.14.5-alpha\lib\net40\Accord.dll</HintPath>
</Reference>
<Reference Include="Accord.Controls, Version=2.14.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Accord.Controls.2.14.0\lib\net40\Accord.Controls.dll</HintPath>
<Reference Include="Accord.Controls">
<HintPath>..\..\packages\Accord.Controls.2.14.5-alpha\lib\net40\Accord.Controls.dll</HintPath>
</Reference>
<Reference Include="Accord.Controls.Imaging, Version=2.14.0.0, Culture=neutral, PublicKeyToken=fa1a88e29555ccf7, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Accord.Controls.Imaging.2.14.0\lib\net40\Accord.Controls.Imaging.dll</HintPath>
<Reference Include="Accord.Controls.Imaging">
<HintPath>..\..\packages\Accord.Controls.Imaging.2.14.5-alpha\lib\net40\Accord.Controls.Imaging.dll</HintPath>
</Reference>
<Reference Include="Accord.Imaging">
<HintPath>..\..\packages\Accord.Imaging.2.14.0\lib\net40\Accord.Imaging.dll</HintPath>
<HintPath>..\..\packages\Accord.Imaging.2.14.5-alpha\lib\net40\Accord.Imaging.dll</HintPath>
</Reference>
<Reference Include="Accord.MachineLearning">
<HintPath>..\..\packages\Accord.MachineLearning.2.14.0\lib\net40\Accord.MachineLearning.dll</HintPath>
<HintPath>..\..\packages\Accord.MachineLearning.2.14.5-alpha\lib\net40\Accord.MachineLearning.dll</HintPath>
</Reference>
<Reference Include="Accord.Math">
<HintPath>..\..\packages\Accord.Math.2.14.0\lib\net40\Accord.Math.dll</HintPath>
<HintPath>..\..\packages\Accord.Math.2.14.5-alpha\lib\net40\Accord.Math.dll</HintPath>
</Reference>
<Reference Include="Accord.Statistics">
<HintPath>..\..\packages\Accord.Statistics.2.14.0\lib\net40\Accord.Statistics.dll</HintPath>
<HintPath>..\..\packages\Accord.Statistics.2.14.5-alpha\lib\net40\Accord.Statistics.dll</HintPath>
</Reference>
<Reference Include="AForge">
<HintPath>..\..\packages\AForge.2.2.5\lib\AForge.dll</HintPath>
Expand All @@ -87,6 +85,9 @@
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="ZedGraph">
<HintPath>..\..\packages\ZedGraph.5.1.6\lib\net35-Client\ZedGraph.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="AboutBox.cs">
Expand Down Expand Up @@ -134,6 +135,7 @@
<ItemGroup />
<ItemGroup>
<Content Include="framework.ico" />
<Content Include="License-LGPL.txt" />
<Content Include="Resources\Cats\image_0001.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
Expand Down
506 changes: 506 additions & 0 deletions Samples/Imaging/Classification (BoW)/License-LGPL.txt

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions Samples/Imaging/Classification (BoW)/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
<assemblyIdentity name="Accord.Imaging" publicKeyToken="fa1a88e29555ccf7" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.14.0.0" newVersion="2.14.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ZedGraph" publicKeyToken="02a83cbd123fcd60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.1.6.417" newVersion="5.1.6.417" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
15 changes: 8 additions & 7 deletions Samples/Imaging/Classification (BoW)/packages.config
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Accord" version="2.14.0" targetFramework="net40-Client" />
<package id="Accord.Controls" version="2.14.0" targetFramework="net40-Client" />
<package id="Accord.Controls.Imaging" version="2.14.0" targetFramework="net40-Client" />
<package id="Accord.Imaging" version="2.14.0" targetFramework="net40-Client" />
<package id="Accord.MachineLearning" version="2.14.0" targetFramework="net40-Client" />
<package id="Accord.Math" version="2.14.0" targetFramework="net40-Client" />
<package id="Accord.Statistics" version="2.14.0" targetFramework="net40-Client" />
<package id="Accord" version="2.14.5-alpha" targetFramework="net40-Client" />
<package id="Accord.Controls" version="2.14.5-alpha" targetFramework="net40-Client" />
<package id="Accord.Controls.Imaging" version="2.14.5-alpha" targetFramework="net40-Client" />
<package id="Accord.Imaging" version="2.14.5-alpha" targetFramework="net40-Client" />
<package id="Accord.MachineLearning" version="2.14.5-alpha" targetFramework="net40-Client" />
<package id="Accord.Math" version="2.14.5-alpha" targetFramework="net40-Client" />
<package id="Accord.Statistics" version="2.14.5-alpha" targetFramework="net40-Client" />
<package id="AForge" version="2.2.5" targetFramework="net40-Client" />
<package id="AForge.Controls" version="2.2.5" targetFramework="net40-Client" />
<package id="AForge.Imaging" version="2.2.5" targetFramework="net40-Client" />
<package id="AForge.Math" version="2.2.5" targetFramework="net40-Client" />
<package id="AForge.Video" version="2.2.5" targetFramework="net40-Client" />
<package id="ZedGraph" version="5.1.6" targetFramework="net40-Client" />
</packages>
43 changes: 17 additions & 26 deletions Setup/Compile.sh
Original file line number Diff line number Diff line change
@@ -1,27 +1,18 @@
#!/bin/bash
###########

echo
echo Accord.NET Framework all projects configurations builder
echo =========================================================
echo
echo This Linux bash script will use Mono's xbuild tool to
echo compile the Debug and Release versions of the framework.
echo
echo - Building Debug configuration...
xbuild /target:"Clean;Build" /p:Configuration=Debug ../Sources/Accord.NET.Mono.sln
echo - Building NET35 configuration...
xbuild /target:"Clean;Build" /p:Configuration=NET35 ../Sources/Accord.NET.Mono.sln
echo - Building NET40 configuration...
xbuild /target:"Clean;Build" /p:Configuration=NET40 ../Sources/Accord.NET.Mono.sln
echo - Building NET45 configuration...
xbuild /target:"Clean;Build" /p:Configuration=NET45 ../Sources/Accord.NET.Mono.sln
echo - Building samples...
xbuild /target:"Clean;Build" /p:Configuration=NET45 ../Samples/Samples.sln
###########

echo
echo Accord.NET Framework all projects configurations builder
echo =========================================================
echo
echo This Linux bash script will use Mono's xbuild tool to
echo compile the Debug and Release versions of the framework.
echo
echo - Building NET40 configuration...
mdtool -v build -c:"NET40" ../Sources/Accord.NET.Mono.sln
# echo - Building samples...
# mdtool -v build ../Samples/Samples.sln
7 changes: 6 additions & 1 deletion Setup/NuGet/Accord.Audio.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,23 @@
<files>
<file src="..\..\Release\net35\Accord.Audio.dll" target="lib\net35\Accord.Audio.dll" />
<file src="..\..\Release\net35\Accord.Audio.xml" target="lib\net35\Accord.Audio.xml" />

<file src="..\..\Release\net35\Accord.Audio.Formats.dll" target="lib\net35\Accord.Audio.Formats.dll" />
<file src="..\..\Release\net35\Accord.Audio.Formats.xml" target="lib\net35\Accord.Audio.Formats.xml" />
<file src="..\..\Release\net35\Accord.Audition.dll" target="lib\net35\Accord.Audition.dll" />
<file src="..\..\Release\net35\Accord.Audition.xml" target="lib\net35\Accord.Audition.xml" />

<file src="..\..\Release\net40\Accord.Audio.dll" target="lib\net40\Accord.Audio.dll" />
<file src="..\..\Release\net40\Accord.Audio.xml" target="lib\net40\Accord.Audio.xml" />
<file src="..\..\Release\net40\Accord.Audio.Formats.dll" target="lib\net40\Accord.Audio.Formats.dll" />
<file src="..\..\Release\net40\Accord.Audio.Formats.xml" target="lib\net40\Accord.Audio.Formats.xml" />
<file src="..\..\Release\net40\Accord.Audition.dll" target="lib\net40\Accord.Audition.dll" />
<file src="..\..\Release\net40\Accord.Audition.xml" target="lib\net40\Accord.Audition.xml" />

<file src="..\..\Release\net45\Accord.Audio.dll" target="lib\net45\Accord.Audio.dll" />
<file src="..\..\Release\net45\Accord.Audio.xml" target="lib\net45\Accord.Audio.xml" />
<file src="..\..\Release\net45\Accord.Audio.Formats.dll" target="lib\net45\Accord.Audio.Formats.dll" />
<file src="..\..\Release\net45\Accord.Audio.Formats.xml" target="lib\net45\Accord.Audio.Formats.xml" />
<file src="..\..\Release\net45\Accord.Audition.dll" target="lib\net45\Accord.Audition.dll" />
<file src="..\..\Release\net45\Accord.Audition.xml" target="lib\net45\Accord.Audition.xml" />
</files>
</package>
1 change: 0 additions & 1 deletion Setup/NuGet/Accord.IO.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<tags>accord.net aforge.net framework statistics mnist libsvm excel mat-file matlab octave matrix</tags>
<dependencies>
<dependency id="Accord" version="$version$" />
<dependency id="Accord.Math" version="$version$" />
</dependencies>
</metadata>
<files>
Expand Down
Binary file modified Setup/NuGet/NuGet.exe
Binary file not shown.
1 change: 1 addition & 0 deletions Sources/Accord.NET.Mono.sln
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
..\Contributors.txt = ..\Contributors.txt
..\Copyright.txt = ..\Copyright.txt
..\License.txt = ..\License.txt
..\README.txt = ..\README.txt
..\Release notes.txt = ..\Release notes.txt
EndProjectSection
EndProject
Expand Down

0 comments on commit 83f3126

Please sign in to comment.