Update Windows support packages (#53)

* Update build scripts

* Updated to new MacPorts build environment
Also updated espeak to espeak-ng

* Update build_setup.sh
Check for custom user macports_sources.conf

* Created check_python.sh for master installer

* Created check_python.sh for master installer
Also improved build scripts.

* Create build directories

* Updated build_python_package.sh implementation
Also updated ffmpeg and espeak postinstall

* Updated build_espeak_package.sh

* Updated postinstall scripts

* Updated postinstall scripts

* Build script fixes

* Improved build system

* Update windows build scripts

* Update to 64bit eSpeak-ng FFmpeg and Python3.8

* Deleted log file

* Fix python paths

* Update sign_installer.sh

* Fix eSpeak NG paths and dll install location

* Fix build_packages.bat

* Updated to build 32bit and 64bit

* Fix build environment

* Fix build paths

* Build environment update and fixes

* Fixed new build system for win32

* Fix build scripts for win64

* Refactore build system for win64

* Update clean_up.bat

* Fix pip install path warnings

* Build win64 update

* Code cleanup

* Updated new build product names

* VisualStudio 2017 vcvars shortcuts

* Added code to copy necessary espeak-ng files for aeneas use

* Updated build_setup.bat

Python is downloaded and installed by build_packages.bat

* Updated build_setup.bat and build_espeak_package.bat

* Tweak espeak-ng install before building aeneas.

* Update to distinguish between 32-bit and 64-bit in Windows Apps installed list

Also renamed 64-bit install builder to MS_Windows_64-bit_Installer

* Tweak aeneas mac installer

* Add code signing for binaries

* Create sign_installer.sh

* Tweaks

* Revert "Tweaks"

This reverts commit f3cbc5b.

* Revert "Create sign_installer.sh"

This reverts commit 526e696.

* Revert "Add code signing for binaries"

This reverts commit f2a52fa.

* Update build_ffmpeg_package.sh

* Update for code signing binaries.

* Tweak aeneas mac installer

* Update to code signing binaries.

* Revert "Update to code signing binaries."

This reverts commit 896ae2a.

* Update to code sign binaries

* Update Readme.md

* Update ReadMe.md

* Update ReadMe.md

* Add entitlements.plist for code signing

* Fixed code signing for macOS 10.9

* Created resign_packages.sh and signing sub scripts

* Tweaked Mac build scripts

* Attempt to notarize package

* Update aeneas support packages to latest versions

* Updates for notarytool

* Update ReadMe.md

* Update for latest support packages

* Update ReadMe.md

* Update ReadMe.md

MS_Windows_Installer/MS_Windows_64-bit_Installer/Aeneas_Installer.iss

@@ -6,7 +6,7 @@
 #define MyAppPublisher "Daniel Bair"
 #define MyAppURL "https://github.com/sillsdev/aeneas-installer"
 #define MyAppInstallDir "C:\aeneas-install"
-#define MyAppFileName "aeneas-win64-setup-1.7.3.0_3"
+#define MyAppFileName "aeneas-win64-setup-1.7.3.0_4"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
@@ -45,24 +45,24 @@ WelcomeLabel2=This will install aeneas 1.7.3.0 on your computer.%n%naeneas is a
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Components]
-Name: "espeak"; Description: "Install eSpeak-NG 1.50"; ExtraDiskSpaceRequired: 11223040; Types: full custom
-Name: "ffmpeg"; Description: "Install FFmpeg 4.3"; ExtraDiskSpaceRequired: 111181824; Types: full custom
-Name: "python"; Description: "Install Python 3.8.5"; ExtraDiskSpaceRequired: 106450944; Types: full
-Name: "bs4"; Description: "Install Python Module BeautifulSoup4 4.9.1"; ExtraDiskSpaceRequired: 3400000; Types: full compact custom
-Name: "lxml"; Description: "Install Python Module lxml 4.5.2"; ExtraDiskSpaceRequired: 3548446; Types: full compact custom
-Name: "numpy"; Description: "Install Python Module NumPy 1.19.1"; ExtraDiskSpaceRequired: 12971083; Types: full compact custom
+Name: "espeak"; Description: "Install eSpeak-NG 1.51"; ExtraDiskSpaceRequired: 11223040; Types: full custom
+Name: "ffmpeg"; Description: "Install FFmpeg 6.0"; ExtraDiskSpaceRequired: 111181824; Types: full custom
+Name: "python"; Description: "Install Python 3.9.13"; ExtraDiskSpaceRequired: 106450944; Types: full
+Name: "bs4"; Description: "Install Python Module BeautifulSoup4 4.12.2"; ExtraDiskSpaceRequired: 3400000; Types: full compact custom
+Name: "lxml"; Description: "Install Python Module lxml 4.9.2"; ExtraDiskSpaceRequired: 3548446; Types: full compact custom
+Name: "numpy"; Description: "Install Python Module NumPy 1.25.0"; ExtraDiskSpaceRequired: 12971083; Types: full compact custom
 Name: "aeneas"; Description: "Install Python Module aeneas 1.7.3.0"; ExtraDiskSpaceRequired: 4885092; Types: full compact custom
 ; NOTE: Previous used "Flags: fixed" on each component
 
 [Files]
