Skip to content

Commit 2979bb1

Browse files
danielbairdanielbair
authored
Merge pull request #31 from danielbair/master
Update to aeneas 1.7.3
2 parents f38a56e + 11c5ce2 commit 2979bb1

File tree

9 files changed

+32
-26
lines changed

9 files changed

+32
-26
lines changed

‎MS_Windows_Installer/Aeneas_Installer.iss‎

100755100644
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
33

44
#define MyAppName "aeneas tools"
5-
#define MyAppVersion "1.7.2"
5+
#define MyAppVersion "1.7.3"
66
#define MyAppPublisher "Daniel Bair"
77
#define MyAppURL "http://www.danielbair.com/"
88
#define MyAppInstallDir "C:\aeneas-install"
9-
#define MyAppFileName "aeneas-windows-setup-1.7.2"
9+
#define MyAppFileName "aeneas-windows-setup-1.7.3"
1010

1111
[Setup]
1212
; NOTE: The value of AppId uniquely identifies this application.
@@ -37,7 +37,7 @@ ChangesEnvironment=yes
3737
;SignTool=mysigntool
3838

3939
[Messages]
40-
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.
40+
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.
4141

4242
[Languages]
4343
Name: "english"; MessagesFile: "compiler:Default.isl"
@@ -55,10 +55,10 @@ Name: "python"; Description: "Install Python 2.7.13"; ExtraDiskSpaceRequired: 10
5555
Name: "bs4"; Description: "Install Python Module BeautifulSoup4 4.5.1"; ExtraDiskSpaceRequired: 3400000; Types: full compact custom; Flags: fixed
5656
Name: "lxml"; Description: "Install Python Module lxml 3.6.0"; ExtraDiskSpaceRequired: 0; Types: full compact custom; Flags: fixed
5757
Name: "numpy"; Description: "Install Python Module NumPy 1.11.2"; ExtraDiskSpaceRequired: 0; Types: full compact custom; Flags: fixed
58-
Name: "aeneas"; Description: "Install Python Module aeneas 1.7.2.0"; ExtraDiskSpaceRequired: 0; Types: full compact custom; Flags: fixed
58+
Name: "aeneas"; Description: "Install Python Module aeneas 1.7.3.0"; ExtraDiskSpaceRequired: 0; Types: full compact custom; Flags: fixed
5959

6060
[Files]
61-
Source: "aeneas-1.7.2.0-cp27-cp27m-win32.whl"; DestDir: "{app}"; Components: aeneas; Flags: ignoreversion
61+
Source: "aeneas-1.7.3.0-cp27-cp27m-win32.whl"; DestDir: "{app}"; Components: aeneas; Flags: ignoreversion
6262
Source: "aeneas_check_setup.bat"; DestDir: "{app}"; Components: aeneas; Flags: ignoreversion
6363
Source: "beautifulsoup4-4.5.1-py2-none-any.whl"; DestDir: "{app}"; Components: bs4; Flags: ignoreversion
6464
Source: "install_packages.bat"; DestDir: "{app}"; Components: aeneas; Flags: ignoreversion
@@ -78,7 +78,7 @@ Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
7878
Filename: "{app}\setup_ffmpeg-3.2.exe"; Parameters: "/SILENT"; Description: "Install FFmpeg 3.2"; Components: ffmpeg; Flags: shellexec waituntilterminated
7979
Filename: "{app}\setup_espeak-1.48.04.exe"; Parameters: "/SILENT"; Description: "Install eSpeak 1.48.04"; Components: espeak; Flags: shellexec waituntilterminated
8080
Filename: "{app}\python-2.7.13.msi"; Parameters: "/PASSIVE"; Description: "Install Python 2.7.13"; Components: python; Flags: shellexec waituntilterminated
81-
Filename: "{app}\install_packages.bat"; Description: "Install Aeneas 1.7.2 and dependencies"; Components: aeneas; Flags: shellexec waituntilterminated
81+
Filename: "{app}\install_packages.bat"; Description: "Install Aeneas 1.7.3 and dependencies"; Components: aeneas; Flags: shellexec waituntilterminated
8282
Filename: "{app}\aeneas_check_setup.bat"; Description: "Check Aeneas Setup"; Components: aeneas; Flags: shellexec waituntilterminated
8383

