Commit 45390018 authored by Sebastian Reichel's avatar Sebastian Reichel

Imported Upstream version 3.0.4

parent 31ba7248
*.App
*.[oadi]
*.ass
*.avi
*.bz2
*.cache
*.dep
*.dll
*.dmg
*.exe
*.gch
*.gz
*.idb
*.ilk
*.manifest
*.mkv
*.mo
*.ncb
*.obj
*.orig
*.patch
*.pch
*.pdb
*.sdf
*.sln
*.so
*.srt
*.suo
*.swp
*.ts
*.user
*.vsp
*.y4m
*.zip
*~
.lvimrc
.syntastic_cpp_config
BuildLog.htm
Debug
Makefile.inc
Release
Win32
acconf.h
acconf.h.in
aclocal.m4
aegisub/conf.sh
aegisub/desktop/aegisub.desktop
aegisub/libaegisub/libaegisub-3.0.so.3
aegisub/reporter/reporter-3.0
aegisub/src/aegisub
aegisub/src/aegisub-3.0
aegisub/src/libresrc/bitmap.cpp
aegisub/src/libresrc/bitmap.h
aegisub/src/libresrc/default_config.cpp
aegisub/src/libresrc/default_config.h
aegisub/src/libresrc/default_config_platform.json
aegisub/tools/common-respack
aegisub/tools/osx-bundle.sed
autom4te.cache
config.log
config.status
config_windows.h
configure
svn-revision.h
svn_revision
svnmove.txt
git_version.h
#define BUILD_GIT_VERSION_NUMBER 7127
#define BUILD_GIT_VERSION_STRING "3.0.3"
#define BUILD_GIT_VERSION_NUMBER 7130
#define BUILD_GIT_VERSION_STRING "3.0.4"
#define TAGGED_RELEASE 1
......@@ -97,7 +97,22 @@ Save::Save(const std::string& file, bool binary)
Save::~Save() {
delete fp;
#ifndef _WIN32
util::Rename(tmp_name, file_name);
#else
for (int i = 0; i < 10; ++i) {
try {
util::Rename(tmp_name, file_name);
return;
}
catch (agi::FileNotAccessibleError const&) {
// Retry up to ten times in case it's just locked by a poorly-written antivirus scanner
if (i == 9)
throw;
Sleep(100);
}
}
#endif
}
std::ofstream& Save::Get() {
......
......@@ -32,7 +32,7 @@
; Contact: mailto:nielsm@indvikleren.dk
;
#define VERSION "3.0.3"
#define VERSION "3.0.4"
[Setup]
AppName=Aegisub
......
......@@ -15,8 +15,8 @@ xcopy ..\src\x64\Microsoft.VC90.CRT\* aegisub-portable\Microsoft.VC90.CRT\ > NUL
xcopy config.json aegisub-portable\ > NUL
echo Creating SFX
del ..\output\aegisub-3.0.2-portable-64.exe
WinRAR a -sfx -s -m5 -ep1 -r -zportable-comment.txt -iimgside-logo.bmp -iiconicon.ico ..\output\aegisub-3.0.2-portable-64.exe aegisub-portable\
del ..\output\aegisub-3.0.4-portable-64.exe
WinRAR a -sfx -s -m5 -ep1 -r -zportable-comment.txt -iimgside-logo.bmp -iiconicon.ico ..\output\aegisub-3.0.4-portable-64.exe aegisub-portable\
echo Removing temp dir
rmdir /S /Q aegisub-portable > NUL
......
......@@ -19,8 +19,8 @@ xcopy ..\src\x86\Microsoft.VC90.CRT\* aegisub-portable\Microsoft.VC90.CRT\ > NUL
xcopy config.json aegisub-portable\ > NUL
echo Creating SFX
del ..\output\aegisub-3.0.2-portable.exe
WinRAR a -sfx -s -m5 -ep1 -r -zportable-comment.txt -iimgside-logo.bmp -iiconicon.ico ..\output\aegisub-3.0.2-portable.exe aegisub-portable\
del ..\output\aegisub-3.0.4-portable.exe
WinRAR a -sfx -s -m5 -ep1 -r -zportable-comment.txt -iimgside-logo.bmp -iiconicon.ico ..\output\aegisub-3.0.4-portable.exe aegisub-portable\
echo Removing temp dir
rmdir /S /Q aegisub-portable > NUL
......
Path=.\Aegisub portable
Title=Aegisub 3.0.2 Portable
Title=Aegisub 3.0.4 Portable
Text
{
<h1 style="font-family: Tahoma; font-size: 20px; text-align: center;">Aegisub 3.0.2 Portable</h1>
<h1 style="font-family: Tahoma; font-size: 20px; text-align: center;">Aegisub 3.0.4 Portable</h1>
<p style="font-family: Tahoma; font-size: 12px;">This archive contains a
"portable" version of Aegisub, suitable for running from USB pen drives or on
machines which you cannot install software on. To reduce the size several
......
This diff is collapsed.
......@@ -124,7 +124,7 @@
// Where the update checker should look for updates
#define UPDATE_CHECKER_SERVER "updates.aegisub.org"
#define UPDATE_CHECKER_BASE_URL "/3.0.3"
#define UPDATE_CHECKER_BASE_URL "/3.0.4"
///////////// NOT RECOMMENDED /////////////
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment