- Now we can see the diff clearly

git-svn-id: http://svn.miranda-ng.org/main/trunk@5930 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 56 insertions, 13 deletions

diff --git a/tools/installer_ng/MirandaNG.iss b/tools/installer_ng/MirandaNG.iss
index d5669ce0b3..3c16700125 100644
--- a/tools/installer_ng/MirandaNG.iss
+++ b/tools/installer_ng/MirandaNG.iss
@@ -1,4 +1,46 @@
-[Setup]

+#ifdef ptx86

+   #define MirName "Miranda32.exe"

+#else

+   #define MirName "Miranda64.exe"

+#endif

+

+#ifdef ptx86

+   #define MirOutName "miranda-ng-alpha-latest"

+#else

+   #define MirOutName "miranda-ng-alpha-latest_x64"

+#endif

+

+#ifndef ptx86

+   #define ArcAllow "x64"

+#else

+   #define ArcAllow ""

+#endif

+

+#ifdef ptx86

+   #define VcRedistName "vcredist_x86.exe"

+#else

+   #define VcRedistName "vcredist_x64.exe"

+#endif

+

+#ifdef ptx86

+   #define Ptf "x86"

+#else

+   #define Ptf "x64"

+#endif

+

+#ifdef ptx86

+   #define RedistRegChk "(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{F0C3E5D1-1ADE-321E-8167-68EF0DE699A5}')"

+#else

+   #define RedistRegChk "(HKLM64, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{1D8E6291-B0D5-35EC-8441-6616F567A0F7}')"

+#endif

+

+#ifdef ptx86

+   #define MirPfInstDir "ExpandConstant('{pf32}')"

+#else

+   #define MirPfInstDir "ExpandConstant('{pf64}')"

+#endif

+

