From 1623f90b4f59c98707bb17a1414725aec07089b2 Mon Sep 17 00:00:00 2001 From: "Reece H. Dunn" Date: Sun, 23 Dec 2012 14:28:53 +0000 Subject: [PATCH] Exclude the MBROLA data files when building the espeakdata.zip file. --- Makefile.am | 7 +++---- android/res/raw/espeakdata.zip | Bin 872153 -> 856942 bytes android/res/raw/espeakdata_version | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 12c2c896..da3b036d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -127,10 +127,9 @@ espeak-data/phontab: src/espeakedit espeak-data/dir.stamp espeak-data/dictsource android/res/raw/espeakdata.zip: espeak-data/dir.stamp espeak-data/phontab dictionaries rm -f $@ - zip -r $@ \ - espeak-data/intonations \ - espeak-data/phondata espeak-data/phonindex espeak-data/phontab \ - espeak-data/*_dict espeak-data/voices + find espeak-data/{intonations,phondata,phonindex,phontab} | zip -@ $@ + find espeak-data/*_dict | zip -@ $@ + find espeak-data/voices -type f | grep -vF "/mb/" | zip -@ $@ android/res/raw/espeakdata_version: android/res/raw/espeakdata.zip sha1sum $< | awk '{ print $$1 }' > $@ diff --git a/android/res/raw/espeakdata.zip b/android/res/raw/espeakdata.zip index 900e9d0c4a760c61b3cb5fc0461ab29753c79416..df26a70666773331834fd114c418338630a40465 100644 GIT binary patch delta 1589 zcmYk6e@v8h9LMkZ!W|qvUyJZAIhbP>rUR4{iR1SPCvb2$Hxt)lnFg!XA4aa$8Wq-4 zOShK)aG#VCl2UOY8X8$5rvgG6LYT8!BeSi*<*HG0t3P^w@AGgy|2?nw`}2K&KF{a* z-hKOi{_R6++YHSRMw}6E*bRq~U?dt&Bgweyq<*FSaC%ser+@C~NmQ667g6|*?jGnk zt8dZ<{1N@)y-{mm+q9m!WZ>E@J!J(=rphD=EtVc}shxJENf*7mSO!E_nBlqt7cu0y z03AfhHPTJ*xMZbBewUqD<-Eoa-lr#0$SwV%VIRBQZkfT2Fcca^Wj8&Og@i}MXBGkbpdq;IU-ONU(UreQKOm|Qq2Qkg>S!%j-P;=9&#I2G6 z?J@GEV(@6p6H1t3p(_`ih9QW}2RJ3FWUhvi*vU%UYK-@i2|p@`?_$TF3wX{191Mzo z8Nyx})OJu?8hSqNm9^SDKS%qIdJ(?!pk?UgYoPpURo+y})^2lvF?`coYp~Vi4`YoT zRFj97f8DAaQHtxMSh9l>*COYG{}nqurIeM2Vl{ReQ%bK@S&=W-YZc^Oy0Eg{`B>Qr zi!cj8+<(N95_|~CVXM-k6i<((#y^1@Dhu!;qo&+cfSUTF)Dl3eNP(=>oU|(g&mJE- zzQWI)lX?QR`fx1$V@{ifEB2VMsu0lC%g*k?h5L4Qk@RRO)Upg|{vuf|GW+O8sZ6DV zMcC3TL%0~v{l}HDgd*SJl5K~g<(Q{n}qFcuHig*#8OVyjp^@&HZ$) z9HBob*nE*<-sZZJ2Qihu`Of3(h)y5gD=1iHI<}=dDWus_1 z9XoHQ)^a#Ar&WBTxc)g0;PXQaf5Bz#eq6uiGyDVn+b^qxZ;;pe@H&(Y4)T7Et;4da z&N4VF0OKY!DQF#HXGnn-VenJ}UNGT#1;0hO&r~I%x18g$tN&`Fyzi7D!mT#Zo0zC&N|rNn=qkZ<0LyPLx7(qRWmoe5yC(XQ|!zr z=jSPQitFJ#`!zf5^>F5*;HE#6^W-!;bsKQ6omUxpHppd*`fPo+i87mQ&sE)Kv;7CR CiUy1T delta 12013 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 LSTqHJ(!>7&6lMjD diff --git a/android/res/raw/espeakdata_version b/android/res/raw/espeakdata_version index da5b7354..400bed71 100644 --- a/android/res/raw/espeakdata_version +++ b/android/res/raw/espeakdata_version @@ -1 +1 @@ -6e7a49d1894b9915873b8bc066f35c65e155c31e +6c25c6e98920cc1cea220e8e8ed8069926d5cff5