Store espeak in lib folder

Author: LeonarddeR

nvdaHelper/archBuild_sconscript

@@ -266,9 +266,10 @@ if not isNVDAHelperLocalArch:
 	if signExec:
 		env.AddPostAction(remoteLoaderProgram, [signExec])
 	env.Install(libInstallDir, remoteLoaderProgram)
-
+if isNVDAHelperLocalArch:
+	(espeakLib, sonicLib) = thirdPartyEnv.SConscript("espeak/sconscript")
+	env.Install(libInstallDir, (espeakLib, sonicLib))
 if isNVDACoreArch:
-	thirdPartyEnv.SConscript("espeak/sconscript")
 	thirdPartyEnv.SConscript("liblouis/sconscript")
 
 	# UWP dlls can only be dynamically linked with the CRT,

nvdaHelper/espeak/sconscript

@@ -1162,9 +1162,6 @@ for dictFileName, (langCode, inputFiles) in espeakDictionaryCompileList.items():
 		os.path.join(synthDriversDir.Dir("espeak-ng-data").abspath, dictFileName), dictFile
 	)
 
-env.Install(synthDriversDir, espeakLib)
-env.Install(synthDriversDir, sonicLib)
-
 # install espeak-ng-data
 targetEspeakDataDir = synthDriversDir.Dir("espeak-ng-data")
 espeakDataSource = espeakRepo.Dir("espeak-ng-data")
@@ -1174,3 +1171,5 @@ env.RecursiveInstall(targetEspeakDataDir.Dir("lang"), espeakDataSource.Dir("lang
 env.RecursiveInstall(
 	targetEspeakDataDir.Dir("voices").Dir("!v"), espeakDataSource.Dir("voices").Dir("!v").abspath
 )
+
+Return("sonicLib", "espeakLib")

source/synthDrivers/_espeak.py

@@ -11,6 +11,7 @@
 from ctypes import *  # noqa: F403
 import config
 import globalVars
+import NVDAHelper
 from logHandler import log
 import os
 
@@ -356,7 +357,7 @@ def initialize(indexCallback=None):
 		the number of the index or C{None} when speech stops.
 	"""
 	global espeakDLL, bgThread, bgQueue, player, onIndexReached
-	espeakDLL = cdll.LoadLibrary(os.path.join(globalVars.appDir, "synthDrivers", "espeak.dll"))
+	espeakDLL = cdll.LoadLibrary(os.path.join(NVDAHelper.coreArchLibPath, "espeak.dll"))
 	espeakDLL.espeak_Info.restype = c_char_p  # noqa: F405
 	espeakDLL.espeak_Synth.errcheck = espeak_errcheck
 	espeakDLL.espeak_SetVoiceByName.errcheck = espeak_errcheck

source/synthDrivers/_sonic.py

@@ -6,7 +6,7 @@
 from ctypes import CDLL, POINTER, Array, c_float, c_int, c_short, c_ubyte, c_void_p, cdll
 import os
 from typing import TYPE_CHECKING
-import globalVars
+import NVDAHelper
 from logHandler import log
 
 if TYPE_CHECKING:
@@ -29,13 +29,12 @@ class SonicStreamP(c_void_p):
 
 def initialize():
 	"""Initialize the Sonic DLL.
-	The sonic.dll file should be in the synthDrivers directory.
 	This can be called more than once."""
 	global sonicLib
 	if sonicLib:
 		return
 	log.debug("Initializing Sonic library")
-	sonicLib = cdll.LoadLibrary(os.path.join(globalVars.appDir, "synthDrivers", "sonic.dll"))
+	sonicLib = cdll.LoadLibrary(os.path.join(NVDAHelper.coreArchLibPath, "sonic.dll"))
 	sonicLib.sonicCreateStream.restype = SonicStreamP
 	sonicLib.sonicCreateStream.argtypes = [c_int, c_int]
 	sonicLib.sonicDestroyStream.restype = None