-Source: "python-wheels\aeneas-1.7.3.0-cp38-cp38-win_amd64.whl"; DestDir: "{app}"; Components: aeneas; Flags: ignoreversion
-Source: "python-wheels\numpy-1.19.1-cp38-cp38-win_amd64.whl"; DestDir: "{app}"; Components: numpy; Flags: ignoreversion
-Source: "python-wheels\lxml-4.5.2-cp38-cp38-win_amd64.whl"; DestDir: "{app}"; Components: lxml; Flags: ignoreversion
-Source: "python-wheels\beautifulsoup4-4.9.1-py3-none-any.whl"; DestDir: "{app}"; Components: bs4; Flags: ignoreversion
-Source: "python-wheels\soupsieve-2.0.1-py3-none-any.whl"; DestDir: "{app}"; Components: bs4; Flags: ignoreversion
-Source: "aeneas-win-installer-packages\python-3.8.5-amd64.exe"; DestDir: "{app}"; Components: python; Flags: ignoreversion
-Source: "aeneas-win-installer-packages\ffmpeg-4.3-win64-static.exe"; DestDir: "{app}"; Components: ffmpeg; Flags: ignoreversion
-Source: "aeneas-win-installer-packages\espeak-ng-1.50-x64.msi"; DestDir: "{app}"; Components: espeak; Flags: ignoreversion
+Source: "python-wheels\aeneas-1.7.3.0-cp39-cp39-win_amd64.whl"; DestDir: "{app}"; Components: aeneas; Flags: ignoreversion
+Source: "python-wheels\numpy-1.25.0-cp39-cp39-win_amd64.whl"; DestDir: "{app}"; Components: numpy; Flags: ignoreversion
+Source: "python-wheels\lxml-4.9.2-cp39-cp39-win_amd64.whl"; DestDir: "{app}"; Components: lxml; Flags: ignoreversion
+Source: "python-wheels\beautifulsoup4-4.12.2-py3-none-any.whl"; DestDir: "{app}"; Components: bs4; Flags: ignoreversion
+Source: "python-wheels\soupsieve-2.4.1-py3-none-any.whl"; DestDir: "{app}"; Components: bs4; Flags: ignoreversion
+Source: "aeneas-win-installer-packages\python-3.9.13-amd64.exe"; DestDir: "{app}"; Components: python; Flags: ignoreversion
+Source: "aeneas-win-installer-packages\ffmpeg-6.0-win64-static.exe"; DestDir: "{app}"; Components: ffmpeg; Flags: ignoreversion
+Source: "aeneas-win-installer-packages\espeak-ng-1.51-x64.msi"; DestDir: "{app}"; Components: espeak; Flags: ignoreversion
 Source: "copy_espeak_aeneas.bat"; DestDir: "{app}"; Components: aeneas; Flags: ignoreversion
 Source: "delete_espeak_aeneas.bat"; DestDir: "{app}"; Components: aeneas; Flags: ignoreversion
 Source: "aeneas_check_setup.bat"; DestDir: "{app}"; Components: aeneas; Flags: ignoreversion
