Skip to content
This repository was archived by the owner on Nov 19, 2020. It is now read-only.

Commit a537e70

Browse files
cesarsouzacesarsouza
committed
Merge branch 'development'
2 parents 2f26587 + ac10a5f commit a537e70

File tree

2,286 files changed

+266349
-91408
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,286 files changed

+266349
-91408
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ obj
55
*.pidb
66
*.suo
77
*.vsp
8+
*.ipch
89

910
/Setup/Accord.Setup.dll
1011
/Setup/Accord.Setup.pdb
@@ -20,6 +21,8 @@ obj
2021
/Docs
2122
/Unit Tests/Accord.Tests.Math.Cpp/Debug
2223
/Unit Tests/Accord.Tests.Math.Cpp/Release
24+
/Unit Tests/packages
25+
2326
/Sources/Debug
2427
/Sources/Release
2528

‎.travis.yml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
language: csharp
2+
solution: Sources/Accord.NET.Mono.sln
3+
install:
4+
- nuget restore Sources/Accord.NET.Mono.sln
5+
script:
6+
- ./Build.sh framework
7+
- ./Build.sh samples
8+
- ./Tests.sh

‎Setup/Compile.cmd ‎Build.cmd

+11-11
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ set DEVENV="C:\Program Files (x86)\Microsoft Visual Studio 12.0\Common7\IDE\deve
1414
del /q "bin\*.log"
1515
echo.
1616

17-
17+
echo.
1818
echo - Building Debug configuration...
19-
%DEVENV% ..\Sources\Accord.NET.sln /Rebuild Debug /out "bin\Build.Debug.log"
20-
19+
%DEVENV% Sources\Accord.NET.sln /Rebuild Debug /out "bin\Build.Debug.log"
20+
echo.
2121
echo - Building NET35 configuration...
22-
%DEVENV% ..\Sources\Accord.NET.sln /Rebuild NET35 /out "bin\Build.NET35.log"
23-
22+
%DEVENV% Sources\Accord.NET.sln /Rebuild NET35 /out "bin\Build.NET35.log"
23+
echo.
2424
echo - Building NET40 configuration...
25-
%DEVENV% ..\Sources\Accord.NET.sln /Rebuild NET40 /out "bin\Build.NET40.log"
26-
25+
%DEVENV% Sources\Accord.NET.sln /Rebuild NET40 /out "bin\Build.NET40.log"
26+
echo.
2727
echo - Building NET45 configuration...
28-
%DEVENV% ..\Sources\Accord.NET.sln /Rebuild NET45 /out "bin\Build.NET45.log"
29-
28+
%DEVENV% Sources\Accord.NET.sln /Rebuild NET45 /out "bin\Build.NET45.log"
29+
echo.
3030
echo - Building samples...
31-
%DEVENV% ..\Samples\Samples.sln /Rebuild Release /out "bin\Build.Samples.log"
32-
31+
%DEVENV% Samples\Samples.sln /Rebuild Release /out "bin\Build.Samples.log"
32+
echo.
3333
timeout /T 5

‎Build.sh

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#!/bin/bash
2+
###########
3+
4+
echo " "
5+
echo "Accord.NET Framework all projects configurations builder "
6+
echo "========================================================="
7+
echo " "
8+
echo "This Linux bash script will use Mono's xbuild tool to "
9+
echo "compile the Debug and Release versions of the framework. "
10+
echo " "
11+
12+
13+
14+
if [ $# -eq 0 ] || [ "$1" == "framework" ]; then
15+
echo ""
16+
echo " - Building NET40 configuration..."
17+
echo ""
18+
xbuild /p:Configuration=NET40 Sources/Accord.NET.Mono.sln
19+
fi
20+
21+
if [ $# -eq 0 ] || [ "$1" == "samples" ]; then
22+
echo ""
23+
echo " - Building samples..."
24+
echo ""
25+
xbuild /p:Configuration=Mono /p:Platform=x86 Samples/Samples.sln
26+
fi

‎Contributors.txt

+25-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
decided to share their work and contribute to its development. The
88
space below enlists a few of those people who either agreed to help
99
or actively participated on its development:
10-
10+
1111

1212
- Anders Gustafsson
1313
- Antonino Porcino
@@ -25,3 +25,27 @@
2525
- Mikkel Porse Rasmussen
2626
- Peter Sergio Larsen
2727
- Remy Disp
28+
29+
30+
In May 2015, the project has been merged with the AForge.NET codebase,
31+
incorporating the work of even more contributors. In a true spirit of
32+
community, notorious previous contributors are also listed below:
33+
34+
35+
- Andrew Kirillov (the project creator, with the best ideas)
36+
- F�bio Caversan
37+
- Alejandro Pirola
38+
- Cezary Wagner
39+
- Dale McCoy
40+
- Fabio Caversan
41+
- Frank Nagl
42+
- Israel Lot
43+
- Jeremy Noring
44+
- Joan Charmant
45+
- Joris Geurts
46+
- Krzysztof Blacha
47+
- Kyle Parrigan
48+
- Markus Falkensteiner
49+
- Mladen Prajdic
50+
- Volodymyr Goncharov
51+
- Yves Vander Haeghen

‎Copyright.txt

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The Accord.NET Framework
22

3-
Copyright (c) 2009-2015, César Roberto de Souza <cesarsouza at gmail.com>
3+
Copyright (c) 2009-2015, Accord.NET Authors <authors @ accord-framework.net>
44

55
This library is free software; you can redistribute it and/or modify it under the terms of
66
the GNU Lesser General Public License as published by the Free Software Foundation; either
@@ -31,9 +31,10 @@ Creative Commons Attribution/Share-Alike License. All referenced sections includ
3131
original article page. If you think you have found something which has not been properly linked, please
3232
let me know so it can be corrected.
3333

34-
Overall framework architecture and style was greatly inspired by AForge.NET. The AForge.NET
35-
Framework is a copyrighted work by Andrew Kirillov. This framework (Accord.NET) is in no way
36-
affiliated with AForge.NET, its authors or contributors.
34+
Overall framework architecture and style was greatly inspired by AForge.NET. In May 2015, this project
35+
has been merged with the AForge.NET framework since public support for AForge.NET has ended. The original
36+
AForge.NET Framework is a copyrighted work by Andrew Kirillov, altough developed and shared under the same
37+
LGPL license.
3738

3839

3940

‎Externals/AForge.NET/AForge.Controls.dll

-43.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)