paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-26 15:00:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Installer, Win: Do not install dll globally by default / Changes/Adds installation "Types" (pre-selectable settings) and custom names for the types."

Browse Source 
This reverts commit cbbdabd969.
This commit is contained in:
Martin 2022-06-23 22:27:47 +02:00
parent dd89fc14e1
commit e051041493
2 changed files with 17 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/install/win/lazarus.def.isl
View File

@ -2,11 +2,6 @@
[CustomMessages] [CustomMessages]
InstallTypeDefault=Default installation (all, except global/system-wide dll)
InstallTypeFull=Full installation
InstallTypeCompact=Compact installation
InstallTypeCustom=Custom installation
DelUserConf=Delete all user configuration files from previous installs DelUserConf=Delete all user configuration files from previous installs
CleanUp=Clean up: CleanUp=Clean up:

40
tools/install/win/lazarus.iss
View File

@ -74,12 +74,6 @@ DisableWelcomePage=no
DisableDirPage=no DisableDirPage=no
[Types]
Name: "default"; Description: {cm:InstallTypeDefault}
Name: "all"; Description: {cm:InstallTypeFull}
Name: "compact"; Description: {cm:InstallTypeCompact}
Name: "custom"; Description: {cm:InstallTypeCustom}; Flags: iscustom
[Tasks] [Tasks]
Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked Name: desktopicon; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:AdditionalIcons}; Flags: unchecked
Name: delusersettings; Description: {cm:DelUserConf}; GroupDescription: {cm:CleanUp}; Flags: unchecked Name: delusersettings; Description: {cm:DelUserConf}; GroupDescription: {cm:CleanUp}; Flags: unchecked
@ -88,44 +82,44 @@ Name: delusersettings; Description: {cm:DelUserConf}; GroupDescription: {cm:Clea
[Components] [Components]
#ifdef CHMHELPFILES #ifdef CHMHELPFILES
#if CHMHELPFILES!="" #if CHMHELPFILES!=""
Name: installhelp; Description: {cm:InstallChm}; Types: custom default all Name: installhelp; Description: {cm:InstallChm}; Types: custom full
#endif #endif
#endif #endif
#if FPCTargetOS=="win32" #if FPCTargetOS=="win32"
;// #if IDEWidgetSet!="qt" ;// #if IDEWidgetSet!="qt"
Name: install4qtintfdll; Description: {cm:InstallQtLocal}; Types: custom default all; Flags: checkablealone Name: install4qtintfdll; Description: {cm:InstallQtLocal}; Types: custom full; Flags: checkablealone
;// #else ;// #else
;//Name: install4qtintfdll; Description: {cm:InstallQtLocal}; Types: custom default all compact; Flags: checkablealone fixed ;//Name: install4qtintfdll; Description: {cm:InstallQtLocal}; Types: custom full compact; Flags: checkablealone fixed
;// #endif ;// #endif
Name: install4qtintfdll/global; Description: {cm:InstallQt}; Types: all; Flags: dontinheritcheck Name: install4qtintfdll/global; Description: {cm:InstallQt}; Types: full; Flags: dontinheritcheck
#endif #endif
#ifdef HasQT5 #ifdef HasQT5
#if HasQT5!="" #if HasQT5!=""
#if IDEWidgetSet!="qt" #if IDEWidgetSet!="qt"
Name: install5qtintfdll; Description: {cm:InstallQt5Local}; Types: custom default all; Flags: checkablealone Name: install5qtintfdll; Description: {cm:InstallQt5Local}; Types: custom full; Flags: checkablealone
#else #else
Name: install5qtintfdll; Description: {cm:InstallQt5Local}; Types: custom default all compact; Flags: checkablealone fixed Name: install5qtintfdll; Description: {cm:InstallQt5Local}; Types: custom full compact; Flags: checkablealone fixed
#endif #endif
Name: install5qtintfdll/global; Description: {cm:InstallQt5Global}; Types: all; Flags: dontinheritcheck Name: install5qtintfdll/global; Description: {cm:InstallQt5Global}; Types: full; Flags: dontinheritcheck
#endif #endif
#endif #endif
#ifdef HasOpenSSL #ifdef HasOpenSSL
#if HasOpenSSL!="" #if HasOpenSSL!=""
Name: installopenssl; Description: {cm:InstallOpenSSL}; Types: custom default all compact; Flags: checkablealone Name: installopenssl; Description: {cm:InstallOpenSSL}; Types: custom full compact; Flags: checkablealone
Name: installopenssl/global; Description: {cm:InstallOpenSSLGlobal}; Types: all; Flags: dontinheritcheck Name: installopenssl/global; Description: {cm:InstallOpenSSLGlobal}; Types: full; Flags: dontinheritcheck
#endif #endif
#endif #endif
Name: association; Description: {cm:AssociateGroup}; Types: custom default all Name: association; Description: {cm:AssociateGroup}; Types: custom full
Name: association/associatelfm; Description: {code:GetAssociateDesc|.lfm}; Types: custom default all Name: association/associatelfm; Description: {code:GetAssociateDesc|.lfm}; Types: custom full
Name: association/associatelpi; Description: {code:GetAssociateDesc|.lpi}; Types: custom default all Name: association/associatelpi; Description: {code:GetAssociateDesc|.lpi}; Types: custom full
Name: association/associatelpk; Description: {code:GetAssociateDesc|.lpk}; Types: custom default all Name: association/associatelpk; Description: {code:GetAssociateDesc|.lpk}; Types: custom full
Name: association/associatelpr; Description: {code:GetAssociateDesc|.lpr}; Types: custom default all Name: association/associatelpr; Description: {code:GetAssociateDesc|.lpr}; Types: custom full
Name: association/associateinc; Description: {code:GetAssociateDesc|.inc}; Types: custom default all Name: association/associateinc; Description: {code:GetAssociateDesc|.inc}; Types: custom full
Name: association/associatepas; Description: {code:GetAssociateDesc|.pas}; Types: custom default all Name: association/associatepas; Description: {code:GetAssociateDesc|.pas}; Types: custom full
Name: association/associatepp; Description: {code:GetAssociateDesc|.pp}; Types: custom default all Name: association/associatepp; Description: {code:GetAssociateDesc|.pp}; Types: custom full
[InstallDelete] [InstallDelete]
Name: {code:GetPCPForDelete}*.xml; Type: files; Tasks: delusersettings Name: {code:GetPCPForDelete}*.xml; Type: files; Tasks: delusersettings