@@ -72,32 +72,32 @@ Source: "aeneas_check_setup.bat"; DestDir: "{app}"; Components: aeneas; Flags: i
 Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
 
 [Run]
-Filename: "{sys}\MSIEXEC.EXE"; Parameters: "/PASSIVE /I {app}\espeak-ng-1.50-x64.msi"; StatusMsg: "Installing eSpeak-NG 1.50"; Components: espeak; Flags: shellexec waituntilterminated; AfterInstall: InstallerCopyFile('{commonpf64}\eSpeak NG\espeak-ng.exe','{commonpf64}\eSpeak NG\espeak.exe')
-Filename: "{app}\ffmpeg-4.3-win64-static.exe"; Parameters: "/SILENT /ALLUSERS"; StatusMsg: "Installing FFmpeg 4.3"; Components: ffmpeg; Flags: shellexec waituntilterminated
-Filename: "{app}\python-3.8.5-amd64.exe"; Parameters: "/PASSIVE InstallAllUsers=1 PrependPath=1 TargetDir=""{commonpf64}""\Python38"; StatusMsg: "Installing Python 3.8.5"; Components: python; Flags: shellexec waituntilterminated
-Filename: "{commonpf64}\Python38\Scripts\pip.exe"; Parameters: "install -U {app}\numpy-1.19.1-cp38-cp38-win_amd64.whl"; StatusMsg: "Installing NumPy 1.19.1"; Components: numpy; Flags: runhidden waituntilterminated
-Filename: "{commonpf64}\Python38\Scripts\pip.exe"; Parameters: "install -U {app}\lxml-4.5.2-cp38-cp38-win_amd64.whl"; StatusMsg: "Installing lxml 4.5.2"; Components: lxml; Flags: runhidden waituntilterminated
-Filename: "{commonpf64}\Python38\Scripts\pip.exe"; Parameters: "install -U {app}\soupsieve-2.0.1-py3-none-any.whl"; StatusMsg: "Installing SoupSieve 2.0.1"; Components: bs4; Flags: runhidden waituntilterminated
-Filename: "{commonpf64}\Python38\Scripts\pip.exe"; Parameters: "install -U {app}\beautifulsoup4-4.9.1-py3-none-any.whl"; StatusMsg: "Installing BeautifulSoup4 4.9.1"; Components: bs4; Flags: runhidden waituntilterminated
-Filename: "{commonpf64}\Python38\Scripts\pip.exe"; Parameters: "install -U {app}\aeneas-1.7.3.0-cp38-cp38-win_amd64.whl"; StatusMsg: "Installing Aeneas 1.7.3.0"; Components: aeneas; Flags: runhidden waituntilterminated; BeforeInstall: InstallerCopyFile('{commonpf64}\eSpeak NG\libespeak-ng.dll','{commonpf64}\Python38\Lib\site-packages\aeneas\cew')
+Filename: "{sys}\MSIEXEC.EXE"; Parameters: "/PASSIVE /I {app}\espeak-ng-1.51-x64.msi"; StatusMsg: "Installing eSpeak-NG 1.51"; Components: espeak; Flags: shellexec waituntilterminated; AfterInstall: InstallerCopyFile('{commonpf64}\eSpeak NG\espeak-ng.exe','{commonpf64}\eSpeak NG\espeak.exe')
+Filename: "{app}\ffmpeg-6.0-win64-static.exe"; Parameters: "/SILENT /ALLUSERS"; StatusMsg: "Installing FFmpeg 6.0"; Components: ffmpeg; Flags: shellexec waituntilterminated
+Filename: "{app}\python-3.9.13-amd64.exe"; Parameters: "/PASSIVE InstallAllUsers=1 PrependPath=1 TargetDir=""{commonpf64}""\Python39"; StatusMsg: "Installing Python 3.9.13"; Components: python; Flags: shellexec waituntilterminated
+Filename: "{commonpf64}\Python39\Scripts\pip.exe"; Parameters: "install -U {app}\numpy-1.25.0-cp39-cp39-win_amd64.whl"; StatusMsg: "Installing NumPy 1.25.0"; Components: numpy; Flags: runhidden waituntilterminated
+Filename: "{commonpf64}\Python39\Scripts\pip.exe"; Parameters: "install -U {app}\lxml-4.9.2-cp39-cp39-win_amd64.whl"; StatusMsg: "Installing lxml 4.9.2"; Components: lxml; Flags: runhidden waituntilterminated
+Filename: "{commonpf64}\Python39\Scripts\pip.exe"; Parameters: "install -U {app}\soupsieve-2.4.1-py3-none-any.whl"; StatusMsg: "Installing SoupSieve 2.4.1"; Components: bs4; Flags: runhidden waituntilterminated
+Filename: "{commonpf64}\Python39\Scripts\pip.exe"; Parameters: "install -U {app}\beautifulsoup4-4.12.2-py3-none-any.whl"; StatusMsg: "Installing BeautifulSoup4 4.12.2"; Components: bs4; Flags: runhidden waituntilterminated
+Filename: "{commonpf64}\Python39\Scripts\pip.exe"; Parameters: "install -U {app}\aeneas-1.7.3.0-cp39-cp39-win_amd64.whl"; StatusMsg: "Installing Aeneas 1.7.3.0"; Components: aeneas; Flags: runhidden waituntilterminated; BeforeInstall: InstallerCopyFile('{commonpf64}\eSpeak NG\libespeak-ng.dll','{commonpf64}\Python39\Lib\site-packages\aeneas\cew')
 Filename: "{app}\copy_espeak_aeneas.bat"; StatusMsg: "Copying necessary eSpeak NG files for aeneas use"; Components: aeneas; Flags: runhidden waituntilterminated
 Filename: "{app}\aeneas_check_setup.bat"; StatusMsg: "Running Aeneas_Check_Setup"; Components: aeneas; Flags: shellexec waituntilterminated
 
 [UninstallRun]
 Filename: "{app}\delete_espeak_aeneas.bat"; Components: aeneas; Flags: runhidden waituntilterminated