8484
[UninstallRun]

‎MS_Windows_Installer/FFmpeg_Installer.iss‎

100755100644
File mode changed.

‎MS_Windows_Installer/build_packages.bat‎

100755100644
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,14 +75,14 @@ C:\Python27\python -m pip install -U numpy-1.11.2-cp27-none-win32.whl
7575
C:\Python27\python -m pip install -U lxml-3.6.0-cp27-none-win32.whl
7676
C:\Python27\python -m pip install -U beautifulsoup4-4.5.1-py2-none-any.whl
7777

78-
C:\Python27\python -m pip download aeneas==1.7.2
78+
C:\Python27\python -m pip download aeneas==1.7.3
7979

80-
RMDIR /S /Q aeneas-1.7.2.0
81-
"%PF32%\7-Zip\7z.exe" e aeneas-1.7.2.0.tar.gz -aoa
82-
"%PF32%\7-Zip\7z.exe" x aeneas-1.7.2.0.tar -aoa
80+
RMDIR /S /Q aeneas-1.7.3.0
81+
"%PF32%\7-Zip\7z.exe" e aeneas-1.7.3.0.tar.gz -aoa
82+
"%PF32%\7-Zip\7z.exe" x aeneas-1.7.3.0.tar -aoa
8383
echo copying espeak.lib to C:\Python27\libs\
8484
copy /b/v/y espeak.lib C:\Python27\libs\
85-
cd aeneas-1.7.2.0
85+
cd aeneas-1.7.3.0
8686
REM copy ..\aeneas-patches\setupmeta.py .
8787
REM C:\Python27\python.exe -m patch -v -p 1 --debug ..\aeneas-patches\1.7.0.0-windows.diff
8888
C:\Python27\python setup.py build_ext --inplace

‎MS_Windows_Installer/build_setup.bat‎

100755100644
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ if %ERRORLEVEL%==0 goto exeCurl
1010