+[Setup]

 AppVersion=0.94.5

 AppName=Miranda NG

 AppVerName=Miranda NG {#SetupSetting("AppVersion")}

@@ -6,11 +48,12 @@ AppPublisher=Miranda NG Team
 AppCopyRight=2013 © Miranda NG Team

 VersionInfoVersion={#SetupSetting("AppVersion")}

 MinVersion=5.0

+ArchitecturesAllowed={#ArcAllow}

 DefaultDirName={pf}\Miranda NG

 DefaultGroupName=Miranda NG

 LicenseFile=Files\Docs\license.txt

 UninstallFilesDir={app}\Uninstall

-UninstallDisplayIcon=Miranda32.exe 

+UninstallDisplayIcon={#MirName}

 UninstallDisplayName=Miranda NG

 UninstallLogMode=overwrite 

 Uninstallable=IsDefault()

@@ -19,7 +62,7 @@ Compression=lzma2/max
 SolidCompression=yes

 PrivilegesRequired=poweruser

 OutputDir=..\

-OutputBaseFilename=miranda-ng-alpha-latest

+OutputBaseFilename={#MirOutName}

 WizardImageFile=Installer\WizModernImage-IS.bmp

 WizardSmallImageFile=Installer\SetupMNGSmall.bmp

 SetupIconFile=Installer\mng_installer.ico

@@ -50,7 +93,7 @@ Source: "Files\Icons\tabsrmm_icons.dll"; DestDir: "{app}\Icons"; Components: mes
 Source: "Files\Icons\toolbar_icons.dll"; DestDir: "{app}\Icons"; Components: clicts\modern; Flags: ignoreversion; AfterInstall: ShowPercent()

 

 ; Core and core modules

-Source: "Files\Miranda32.exe"; DestDir: "{app}"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent() 

+Source: "Files\{#MirName}"; DestDir: "{app}"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent() 

 Source: "Files\mir_core.dll"; DestDir: "{app}"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent() 

 Source: "Files\zlib.dll"; DestDir: "{app}"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent() 

 Source: "Files\DbChecker.bat"; DestDir: "{app}"; Components: program; Check: IsPortable(); Flags: ignoreversion; AfterInstall: ShowPercent() 

@@ -120,7 +163,7 @@ Source: "Files\autoexec_nightly_pu.ini"; DestDir: "{app}"; Components: program;
 ; Installer add-ons

 Source: "Installer\ISWin7.dll"; Flags: dontcopy 

 Source: "Installer\descctrl.dll"; Flags: dontcopy

-Source: "Installer\vcredist_x86.exe"; DestDir: {tmp}; Flags: deleteafterinstall; Check: RedistIsNotInstalled

+Source: "Installer\{#VcRedistName}"; DestDir: {tmp}; Flags: deleteafterinstall; Check: RedistIsNotInstalled

 

 [Components]

 Name: "program"; Description: "{cm:Program}"; Types: extended regular minimal custom; Flags: fixed 

@@ -164,15 +207,15 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 Name: "quicklaunchicon"; Description: "{cm:CreateQuickLaunchIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked 

 

 [Icons]

-Name: "{app}\DbChecker"; Filename: "{app}\Miranda32.exe"; Parameters: "/svc:dbchecker"; Check: IsDefault() 

-Name: "{group}\Miranda NG"; Filename: "{app}\Miranda32.exe" 

+Name: "{app}\DbChecker"; Filename: "{app}\{#MirName}"; Parameters: "/svc:dbchecker"; Check: IsDefault() 

+Name: "{group}\Miranda NG"; Filename: "{app}\{#MirName}" 

 Name: "{group}\{cm:UninstallProgram,Miranda NG}"; Filename: {app}\Uninstall\Unins000.exe 

-Name: "{userdesktop}\Miranda NG"; Filename: "{app}\Miranda32.exe"; WorkingDir: {app}; Tasks: desktopicon 

-Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Miranda NG"; Filename: "{app}\Miranda32.exe"; WorkingDir: {app}; Tasks: quicklaunchicon 

+Name: "{userdesktop}\Miranda NG"; Filename: "{app}\{#MirName}"; WorkingDir: {app}; Tasks: desktopicon 

+Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\Miranda NG"; Filename: "{app}\{#MirName}"; WorkingDir: {app}; Tasks: quicklaunchicon 

 

 [Run]

-Filename: {tmp}\vcredist_x86.exe; Parameters: "/passive /Q:a /c:""msiexec /qb /i vcredist.msi"" "; Check: RedistIsNotInstalled(); StatusMsg: Installing Microsoft Visual C++ 2010 SP1 Redistributable Package (x86)

-Filename: "{app}\Miranda32.exe"; Description: "{cm:LaunchProgram,Miranda NG}"; Flags: nowait postinstall skipifsilent 

+Filename: "{tmp}\{#VcRedistName}"; Parameters: "/passive /Q:a /c:""msiexec /qb /i vcredist.msi"" "; Check: RedistIsNotInstalled(); StatusMsg: Installing Microsoft Visual C++ 2010 SP1 Redistributable Package ({#Ptf})

+Filename: "{app}\{#MirName}"; Description: "{cm:LaunchProgram,Miranda NG}"; Flags: nowait postinstall skipifsilent 

 

 [UninstallDelete]

 Type: filesandordirs; Name: {app} 

@@ -491,7 +534,7 @@ end;
 //vc redist installation check

 function RedistIsNotInstalled: Boolean;

 begin

-   Result := not RegKeyExists(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{F0C3E5D1-1ADE-321E-8167-68EF0DE699A5}');

+   Result := not RegKeyExists{#RedistRegChk};

 end;

 

 //создание страницы установки с типами установки (обычная или портативная)

@@ -580,7 +623,7 @@ var
   FreeMB, TotalMB: Cardinal;

 begin

   if (DefTypeInstRadio.Checked) then

-    WizardForm.DirEdit.Text := ExpandConstant('{pf32}') + '\Miranda NG';

+    WizardForm.DirEdit.Text := {#MirPfInstDir} + '\Miranda NG';

 

   if (PortTypeInstRadio.Checked) then

   begin