From b6dab6f9bc9c39432bdb872407528331d0f373a0 Mon Sep 17 00:00:00 2001 From: Thomas Goyne Date: Fri, 6 Apr 2012 01:55:34 +0000 Subject: [PATCH] Add 64-bit installer Originally committed to SVN as r6665. --- aegisub/packages/win_installer/aegisub3.iss | 15 ++- .../win_installer/fragment_associations.iss | 110 +++++++++--------- ...ment_codecs.iss => fragment_codecs_32.iss} | 0 .../win_installer/fragment_codecs_64.iss | 47 ++++++++ .../win_installer/fragment_mainprogram.iss | 14 +-- .../win_installer/fragment_runtimes.iss | 10 +- .../win_installer/fragment_setupbase.iss | 6 +- 7 files changed, 131 insertions(+), 71 deletions(-) rename aegisub/packages/win_installer/{fragment_codecs.iss => fragment_codecs_32.iss} (100%) create mode 100644 aegisub/packages/win_installer/fragment_codecs_64.iss diff --git a/aegisub/packages/win_installer/aegisub3.iss b/aegisub/packages/win_installer/aegisub3.iss index 1d90907dd..428a3c467 100644 --- a/aegisub/packages/win_installer/aegisub3.iss +++ b/aegisub/packages/win_installer/aegisub3.iss @@ -32,7 +32,9 @@ ; Contact: mailto:nielsm@indvikleren.dk ; -#define SETUP_TYPE "setup" +#ifndef ARCH +#define ARCH 32 +#endif #include "fragment_setupbase.iss" @@ -40,12 +42,19 @@ AppID={{24BC8B57-716C-444F-B46B-A3349B9164C5} DefaultDirName={pf}\Aegisub PrivilegesRequired=poweruser - +#ifdef ARCH64 +ArchitecturesInstallIn64BitMode=x64 +ArchitecturesAllowed=x64 +#endif #include "fragment_mainprogram.iss" #include "fragment_associations.iss" #include "fragment_runtimes.iss" -#include "fragment_codecs.iss" +#ifdef ARCH64 +#include "fragment_codecs_64.iss" +#else +#include "fragment_codecs_32.iss" +#endif #include "fragment_automation.iss" #include "fragment_translations.iss" #include "fragment_spelling.iss" diff --git a/aegisub/packages/win_installer/fragment_associations.iss b/aegisub/packages/win_installer/fragment_associations.iss index 16d153101..a306b2b97 100644 --- a/aegisub/packages/win_installer/fragment_associations.iss +++ b/aegisub/packages/win_installer/fragment_associations.iss @@ -39,114 +39,114 @@ DestDir: {commontemplates}; Source: template.ass; DestName: Aegisub.ass; Compone [Registry] ; File type registration ; Application registration for Open With dialogue -Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub32.exe"; ValueType: none; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub32.exe"; ValueType: string; ValueName: "FriendlyAppName"; ValueData: "@{app}\aegisub32.exe,-10000"; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub32.exe\shell"; ValueType: none; Flags: uninsdeletekey -Root: HKLM; SubKey: "SOFTWARE\Classes\Applications\aegisub32.exe\shell\open"; ValueType: none; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub32.exe\shell\open"; ValueType: string; ValueName: "FriendlyAppName"; ValueData: "@{app}\aegisub32.exe,-10000"; Flags: uninsdeletekey -Root: HKLM; SubKey: "SOFTWARE\Classes\Applications\aegisub32.exe\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\aegisub32.exe"" ""%1"""; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub32.exe\SupportedTypes"; ValueType: none; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub32.exe\SupportedTypes"; ValueType: string; ValueName: ".ass"; ValueData: ""; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub32.exe\SupportedTypes"; ValueType: string; ValueName: ".ssa"; ValueData: ""; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub32.exe\SupportedTypes"; ValueType: string; ValueName: ".srt"; ValueData: ""; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub32.exe\SupportedTypes"; ValueType: string; ValueName: ".sub"; ValueData: ""; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub32.exe\SupportedTypes"; ValueType: string; ValueName: ".ttxt"; ValueData: ""; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub32.exe\SupportedTypes"; ValueType: string; ValueName: ".txt"; ValueData: ""; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub32.exe\SupportedTypes"; ValueType: string; ValueName: ".mkv"; ValueData: ""; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub32.exe\SupportedTypes"; ValueType: string; ValueName: ".mka"; ValueData: ""; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub32.exe\SupportedTypes"; ValueType: string; ValueName: ".mks"; ValueData: ""; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub32.exe\SupportedTypes"; ValueType: string; ValueName: ".avi"; ValueData: ""; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub32.exe\SupportedTypes"; ValueType: string; ValueName: ".mp3"; ValueData: ""; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub32.exe\SupportedTypes"; ValueType: string; ValueName: ".mp4"; ValueData: ""; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub32.exe\SupportedTypes"; ValueType: string; ValueName: ".aac"; ValueData: ""; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub32.exe\SupportedTypes"; ValueType: string; ValueName: ".m4a"; ValueData: ""; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub32.exe\SupportedTypes"; ValueType: string; ValueName: ".wav"; ValueData: ""; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub32.exe\SupportedTypes"; ValueType: string; ValueName: ".ogg"; ValueData: ""; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub32.exe\SupportedTypes"; ValueType: string; ValueName: ".avs"; ValueData: ""; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub{#ARCH}.exe"; ValueType: none; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub{#ARCH}.exe"; ValueType: string; ValueName: "FriendlyAppName"; ValueData: "@{app}\aegisub{#ARCH}.exe,-10000"; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub{#ARCH}.exe\shell"; ValueType: none; Flags: uninsdeletekey +Root: HKLM; SubKey: "SOFTWARE\Classes\Applications\aegisub{#ARCH}.exe\shell\open"; ValueType: none; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub{#ARCH}.exe\shell\open"; ValueType: string; ValueName: "FriendlyAppName"; ValueData: "@{app}\aegisub{#ARCH}.exe,-10000"; Flags: uninsdeletekey +Root: HKLM; SubKey: "SOFTWARE\Classes\Applications\aegisub{#ARCH}.exe\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\aegisub{#ARCH}.exe"" ""%1"""; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub{#ARCH}.exe\SupportedTypes"; ValueType: none; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub{#ARCH}.exe\SupportedTypes"; ValueType: string; ValueName: ".ass"; ValueData: ""; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub{#ARCH}.exe\SupportedTypes"; ValueType: string; ValueName: ".ssa"; ValueData: ""; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub{#ARCH}.exe\SupportedTypes"; ValueType: string; ValueName: ".srt"; ValueData: ""; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub{#ARCH}.exe\SupportedTypes"; ValueType: string; ValueName: ".sub"; ValueData: ""; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub{#ARCH}.exe\SupportedTypes"; ValueType: string; ValueName: ".ttxt"; ValueData: ""; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub{#ARCH}.exe\SupportedTypes"; ValueType: string; ValueName: ".txt"; ValueData: ""; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub{#ARCH}.exe\SupportedTypes"; ValueType: string; ValueName: ".mkv"; ValueData: ""; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub{#ARCH}.exe\SupportedTypes"; ValueType: string; ValueName: ".mka"; ValueData: ""; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub{#ARCH}.exe\SupportedTypes"; ValueType: string; ValueName: ".mks"; ValueData: ""; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub{#ARCH}.exe\SupportedTypes"; ValueType: string; ValueName: ".avi"; ValueData: ""; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub{#ARCH}.exe\SupportedTypes"; ValueType: string; ValueName: ".mp3"; ValueData: ""; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub{#ARCH}.exe\SupportedTypes"; ValueType: string; ValueName: ".mp4"; ValueData: ""; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub{#ARCH}.exe\SupportedTypes"; ValueType: string; ValueName: ".aac"; ValueData: ""; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub{#ARCH}.exe\SupportedTypes"; ValueType: string; ValueName: ".m4a"; ValueData: ""; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub{#ARCH}.exe\SupportedTypes"; ValueType: string; ValueName: ".wav"; ValueData: ""; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub{#ARCH}.exe\SupportedTypes"; ValueType: string; ValueName: ".ogg"; ValueData: ""; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\aegisub{#ARCH}.exe\SupportedTypes"; ValueType: string; ValueName: ".avs"; ValueData: ""; Flags: uninsdeletekey ; Class for general subtitle formats Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Subtitle.1"; ValueType: string; ValueName: ""; ValueData: "Aegisub subtitle file"; Flags: uninsdeletekey Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Subtitle.1"; ValueType: dword; ValueName: "EditFlags"; ValueData: $af0; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Subtitle.1"; ValueType: string; ValueName: "FriendlyTypeName"; ValueData: "@{app}\aegisub32.exe,-10101"; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Subtitle.1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\aegisub32.exe,0"; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Subtitle.1"; ValueType: string; ValueName: "FriendlyTypeName"; ValueData: "@{app}\aegisub{#ARCH}.exe,-10101"; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Subtitle.1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\aegisub{#ARCH}.exe,0"; Flags: uninsdeletekey Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Subtitle.1\shell"; ValueType: string; ValueName: ""; ValueData: "open"; Flags: uninsdeletekey Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.Subtitle.1\shell\open"; ValueType: none; Flags: uninsdeletekey -Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.Subtitle.1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\aegisub32.exe"" ""%L"""; Flags: uninsdeletekey +Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.Subtitle.1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\aegisub{#ARCH}.exe"" ""%L"""; Flags: uninsdeletekey ; Class for .ass files Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.ASSA.1"; ValueType: string; ValueName: ""; ValueData: "Aegisub Advanced SSA subtitles"; Flags: uninsdeletekey Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.ASSA.1"; ValueType: dword; ValueName: "EditFlags"; ValueData: $af0; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.ASSA.1"; ValueType: string; ValueName: "FriendlyTypeName"; ValueData: "@{app}\aegisub32.exe,-10102"; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.ASSA.1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\aegisub32.exe,0"; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.ASSA.1"; ValueType: string; ValueName: "FriendlyTypeName"; ValueData: "@{app}\aegisub{#ARCH}.exe,-10102"; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.ASSA.1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\aegisub{#ARCH}.exe,0"; Flags: uninsdeletekey Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.ASSA.1\shell"; ValueType: string; ValueName: ""; ValueData: "open"; Flags: uninsdeletekey Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.ASSA.1\shell\open"; ValueType: none; Flags: uninsdeletekey -Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.ASSA.1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\aegisub32.exe"" ""%L"""; Flags: uninsdeletekey +Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.ASSA.1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\aegisub{#ARCH}.exe"" ""%L"""; Flags: uninsdeletekey ; Class for .ssa files Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.SSA.1"; ValueType: string; ValueName: ""; ValueData: "Aegisub SubStation Alpha subtitles"; Flags: uninsdeletekey Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.SSA.1"; ValueType: dword; ValueName: "EditFlags"; ValueData: $af0; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.SSA.1"; ValueType: string; ValueName: "FriendlyTypeName"; ValueData: "@{app}\aegisub32.exe,-10103"; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.SSA.1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\aegisub32.exe,0"; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.SSA.1"; ValueType: string; ValueName: "FriendlyTypeName"; ValueData: "@{app}\aegisub{#ARCH}.exe,-10103"; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.SSA.1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\aegisub{#ARCH}.exe,0"; Flags: uninsdeletekey Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.SSA.1\shell"; ValueType: string; ValueName: ""; ValueData: "open"; Flags: uninsdeletekey Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.SSA.1\shell\open"; ValueType: none; Flags: uninsdeletekey -Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.SSA.1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\aegisub32.exe"" ""%L"""; Flags: uninsdeletekey +Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.SSA.1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\aegisub{#ARCH}.exe"" ""%L"""; Flags: uninsdeletekey ; Class for .srt files Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.SRT.1"; ValueType: string; ValueName: ""; ValueData: "Aegisub SubRip text subtitles"; Flags: uninsdeletekey Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.SRT.1"; ValueType: dword; ValueName: "EditFlags"; ValueData: $af0; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.SRT.1"; ValueType: string; ValueName: "FriendlyTypeName"; ValueData: "@{app}\aegisub32.exe,-10104"; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.SRT.1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\aegisub32.exe,0"; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.SRT.1"; ValueType: string; ValueName: "FriendlyTypeName"; ValueData: "@{app}\aegisub{#ARCH}.exe,-10104"; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.SRT.1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\aegisub{#ARCH}.exe,0"; Flags: uninsdeletekey Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.SRT.1\shell"; ValueType: string; ValueName: ""; ValueData: "open"; Flags: uninsdeletekey Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.SRT.1\shell\open"; ValueType: none; Flags: uninsdeletekey -Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.SRT.1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\aegisub32.exe"" ""%L"""; Flags: uninsdeletekey +Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.SRT.1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\aegisub{#ARCH}.exe"" ""%L"""; Flags: uninsdeletekey ; Class for .ttxt files Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.TTXT.1"; ValueType: string; ValueName: ""; ValueData: "Aegisub MPEG-4 timed text"; Flags: uninsdeletekey Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.TTXT.1"; ValueType: dword; ValueName: "EditFlags"; ValueData: $af0; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.TTXT.1"; ValueType: string; ValueName: "FriendlyTypeName"; ValueData: "@{app}\aegisub32.exe,-10105"; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.TTXT.1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\aegisub32.exe,0"; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.TTXT.1"; ValueType: string; ValueName: "FriendlyTypeName"; ValueData: "@{app}\aegisub{#ARCH}.exe,-10105"; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.TTXT.1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\aegisub{#ARCH}.exe,0"; Flags: uninsdeletekey Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.TTXT.1\shell"; ValueType: string; ValueName: ""; ValueData: "open"; Flags: uninsdeletekey Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.TTXT.1\shell\open"; ValueType: none; Flags: uninsdeletekey -Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.TTXT.1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\aegisub32.exe"" ""%L"""; Flags: uninsdeletekey +Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.TTXT.1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\aegisub{#ARCH}.exe"" ""%L"""; Flags: uninsdeletekey ; Class for .mks files Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.MKS.1"; ValueType: string; ValueName: ""; ValueData: "Aegisub Matroska subtitles"; Flags: uninsdeletekey Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.MKS.1"; ValueType: dword; ValueName: "EditFlags"; ValueData: $af0; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.MKS.1"; ValueType: string; ValueName: "FriendlyTypeName"; ValueData: "@{app}\aegisub32.exe,-10106"; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.MKS.1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\aegisub32.exe,0"; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.MKS.1"; ValueType: string; ValueName: "FriendlyTypeName"; ValueData: "@{app}\aegisub{#ARCH}.exe,-10106"; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.MKS.1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\aegisub{#ARCH}.exe,0"; Flags: uninsdeletekey Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.MKS.1\shell"; ValueType: string; ValueName: ""; ValueData: "open"; Flags: uninsdeletekey Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.MKS.1\shell\open"; ValueType: none; Flags: uninsdeletekey -Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.MKS.1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\aegisub32.exe"" ""%L"""; Flags: uninsdeletekey +Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.MKS.1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\aegisub{#ARCH}.exe"" ""%L"""; Flags: uninsdeletekey ; Class for .txt files Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.TXT.1"; ValueType: string; ValueName: ""; ValueData: "Aegisub raw text file"; Flags: uninsdeletekey Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.TXT.1"; ValueType: dword; ValueName: "EditFlags"; ValueData: $af0; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.TXT.1"; ValueType: string; ValueName: "FriendlyTypeName"; ValueData: "@{app}\aegisub32.exe,-10107"; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.TXT.1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\aegisub32.exe,0"; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.TXT.1"; ValueType: string; ValueName: "FriendlyTypeName"; ValueData: "@{app}\aegisub{#ARCH}.exe,-10107"; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.TXT.1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\aegisub{#ARCH}.exe,0"; Flags: uninsdeletekey Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.TXT.1\shell"; ValueType: string; ValueName: ""; ValueData: "open"; Flags: uninsdeletekey Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.TXT.1\shell\open"; ValueType: none; Flags: uninsdeletekey -Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.TXT.1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\aegisub32.exe"" ""%L"""; Flags: uninsdeletekey +Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.TXT.1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\aegisub{#ARCH}.exe"" ""%L"""; Flags: uninsdeletekey ; Class for undecideable media file types Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Media.1"; ValueType: string; ValueName: ""; ValueData: "Aegisub media file"; Flags: uninsdeletekey Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Media.1"; ValueType: dword; ValueName: "EditFlags"; ValueData: $af0; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Media.1"; ValueType: string; ValueName: "FriendlyTypeName"; ValueData: "@{app}\aegisub32.exe,-10108"; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Media.1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\aegisub32.exe,0"; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Media.1"; ValueType: string; ValueName: "FriendlyTypeName"; ValueData: "@{app}\aegisub{#ARCH}.exe,-10108"; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Media.1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\aegisub{#ARCH}.exe,0"; Flags: uninsdeletekey Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Media.1\shell"; ValueType: string; ValueName: ""; ValueData: "open"; Flags: uninsdeletekey Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.Media.1\shell\open"; ValueType: none; Flags: uninsdeletekey -Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.Media.1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\aegisub32.exe"" ""%L"""; Flags: uninsdeletekey +Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.Media.1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\aegisub{#ARCH}.exe"" ""%L"""; Flags: uninsdeletekey ; Class for audio file types Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Audio.1"; ValueType: string; ValueName: ""; ValueData: "Aegisub audio file"; Flags: uninsdeletekey Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Audio.1"; ValueType: dword; ValueName: "EditFlags"; ValueData: $af0; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Audio.1"; ValueType: string; ValueName: "FriendlyTypeName"; ValueData: "@{app}\aegisub32.exe,-10109"; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Audio.1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\aegisub32.exe,0"; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Audio.1"; ValueType: string; ValueName: "FriendlyTypeName"; ValueData: "@{app}\aegisub{#ARCH}.exe,-10109"; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Audio.1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\aegisub{#ARCH}.exe,0"; Flags: uninsdeletekey Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Audio.1\shell"; ValueType: string; ValueName: ""; ValueData: "open"; Flags: uninsdeletekey Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.Audio.1\shell\open"; ValueType: none; Flags: uninsdeletekey -Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.Audio.1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\aegisub32.exe"" ""%L"""; Flags: uninsdeletekey +Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.Audio.1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\aegisub{#ARCH}.exe"" ""%L"""; Flags: uninsdeletekey ; Class for video file types Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Video.1"; ValueType: string; ValueName: ""; ValueData: "Aegisub video file"; Flags: uninsdeletekey Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Video.1"; ValueType: dword; ValueName: "EditFlags"; ValueData: $af0; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Video.1"; ValueType: string; ValueName: "FriendlyTypeName"; ValueData: "@{app}\aegisub32.exe,-10110"; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Video.1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\aegisub32.exe,0"; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Video.1"; ValueType: string; ValueName: "FriendlyTypeName"; ValueData: "@{app}\aegisub{#ARCH}.exe,-10110"; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Video.1\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\aegisub{#ARCH}.exe,0"; Flags: uninsdeletekey Root: HKLM; Subkey: "SOFTWARE\Classes\Aegisub.Video.1\shell"; ValueType: string; ValueName: ""; ValueData: "open"; Flags: uninsdeletekey Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.Video.1\shell\open"; ValueType: none; Flags: uninsdeletekey -Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.Video.1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\aegisub32.exe"" ""%L"""; Flags: uninsdeletekey +Root: HKLM; SubKey: "SOFTWARE\Classes\Aegisub.Video.1\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\aegisub{#ARCH}.exe"" ""%L"""; Flags: uninsdeletekey ; Default Programs registration Root: HKLM; Subkey: "SOFTWARE\Aegisub"; ValueType: none; Flags: uninsdeletekey Root: HKLM; Subkey: "SOFTWARE\Aegisub\Capabilities"; ValueType: none -Root: HKLM; Subkey: "SOFTWARE\Aegisub\Capabilities"; ValueType: string; ValueName: "ApplicationDescription"; ValueData: "@{app}\aegisub32.exe,-10001" +Root: HKLM; Subkey: "SOFTWARE\Aegisub\Capabilities"; ValueType: string; ValueName: "ApplicationDescription"; ValueData: "@{app}\aegisub{#ARCH}.exe,-10001" Root: HKLM; Subkey: "SOFTWARE\Aegisub\Capabilities\FileAssociations"; ValueType: none Root: HKLM; Subkey: "SOFTWARE\Aegisub\Capabilities\FileAssociations"; ValueType: string; ValueName: ".ass"; ValueData: "Aegisub.ASSA.1" Root: HKLM; Subkey: "SOFTWARE\Aegisub\Capabilities\FileAssociations"; ValueType: string; ValueName: ".ssa"; ValueData: "Aegisub.SSA.1" diff --git a/aegisub/packages/win_installer/fragment_codecs.iss b/aegisub/packages/win_installer/fragment_codecs_32.iss similarity index 100% rename from aegisub/packages/win_installer/fragment_codecs.iss rename to aegisub/packages/win_installer/fragment_codecs_32.iss diff --git a/aegisub/packages/win_installer/fragment_codecs_64.iss b/aegisub/packages/win_installer/fragment_codecs_64.iss new file mode 100644 index 000000000..8bda5ed3a --- /dev/null +++ b/aegisub/packages/win_installer/fragment_codecs_64.iss @@ -0,0 +1,47 @@ +; Copyright (c) 2007-2009, Niels Martin Hansen +; +; Redistribution and use in source and binary forms, with or without +; modification, are permitted provided that the following conditions are met: +; +; * Redistributions of source code must retain the above copyright notice, +; this list of conditions and the following disclaimer. +; * Redistributions in binary form must reproduce the above copyright notice, +; this list of conditions and the following disclaimer in the documentation +; and/or other materials provided with the distribution. +; * Neither the name of the Aegisub Group nor the names of its contributors +; may be used to endorse or promote products derived from this software +; without specific prior written permission. +; +; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +; IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +; ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +; LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +; CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +; SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +; INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +; CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +; ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +; POSSIBILITY OF SUCH DAMAGE. +; +; ----------------------------------------------------------------------------- +; +; AEGISUB +; +; Website: http://www.aegisub.org/ +; Contact: mailto:nielsm@indvikleren.dk +; + + +[Files] +; ffmpegsource +DestDir: {app}; Source: ..\..\bin\ffms2_64.dll; Flags: ignoreversion; Components: codec +DestDir: {app}; Source: ..\..\bin\ffms2_64.pdb; Flags: ignoreversion; Components: codec and main/pdb +; vsfilter +DestDir: {app}; Source: src\vsfilter-aegisub64.dll; Flags: ignoreversion; Components: codec/vsfilter + +[Components] +Name: codec; Description: Media formats support; Flags: fixed; Types: custom compact full +Name: codec/vsfilter; Description: VSFilter-Aegisub 2.40; Types: compact full custom; Flags: fixed + + diff --git a/aegisub/packages/win_installer/fragment_mainprogram.iss b/aegisub/packages/win_installer/fragment_mainprogram.iss index bc075bd1f..8bfcab3ba 100644 --- a/aegisub/packages/win_installer/fragment_mainprogram.iss +++ b/aegisub/packages/win_installer/fragment_mainprogram.iss @@ -42,19 +42,19 @@ Name: main/qcklnch; Description: Quick launch icon; Types: custom compact full [Files] ; main -DestDir: {app}; Source: ..\..\bin\aegisub32.exe; Flags: ignoreversion solidbreak; Components: main -DestDir: {app}; Source: ..\..\bin\aegisub32.pdb; Flags: ignoreversion; Components: main/pdb +DestDir: {app}; Source: ..\..\bin\aegisub{#ARCH}.exe; Flags: ignoreversion solidbreak; Components: main +DestDir: {app}; Source: ..\..\bin\aegisub{#ARCH}.pdb; Flags: ignoreversion; Components: main/pdb DestDir: {app}; Source: license.txt; Flags: ignoreversion; Tasks: ; Languages: ; Components: main [Icons] -Name: {commonprograms}\Aegisub; Filename: {app}\aegisub32.exe; WorkingDir: {app}; IconIndex: 0; Components: main/icons; Comment: Create and edit subtitle files -Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Aegisub; Filename: {app}\aegisub32.exe; WorkingDir: {app}; IconIndex: 0; Components: main/qcklnch; Comment: Create and edit subtitle files +Name: {commonprograms}\Aegisub; Filename: {app}\aegisub{#ARCH}.exe; WorkingDir: {app}; IconIndex: 0; Components: main/icons; Comment: Create and edit subtitle files +Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\Aegisub; Filename: {app}\aegisub{#ARCH}.exe; WorkingDir: {app}; IconIndex: 0; Components: main/qcklnch; Comment: Create and edit subtitle files [Registry] ; Register in App Paths so the user can conveniently enter 'aegisub' in their Run box -Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\aegisub32.exe"; ValueType: string; ValueName: ""; ValueData: "{app}\aegisub32.exe"; Flags: uninsdeletekey -Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\aegisub.exe"; ValueType: string; ValueName: ""; ValueData: "{app}\aegisub32.exe"; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\aegisub{#ARCH}.exe"; ValueType: string; ValueName: ""; ValueData: "{app}\aegisub{#ARCH}.exe"; Flags: uninsdeletekey +Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\aegisub.exe"; ValueType: string; ValueName: ""; ValueData: "{app}\aegisub{#ARCH}.exe"; Flags: uninsdeletekey [Run] -Filename: {app}\aegisub32.exe; Description: {cm:LaunchProgram,Aegisub}; Flags: nowait postinstall skipifsilent +Filename: {app}\aegisub{#ARCH}.exe; Description: {cm:LaunchProgram,Aegisub}; Flags: nowait postinstall skipifsilent diff --git a/aegisub/packages/win_installer/fragment_runtimes.iss b/aegisub/packages/win_installer/fragment_runtimes.iss index e4bfb118c..183c3396f 100644 --- a/aegisub/packages/win_installer/fragment_runtimes.iss +++ b/aegisub/packages/win_installer/fragment_runtimes.iss @@ -32,17 +32,21 @@ ; Contact: mailto:nielsm@indvikleren.dk ; - ; This file implements checking for and installing runtime libraries for Aegisub +#ifdef ARCH64 +#define SUFFIX "x64" +#else +#define SUFFIX "x86" +#endif [Files] -DestDir: {tmp}; Source: src\vcredist_x86.exe; Flags: nocompression deleteafterinstall; Check: RuntimesRequired +DestDir: {tmp}; Source: src\vcredist_{#SUFFIX}.exe; Flags: nocompression deleteafterinstall; Check: RuntimesRequired [Components] Name: main/runtime; Description: Runtime libraries; Check: RuntimesRequired; Flags: fixed; Types: custom compact full; ExtraDiskSpaceRequired: 4630528 [Run] -Filename: {tmp}\vcredist_x86.exe; StatusMsg: Installing runtime libraries...; Check: RuntimesRequired; Components: main/runtime; Parameters: "/q" +Filename: {tmp}\vcredist_{#SUFFIX}.exe; StatusMsg: Installing runtime libraries...; Check: RuntimesRequired; Components: main/runtime; Parameters: "/q" [Code] function RuntimesRequired: Boolean; diff --git a/aegisub/packages/win_installer/fragment_setupbase.iss b/aegisub/packages/win_installer/fragment_setupbase.iss index 2d45aac43..1a68a0f01 100644 --- a/aegisub/packages/win_installer/fragment_setupbase.iss +++ b/aegisub/packages/win_installer/fragment_setupbase.iss @@ -56,14 +56,14 @@ UsePreviousGroup=yes UsePreviousSetupType=no UsePreviousAppDir=yes UsePreviousTasks=no -UninstallDisplayIcon={app}\aegisub32.exe +UninstallDisplayIcon={app}\aegisub{#ARCH}.exe ; Default to a large welcome bitmap, suitable for large fonts ; The normal fonts version is selected by code below WizardImageFile=welcome-large.bmp WizardSmallImageFile=aegisub-large.bmp -OutputBaseFilename=Aegisub-{#VERSION}-{#SETUP_TYPE} -VersionInfoDescription=Aegisub {#VERSION} {#SETUP_TYPE} +OutputBaseFilename=Aegisub-{#VERSION}-{#ARCH} +VersionInfoDescription=Aegisub {#VERSION} {#ARCH} [Languages] Name: english; MessagesFile: compiler:Default.isl