Adds static binaries for MacOSX

Also - Shifts all app.config settings to a central config file - Modified app.config to read from shared settings file - adjusts .gitattributes to better handle binaries in lib - [BREAKING] AbstractAudioUtility now throws if exit code is not 0 - [BREAKING] mp3splt is now an optional dependency
QutEcoacoustics · Jun 20, 2018 · 28edc79 · 28edc79
1 parent fe4076b
commit 28edc79
Show file tree

Hide file tree

Showing 134 changed files with 2,979 additions and 242 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -46,8 +46,9 @@ docs/**/*.jpg filter=lfs diff=lfs merge=lfs -text
 *.mp3 filter=lfs diff=lfs merge=lfs -text
 
 # all binaries in lib should be tracked by git-lfs
-lib/**/*.exe filter=lfs diff=lfs merge=lfs -text
-lib/**/*.dll filter=lfs diff=lfs merge=lfs -text
+lib/**/*.exe    filter=lfs diff=lfs merge=lfs -text
+lib/**/*.dll    filter=lfs diff=lfs merge=lfs -text
+lib/audio-utils/macosx/**/*        filter=lfs diff=lfs merge=lfs -text
 
 # assets in tests/Fixtures should generally be in lfs
 tests/Fixtures/**/*.zip filter=lfs diff=lfs merge=lfs -text

diff --git a/AudioAnalysis.sln b/AudioAnalysis.sln
@@ -5,6 +5,7 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A050BD53-DEE0-40F3-BEAB-1F7474533C40}"
 	ProjectSection(SolutionItems) = preProject
 		src\AP.CopyFiles.targets = src\AP.CopyFiles.targets
+		src\AP.Settings.config = src\AP.Settings.config
 		src\AP.VersionBuild.targets = src\AP.VersionBuild.targets
 		src\AssemblyMetadata.cs.template = src\AssemblyMetadata.cs.template
 		README.md = README.md

