Merge pull request #68 from lenzo-duo/kal-merge-up

Merge from upstream

Author: lenzo-ka

.gitignore

@@ -1,9 +1,22 @@
-.idea
-venv
-build
-dist
+.idea/
+.vscode/
+build/
+dist/
 MANIFEST
+__pycache__
 *.pyd
 *.egg-info
 *.so
-__pycache__
+*.htk
+*.lat
+*.pyc
+*.log
+sphinxbase/ad_win32.py
+sphinxbase/ad_openal.py
+sphinxbase/ad_pulse.py
+sphinxbase/ad_alsa.py
+sphinxbase/sphinxbase.py
+pocketsphinx/pocketsphinx.py
+*_wrap.c
+pocketsphinx/data/
+pocketsphinx/model/

.gitmodules

@@ -1,8 +1,6 @@
-[submodule "pocketsphinx"]
-    path = pocketsphinx
-    url = https://github.com/cmusphinx/pocketsphinx
-    ignore = dirty
-[submodule "sphinxbase"]
-    path = sphinxbase
-    url = https://github.com/cmusphinx/sphinxbase
-    ignore = dirty
+[submodule "deps/pocketsphinx"]
+	path = deps/pocketsphinx
+	url = https://github.com/cmusphinx/pocketsphinx
+[submodule "deps/sphinxbase"]
+	path = deps/sphinxbase
+	url = https://github.com/cmusphinx/sphinxbase

.travis.yml

@@ -1,26 +1,70 @@
-language: python
-python:
-  - "2.6"
-  - "2.7"
-  - "3.2"
-  - "3.3"
-  - "3.4"
-  - "3.5"
-  - "3.5-dev"
-  - "nightly"
+sudo: false
+
+env:
+  global:
+    secure: kRjum2tZsaQZPnti27bc/ZIjYS1hftXTyuSWdq/6raRignORgbZMUc/RMXBz+ig8kiEVE3SFBZdapECGj+3Vb6Q6Vi4ypv8lR4rtJMTNITSOeM1KHHDCi6xLLGKrOsJ5ndkYHTNxuyIMGZu9Sv3TMcNqHcBChbZKT383OXgrxLA=
+
+matrix:
+  include:
+  - os: osx
+    osx_image: xcode6.4
+    language: generic
+    env: ENABLE_LIBSPHINXAD=1 BUILD_WHEEL=true
+  - os: osx
+    osx_image: xcode8
+    language: generic
+    env: ENABLE_LIBSPHINXAD=1 BUILD_WHEEL=true
+  - os: osx
+    osx_image: xcode8.3
+    language: generic
+    env: ENABLE_LIBSPHINXAD=1 BUILD_WHEEL=true
+  - os: osx
+    osx_image: xcode9.3
+    language: generic
+    env: ENABLE_LIBSPHINXAD=1 BUILD_WHEEL=true
+  - os: linux
+    language: python
+    python: 2.7
+    env: ENABLE_LIBSPHINXAD=1
+  - os: linux
+    language: python
+    python: 3.5
+    env: ENABLE_LIBSPHINXAD=1
+  - os: linux
+    language: python
+    python: 3.6
+    env: ENABLE_LIBSPHINXAD=1 BUILD_SDIST=true
+
 before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq build-essential swig
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew reinstall swig python python@2; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PATH=$HOME/Library/Python/3.6/bin:$PATH; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y swig libpulse-dev libasound2-dev; fi
+
 install:
-  - python setup.py bdist_wheel build
-  - python setup.py bdist_wheel build
-  - pip install ./dist/pocketsphinx-*.whl
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then python2 -m pip install --user --upgrade pip setuptools wheel twine; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then python3 -m pip install --user --upgrade pip setuptools wheel twine; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then python -m pip install --upgrade pip setuptools wheel twine; fi
+
 script:
-  - cd pocketsphinx/swig/python/test
-  - python ./config_test.py
-  - python ./decoder_test.py
-  - python ./fsg_test.py
-  - python ./jsgf_test.py
-  - python ./kws_test.py
-  - python ./lattice_test.py
-  - python ./lm_test.py
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then python2 setup.py test; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then python3 setup.py test; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then python setup.py test; fi
+
+before_deploy:
+  - if [[ "$TRAVIS_OS_NAME" == "osx" && "$BUILD_SDIST" == "true" ]]; then python2 setup.py sdist; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" && "$BUILD_WHEEL" == "true" ]]; then python2 setup.py bdist_wheel; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" && "$BUILD_SDIST" == "true" ]]; then python3 setup.py sdist; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" && "$BUILD_WHEEL" == "true" ]]; then python3 setup.py bdist_wheel; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" && "$BUILD_SDIST" == "true" ]]; then python setup.py sdist; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" && "$BUILD_WHEEL" == "true" ]]; then python setup.py bdist_wheel; fi
+
+deploy:
+  provider: script
+  script: twine upload -u bambucha -p $PASSWORD dist/*
+  on:
+    tags: true
+    branch: master
+    condition: '"$BUILD_SDIST" == "true" || "$BUILD_WHEEL" == "true"'
+  skip_cleanup: true

LICENSE

@@ -0,0 +1,30 @@
+Copyright (c) 1999-2016 Carnegie Mellon University. All rights
+reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer. 
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+This work was supported in part by funding from the Defense Advanced 
+Research Projects Agency and the National Science Foundation of the 
+United States of America, and the CMU Sphinx Speech Consortium.
+
+THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND 
+ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, 
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
+NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

MANIFEST.in

@@ -1,21 +1,10 @@
-prune build
-prune dist
-recursive-include sphinxbase/include *.h
-recursive-include sphinxbase/src *.c
-recursive-include sphinxbase/src *.h
-recursive-include sphinxbase/swig *.i
-prune sphinxbase/include/wince
-prune sphinxbase/include/android
-prune sphinxbase/src/sphinx_adtools
-prune sphinxbase/src/sphinx_cepview
-prune sphinxbase/src/sphinx_fe
-prune sphinxbase/src/sphinx_jsgf2fsg
-prune sphinxbase/src/sphinx_lmtools
-recursive-include pocketsphinx/include *.h
-recursive-include pocketsphinx/src *.c
-recursive-include pocketsphinx/src *.h
-recursive-include pocketsphinx/swig *.i
-prune pocketsphinx/src/gst-plugin
-prune pocketsphinx/src/programs
-include readme.md
-recursive-include include *.h
+recursive-include deps/sphinxbase/include *.h
+prune deps/sphinxbase/include/wince
+recursive-include deps/sphinxbase/src/libsphinxad *.c
+recursive-include deps/sphinxbase/src/libsphinxbase *.c *.h
+recursive-include deps/pocketsphinx/include *.h
+recursive-include deps/pocketsphinx/src/libpocketsphinx *.c *.h
+global-include *.i
+graft pocketsphinx/model
+graft pocketsphinx/data
+include README.md LICENSE