Skip to content

Commit

Permalink
- Updating the linux build scripts to use autogen/autoconf/make
Browse files Browse the repository at this point in the history
- Reorganizing the the build scripts to make their intent more clear
  • Loading branch information
cesarsouza committed Sep 27, 2016
1 parent 8f0f355 commit b0ce609
Show file tree
Hide file tree
Showing 17 changed files with 359 additions and 84 deletions.
66 changes: 37 additions & 29 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,29 +1,37 @@
bin
obj

*.user
*.pidb
*.suo
*.vsp
*.ipch

/Setup/Accord.Setup.dll
/Setup/Accord.Setup.pdb

/Sources/Accord.Music
/Sources/TestResults
*.sdf
*.shfbproj_*

/Release
/Debug

/Docs
/Unit Tests/Accord.Tests.Math.Cpp/Debug
/Unit Tests/Accord.Tests.Math.Cpp/Release
/Unit Tests/packages

/Sources/Debug
/Sources/Release

/Sources/*.opensdf
bin
obj

*.user
*.pidb
*.suo
*.vsp
*.ipch

/Setup/Accord.Setup.dll
/Setup/Accord.Setup.pdb

/Sources/Accord.Music
/Sources/TestResults
*.sdf
*.shfbproj_*

/Release
/Debug

/Docs
/Unit Tests/Accord.Tests.Math.Cpp/Debug
/Unit Tests/Accord.Tests.Math.Cpp/Release
/Unit Tests/packages

/Sources/Debug
/Sources/Release

/Sources/*.opensdf
/autom4te.cache/
/Makefile.in
/Makefile
/configure
/config.status
/config.log
*.m4
/accord.pc
9 changes: 5 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
language: csharp
solution: Sources/Accord.NET.sln
install:
- nuget restore Sources/Accord.NET.sln
script:
- ./Build.sh framework
- ./Build.sh samples
- ./Tests.sh
- ./autogen.sh
- make
- make samples
- make test
- make check
26 changes: 0 additions & 26 deletions Build.sh

This file was deleted.

104 changes: 104 additions & 0 deletions Makefile.am
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
SUBDIRS =
DIST_SUBDIRS =

DIR_DEBUG = $(srcdir)/Debug
DIR_RELEASE = $(srcdir)/Release
LIBDIR = $(srcdir)/Release/mono

ACCORD_ASSEMBLY_PC = $(srcdir)/$(PACKAGE_NAME).pc

DIR_TEST = "$(srcdir)/Unit Tests/bin/Release/mono"
NUNIT = "$(srcdir)/Externals/NUnit/nunit-console-x86.exe"

LIBFILES = \
$(LIBDIR)/Accord.Vision.dll \
$(LIBDIR)/Accord.Video.Ximea.dll \
$(LIBDIR)/Accord.Video.VFW.dll \
$(LIBDIR)/Accord.Video.Kinect.dll \
$(LIBDIR)/Accord.Video.dll \
$(LIBDIR)/Accord.Video.DirectShow.dll \
$(LIBDIR)/Accord.Neuro.dll \
$(LIBDIR)/Accord.Math.dll \
$(LIBDIR)/Accord.Math.Core.dll \
$(LIBDIR)/Accord.MachineLearning.dll \
$(LIBDIR)/Accord.IO.dll \
$(LIBDIR)/Accord.Imaging.dll \
$(LIBDIR)/Accord.Genetic.dll \
$(LIBDIR)/Accord.Fuzzy.dll \
$(LIBDIR)/Accord.dll \
$(LIBDIR)/Accord.Controls.Vision.dll \
$(LIBDIR)/Accord.Controls.Imaging.dll \
$(LIBDIR)/Accord.Controls.Audio.dll \
$(LIBDIR)/Accord.Audition.dll \
$(LIBDIR)/Accord.Audio.dll

TESTFILES = \
${DIR_TEST}/Accord.Tests.Controls.dll \
${DIR_TEST}/Accord.Tests.Core.dll \
${DIR_TEST}/Accord.Tests.Imaging.dll \
${DIR_TEST}/Accord.Tests.IO.dll \
${DIR_TEST}/Accord.Tests.MachineLearning.dll \
${DIR_TEST}/Accord.Tests.Math.dll \
${DIR_TEST}/Accord.Tests.Neuro.dll \
${DIR_TEST}/Accord.Tests.Vision.dll \
${DIR_TEST}/Accord.Tests.Statistics.dll
# ${DIR_TEST}/Accord.Tests.Audio.dll


DEBUG_FILES = $(addsuffix .mdb, $(LIBFILES))
RELEASE_FILE = $(PACKAGE)-$(VERSION)


#magic automake variables
pkgconfigdir = $(LIBDIR)/pkgconfig
pkgconfig_DATA = $(ACCORD_ASSEMBLY_PC)
#end



# target: all - Default target: build
all: build

# target: help - Display callable targets.
help:
egrep "^# target:" Makefile | sed 's/^# target:/make/'

# target: build - Build Accord.NET Framework
build: Sources/Accord.NET.sln
$(XBUILD) /p:Configuration=Mono Sources/Accord.NET.sln

# target: build - Build sample applications
samples: Samples/Samples.sln
$(XBUILD) /p:Configuration=Mono /p:Platform=x86 Samples/Samples.sln

# target: build - Build documentation
docs:
mdoc update --lib=Release/mono/ --out=Docs/monodoc Release/mono/*.dll
mdoc export-html -o htmldocs docfiles

# target: test - Run unit tests
test: build
$(MONO) --runtime=v4.0 ${NUNIT} -noxml -nodots -labels -process=single \
-exclude:Serialization,Intensive,WinForms,Office,MonoNotSupported,Random \
${TESTFILES}

# target: clean obj and bin directories
clean-local:
rm -rvf $(LIBDIR)/*
rm -rvf $(DIR_RELEASE)/*
rm -rvf $(DIR_DEBUG)/*
find $(srcdir)/ -type d -name obj | xargs rm -rvf

maintainer-clean-local:
rm -rf autom4te.cache



MAINTAINERCLEANFILES = Makefile.in \
install-sh \
configure \
aclocal.m4 \
missing \
compile

.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.
8 changes: 4 additions & 4 deletions Setup/CreateRelease.cmd → Setup/create-release.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@

:: Compile sources
cd ..
cmd /c "Build.cmd"
cmd /c "build-all.cmd"
cd Setup

:: Build compressed archive
cd Archiver
cmd /c "Build.cmd"
cmd /c "Samples.cmd"
cmd /c "package-framework.cmd"
cmd /c "package-samples.cmd"
cd ..

echo.
Expand All @@ -29,7 +29,7 @@ echo.

:: Build NuGet packages
cd NuGet
cmd /c Build.cmd
cmd /c "package-nuget.cmd"
cd ..

echo.
Expand Down
File renamed without changes.
21 changes: 0 additions & 21 deletions Tests.sh

This file was deleted.

10 changes: 10 additions & 0 deletions accord.pc.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Name: Accord.NET
Description: The Accord.NET Framework for Machine Learning, Image Processing, Mathematics and Statistics
Version: @VERSION@
URL: http://accord-framework.net

prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@

Libs: -r:@libdir@/Accord.Vision.dll -r:@libdir@/Accord.Video.Ximea.dll -r:@libdir@/Accord.Video.VFW.dll -r:@libdir@/Accord.Video.Kinect.dll -r:@libdir@/Accord.Video.dll -r:@libdir@/Accord.Video.DirectShow.dll -r:@libdir@/Accord.Neuro.dll -r:@libdir@/Accord.Math.dll -r:@libdir@/Accord.Math.Core.dll -r:@libdir@/Accord.MachineLearning.dll -r:@libdir@/Accord.IO.dll -r:@libdir@/Accord.Imaging.dll -r:@libdir@/Accord.Genetic.dll -r:@libdir@/Accord.Fuzzy.dll -r:@libdir@/Accord.dll -r:@libdir@/Accord.Controls.Vision.dll -r:@libdir@/Accord.Controls.Imaging.dll -r:@libdir@/Accord.Controls.Audio.dll -r:@libdir@/Accord.Audition.dll -r:@libdir@/Accord.Audio.dll
Loading

0 comments on commit b0ce609

Please sign in to comment.