diff --git a/docs/installing.md b/docs/installing.md
@@ -32,7 +32,13 @@ running:
 AnalysisPrograms.exe CheckEnvironment
 ```
 
-## Unix && MacOSX
+## MacOSX
+
+The following additional dependencies are required for MaxOSX machines:
+
+- mono (version 5.5 or greater)
+
+## Unix
 
 The following additional dependencies are required for Unix machines:
 
@@ -48,5 +54,5 @@ The following additional dependencies are required for Unix machines:
 
 ## Coming soon: Docker
 
-We're working on a `Dockerfile` that will greatly simplify installation.
-Let us know if you're keen for it.
+We have a `Dockerfile` that theoretically works (BETA warning). See the 
+`build` directory to find it.
diff --git a/docs/supported_platforms.md b/docs/supported_platforms.md
@@ -51,7 +51,9 @@ $ mono AnalysisPrograms.exe list
 
 ### MacOSX
 
-Should the same as the Unix requirements, however, we have never run or tested
-the code on MacOS systems.
+We support Mac OS X 10.9 and later.
+
+Should the same as the Unix requirements, however, we have limited exeprience
+running on MacOSX systems.
 
 We'd like to hear from you if you do try!
diff --git a/lib/audio-utils/README.txt b/lib/audio-utils/README.txt
@@ -0,0 +1,15 @@
+The binaries you download here should work on as many systems as possible.
+
+We can utilise so called static builds.
+
+When adding a new binary check that our supported platforms documentation matches
+what the binary is capable of running on.
+
+# FFMPEG notes
+
+Download from here:
+https://ffmpeg.zeranoe.com/builds/
+
+Choose a stable version, 64-bit builds only, and choose "Shared" linking.
+The shared linking option saves on space, otherwise all resources are embedded into all 
+executables.
diff --git a/lib/audio-utils/ffmpeg/README.txt b/lib/audio-utils/ffmpeg/README.txt
diff --git a/lib/audio-utils/ffmpeg/avcodec-57.dll b/lib/audio-utils/ffmpeg/avcodec-57.dll
diff --git a/lib/audio-utils/ffmpeg/avdevice-57.dll b/lib/audio-utils/ffmpeg/avdevice-57.dll
diff --git a/lib/audio-utils/ffmpeg/avfilter-6.dll b/lib/audio-utils/ffmpeg/avfilter-6.dll
diff --git a/lib/audio-utils/ffmpeg/avformat-57.dll b/lib/audio-utils/ffmpeg/avformat-57.dll
diff --git a/lib/audio-utils/ffmpeg/avutil-55.dll b/lib/audio-utils/ffmpeg/avutil-55.dll
diff --git a/lib/audio-utils/ffmpeg/ffmpeg.exe b/lib/audio-utils/ffmpeg/ffmpeg.exe
diff --git a/lib/audio-utils/ffmpeg/ffplay.exe b/lib/audio-utils/ffmpeg/ffplay.exe
diff --git a/lib/audio-utils/ffmpeg/ffprobe.exe b/lib/audio-utils/ffmpeg/ffprobe.exe
diff --git a/lib/audio-utils/ffmpeg/postproc-54.dll b/lib/audio-utils/ffmpeg/postproc-54.dll
diff --git a/lib/audio-utils/ffmpeg/swresample-2.dll b/lib/audio-utils/ffmpeg/swresample-2.dll
diff --git a/lib/audio-utils/ffmpeg/swscale-4.dll b/lib/audio-utils/ffmpeg/swscale-4.dll
diff --git a/lib/audio-utils/macosx/README.txt b/lib/audio-utils/macosx/README.txt
diff --git a/lib/audio-utils/macosx/ffmpeg/LICENSE.txt b/lib/audio-utils/macosx/ffmpeg/LICENSE.txt
diff --git a/lib/audio-utils/macosx/ffmpeg/README.txt b/lib/audio-utils/macosx/ffmpeg/README.txt
diff --git a/lib/audio-utils/macosx/ffmpeg/ffmpeg b/lib/audio-utils/macosx/ffmpeg/ffmpeg
diff --git a/lib/audio-utils/macosx/ffmpeg/ffplay b/lib/audio-utils/macosx/ffmpeg/ffplay
diff --git a/lib/audio-utils/macosx/ffmpeg/ffprobe b/lib/audio-utils/macosx/ffmpeg/ffprobe
diff --git a/lib/audio-utils/macosx/ffmpeg/libavcodec.58.dylib b/lib/audio-utils/macosx/ffmpeg/libavcodec.58.dylib
diff --git a/lib/audio-utils/macosx/ffmpeg/libavdevice.58.dylib b/lib/audio-utils/macosx/ffmpeg/libavdevice.58.dylib
diff --git a/lib/audio-utils/macosx/ffmpeg/libavfilter.7.dylib b/lib/audio-utils/macosx/ffmpeg/libavfilter.7.dylib
diff --git a/lib/audio-utils/macosx/ffmpeg/libavformat.58.dylib b/lib/audio-utils/macosx/ffmpeg/libavformat.58.dylib
diff --git a/lib/audio-utils/macosx/ffmpeg/libavutil.56.dylib b/lib/audio-utils/macosx/ffmpeg/libavutil.56.dylib
diff --git a/lib/audio-utils/macosx/ffmpeg/libpostproc.55.dylib b/lib/audio-utils/macosx/ffmpeg/libpostproc.55.dylib
diff --git a/lib/audio-utils/macosx/ffmpeg/libswresample.3.dylib b/lib/audio-utils/macosx/ffmpeg/libswresample.3.dylib
diff --git a/lib/audio-utils/macosx/ffmpeg/libswscale.5.dylib b/lib/audio-utils/macosx/ffmpeg/libswscale.5.dylib
diff --git a/lib/audio-utils/macosx/sox/ChangeLog b/lib/audio-utils/macosx/sox/ChangeLog
diff --git a/lib/audio-utils/macosx/sox/LICENSE.GPL.txt b/lib/audio-utils/macosx/sox/LICENSE.GPL.txt
diff --git a/lib/audio-utils/macosx/sox/README b/lib/audio-utils/macosx/sox/README
diff --git a/lib/audio-utils/macosx/sox/README.osx.txt b/lib/audio-utils/macosx/sox/README.osx.txt
diff --git a/lib/audio-utils/macosx/sox/libsox.txt b/lib/audio-utils/macosx/sox/libsox.txt
diff --git a/lib/audio-utils/macosx/sox/play b/lib/audio-utils/macosx/sox/play
diff --git a/lib/audio-utils/macosx/sox/rec b/lib/audio-utils/macosx/sox/rec
diff --git a/lib/audio-utils/macosx/sox/sox b/lib/audio-utils/macosx/sox/sox
diff --git a/lib/audio-utils/macosx/sox/sox.txt b/lib/audio-utils/macosx/sox/sox.txt
diff --git a/lib/audio-utils/macosx/sox/soxformat.txt b/lib/audio-utils/macosx/sox/soxformat.txt
diff --git a/lib/audio-utils/macosx/sox/soxi b/lib/audio-utils/macosx/sox/soxi
diff --git a/lib/audio-utils/macosx/sox/soxi.txt b/lib/audio-utils/macosx/sox/soxi.txt
diff --git a/lib/audio-utils/macosx/wavpack/changelog.txt b/lib/audio-utils/macosx/wavpack/changelog.txt
diff --git a/lib/audio-utils/macosx/wavpack/license.txt b/lib/audio-utils/macosx/wavpack/license.txt
diff --git a/lib/audio-utils/macosx/wavpack/wavpack b/lib/audio-utils/macosx/wavpack/wavpack
diff --git a/lib/audio-utils/macosx/wavpack/wavpack_doc.html b/lib/audio-utils/macosx/wavpack/wavpack_doc.html
diff --git a/lib/audio-utils/macosx/wavpack/wvgain b/lib/audio-utils/macosx/wavpack/wvgain
diff --git a/lib/audio-utils/macosx/wavpack/wvunpack b/lib/audio-utils/macosx/wavpack/wvunpack
diff --git a/lib/audio-utils/mp3splt/libmp3splt-0.dll b/lib/audio-utils/mp3splt/libmp3splt-0.dll
diff --git a/lib/audio-utils/mp3splt/libsplt_flac-0.dll b/lib/audio-utils/mp3splt/libsplt_flac-0.dll
diff --git a/lib/audio-utils/mp3splt/libsplt_mp3-0.dll b/lib/audio-utils/mp3splt/libsplt_mp3-0.dll
diff --git a/lib/audio-utils/mp3splt/libsplt_ogg-0.dll b/lib/audio-utils/mp3splt/libsplt_ogg-0.dll
diff --git a/lib/audio-utils/mp3splt/mp3splt.exe b/lib/audio-utils/mp3splt/mp3splt.exe
diff --git a/lib/audio-utils/mp3splt/mp3splt.ico b/lib/audio-utils/mp3splt/mp3splt.ico
diff --git a/lib/audio-utils/sox/libgomp-1.dll b/lib/audio-utils/sox/libgomp-1.dll
diff --git a/lib/audio-utils/sox/sox.exe b/lib/audio-utils/sox/sox.exe
diff --git a/lib/audio-utils/sox/zlib1.dll b/lib/audio-utils/sox/zlib1.dll
diff --git a/lib/audio-utils/windows/README.txt b/lib/audio-utils/windows/README.txt
@@ -0,0 +1,5 @@
+Don't include the `presets` or `docs` folder for ffmpeg
+
+Don't include the `wget` or docs for SoX
+SoX no longer includes an mp3 encoder by default. Make sure to include copies
+of the MAD (libmad and libmad-0) libraries.
diff --git a/lib/audio-utils/ffmpeg/LICENSE.txt → lib/audio-utils/windows/ffmpeg/LICENSE.txt b/lib/audio-utils/ffmpeg/LICENSE.txt → lib/audio-utils/windows/ffmpeg/LICENSE.txt