1111
IF NOT EXIST "%cd%\7z1602.exe" (
1212
echo Downloading 7-zip...
13-
%CURL% "http://www.7-zip.org/a/7z1602.exe" -o "%cd%\7z1602.exe"
13+
%CURL% "https://www.7-zip.org/a/7z1801.exe" -o "%cd%\7zSetup.exe"
1414
)
15-
IF EXIST "%cd%\7z1602.exe" (
15+
IF EXIST "%cd%\7zSetup.exe" (
1616
echo Installing 7-zip...
17-
7z1602.exe
17+
7zSetup.exe
1818
) ELSE (
1919
echo Could not find 7-zip...
2020
START http://www.7-zip.org/

‎MS_Windows_Installer/install_packages.bat‎

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@ C:\Python27\python -m pip install -U beautifulsoup4-4.5.1-py2-none-any.whl
4444
C:\Python27\python -m pip install -U lxml-3.6.0-cp27-none-win32.whl
4545
C:\Python27\python -m pip install -U numpy-1.11.2-cp27-none-win32.whl
4646
C:\Python27\python -m pip uninstall -y aeneas
47-
C:\Python27\python -m pip install aeneas-1.7.2.0-cp27-cp27m-win32.whl
47+
C:\Python27\python -m pip install aeneas-1.7.3.0-cp27-cp27m-win32.whl
4848

‎Mac_OSX_Installer/Aeneas_Installer.pkgproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,12 @@
130130
<key>LOCATION</key>
131131
<integer>0</integer>
132132
<key>NAME</key>
133-
<string>aeneas-1.7.2</string>
133+
<string>aeneas-1.7.3</string>
134134
</dict>
135135
<key>PATH</key>
136136
<dict>
137137
<key>PATH</key>
138-
<string>aeneas-1.7.2.pkg</string>
138+
<string>aeneas-1.7.3.pkg</string>
139139
<key>PATH_TYPE</key>
140140
<integer>1</integer>
141141
</dict>
@@ -850,7 +850,7 @@
850850
</dict>
851851
</array>
852852
<key>NAME</key>
853-
<string>aeneas-mac-setup-1.7.2</string>
853+
<string>aeneas-mac-setup-1.7.3</string>
854854
</dict>
855855
</dict>
856856
<key>TYPE</key>

‎Mac_OSX_Installer/INFO.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
This will install aeneas 1.7.2 on your computer.
1+
This will install aeneas 1.7.3 on your computer.
22

33
aeneas is a Python library and a set of tools for automated audio and text synchronization.
44

‎Mac_OSX_Installer/build_dmg.sh‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,16 @@ export PATH=/usr/local/bin:/usr/local/sbin:$PATH
44

55
CURDIR=`dirname $0`
66
cd $CURDIR
7+
VERSION="1.7.3"
78

89
brew install danielbair/tap/create-dmg
910

11+
productsign --timestamp=none --sign "Developer ID Installer" aeneas-mac-setup-$VERSION.pkg aeneas-mac-setup-$VERSION-signed.pkg
12+
cp -v aeneas-mac-setup-$VERSION.pkg aeneas-mac-setup-$VERSION-unsigned.pkg
13+
cp -v aeneas-mac-setup-$VERSION-signed.pkg aeneas-mac-setup-$VERSION.pkg
14+
1015
mkdir -p aeneas-mac-uninstall-scripts
1116
cp _*.sh aeneas-mac-uninstall-scripts
12-
VERSION="1.7.2"
1317
DMGFILE="Aeneas_Tools-$VERSION.dmg"
1418
BUILDTMP="$(mktemp -d -t createdmg.tmp.XXXXXXXX)"
1519
rm -f "$DMGFILE"
@@ -23,3 +27,5 @@ rm -rf aeneas-mac-uninstall-scripts
2327
rm -rf "$BUILDTMP"
2428
open -R "$DMGFILE"
2529
open "$DMGFILE"
30+
31+
cp -v Aeneas_Tools-$VERSION.dmg aeneas-mac-setup-$VERSION.dmg

‎Mac_OSX_Installer/build_packages.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ if [ ! -f "espeak-1.48.04_1.pkg" ]; then
4040
else
4141
echo "Found espeak-1.48.04_1.pkg"
4242
fi
43-
if [ ! -f "aeneas-1.7.2.pkg" ]; then
43+
if [ ! -f "aeneas-1.7.3.pkg" ]; then
4444
echo ""
4545
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
4646
brew pkg --identifier-prefix org.python.python --with-deps --without-kegs --postinstall-script ./install_aeneas.sh aeneas
47-
mv -v aeneas-1.7.2.pkg aeneas-full-1.7.2.pkg
47+
mv -v aeneas-1.7.3.pkg aeneas-full-1.7.3.pkg
4848
brew pkg --identifier-prefix org.python.python --without-kegs --postinstall-script ./install_aeneas.sh danielbair/tap/aeneas
4949
[ $? = 0 ] || exit 1
5050
else
51-
echo "Found aeneas-1.7.2.pkg"
51+
echo "Found aeneas-1.7.3.pkg"
5252
fi
5353
if [ ! -f "numpy-1.11.2.pkg" ]; then
5454
echo ""
@@ -85,9 +85,9 @@ cd $CURDIR
8585

8686
packagesbuild -v Aeneas_Installer.pkgproj
8787
[ $? = 0 ] || exit 1
88-
if [ -f "aeneas-mac-setup-1.7.2.pkg" ]; then
89-
echo -e "Resulting Installer program filename is:\n$(pwd)/aeneas-mac-setup-1.7.2.pkg"
88+
if [ -f "aeneas-mac-setup-1.7.3.pkg" ]; then
89+
echo -e "Resulting Installer program filename is:\n$(pwd)/aeneas-mac-setup-1.7.3.pkg"
9090
fi
9191

92-
#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
92+
#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
9393

0 commit comments

Comments
 (0)