Permalink
Browse files

- Updating the linux build scripts to use autogen/autoconf/make

- Reorganizing the the build scripts to make their intent more clear
  • Loading branch information...
1 parent 8f0f355 commit b0ce609eca32ec033b026ebab6d6f578366e20cc @cesarsouza cesarsouza committed Sep 27, 2016
View
@@ -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
View
@@ -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
View
@@ -1,26 +0,0 @@
-#!/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 " "
-
-
-
-if [ $# -eq 0 ] || [ "$1" == "framework" ]; then
- echo ""
- echo " - Building Mono configuration..."
- echo ""
- xbuild /p:Configuration=Mono Sources/Accord.NET.sln
-fi
-
-if [ $# -eq 0 ] || [ "$1" == "samples" ]; then
- echo ""
- echo " - Building samples..."
- echo ""
- xbuild /p:Configuration=Mono /p:Platform=x86 Samples/Samples.sln
-fi
View
@@ -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.
@@ -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.
@@ -29,7 +29,7 @@ echo.
:: Build NuGet packages
cd NuGet
-cmd /c Build.cmd
+cmd /c "package-nuget.cmd"
cd ..
echo.
File renamed without changes.
View
@@ -1,21 +0,0 @@
-#!/bin/bash
-###########
-
-TESTS="Unit Tests/bin/Release/mono/"
-NUNIT="Externals/NUnit/nunit-console-x86.exe"
-LIST=()
-
-# Run unit tests in the Mono solution
-#LIST+=("${TESTS}Accord.Tests.Audio.dll")
-LIST+=("${TESTS}Accord.Tests.Controls.dll")
-LIST+=("${TESTS}Accord.Tests.Core.dll")
-LIST+=("${TESTS}Accord.Tests.Imaging.dll")
-LIST+=("${TESTS}Accord.Tests.IO.dll")
-LIST+=("${TESTS}Accord.Tests.MachineLearning.dll")
-LIST+=("${TESTS}Accord.Tests.Math.dll")
-LIST+=("${TESTS}Accord.Tests.Neuro.dll")
-LIST+=("${TESTS}Accord.Tests.Vision.dll")
-LIST+=("${TESTS}Accord.Tests.Statistics.dll")
-
-
-mono --runtime=v4.0 ${NUNIT} -noxml -nodots -labels -exclude:Serialization,Intensive,WinForms,Office,MonoNotSupported,Random -process=single "${LIST[@]/#/}"
View
@@ -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
Oops, something went wrong.

0 comments on commit b0ce609

Please sign in to comment.