Skip to content

Commit b0ce609

Browse files
committed
- Updating the linux build scripts to use autogen/autoconf/make
- Reorganizing the the build scripts to make their intent more clear
1 parent 8f0f355 commit b0ce609

17 files changed

+359
-84
lines changed

.gitignore

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,37 @@
1-
bin
2-
obj
3-
4-
*.user
5-
*.pidb
6-
*.suo
7-
*.vsp
8-
*.ipch
9-
10-
/Setup/Accord.Setup.dll
11-
/Setup/Accord.Setup.pdb
12-
13-
/Sources/Accord.Music
14-
/Sources/TestResults
15-
*.sdf
16-
*.shfbproj_*
17-
18-
/Release
19-
/Debug
20-
21-
/Docs
22-
/Unit Tests/Accord.Tests.Math.Cpp/Debug
23-
/Unit Tests/Accord.Tests.Math.Cpp/Release
24-
/Unit Tests/packages
25-
26-
/Sources/Debug
27-
/Sources/Release
28-
29-
/Sources/*.opensdf
1+
bin
2+
obj
3+
4+
*.user
5+
*.pidb
6+
*.suo
7+
*.vsp
8+
*.ipch
9+
10+
/Setup/Accord.Setup.dll
11+
/Setup/Accord.Setup.pdb
12+
13+
/Sources/Accord.Music
14+
/Sources/TestResults
15+
*.sdf
16+
*.shfbproj_*
17+
18+
/Release
19+
/Debug
20+
21+
/Docs
22+
/Unit Tests/Accord.Tests.Math.Cpp/Debug
23+
/Unit Tests/Accord.Tests.Math.Cpp/Release
24+
/Unit Tests/packages
25+
26+
/Sources/Debug
27+
/Sources/Release
28+
29+
/Sources/*.opensdf
30+
/autom4te.cache/
31+
/Makefile.in
32+
/Makefile
33+
/configure
34+
/config.status
35+
/config.log
36+
*.m4
37+
/accord.pc

.travis.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
language: csharp
2-
solution: Sources/Accord.NET.sln
32
install:
43
- nuget restore Sources/Accord.NET.sln
54
script:
6-
- ./Build.sh framework
7-
- ./Build.sh samples
8-
- ./Tests.sh
5+
- ./autogen.sh
6+
- make
7+
- make samples
8+
- make test
9+
- make check

Build.sh

Lines changed: 0 additions & 26 deletions
This file was deleted.

Makefile.am

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
SUBDIRS =
2+
DIST_SUBDIRS =
3+
4+
DIR_DEBUG = $(srcdir)/Debug
5+
DIR_RELEASE = $(srcdir)/Release
6+
LIBDIR = $(srcdir)/Release/mono
7+
8+
ACCORD_ASSEMBLY_PC = $(srcdir)/$(PACKAGE_NAME).pc
9+
10+
DIR_TEST = "$(srcdir)/Unit Tests/bin/Release/mono"
11+
NUNIT = "$(srcdir)/Externals/NUnit/nunit-console-x86.exe"
12+
13+
LIBFILES = \
14+
$(LIBDIR)/Accord.Vision.dll \
15+
$(LIBDIR)/Accord.Video.Ximea.dll \
16+
$(LIBDIR)/Accord.Video.VFW.dll \
17+
$(LIBDIR)/Accord.Video.Kinect.dll \
18+
$(LIBDIR)/Accord.Video.dll \
19+
$(LIBDIR)/Accord.Video.DirectShow.dll \
20+
$(LIBDIR)/Accord.Neuro.dll \
21+
$(LIBDIR)/Accord.Math.dll \
22+
$(LIBDIR)/Accord.Math.Core.dll \
23+
$(LIBDIR)/Accord.MachineLearning.dll \
24+
$(LIBDIR)/Accord.IO.dll \
25+
$(LIBDIR)/Accord.Imaging.dll \
26+
$(LIBDIR)/Accord.Genetic.dll \
27+
$(LIBDIR)/Accord.Fuzzy.dll \
28+
$(LIBDIR)/Accord.dll \
29+
$(LIBDIR)/Accord.Controls.Vision.dll \
30+
$(LIBDIR)/Accord.Controls.Imaging.dll \
31+
$(LIBDIR)/Accord.Controls.Audio.dll \
32+
$(LIBDIR)/Accord.Audition.dll \
33+
$(LIBDIR)/Accord.Audio.dll
34+
35+
TESTFILES = \
36+
${DIR_TEST}/Accord.Tests.Controls.dll \
37+
${DIR_TEST}/Accord.Tests.Core.dll \
38+
${DIR_TEST}/Accord.Tests.Imaging.dll \
39+
${DIR_TEST}/Accord.Tests.IO.dll \
40+
${DIR_TEST}/Accord.Tests.MachineLearning.dll \
41+
${DIR_TEST}/Accord.Tests.Math.dll \
42+
${DIR_TEST}/Accord.Tests.Neuro.dll \
43+
${DIR_TEST}/Accord.Tests.Vision.dll \
44+
${DIR_TEST}/Accord.Tests.Statistics.dll
45+
# ${DIR_TEST}/Accord.Tests.Audio.dll
46+
47+
48+
DEBUG_FILES = $(addsuffix .mdb, $(LIBFILES))
49+
RELEASE_FILE = $(PACKAGE)-$(VERSION)
50+
51+
52+
#magic automake variables
53+
pkgconfigdir = $(LIBDIR)/pkgconfig
54+
pkgconfig_DATA = $(ACCORD_ASSEMBLY_PC)
55+
#end
56+
57+
58+
59+
# target: all - Default target: build
60+
all: build
61+
62+
# target: help - Display callable targets.
63+
help:
64+
egrep "^# target:" Makefile | sed 's/^# target:/make/'
65+
66+
# target: build - Build Accord.NET Framework
67+
build: Sources/Accord.NET.sln
68+
$(XBUILD) /p:Configuration=Mono Sources/Accord.NET.sln
69+
70+
# target: build - Build sample applications
71+
samples: Samples/Samples.sln
72+
$(XBUILD) /p:Configuration=Mono /p:Platform=x86 Samples/Samples.sln
73+
74+
# target: build - Build documentation
75+
docs:
76+
mdoc update --lib=Release/mono/ --out=Docs/monodoc Release/mono/*.dll
77+
mdoc export-html -o htmldocs docfiles
78+
79+
# target: test - Run unit tests
80+
test: build
81+
$(MONO) --runtime=v4.0 ${NUNIT} -noxml -nodots -labels -process=single \
82+
-exclude:Serialization,Intensive,WinForms,Office,MonoNotSupported,Random \
83+
${TESTFILES}
84+
85+
# target: clean obj and bin directories
86+
clean-local:
87+
rm -rvf $(LIBDIR)/*
88+
rm -rvf $(DIR_RELEASE)/*
89+
rm -rvf $(DIR_DEBUG)/*
90+
find $(srcdir)/ -type d -name obj | xargs rm -rvf
91+
92+
maintainer-clean-local:
93+
rm -rf autom4te.cache
94+
95+
96+
97+
MAINTAINERCLEANFILES = Makefile.in \
98+
install-sh \
99+
configure \
100+
aclocal.m4 \
101+
missing \
102+
compile
103+
104+
.PHONY: install uninstall cleanbin cleanobj
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Setup/CreateRelease.cmd renamed to Setup/create-release.cmd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77

88
:: Compile sources
99
cd ..
10-
cmd /c "Build.cmd"
10+
cmd /c "build-all.cmd"
1111
cd Setup
1212

1313
:: Build compressed archive
1414
cd Archiver
15-
cmd /c "Build.cmd"
16-
cmd /c "Samples.cmd"
15+
cmd /c "package-framework.cmd"
16+
cmd /c "package-samples.cmd"
1717
cd ..
1818

1919
echo.
@@ -29,7 +29,7 @@ echo.
2929

3030
:: Build NuGet packages
3131
cd NuGet
32-
cmd /c Build.cmd
32+
cmd /c "package-nuget.cmd"
3333
cd ..
3434

3535
echo.

0 commit comments

Comments
 (0)