From 3ecf571dd33d4a77bd9472e29e9068b9c03b1e86 Mon Sep 17 00:00:00 2001 From: Daniel Bair Date: Thu, 9 Mar 2017 15:52:43 +0700 Subject: [PATCH] Update aeneas to v1.7.2 --- MS_Windows_Installer/Aeneas_Installer.iss | 12 ++++++------ MS_Windows_Installer/build_packages.bat | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/MS_Windows_Installer/Aeneas_Installer.iss b/MS_Windows_Installer/Aeneas_Installer.iss index fd6d7fb..b923efc 100755 --- a/MS_Windows_Installer/Aeneas_Installer.iss +++ b/MS_Windows_Installer/Aeneas_Installer.iss @@ -2,11 +2,11 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "aeneas tools" -#define MyAppVersion "1.7.1" +#define MyAppVersion "1.7.2" #define MyAppPublisher "Daniel Bair" #define MyAppURL "http://www.danielbair.com/" #define MyAppInstallDir "C:\aeneas-install" -#define MyAppFileName "aeneas-windows-setup-1.7.1" +#define MyAppFileName "aeneas-windows-setup-1.7.2" [Setup] ; NOTE: The value of AppId uniquely identifies this application. @@ -37,7 +37,7 @@ ChangesEnvironment=yes ;SignTool=mysigntool [Messages] -WelcomeLabel2=This will install aeneas 1.7.1 on your computer.%n%naeneas is a Python library and a set of tools for automated audio and text synchronization.%n%nIn addition to aeneas, the following independent programs necessary for running aeneas are contained in this installer:%n1. FFmpeg%n2. eSpeak%n3. Python%n%nIt is recommended that you close all other applications before continuing. +WelcomeLabel2=This will install aeneas 1.7.2 on your computer.%n%naeneas is a Python library and a set of tools for automated audio and text synchronization.%n%nIn addition to aeneas, the following independent programs necessary for running aeneas are contained in this installer:%n1. FFmpeg%n2. eSpeak%n3. Python%n%nIt is recommended that you close all other applications before continuing. [Languages] Name: "english"; MessagesFile: "compiler:Default.isl" @@ -55,10 +55,10 @@ Name: "python"; Description: "Install Python 2.7.13"; ExtraDiskSpaceRequired: 10 Name: "bs4"; Description: "Install Python Module BeautifulSoup4 4.5.1"; ExtraDiskSpaceRequired: 3400000; Types: full compact custom; Flags: fixed Name: "lxml"; Description: "Install Python Module lxml 3.6.0"; ExtraDiskSpaceRequired: 0; Types: full compact custom; Flags: fixed Name: "numpy"; Description: "Install Python Module NumPy 1.11.2"; ExtraDiskSpaceRequired: 0; Types: full compact custom; Flags: fixed -Name: "aeneas"; Description: "Install Python Module aeneas 1.7.1.0"; ExtraDiskSpaceRequired: 0; Types: full compact custom; Flags: fixed +Name: "aeneas"; Description: "Install Python Module aeneas 1.7.2.0"; ExtraDiskSpaceRequired: 0; Types: full compact custom; Flags: fixed [Files] -Source: "aeneas-1.7.1.0-cp27-cp27m-win32.whl"; DestDir: "{app}"; Components: aeneas; Flags: ignoreversion +Source: "aeneas-1.7.2.0-cp27-cp27m-win32.whl"; DestDir: "{app}"; Components: aeneas; Flags: ignoreversion Source: "aeneas_check_setup.bat"; DestDir: "{app}"; Components: aeneas; Flags: ignoreversion Source: "beautifulsoup4-4.5.1-py2-none-any.whl"; DestDir: "{app}"; Components: bs4; Flags: ignoreversion Source: "install_packages.bat"; DestDir: "{app}"; Components: aeneas; Flags: ignoreversion @@ -78,7 +78,7 @@ Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" Filename: "{app}\setup_ffmpeg-3.2.exe"; Parameters: "/SILENT"; Description: "Install FFmpeg 3.2"; Components: ffmpeg; Flags: shellexec waituntilterminated Filename: "{app}\setup_espeak-1.48.04.exe"; Parameters: "/SILENT"; Description: "Install eSpeak 1.48.04"; Components: espeak; Flags: shellexec waituntilterminated Filename: "{app}\python-2.7.13.msi"; Parameters: "/PASSIVE"; Description: "Install Python 2.7.13"; Components: python; Flags: shellexec waituntilterminated -Filename: "{app}\install_packages.bat"; Description: "Install Aeneas 1.7.1 and dependencies"; Components: aeneas; Flags: shellexec waituntilterminated +Filename: "{app}\install_packages.bat"; Description: "Install Aeneas 1.7.2 and dependencies"; Components: aeneas; Flags: shellexec waituntilterminated Filename: "{app}\aeneas_check_setup.bat"; Description: "Check Aeneas Setup"; Components: aeneas; Flags: shellexec waituntilterminated [UninstallRun] diff --git a/MS_Windows_Installer/build_packages.bat b/MS_Windows_Installer/build_packages.bat index a26cb6c..810611f 100755 --- a/MS_Windows_Installer/build_packages.bat +++ b/MS_Windows_Installer/build_packages.bat @@ -75,14 +75,14 @@ C:\Python27\python -m pip install -U numpy-1.11.2-cp27-none-win32.whl C:\Python27\python -m pip install -U lxml-3.6.0-cp27-none-win32.whl C:\Python27\python -m pip install -U beautifulsoup4-4.5.1-py2-none-any.whl -C:\Python27\python -m pip download aeneas==1.7.1 +C:\Python27\python -m pip download aeneas==1.7.2 -RMDIR /S /Q aeneas-1.7.1.0 -"%PF32%\7-Zip\7z.exe" e aeneas-1.7.1.0.tar.gz -aoa -"%PF32%\7-Zip\7z.exe" x aeneas-1.7.1.0.tar -aoa +RMDIR /S /Q aeneas-1.7.2.0 +"%PF32%\7-Zip\7z.exe" e aeneas-1.7.2.0.tar.gz -aoa +"%PF32%\7-Zip\7z.exe" x aeneas-1.7.2.0.tar -aoa echo copying espeak.lib to C:\Python27\libs\ copy /b/v/y espeak.lib C:\Python27\libs\ -cd aeneas-1.7.1.0 +cd aeneas-1.7.2.0 REM copy ..\aeneas-patches\setupmeta.py . REM C:\Python27\python.exe -m patch -v -p 1 --debug ..\aeneas-patches\1.7.0.0-windows.diff C:\Python27\python setup.py build_ext --inplace