-Filename: "{commonpf64}\Python38\Scripts\pip.exe"; Parameters: "uninstall -y aeneas beautifulsoup4 soupsieve lxml numpy"; Components: aeneas; Flags: runhidden waituntilterminated
-Filename: "{app}\python-3.8.5-amd64.exe"; Parameters: "/PASSIVE /UNINSTALL "; Components: python; Flags: shellexec waituntilterminated; BeforeInstall: InstallerDeleteFile('{commonpf64}\Python38\Lib\site-packages\aeneas\cew\libespeak-ng.dll')
+Filename: "{commonpf64}\Python39\Scripts\pip.exe"; Parameters: "uninstall -y aeneas beautifulsoup4 soupsieve lxml numpy"; Components: aeneas; Flags: runhidden waituntilterminated
+Filename: "{app}\python-3.9.13-amd64.exe"; Parameters: "/PASSIVE /UNINSTALL "; Components: python; Flags: shellexec waituntilterminated; BeforeInstall: InstallerDeleteFile('{commonpf64}\Python39\Lib\site-packages\aeneas\cew\libespeak-ng.dll')
 Filename: "{commonpf64}\FFmpeg\unins000.exe"; Parameters: "/SILENT"; Components: ffmpeg; Flags: shellexec waituntilterminated
-Filename: "{sys}\MSIEXEC.EXE"; Parameters: "/PASSIVE /X {app}\espeak-ng-1.50-x64.msi"; Components: espeak; Flags: shellexec waituntilterminated; BeforeInstall: InstallerDeleteFile('{commonpf64}\eSpeak NG\espeak.exe')
+Filename: "{sys}\MSIEXEC.EXE"; Parameters: "/PASSIVE /X {app}\espeak-ng-1.51-x64.msi"; Components: espeak; Flags: shellexec waituntilterminated; BeforeInstall: InstallerDeleteFile('{commonpf64}\eSpeak NG\espeak.exe')
 
 [UninstallDelete]
 ;Type: filesandordirs; Name: "{commonpf64}\FFmpeg"; Components: ffmpeg
