Permalink
Browse files

Update to latest espeak-ng master (#6717)

  • Loading branch information...
1 parent 1e4d802 commit 466651ed90708602280fb48fe97d7f63d344fa58 @michaelDCurran michaelDCurran committed on GitHub Jan 29, 2017
View
@@ -8,7 +8,7 @@ dist
*.dll
*.exe
*.manifest
-source/synthDrivers/espeak-data
+source/synthDrivers/espeak-ng-data
source/lib
source/lib64
source/typelibs
Submodule espeak updated 462 files
@@ -6,3 +6,5 @@
// Espeak features
#define INCLUDE_KLATT 1
#define HAVE_SONIC_H 1
+
+#define PACKAGE_VERSION "1.49.1 dev"
@@ -123,7 +123,7 @@ espeakLib=env.SharedLibrary(
LIBS=['advapi32'],
)
-phonemeData=env.espeak_compilePhonemeData(espeakRepo.Dir('espeak-data'),espeakRepo.Dir('phsource'))
+phonemeData=env.espeak_compilePhonemeData(espeakRepo.Dir('espeak-ng-data'),espeakRepo.Dir('phsource'))
env.Depends(phonemeData,espeakLib)
# Move any extra dictionaries into dictsource for compilation
@@ -135,7 +135,7 @@ dictSourcePath=espeakRepo.Dir('dictsource').abspath
for f in env.Glob(os.path.join(dictSourcePath,'*_rules')):
lang=f.name.split('_')[0]
if lang in missingDicts: continue
- dictFile=env.Command(espeakRepo.Dir('espeak-data').File(lang+'_dict'),f,espeak_compileDict_buildAction)
+ dictFile=env.Command(espeakRepo.Dir('espeak-ng-data').File(lang+'_dict'),f,espeak_compileDict_buildAction)
dictDeps=env.Glob(os.path.join(espeakRepo.abspath,'dictsource',lang+'_*'))
dictDeps.remove(f)
env.Depends(dictFile,dictDeps)
@@ -144,4 +144,4 @@ for f in env.Glob(os.path.join(dictSourcePath,'*_rules')):
env.SideEffect('_espeak_compileDict',dictFile)
env.Install(synthDriversDir,espeakLib)
-env.RecursiveInstall(synthDriversDir.Dir('espeak-data'),espeakRepo.Dir('espeak-data').abspath)
+env.RecursiveInstall(synthDriversDir.Dir('espeak-ng-data'),espeakRepo.Dir('espeak-ng-data').abspath)
View
@@ -136,9 +136,9 @@ def copyUserConfig(destPath):
tryCopyFile(sourceFilePath,destFilePath)
def removeOldProgramFiles(destPath):
- # #3181: Remove espeak-data\voices except for variants.
+ # #3181: Remove espeak-ng-data\voices except for variants.
# Otherwise, there will be duplicates if voices have been moved in this new eSpeak version.
- root = os.path.join(destPath, "synthDrivers", "espeak-data", "voices")
+ root = os.path.join(destPath, "synthDrivers", "espeak-ng-data", "voices")
try:
files = set(os.listdir(root))
except OSError:
@@ -308,7 +308,7 @@ def info():
return espeakDLL.espeak_Info()
def getVariantDict():
- dir='synthDrivers\\espeak-data\\voices\\!v'
+ dir='synthDrivers\\espeak-ng-data\\voices\\!v'
# Translators: name of the default espeak varient.
variantDict={"none": pgettext("espeakVarient", "none")}
for fileName in os.listdir(dir):
@@ -37,7 +37,7 @@ def check(cls):
def __init__(self):
_espeak.initialize()
- log.info("Using eSpeak version %s" % _espeak.info())
+ log.info("Using eSpeak NG version %s" % _espeak.info())
lang=languageHandler.getLanguage()
_espeak.setVoiceByLanguage(lang)
self._language=lang

0 comments on commit 466651e

Please sign in to comment.