rearrange kaldi's tools

3 files changed, 37 insertions, 54 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1cdb48b4084c..eb5b29e7a7a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,24 @@
 # Generated by mksrcinfo v8
-# Fri Oct  6 10:03:43 UTC 2017
+# Wed Nov  1 03:41:03 UTC 2017
 pkgbase = kaldi
 	pkgdesc = Speech recognition research toolkit
-	pkgver = 5.2.r7589.fad21abdf
+	pkgver = 5.2.r7627.323100178
 	pkgrel = 1
 	url = https://github.com/kaldi-asr/kaldi
 	arch = x86_64
 	arch = i686
 	license = APACHE
-	makedepends = gcc5
 	makedepends = git
 	makedepends = wget
+	makedepends = python
+	makedepends = python2
 	makedepends = subversion
-	depends = python2
+	makedepends = gcc6
+	depends = kaldi-openfst
 	depends = openblas-lapack
 	optdepends = cuda: For GPU support
-	noextract = srilm.tgz
-	source = kaldi::git+https://github.com/kaldi-asr/kaldi
-	source = srilm.tgz::https://www.dropbox.com/s/41y27or8lco4fju/srilm-1.7.2.tar.gz?dl=1
+	source = git+https://github.com/kaldi-asr/kaldi
 	sha256sums = SKIP
-	sha256sums = a528a778f881c679233f94d7b26d6f795129fa6009b32305c8ce769f66e223b4
 
 pkgname = kaldi
 
diff --git a/.gitignore b/.gitignore
index 20c7ec562053..39297eec8857 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@ src/
 pkg/
 */
 *.log
+*.sw*
+*.zip
diff --git a/PKGBUILD b/PKGBUILD
index 5737c3deb285..bc94a27200ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,16 @@
 # Maintainer: Jingbei Li <i@jingbei.lli>
 pkgname='kaldi'
 pkgdesc='Speech recognition research toolkit'
-pkgver=5.2.r7589.fad21abdf
+pkgver=5.2.r7627.323100178
 pkgrel=1
-makedepends=('gcc5' 'git' 'wget' 'subversion')
-depends=('python2' 'openblas-lapack')
+makedepends=('git' 'wget' 'python' 'python2' 'subversion' 'gcc6')
+depends=('kaldi-openfst' 'openblas-lapack')
 optdepends=('cuda: For GPU support')
 arch=('x86_64' 'i686')
 url='https://github.com/kaldi-asr/kaldi'
 license=('APACHE')
-source=("${pkgname}::git+${url}"
-"srilm.tgz::https://www.dropbox.com/s/41y27or8lco4fju/srilm-1.7.2.tar.gz?dl=1"
-)
-noextract=('srilm.tgz')
-sha256sums=('SKIP'
-'a528a778f881c679233f94d7b26d6f795129fa6009b32305c8ce769f66e223b4'
-)
+source=("git+${url}")
+sha256sums=('SKIP')
 
 pkgver () {
 	cd "${pkgname}"
@@ -40,28 +35,11 @@ prepare(){
 }
 
 build () {
-	CFLAGS="${CFLAGS/-fno-plt/}"
-	CXXFLAGS="${CFLAGS/-fno-plt/}"
-	cd $srcdir/$pkgname/tools
-	sed \
-		-e '/^sclite_compiled/s/ sctk_configured//' \
-		-i Makefile
-	sed 's/^exit/# exit/' -i extras/check_dependencies.sh
-	make CXX=g++-5 sph2pipe openfst sctk_configured
-
-	sed '/^DEFS/s/ -Dsize_t=unsigned//' -i sctk/src/sclite/makefile
-	make sclite
-
-	CXX=g++-5 extras/install_irstlm.sh
-	extras/install_kaldi_lm.sh
-	chmod +rx kaldi_lm
-
-	ln -sf $srcdir/srilm.tgz .
-	extras/install_srilm.sh
-
 	cd $srcdir/$pkgname/src
-	CXX=g++-5 ./configure $_cuda_config_opts \
+	CXX=g++-6 \
+	./configure $_cuda_config_opts \
 		--shared \
+		--fst-root=/opt/kaldi/tools/openfst \
 		--openblas-root=/usr \
 		--threaded-math=yes
 	make depend
@@ -69,29 +47,33 @@ build () {
 }
 
 package () {
-	cd $srcdir/$pkgname
-	for i in "*.tar*" "*.c" "*.cc" "*.cu" "*.cpp" "*.o" "*.a" "*.lo" "*.la" "*.mk" "Makefile*" "makefile*" "*.bak" "*.log" "*.status" "*.~*"
-	do
-		find . -type f -name "$i" -exec rm -f {} \;
-	done
+	cd  $srcdir/$pkgname
 
-	find . -name 'path.sh' -exec sed 's?^\(export KALDI_ROOT\)=.*$?\1=/opt/'$pkgname'?' -i {} \;
-
-	rm tools/srilm.tgz
-	rm tools/srilm/lm/src/Dependencies.i686-m64
-
-	for i in `grep $srcdir . -rIl`
+	for i in src/lib/*.so
 	do
-		sed -i "s|$srcdir|/opt|g" $i
+		mv `realpath $i` $i
 	done
+	rm src/*/*.{cc,cu,o,a,orig}
+	rm -r src/{doc,feat/test_data,lm/examples,lm/test_data,makefiles,onlinebin,probe}
+	find src \
+		-name 'Makefile*' \
+		-or -name 'README' \
+		-exec rm {} \;
+	find src \
+		-name '*.mk' \
+		-not -name 'kaldi.mk' \
+		-exec rm {} \;
+	find src -maxdepth 1 -type f -not -name 'kaldi.mk' -exec rm {} \;
+	rm -r tools/{ATLAS_headers,CLAPACK,INSTALL,Makefile}
 
+	sed "s|$srcdir|/opt|g" -i `grep $srcdir . -rIl`
+	find . -name 'path.sh' -exec sed 's?^\(export KALDI_ROOT\)=.*$?\1=/opt/'$pkgname'?' -i {} \;
 	echo "export OPENFST=/opt/kaldi/$(find tools -type d -name 'openfst*')" >> tools/env.sh
 	echo 'export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:-}:${OPENFST}/lib' >> tools/env.sh
 
-	mkdir -p $pkgdir/opt/$pkgname
-	cp -rL src $pkgdir/opt/$pkgname
-	cp -r misc egs tools $pkgdir/opt/$pkgname
-
 	install -dm755 "$pkgdir"/etc/ld.so.conf.d/
 	echo "/opt/$pkgname/src/lib" > "$pkgdir"/etc/ld.so.conf.d/$pkgname.conf
+
+	mkdir -p $pkgdir/opt/$pkgname
+	cp -r src egs tools $pkgdir/opt/$pkgname
 }