-;Type: filesandordirs; Name: "{commonpf64}\Python38"; Components: espeak
+;Type: filesandordirs; Name: "{commonpf64}\Python39"; Components: espeak
 ;Type: filesandordirs; Name: "{commonpf64}\eSpeak NG"; Components: espeak
 ;Type: filesandordirs; Name: "{app}";
 
 [Registry]
-Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: expandsz; ValueName: "Path"; ValueData: "{userappdata}\python\python38\Scripts;{olddata}"; Components: aeneas; Check: NeedsAddPath('{userappdata}\python\python38\Scripts')
+Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: expandsz; ValueName: "Path"; ValueData: "{userappdata}\python\Python39\Scripts;{olddata}"; Components: aeneas; Check: NeedsAddPath('{userappdata}\python\Python39\Scripts')
 Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: expandsz; ValueName: "Path"; ValueData: "{commonpf64}\eSpeak NG;{olddata}"; Components: espeak; Check: NeedsAddPath('{commonpf64}\eSpeak NG')
 
 [Code]

MS_Windows_Installer/MS_Windows_64-bit_Installer/Aeneas_Installer_TEMPLATE.iss

@@ -6,7 +6,7 @@
 #define MyAppPublisher "Daniel Bair"
 #define MyAppURL "https://github.com/sillsdev/aeneas-installer"
 #define MyAppInstallDir "C:\aeneas-install"
-#define MyAppFileName "aeneas-win64-setup-[AENEAS_VER]_3"
+#define MyAppFileName "aeneas-win64-setup-[AENEAS_VER]_4"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
@@ -74,30 +74,30 @@ Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
 [Run]
 Filename: "{sys}\MSIEXEC.EXE"; Parameters: "/PASSIVE /I {app}\[ESPEAK_FILE]"; StatusMsg: "Installing eSpeak-NG [ESPEAK_VER]"; Components: espeak; Flags: shellexec waituntilterminated; AfterInstall: InstallerCopyFile('{commonpf64}\eSpeak NG\espeak-ng.exe','{commonpf64}\eSpeak NG\espeak.exe')
 Filename: "{app}\[FFMPEG_FILE]"; Parameters: "/SILENT /ALLUSERS"; StatusMsg: "Installing FFmpeg [FFMPEG_VER]"; Components: ffmpeg; Flags: shellexec waituntilterminated
