Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-11-22 03:02:35 +01:00
Code Issues Projects Releases Wiki Activity

installer: minor internal changes

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@756 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
XhmikosR 2011-10-27 12:49:38 +00:00
parent edcac1e0e1
commit 1934523544
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build.bat
View File

@ -7,11 +7,11 @@ SET "SEVENZIP_PATH=%PROGRAMFILES%\7-Zip\7z.exe"
CD /D %~dp0
rem Check for the help switches
IF /I "%~1"=="help" GOTO SHOWHELP
IF /I "%~1"=="/help" GOTO SHOWHELP
IF /I "%~1"=="-help" GOTO SHOWHELP
IF /I "%~1"=="--help" GOTO SHOWHELP
IF /I "%~1"=="/?" GOTO SHOWHELP
IF /I "%~1" == "help" GOTO SHOWHELP
IF /I "%~1" == "/help" GOTO SHOWHELP
IF /I "%~1" == "-help" GOTO SHOWHELP
IF /I "%~1" == "--help" GOTO SHOWHELP
IF /I "%~1" == "/?" GOTO SHOWHELP
IF NOT DEFINED VS100COMNTOOLS (
ECHO Visual Studio 2010 wasn't found
@ -139,10 +139,10 @@ EXIT /B
:SubDetectInnoSetup
REM Detect if we are running on 64bit WIN and use Wow6432Node, and set the path
REM of Inno Setup accordingly
IF "%PROGRAMFILES(x86)%zzz"=="zzz" (
SET "U_=HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall"
) ELSE (
IF DEFINED PROGRAMFILES(x86) (
SET "U_=HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall"
) ELSE (
SET "U_=HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall"
)
FOR /F "delims=" %%a IN (

10
installer/Subtitle_Edit_installer.iss
View File

@ -44,9 +44,9 @@
#expr ParseVersion(bindir + "\SubtitleEdit.exe", VerMajor, VerMinor, VerBuild, VerRevision)
#define app_version str(VerMajor) + "." + str(VerMinor) + "." + str(VerBuild) + "." + str(VerRevision)
; the following simple_app_version is for 3 digit releases, one of the two must be uncommented at a time
#define simple_app_version str(VerMajor) + "." + str(VerMinor) + "." + str(VerBuild)
;#define simple_app_version str(VerMajor) + "." + str(VerMinor)
; The following simple_app_version is for 3 digit releases, one of the two must be uncommented at a time
#define simple_app_version str(VerMajor) + "." + str(VerMinor) + "." + str(VerBuild)
#define installer_build_date GetDateTimeString('mmm, d yyyy', '', '')
@ -302,10 +302,10 @@ Filename: {win}\Microsoft.NET\Framework\v2.0.50727\ngen.exe; Parameters: "uninst
// Global variables/constants and general functions
const installer_mutex_name = 'subtitle_edit_setup_mutex';
function IsModuleLoaded(modulename: AnsiString ): Boolean;
function IsModuleLoaded(modulename: AnsiString): Boolean;
external 'IsModuleLoaded@files:psvince.dll stdcall setuponly';
function IsModuleLoadedU(modulename: AnsiString ): Boolean;
function IsModuleLoadedU(modulename: AnsiString): Boolean;
external 'IsModuleLoaded@{app}\psvince.dll stdcall uninstallonly';
@ -447,7 +447,7 @@ begin
except
begin
if NOT WizardSilent() then
if SuppressibleMsgBox(ExpandConstant('{cm:msg_AskToDownNET}'), mbCriticalError, MB_YESNO OR MB_DEFBUTTON1, IDYES) = IDYES then begin
if SuppressibleMsgBox(ExpandConstant('{cm:msg_AskToDownNET}'), mbCriticalError, MB_YESNO OR MB_DEFBUTTON1, IDNO) = IDYES then begin
ShellExec('open','http://download.microsoft.com/download/5/6/7/567758a3-759e-473e-bf8f-52154438565a/dotnetfx.exe','','',SW_SHOWNORMAL,ewNoWait,ErrorCode);
Result := False;
end