installer: add a check for the binaries before compiling the installer, various cosmetic changes

git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@783 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
XhmikosR 2011-11-06 10:45:57 +00:00
parent 9ee3041007
commit e5075ad3de
2 changed files with 22 additions and 23 deletions

View File

@ -45,16 +45,15 @@
#define bindir "..\src\Bin\Release"
;#ifnexist "..\src\bin\Release\SubtitleEdit.exe"
; #error Compile Subtitle Edit first
;#endif
#ifnexist SourcePath + "..\src\bin\Release\SubtitleEdit.exe"
#error Compile Subtitle Edit first
#endif
#expr ParseVersion(bindir + "\SubtitleEdit.exe", VerMajor, VerMinor, VerBuild, VerRevision)
#define app_version str(VerMajor) + "." + str(VerMinor) + "." + str(VerBuild) + "." + str(VerRevision)
;#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 app_version str(VerMajor) + "." + str(VerMinor)
; The following app_version is for 3 digit releases, one of the two must be uncommented at a time
#define app_version str(VerMajor) + "." + str(VerMinor) + "." + str(VerBuild)
#define installer_build_date GetDateTimeString('mmm, d yyyy', '', '')
#define quick_launch "{userappdata}\Microsoft\Internet Explorer\Quick Launch"
@ -65,13 +64,13 @@ AppID=SubtitleEdit
AppCopyright={#app_copyright}
AppContact=http://www.nikse.dk/SubtitleEdit/
AppName=Subtitle Edit
AppVerName=Subtitle Edit {#simple_app_version}
AppVersion={#simple_app_version}
AppVerName=Subtitle Edit {#app_version}
AppVersion={#app_version}
AppPublisher=Nikse
AppPublisherURL=http://www.nikse.dk/SubtitleEdit/
AppSupportURL=http://www.nikse.dk/SubtitleEdit/
AppUpdatesURL=http://www.nikse.dk/SubtitleEdit/
UninstallDisplayName=Subtitle Edit {#simple_app_version}
UninstallDisplayName=Subtitle Edit {#app_version}
UninstallDisplayIcon={app}\SubtitleEdit.exe
DefaultDirName={pf}\Subtitle Edit
DefaultGroupName=Subtitle Edit
@ -79,10 +78,10 @@ VersionInfoCompany=Nikse
VersionInfoCopyright={#app_copyright}
VersionInfoDescription=Subtitle Edit Setup
VersionInfoProductName=Subtitle Edit
VersionInfoProductVersion={#simple_app_version}
VersionInfoProductTextVersion={#simple_app_version}
VersionInfoTextVersion={#simple_app_version}
VersionInfoVersion={#simple_app_version}
VersionInfoProductVersion={#app_version}
VersionInfoProductTextVersion={#app_version}
VersionInfoTextVersion={#app_version}
VersionInfoVersion={#app_version}
MinVersion=0,5.1
LicenseFile=..\src\gpl.txt
InfoAfterFile=..\src\Changelog.txt
@ -90,7 +89,7 @@ SetupIconFile=..\src\Icons\SE.ico
WizardImageFile=Icons\WizardImageFile.bmp
WizardSmallImageFile=Icons\WizardSmallImageFile.bmp
OutputDir=.
OutputBaseFilename=SubtitleEdit-{#simple_app_version}-setup
OutputBaseFilename=SubtitleEdit-{#app_version}-setup
AllowNoIcons=yes
Compression=lzma2/ultra
SolidCompression=yes
@ -130,7 +129,7 @@ Name: sv; MessagesFile: Languages\Swedish.isl
[Messages]
BeveledLabel=Subtitle Edit {#simple_app_version} by Nikse - Setup v{#installer_build_number} built on {#installer_build_date}
BeveledLabel=Subtitle Edit {#app_version} by Nikse - Setup v{#installer_build_number} built on {#installer_build_date}
SetupAppTitle=Setup - Subtitle Edit
SetupWindowTitle=Setup - Subtitle Edit
@ -141,7 +140,7 @@ Name: custom; Description: {cm:types_custom}; Flags: iscustom
[Components]
Name: main; Description: Subtitle Edit {#simple_app_version}; Types: default custom; Flags: fixed
Name: main; Description: Subtitle Edit {#app_version}; Types: default custom; Flags: fixed
#ifdef localize
Name: translations; Description: {cm:comp_translations}; Types: default custom; Flags: disablenouninstallwarning
#endif
@ -220,15 +219,15 @@ Source: ..\Dictionaries\swe_OCRFixReplaceList.xml; DestDir: {userappdata}\Subtit
[Icons]
Name: {group}\Subtitle Edit; Filename: {app}\SubtitleEdit.exe; WorkingDir: {app}; Comment: Subtitle Edit {#simple_app_version}; AppUserModelID: Nikse.SubtitleEdit; IconFilename: {app}\SubtitleEdit.exe; IconIndex: 0
Name: {group}\Subtitle Edit; Filename: {app}\SubtitleEdit.exe; WorkingDir: {app}; Comment: Subtitle Edit {#app_version}; AppUserModelID: Nikse.SubtitleEdit; IconFilename: {app}\SubtitleEdit.exe; IconIndex: 0
Name: {group}\Help and Support\Changelog; Filename: {app}\Changelog.txt; WorkingDir: {app}; Comment: {cm:sm_com_Changelog}
Name: {group}\Help and Support\Online Help; Filename: http://www.nikse.dk/SubtitleEdit/Help.aspx
Name: {group}\Help and Support\{cm:ProgramOnTheWeb,Subtitle Edit}; Filename: http://www.nikse.dk/SubtitleEdit/; Comment: {cm:ProgramOnTheWeb,Subtitle Edit}
Name: {group}\{cm:UninstallProgram,Subtitle Edit}; Filename: {uninstallexe}; Comment: {cm:UninstallProgram,Subtitle Edit}; WorkingDir: {app}; IconFilename: {app}\Icons\uninstall.ico
Name: {commondesktop}\Subtitle Edit; Filename: {app}\SubtitleEdit.exe; WorkingDir: {app}; Comment: Subtitle Edit {#simple_app_version}; AppUserModelID: Nikse.SubtitleEdit; IconFilename: {app}\SubtitleEdit.exe; IconIndex: 0; Tasks: desktopicon\common
Name: {userdesktop}\Subtitle Edit; Filename: {app}\SubtitleEdit.exe; WorkingDir: {app}; Comment: Subtitle Edit {#simple_app_version}; AppUserModelID: Nikse.SubtitleEdit; IconFilename: {app}\SubtitleEdit.exe; IconIndex: 0; Tasks: desktopicon\user
Name: {#quick_launch}\Subtitle Edit; Filename: {app}\SubtitleEdit.exe; WorkingDir: {app}; Comment: Subtitle Edit {#simple_app_version}; IconFilename: {app}\SubtitleEdit.exe; IconIndex: 0; Tasks: quicklaunchicon
Name: {commondesktop}\Subtitle Edit; Filename: {app}\SubtitleEdit.exe; WorkingDir: {app}; Comment: Subtitle Edit {#app_version}; AppUserModelID: Nikse.SubtitleEdit; IconFilename: {app}\SubtitleEdit.exe; IconIndex: 0; Tasks: desktopicon\common
Name: {userdesktop}\Subtitle Edit; Filename: {app}\SubtitleEdit.exe; WorkingDir: {app}; Comment: Subtitle Edit {#app_version}; AppUserModelID: Nikse.SubtitleEdit; IconFilename: {app}\SubtitleEdit.exe; IconIndex: 0; Tasks: desktopicon\user
Name: {#quick_launch}\Subtitle Edit; Filename: {app}\SubtitleEdit.exe; WorkingDir: {app}; Comment: Subtitle Edit {#app_version}; IconFilename: {app}\SubtitleEdit.exe; IconIndex: 0; Tasks: quicklaunchicon
[InstallDelete]

View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="SubtitleEdit"
processorArchitecture="*"
version="3.2.0.0"
version="3.2.3.0"
type="win32"
/>
<description>SubtitleEdit</description>