-Filename: "{app}\[PYTHON_FILE]"; Parameters: "/PASSIVE InstallAllUsers=1 PrependPath=1 TargetDir=""{commonpf64}""\Python38"; StatusMsg: "Installing Python [PYTHON_VER]"; Components: python; Flags: shellexec waituntilterminated
-Filename: "{commonpf64}\Python38\Scripts\pip.exe"; Parameters: "install -U {app}\[NUMPY_FILE]"; StatusMsg: "Installing NumPy [NUMPY_VER]"; Components: numpy; Flags: runhidden waituntilterminated
-Filename: "{commonpf64}\Python38\Scripts\pip.exe"; Parameters: "install -U {app}\[LXML_FILE]"; StatusMsg: "Installing lxml [LXML_VER]"; Components: lxml; Flags: runhidden waituntilterminated
-Filename: "{commonpf64}\Python38\Scripts\pip.exe"; Parameters: "install -U {app}\[SOUPSIEVE_FILE]"; StatusMsg: "Installing SoupSieve [SOUPSIEVE_VER]"; Components: bs4; Flags: runhidden waituntilterminated
-Filename: "{commonpf64}\Python38\Scripts\pip.exe"; Parameters: "install -U {app}\[BS4_FILE]"; StatusMsg: "Installing BeautifulSoup4 [BS4_VER]"; Components: bs4; Flags: runhidden waituntilterminated
-Filename: "{commonpf64}\Python38\Scripts\pip.exe"; Parameters: "install -U {app}\[AENEAS_FILE]"; StatusMsg: "Installing Aeneas [AENEAS_VER]"; Components: aeneas; Flags: runhidden waituntilterminated; BeforeInstall: InstallerCopyFile('{commonpf64}\eSpeak NG\libespeak-ng.dll','{commonpf64}\Python38\Lib\site-packages\aeneas\cew')
+Filename: "{app}\[PYTHON_FILE]"; Parameters: "/PASSIVE InstallAllUsers=1 PrependPath=1 TargetDir=""{commonpf64}""\Python39"; StatusMsg: "Installing Python [PYTHON_VER]"; Components: python; Flags: shellexec waituntilterminated
+Filename: "{commonpf64}\Python39\Scripts\pip.exe"; Parameters: "install -U {app}\[NUMPY_FILE]"; StatusMsg: "Installing NumPy [NUMPY_VER]"; Components: numpy; Flags: runhidden waituntilterminated
+Filename: "{commonpf64}\Python39\Scripts\pip.exe"; Parameters: "install -U {app}\[LXML_FILE]"; StatusMsg: "Installing lxml [LXML_VER]"; Components: lxml; Flags: runhidden waituntilterminated
+Filename: "{commonpf64}\Python39\Scripts\pip.exe"; Parameters: "install -U {app}\[SOUPSIEVE_FILE]"; StatusMsg: "Installing SoupSieve [SOUPSIEVE_VER]"; Components: bs4; Flags: runhidden waituntilterminated
+Filename: "{commonpf64}\Python39\Scripts\pip.exe"; Parameters: "install -U {app}\[BS4_FILE]"; StatusMsg: "Installing BeautifulSoup4 [BS4_VER]"; Components: bs4; Flags: runhidden waituntilterminated
+Filename: "{commonpf64}\Python39\Scripts\pip.exe"; Parameters: "install -U {app}\[AENEAS_FILE]"; StatusMsg: "Installing Aeneas [AENEAS_VER]"; Components: aeneas; Flags: runhidden waituntilterminated; BeforeInstall: InstallerCopyFile('{commonpf64}\eSpeak NG\libespeak-ng.dll','{commonpf64}\Python39\Lib\site-packages\aeneas\cew')
 Filename: "{app}\copy_espeak_aeneas.bat"; StatusMsg: "Copying necessary eSpeak NG files for aeneas use"; Components: aeneas; Flags: runhidden waituntilterminated
 Filename: "{app}\aeneas_check_setup.bat"; StatusMsg: "Running Aeneas_Check_Setup"; Components: aeneas; Flags: shellexec waituntilterminated
 
 [UninstallRun]
 Filename: "{app}\delete_espeak_aeneas.bat"; Components: aeneas; Flags: runhidden waituntilterminated
-Filename: "{commonpf64}\Python38\Scripts\pip.exe"; Parameters: "uninstall -y aeneas beautifulsoup4 soupsieve lxml numpy"; Components: aeneas; Flags: runhidden waituntilterminated
-Filename: "{app}\[PYTHON_FILE]"; Parameters: "/PASSIVE /UNINSTALL "; Components: python; Flags: shellexec waituntilterminated; BeforeInstall: InstallerDeleteFile('{commonpf64}\Python38\Lib\site-packages\aeneas\cew\libespeak-ng.dll')
+Filename: "{commonpf64}\Python39\Scripts\pip.exe"; Parameters: "uninstall -y aeneas beautifulsoup4 soupsieve lxml numpy"; Components: aeneas; Flags: runhidden waituntilterminated
+Filename: "{app}\[PYTHON_FILE]"; Parameters: "/PASSIVE /UNINSTALL "; Components: python; Flags: shellexec waituntilterminated; BeforeInstall: InstallerDeleteFile('{commonpf64}\Python39\Lib\site-packages\aeneas\cew\libespeak-ng.dll')
 Filename: "{commonpf64}\FFmpeg\unins000.exe"; Parameters: "/SILENT"; Components: ffmpeg; Flags: shellexec waituntilterminated
 Filename: "{sys}\MSIEXEC.EXE"; Parameters: "/PASSIVE /X {app}\[ESPEAK_FILE]"; Components: espeak; Flags: shellexec waituntilterminated; BeforeInstall: InstallerDeleteFile('{commonpf64}\eSpeak NG\espeak.exe')
 
 [UninstallDelete]
 ;Type: filesandordirs; Name: "{commonpf64}\FFmpeg"; Components: ffmpeg
