Merge pull request #31 from danielbair/master

Update to aeneas 1.7.3

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.2"
+#define MyAppVersion "1.7.3"
 #define MyAppPublisher "Daniel Bair"
 #define MyAppURL "http://www.danielbair.com/"
 #define MyAppInstallDir "C:\aeneas-install"
-#define MyAppFileName "aeneas-windows-setup-1.7.2"
+#define MyAppFileName "aeneas-windows-setup-1.7.3"
 
 [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.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.
+WelcomeLabel2=This will install aeneas 1.7.3 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.2.0"; ExtraDiskSpaceRequired: 0; Types: full compact custom; Flags: fixed
+Name: "aeneas"; Description: "Install Python Module aeneas 1.7.3.0"; ExtraDiskSpaceRequired: 0; Types: full compact custom; Flags: fixed
 
 [Files]
-Source: "aeneas-1.7.2.0-cp27-cp27m-win32.whl"; DestDir: "{app}"; Components: aeneas; Flags: ignoreversion
+Source: "aeneas-1.7.3.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.2 and dependencies"; Components: aeneas; Flags: shellexec waituntilterminated
+Filename: "{app}\install_packages.bat"; Description: "Install Aeneas 1.7.3 and dependencies"; Components: aeneas; Flags: shellexec waituntilterminated
 Filename: "{app}\aeneas_check_setup.bat"; Description: "Check Aeneas Setup"; Components: aeneas; Flags: shellexec waituntilterminated
 
 [UninstallRun]

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.2
+C:\Python27\python -m pip download aeneas==1.7.3
 
-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
+RMDIR /S /Q aeneas-1.7.3.0
+"%PF32%\7-Zip\7z.exe" e aeneas-1.7.3.0.tar.gz -aoa
+"%PF32%\7-Zip\7z.exe" x aeneas-1.7.3.0.tar -aoa
 echo copying espeak.lib to C:\Python27\libs\
 copy /b/v/y espeak.lib C:\Python27\libs\
-cd aeneas-1.7.2.0
+cd aeneas-1.7.3.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

MS_Windows_Installer/build_setup.bat

@@ -10,11 +10,11 @@ if %ERRORLEVEL%==0 goto exeCurl
 
 IF NOT EXIST "%cd%\7z1602.exe" (
   echo Downloading 7-zip... 
-  %CURL% "http://www.7-zip.org/a/7z1602.exe" -o "%cd%\7z1602.exe"
+  %CURL% "https://www.7-zip.org/a/7z1801.exe" -o "%cd%\7zSetup.exe"
 )
-IF EXIST "%cd%\7z1602.exe" (
+IF EXIST "%cd%\7zSetup.exe" (
   echo Installing 7-zip...
-  7z1602.exe
+  7zSetup.exe
 ) ELSE (
   echo Could not find 7-zip...
   START http://www.7-zip.org/

MS_Windows_Installer/install_packages.bat

@@ -44,5 +44,5 @@ C:\Python27\python -m pip install -U beautifulsoup4-4.5.1-py2-none-any.whl
 C:\Python27\python -m pip install -U lxml-3.6.0-cp27-none-win32.whl
 C:\Python27\python -m pip install -U numpy-1.11.2-cp27-none-win32.whl
 C:\Python27\python -m pip uninstall -y aeneas
-C:\Python27\python -m pip install aeneas-1.7.2.0-cp27-cp27m-win32.whl
+C:\Python27\python -m pip install aeneas-1.7.3.0-cp27-cp27m-win32.whl
 

Mac_OSX_Installer/Aeneas_Installer.pkgproj

@@ -130,12 +130,12 @@
 				<key>LOCATION</key>
 				<integer>0</integer>
 				<key>NAME</key>
-				<string>aeneas-1.7.2</string>
+				<string>aeneas-1.7.3</string>
 			</dict>
 			<key>PATH</key>
 			<dict>
 				<key>PATH</key>
-				<string>aeneas-1.7.2.pkg</string>
+				<string>aeneas-1.7.3.pkg</string>
 				<key>PATH_TYPE</key>
 				<integer>1</integer>
 			</dict>
@@ -850,7 +850,7 @@
 				</dict>
 			</array>
 			<key>NAME</key>
-			<string>aeneas-mac-setup-1.7.2</string>
+			<string>aeneas-mac-setup-1.7.3</string>
 		</dict>
 	</dict>
 	<key>TYPE</key>

Mac_OSX_Installer/INFO.txt

@@ -1,4 +1,4 @@
-This will install aeneas 1.7.2 on your computer.
+This will install aeneas 1.7.3 on your computer.
 
 aeneas is a Python library and a set of tools for automated audio and text synchronization.
 

Mac_OSX_Installer/build_dmg.sh

@@ -4,12 +4,16 @@ export PATH=/usr/local/bin:/usr/local/sbin:$PATH
 
 CURDIR=`dirname $0`
 cd $CURDIR
+VERSION="1.7.3"
 
 brew install danielbair/tap/create-dmg
 
+productsign --timestamp=none --sign "Developer ID Installer" aeneas-mac-setup-$VERSION.pkg aeneas-mac-setup-$VERSION-signed.pkg
+cp -v aeneas-mac-setup-$VERSION.pkg aeneas-mac-setup-$VERSION-unsigned.pkg
+cp -v aeneas-mac-setup-$VERSION-signed.pkg aeneas-mac-setup-$VERSION.pkg
+
 mkdir -p aeneas-mac-uninstall-scripts
 cp _*.sh aeneas-mac-uninstall-scripts
-VERSION="1.7.2"
 DMGFILE="Aeneas_Tools-$VERSION.dmg"
 BUILDTMP="$(mktemp -d -t createdmg.tmp.XXXXXXXX)"
 rm -f "$DMGFILE"
@@ -23,3 +27,5 @@ rm -rf aeneas-mac-uninstall-scripts
 rm -rf "$BUILDTMP"
 open -R "$DMGFILE"
 open "$DMGFILE"
+
+cp -v Aeneas_Tools-$VERSION.dmg aeneas-mac-setup-$VERSION.dmg

Mac_OSX_Installer/build_packages.sh

@@ -40,15 +40,15 @@ if [ ! -f "espeak-1.48.04_1.pkg" ]; then
 else
 	echo "Found espeak-1.48.04_1.pkg"
 fi
-if [ ! -f "aeneas-1.7.2.pkg" ]; then
+if [ ! -f "aeneas-1.7.3.pkg" ]; then
 	echo ""
 	sudo install_name_tool /usr/local/lib/python2.7/site-packages/aeneas/cew/cew.so -change /usr/local/opt/espeak/lib/libespeak.dylib /usr/local/lib/libespeak.dylib 
 	brew pkg --identifier-prefix org.python.python --with-deps --without-kegs --postinstall-script ./install_aeneas.sh aeneas
-	mv -v aeneas-1.7.2.pkg aeneas-full-1.7.2.pkg
+	mv -v aeneas-1.7.3.pkg aeneas-full-1.7.3.pkg
 	brew pkg --identifier-prefix org.python.python --without-kegs --postinstall-script ./install_aeneas.sh danielbair/tap/aeneas
 	[ $? = 0 ] || exit 1
 else
-	echo "Found aeneas-1.7.2.pkg"
+	echo "Found aeneas-1.7.3.pkg"
 fi
 if [ ! -f "numpy-1.11.2.pkg" ]; then
 	echo ""
@@ -85,9 +85,9 @@ cd $CURDIR
 
 packagesbuild -v Aeneas_Installer.pkgproj
 [ $? = 0 ] || exit 1
-if [ -f "aeneas-mac-setup-1.7.2.pkg" ]; then
-	echo -e "Resulting Installer program filename is:\n$(pwd)/aeneas-mac-setup-1.7.2.pkg"
+if [ -f "aeneas-mac-setup-1.7.3.pkg" ]; then
+	echo -e "Resulting Installer program filename is:\n$(pwd)/aeneas-mac-setup-1.7.3.pkg"
 fi
 
-#productsign --timestamp=none --sign "Developer ID Installer" ~/build/10.7/aeneas-mac-setup-1.7.2.pkg ~/build/10.7/aeneas-mac-setup-1.7.2_signed.pkg
+#productsign --timestamp=none --sign "Developer ID Installer" ~/build/10.7/aeneas-mac-setup-1.7.3.pkg ~/build/10.7/aeneas-mac-setup-1.7.3_signed.pkg