Fix branch name and add implib dump

ls-milkyway · Jan 7, 2022 · c320997 · c320997
1 parent a1eac01
commit c320997
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/travis/Dockerfile.win b/travis/Dockerfile.win
@@ -55,7 +55,7 @@ RUN cd /opt/kaldi \
     && find . -name *.a -exec cp {} /opt/kaldi/local/lib \;
 
 RUN cd /opt/kaldi \
-    && git clone -b android-mix --single-branch https://github.com/alphacep/kaldi \
+    && git clone -b vosk-android --single-branch https://github.com/alphacep/kaldi \
     && cd kaldi/src \
     && CXX=x86_64-w64-mingw32-g++-posix CXXFLAGS="-O3 -ftree-vectorize -DFST_NO_DYNAMIC_LINKING" ./configure --shared --mingw=yes --use-cuda=no \
         --mathlib=OPENBLAS_CLAPACK \

diff --git a/travis/Dockerfile.win32 b/travis/Dockerfile.win32
@@ -54,7 +54,7 @@ RUN cd /opt/kaldi \
     && find . -name *.a -exec cp {} /opt/kaldi/local/lib \;
 
 RUN cd /opt/kaldi \
-    && git clone -b android-mix --single-branch https://github.com/alphacep/kaldi \
+    && git clone -b vosk-android --single-branch https://github.com/alphacep/kaldi \
     && cd kaldi/src \
     && CXX=i686-w64-mingw32-g++-posix CXXFLAGS="-O3 -ftree-vectorize -DFST_NO_DYNAMIC_LINKING" ./configure --shared --mingw=yes --use-cuda=no \
         --mathlib=OPENBLAS_CLAPACK \

diff --git a/travis/build-wheels-win.sh b/travis/build-wheels-win.sh
@@ -5,7 +5,7 @@ set -e -x
 cd /opt
 git clone https://github.com/alphacep/vosk-api
 cd vosk-api/src
-CXX=x86_64-w64-mingw32-g++-posix EXT=dll KALDI_ROOT=/opt/kaldi/kaldi OPENFST_ROOT=/opt/kaldi/local OPENBLAS_ROOT=/opt/kaldi/local make -j $(nproc)
+EXTRA_LDFLAGS=-Wl,--out-implib,libvosk.lib CXX=x86_64-w64-mingw32-g++-posix EXT=dll KALDI_ROOT=/opt/kaldi/kaldi OPENFST_ROOT=/opt/kaldi/local OPENBLAS_ROOT=/opt/kaldi/local make -j $(nproc)
 
 # Collect dependencies
 cp /usr/lib/gcc/x86_64-w64-mingw32/*-posix/libstdc++-6.dll /opt/vosk-api/src
@@ -14,7 +14,7 @@ cp /usr/x86_64-w64-mingw32/lib/libwinpthread-1.dll /opt/vosk-api/src
 
 # Copy dlls to output folder
 mkdir -p /io/wheelhouse/win64
-cp /opt/vosk-api/src/*.dll /io/wheelhouse/win64
+cp /opt/vosk-api/src/*.{dll,lib} /io/wheelhouse/win64
 
 # Build wheel and put to the output folder
 export VOSK_SOURCE=/opt/vosk-api

diff --git a/travis/build-wheels-win32.sh b/travis/build-wheels-win32.sh
@@ -5,7 +5,7 @@ set -e -x
 cd /opt
 git clone https://github.com/alphacep/vosk-api
 cd vosk-api/src
-CXX=i686-w64-mingw32-g++-posix EXT=dll KALDI_ROOT=/opt/kaldi/kaldi OPENFST_ROOT=/opt/kaldi/local OPENBLAS_ROOT=/opt/kaldi/local make -j $(nproc)
+EXTRA_LDFLAGS=-Wl,--out-implib,libvosk.lib CXX=i686-w64-mingw32-g++-posix EXT=dll KALDI_ROOT=/opt/kaldi/kaldi OPENFST_ROOT=/opt/kaldi/local OPENBLAS_ROOT=/opt/kaldi/local make -j $(nproc)
 
 # Copy dependencies
 cp /usr/lib/gcc/i686-w64-mingw32/*-posix/libstdc++-6.dll /opt/vosk-api/src
@@ -14,7 +14,7 @@ cp /usr/i686-w64-mingw32/lib/libwinpthread-1.dll /opt/vosk-api/src
 
 # Copy dlls to output folder
 mkdir -p /io/wheelhouse/win32
-cp /opt/vosk-api/src/*.dll /io/wheelhouse/win32
+cp /opt/vosk-api/src/*.{dll,lib} /io/wheelhouse/win32
 
 # Build wheel and put to the output folder
 export VOSK_SOURCE=/opt/vosk-api