From 5d886024a2a3a4bcc0e8bfd7ab7fa28d9be3257f Mon Sep 17 00:00:00 2001 From: dartraiden Date: Wed, 4 Oct 2017 22:34:57 +0300 Subject: remove redist installation completely --- tools/build_scripts/z3_PackArchivesStable.bat | 5 ----- tools/installer_ng/MirandaNG.iss | 16 +--------------- tools/installer_ng/createstructure.bat | 2 -- tools/installer_ng_stable/MirandaNG.iss | 16 +--------------- tools/installer_ng_stable/createstructure.bat | 2 -- 5 files changed, 2 insertions(+), 39 deletions(-) (limited to 'tools') diff --git a/tools/build_scripts/z3_PackArchivesStable.bat b/tools/build_scripts/z3_PackArchivesStable.bat index 6baf7ac245..6578a45b20 100644 --- a/tools/build_scripts/z3_PackArchivesStable.bat +++ b/tools/build_scripts/z3_PackArchivesStable.bat @@ -2,10 +2,6 @@ set tp=%1 if "%tp%"=="" (echo "please specify target platform 32 or 64!"&&pause&&goto :EOF) for /F "tokens=1,2,3 delims= " %%i in (build\build.no) do set MirVer=%%i.%%j.%%k if /i '%tp%' == '64' set bit=_x64 -if /i '%tp%' == '32' set VcPt=x86 -if /i '%tp%' == '64' set VcPt=x64 -if /i '%tp%' == '32' set VcURL=https://download.visualstudio.microsoft.com/download/pr/11100229/78c1e864d806e36f6035d80a0e80399e/VC_redist.x86.exe -if /i '%tp%' == '64' set VcURL=https://download.visualstudio.microsoft.com/download/pr/11100230/15ccb3f02745c7b206ad10373cbca89b/VC_redist.x64.exe if /i '%tp%' == '32' set CompileString=..\Tools\InnoSetup5\ISCC.exe /Dptx86 /DAppVer=%MirVer% "MirandaNG.iss" if /i '%tp%' == '64' set CompileString=..\Tools\InnoSetup5\ISCC.exe /DAppVer=%MirVer% "MirandaNG.iss" @@ -45,7 +41,6 @@ copy /V /Y MirandaNG.iss InnoNG_%tp% xcopy Common\* InnoNG_%tp% /I /S /V /Y Tools\wget.exe -O tmp\InnoSetup5.7z https://miranda-ng.org/distr/installer/InnoSetup5.7z Tools\wget.exe -O tmp\MNG_Sounds.7z https://miranda-ng.org/distr/addons/Sounds/MNG_Sounds.7z -Tools\wget.exe -O InnoNG_%tp%\Installer\vcredist_%VcPt%.exe %VcURL% %CompressIt% x tmp\InnoSetup5.7z -y -oTools %CompressIt% x %ArchDistr%\miranda-ng-v%MirVer%%bit%.7z -y -oInnoNG_%tp%\Files %CompressIt% x tmp\MNG_Sounds.7z -y -oInnoNG_%tp%\Files diff --git a/tools/installer_ng/MirandaNG.iss b/tools/installer_ng/MirandaNG.iss index 1caa89dcb4..be82fd3e13 100644 --- a/tools/installer_ng/MirandaNG.iss +++ b/tools/installer_ng/MirandaNG.iss @@ -3,18 +3,12 @@ #define MirGroupName "Miranda NG" #define MirOutName "miranda-ng-alpha-latest" #define ArcAllow "" - #define VcRedistName "vcredist_x86.exe" - #define Ptf "x86" - #define RedistRegChk "(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{029DA848-1A80-34D3-BFC1-A6447BFC8E7F}')" #define MirPfInstDir "ExpandConstant('{pf32}')" #else #define MirName "Miranda64.exe" #define MirGroupName "Miranda NG x64" #define MirOutName "miranda-ng-alpha-latest_x64" #define ArcAllow "x64" - #define VcRedistName "vcredist_x64.exe" - #define Ptf "x64" - #define RedistRegChk "(HKLM64, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{B0037450-526D-3448-A370-CACBD87769A0}')" #define MirPfInstDir "ExpandConstant('{pf64}')" #endif @@ -73,7 +67,7 @@ Source: "Files\Icons\Toolbar_icons.dll"; DestDir: "{app}\Icons"; Components: cli ; Core and core modules Source: "Files\{#MirName}"; DestDir: "{app}"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent() Source: "Files\DbChecker.bat"; DestDir: "{app}"; Components: program; Check: IsPortable(); Flags: ignoreversion; AfterInstall: ShowPercent() -Source: "Files\*.dll"; DestDir: "{app}"; Components: program; Check: IsPortable(); Flags: ignoreversion; AfterInstall: ShowPercent() +Source: "Files\*.dll"; DestDir: "{app}"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent() Source: "Files\Libs\libeay32.mir"; DestDir: "{app}\Libs"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent() Source: "Files\Libs\libjson.mir"; DestDir: "{app}\Libs"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent() Source: "Files\Libs\mir_app.mir"; DestDir: "{app}\Libs"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent() @@ -143,7 +137,6 @@ Source: "Files\Settings\autoexec_sounds.ini"; DestDir: "{app}"; Components: soun ; Installer add-ons Source: "Installer\ISWin7.dll"; Flags: dontcopy Source: "Installer\descctrl.dll"; Flags: dontcopy -Source: "Installer\{#VcRedistName}"; DestDir: {tmp}; Flags: deleteafterinstall; Check: RedistIsNotInstalled [Components] Name: "program"; Description: "{cm:Program}"; Types: extended regular minimal custom; Flags: fixed @@ -191,7 +184,6 @@ Name: "{userdesktop}\{#MirGroupName}"; Filename: "{app}\{#MirName}"; WorkingDir: Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MirGroupName}"; Filename: "{app}\{#MirName}"; WorkingDir: {app}; Tasks: quicklaunchicon [Run] -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] @@ -642,12 +634,6 @@ begin Result:= True; end; -// Visual C++ redistributable package installation check -function RedistIsNotInstalled: Boolean; -begin - Result := not RegKeyExists{#RedistRegChk}; -end; - // Installation type page creation (default or portable) procedure CreateInstallTypePage(); begin diff --git a/tools/installer_ng/createstructure.bat b/tools/installer_ng/createstructure.bat index 3d8371f09f..3cc7d7b8b8 100644 --- a/tools/installer_ng/createstructure.bat +++ b/tools/installer_ng/createstructure.bat @@ -26,8 +26,6 @@ Tools\wget.exe --no-check-certificate -O tmp\langpack_czech.zip https://miranda- Tools\wget.exe --no-check-certificate -O tmp\langpack_german.zip https://miranda-ng.org/x32/Languages/langpack_german.zip Tools\wget.exe --no-check-certificate -O tmp\langpack_polish.zip https://miranda-ng.org/x32/Languages/langpack_polish.zip Tools\wget.exe --no-check-certificate -O tmp\langpack_russian.zip https://miranda-ng.org/x32/Languages/langpack_russian.zip -Tools\wget.exe --no-check-certificate -O InnoNG_32\Installer\vcredist_x86.exe https://download.visualstudio.microsoft.com/download/pr/11100229/78c1e864d806e36f6035d80a0e80399e/VC_redist.x86.exe -Tools\wget.exe --no-check-certificate -O InnoNG_64\Installer\vcredist_x64.exe https://download.visualstudio.microsoft.com/download/pr/11100230/15ccb3f02745c7b206ad10373cbca89b/VC_redist.x64.exe rem end rem Extract diff --git a/tools/installer_ng_stable/MirandaNG.iss b/tools/installer_ng_stable/MirandaNG.iss index 23a7000780..2371953575 100644 --- a/tools/installer_ng_stable/MirandaNG.iss +++ b/tools/installer_ng_stable/MirandaNG.iss @@ -3,18 +3,12 @@ #define MirGroupName "Miranda NG" #define MirPtf "" #define ArcAllow "" - #define VcRedistName "vcredist_x86.exe" - #define Ptf "x86" - #define RedistRegChk "(HKEY_LOCAL_MACHINE, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{029DA848-1A80-34D3-BFC1-A6447BFC8E7F}')" #define MirPfInstDir "ExpandConstant('{pf32}')" #else #define MirName "Miranda64.exe" #define MirGroupName "Miranda NG x64" #define MirPtf "_x64" #define ArcAllow "x64" - #define VcRedistName "vcredist_x64.exe" - #define Ptf "x64" - #define RedistRegChk "(HKLM64, 'SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{B0037450-526D-3448-A370-CACBD87769A0}')" #define MirPfInstDir "ExpandConstant('{pf64}')" #endif @@ -73,7 +67,7 @@ Source: "Files\Icons\Toolbar_icons.dll"; DestDir: "{app}\Icons"; Components: cli ; Core and core modules Source: "Files\{#MirName}"; DestDir: "{app}"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent() Source: "Files\DbChecker.bat"; DestDir: "{app}"; Components: program; Check: IsPortable(); Flags: ignoreversion; AfterInstall: ShowPercent() -Source: "Files\*.dll"; DestDir: "{app}"; Components: program; Check: IsPortable(); Flags: ignoreversion; AfterInstall: ShowPercent() +Source: "Files\*.dll"; DestDir: "{app}"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent() Source: "Files\Libs\libeay32.mir"; DestDir: "{app}\Libs"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent() Source: "Files\Libs\libjson.mir"; DestDir: "{app}\Libs"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent() Source: "Files\Libs\mir_app.mir"; DestDir: "{app}\Libs"; Components: program; Flags: ignoreversion; AfterInstall: ShowPercent() @@ -143,7 +137,6 @@ Source: "Files\Settings\autoexec_sounds.ini"; DestDir: "{app}"; Components: soun ; Installer add-ons Source: "Installer\ISWin7.dll"; Flags: dontcopy Source: "Installer\descctrl.dll"; Flags: dontcopy -Source: "Installer\{#VcRedistName}"; DestDir: {tmp}; Flags: deleteafterinstall; Check: RedistIsNotInstalled [Components] Name: "program"; Description: "{cm:Program}"; Types: extended regular minimal custom; Flags: fixed @@ -191,7 +184,6 @@ Name: "{userdesktop}\{#MirGroupName}"; Filename: "{app}\{#MirName}"; WorkingDir: Name: "{userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MirGroupName}"; Filename: "{app}\{#MirName}"; WorkingDir: {app}; Tasks: quicklaunchicon [Run] -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] @@ -642,12 +634,6 @@ begin Result:= True; end; -// Visual C++ redistributable package installation check -function RedistIsNotInstalled: Boolean; -begin - Result := not RegKeyExists{#RedistRegChk}; -end; - // Installation type page creation (default or portable) procedure CreateInstallTypePage(); begin diff --git a/tools/installer_ng_stable/createstructure.bat b/tools/installer_ng_stable/createstructure.bat index 5b4de17370..a32720da98 100644 --- a/tools/installer_ng_stable/createstructure.bat +++ b/tools/installer_ng_stable/createstructure.bat @@ -37,8 +37,6 @@ Tools\wget.exe --no-check-certificate -O tmp\langpack_czech.zip https://miranda- Tools\wget.exe --no-check-certificate -O tmp\langpack_german.zip https://miranda-ng.org/distr/stable/x32/Languages/langpack_german.zip Tools\wget.exe --no-check-certificate -O tmp\langpack_polish.zip https://miranda-ng.org/distr/stable/x32/Languages/langpack_polish.zip Tools\wget.exe --no-check-certificate -O tmp\langpack_russian.zip https://miranda-ng.org/distr/stable/x32/Languages/langpack_russian.zip -Tools\wget.exe --no-check-certificate -O InnoNG_32\Installer\vcredist_x86.exe https://download.visualstudio.microsoft.com/download/pr/11100229/78c1e864d806e36f6035d80a0e80399e/VC_redist.x86.exe -Tools\wget.exe --no-check-certificate -O InnoNG_64\Installer\vcredist_x64.exe https://download.visualstudio.microsoft.com/download/pr/11100230/15ccb3f02745c7b206ad10373cbca89b/VC_redist.x64.exe rem end rem Extract -- cgit v1.2.3