Skip to content

Commit eb4613e

Browse files
authored
Merge pull request #94 from MycroftAI/development
Release version 1.2.0.0
2 parents 29b0b02 + 62078c6 commit eb4613e

File tree

174 files changed

+2637
-17532
lines changed

Some content is hidden

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

174 files changed

+2637
-17532
lines changed

.gitignore

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,20 @@ tags
3737
# Configure Generated Files/Directories
3838
config.log
3939
config.status
40-
config/config
41-
config/system.mak
40+
config/*
41+
configure
4242
aclocal.m4
4343
autom4te.cache
44+
Makefile.in
45+
m4/*
46+
include/config.h.in
47+
4448
# Building Process Files/Directories
45-
build/
46-
bin/
47-
include/mimic_version.h
48-
main/mimic_lang_list.c
49-
main/mimic_voice_list.c
50-
.build_lib
49+
*.deps
50+
*.dirstamp
51+
Makefile
52+
include/config.h
53+
include/stamp-h1
5154

5255
# Test suite executables
5356
testsuite/play_client
@@ -79,6 +82,7 @@ unittests/nums_test
7982
unittests/voice_select_test
8083
unittests/lts_test
8184
unittests/wave_test
85+
8286
# temporary files for building cmulex
8387
_festsuite
8488
lang/cmulex/festival

.travis.yml

Lines changed: 40 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,62 @@
11
language: c
2-
sudo: false
32

4-
compiler:
5-
- gcc
3+
matrix:
4+
include:
5+
- env: TASK="osx"
6+
os: osx
7+
compiler: clang
8+
- os: linux
9+
env: TASK="coverage" # code coverage
10+
compiler: gcc
11+
sudo: false
12+
- env: TASK="shared" # shared libraries
13+
os: linux
14+
compiler: gcc
15+
sudo: false
16+
- env: TASK="arm-linux-gnueabihf-gcc" # arm build
17+
os: linux
18+
compiler: gcc
19+
sudo: false
20+
- env: TASK="winbuild" # windows build
21+
os: linux
22+
compiler: gcc
23+
sudo: false
24+
- env: TASK="winbuild_shared" # windows build shared libraries
25+
os: linux
26+
compiler: gcc
27+
sudo: false
628

729
script:
8-
- ./run_testsuite.sh
30+
- ./run_testsuite.sh "$TASK"
931

1032
after_success:
11-
- make gcov
12-
- bash <(curl -s https://codecov.io/bash)
33+
- if [ "x$TASK" = "xcoverage" ]; then bash <(curl -s https://codecov.io/bash); fi
1334

1435
env:
1536
global:
1637
# The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
1738
# via the "travis encrypt" command using the project repo's public key
1839
- secure: "VQXmVb9lTL4Yo58doWyCkdPTaDoe7sHPnOMCcJMPuxOpK1d/JWkm9Pp2UV8L/32JkCOO32azPJ1R1nr7uz6GFs0CwNAW+FO24mRex/h3CaH33eu7fQkq4MwfBqa19qqPoUX7KB8iofT6KyRxNrC8Z+zYPR9gogP2VrLSldi0Wva3+On/9tnj+e0/Cy2lTfjyXGvdFoDCM+WtbVz38IZrrAl7TG9azCorM0AaHr1U57DNVKQNlWdTJLiN2tzc5971nA7/Ws+ZoNK2ZWV6fIghgLju/h25JIqKpXB/Wi5QyUWY0pZ5oAEfqIgJchZ3e5qLS4bARsJwXTL8BFfwStA05qBTKI5M0lj93u1/d4tuVJzSP5LTJJelFYPsLVtyOKglFHr/Pb4PhieHJXjr/jig8P48nP+jgXcQjpP4uLZ3D1Z01///QCWCiHXloSurQkA0fhQSyeCHGNiTPEjAYfcFAjlH5/C1tsRLIerxm8hdGDhF0x7lg9j069B0Yet5GINiBeBZdTph1r6YWYQUqAwb8gAYt20KE/i/f5TSIFOd9jDOrPHLgSZX0N+C7x6PqVTxBGMksNJtf+PNOrBC5+VbYxdw0ldX1AveBD4oW9bcJ9wo3rAsFGZ8q6Vnl0r3U48eKWtMUf4//aq4Ab1h/LP8t+c+XyEXfMNh4WpJ4lySn4s="
1940

20-
2141
addons:
2242
apt:
2343
packages:
24-
- libasound2-dev
44+
- autotools-dev
2545
- autoconf
2646
- automake
47+
- libtool
2748
- pkg-config
49+
- libasound2-dev
50+
- libicu-dev
51+
- binutils-arm-linux-gnueabihf
52+
- gcc-arm-linux-gnueabihf
53+
- g++-arm-linux-gnueabihf
54+
- libc6-dev-armhf-cross
55+
- pkg-config-arm-linux-gnueabihf
56+
- mingw32
57+
- mingw32-runtime
58+
- wine
59+
- xvfb
2860
coverity_scan:
2961
project:
3062
name: "MycroftAI/mimic"

Exports.def

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

Makefile

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

0 commit comments

Comments
 (0)