-;Type: filesandordirs; Name: "{commonpf64}\Python38"; Components: espeak
+;Type: filesandordirs; Name: "{commonpf64}\Python39"; Components: espeak
 ;Type: filesandordirs; Name: "{commonpf64}\eSpeak NG"; Components: espeak
 ;Type: filesandordirs; Name: "{app}";
 
 [Registry]
-Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: expandsz; ValueName: "Path"; ValueData: "{userappdata}\python\python38\Scripts;{olddata}"; Components: aeneas; Check: NeedsAddPath('{userappdata}\python\python38\Scripts')
+Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: expandsz; ValueName: "Path"; ValueData: "{userappdata}\python\Python39\Scripts;{olddata}"; Components: aeneas; Check: NeedsAddPath('{userappdata}\python\Python39\Scripts')
 Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; ValueType: expandsz; ValueName: "Path"; ValueData: "{commonpf64}\eSpeak NG;{olddata}"; Components: espeak; Check: NeedsAddPath('{commonpf64}\eSpeak NG')
 
 [Code]

MS_Windows_Installer/MS_Windows_64-bit_Installer/FFmpeg_Installer.iss

@@ -2,11 +2,11 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "FFmpeg"
-#define MyAppVersion "4.3"
+#define MyAppVersion "6.0"
 #define MyAppPublisher "Daniel Bair"
 #define MyAppURL "https://github.com/sillsdev/aeneas-installer"
 #define MyAppExeName "ff-prompt.bat"
-#define MyAppFileName "ffmpeg-4.3-win64-static"
+#define MyAppFileName "ffmpeg-6.0-win64-static"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application.
@@ -29,7 +29,7 @@ DisableWelcomePage=no
 DefaultGroupName={#MyAppName}
 AllowNoIcons=no
 DisableProgramGroupPage=no
-LicenseFile={#MyAppFileName}\LICENSE.txt
+LicenseFile={#MyAppFileName}\LICENSE
 InfoBeforeFile={#MyAppFileName}\README.txt
 OutputDir=.\
 OutputBaseFilename={#MyAppFileName}

MS_Windows_Installer/MS_Windows_64-bit_Installer/ReadMe.md

@@ -4,7 +4,8 @@ This provides a simple installer for [Aeneas](https://github.com/readbeyond/aene
 2. Then open Command Prompt and _cd_ to _MS\_Windows\_Installer_  
 3. Next run `build_setup.bat` which will install the necessary applications for building.  
 4. Then run `build_packages.bat` which will then build all the individual packages.
-4. Finally run `build_installer.bat` which will then build the main installer.
+5. Finally run `build_installer.bat` which will then build the main installer.
 
 NOTE: This will build an installer for 64-bit Windows setups.
 
+

MS_Windows_Installer/MS_Windows_64-bit_Installer/aeneas_check_setup.bat

@@ -9,7 +9,8 @@ IF EXIST "C:\Program Files (x86)" GOTO WIN64PATH
   set PF32=C:\Program Files (x86)
   (call )
 :ENDIF
-set PATH=%PF64%\Python38\;%PF64%\Python38\Scripts;%PF64%\eSpeak NG;%PF64%\FFmpeg\bin;%PATH%
+set PATH=%PF64%\Python39\;%PF64%\Python39\Scripts;%PF64%\eSpeak NG;%PF64%\FFmpeg\bin;%PATH%
 set PYTHONIOENCODING=UTF-8
+set AENEAS_USE_ESPEAKNG=True
 python -m aeneas.diagnostics
 C:\Windows\System32\ping 127.0.0.1 -n 5 -w 1000 > NUL