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

Installer, Windows: No longer install openssl libs. They will be downloaded by OPM on request.

Browse Source 
https://idefix.freepascal.org/cgi-bin/mailman/private/lazarusdev/2022-May/037206.html
This commit is contained in:
Martin 2022-06-23 22:34:21 +02:00
parent e051041493
commit 1b80d31355
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/install/win/create_installer.bat
View File

@ -94,11 +94,11 @@ SET PATCHDIR=%CD%\..\patches
:: it should have the debugger with the name gdb.exe in its bin subdirectory
SET GDBDIR=%LAZGITBINDIR%\%FPCFULLTARGET%\gdb
:: OPENSSL
SET OPENSSLDIR=%LAZGITBINDIR%\%FPCFULLTARGET%\openssl
for /F %%i in ('dir /b "%OPENSSLDIR%\*.*"') do (
SET HASOPENSSL=1
)
rem :: OPENSSL
rem SET OPENSSLDIR=%LAZGITBINDIR%\%FPCFULLTARGET%\openssl
rem for /F %%i in ('dir /b "%OPENSSLDIR%\*.*"') do (
rem SET HASOPENSSL=1
rem )
:: Path to the directory containing the qtinf dll matching the qt4.pas from
:: http://users.pandora.be/Jan.Van.hijfte/qtforfpc/fpcqt4.html

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

@ -23,8 +23,8 @@ EnableISX=true
#define QtInfDir GetEnv('QTINFDIR')
#define HasQT5 GetEnv('HASQT5')
#define Qt5InfDir GetEnv('QT5INFDIR')
#define HasOpenSSL GetEnv('HASOPENSSL')
#define OpenSSLDir GetEnv('OPENSSLDIR')
;#define HasOpenSSL GetEnv('HASOPENSSL')
;#define OpenSSLDir GetEnv('OPENSSLDIR')
#define IDEWidgetSet GetEnv('IDE_WidgetSet')
#define OutputFileName GetEnv('OutputFileName')
#define CHMHELPFILES GetEnv('CHMHELPFILES')
@ -106,12 +106,12 @@ Name: install5qtintfdll/global; Description: {cm:InstallQt5Global}; Types: full;
#endif
#endif
#ifdef HasOpenSSL
#if HasOpenSSL!=""
Name: installopenssl; Description: {cm:InstallOpenSSL}; Types: custom full compact; Flags: checkablealone
Name: installopenssl/global; Description: {cm:InstallOpenSSLGlobal}; Types: full; Flags: dontinheritcheck
#endif
#endif
;#ifdef HasOpenSSL
;#if HasOpenSSL!=""
;Name: installopenssl; Description: {cm:InstallOpenSSL}; Types: custom full compact; Flags: checkablealone
;Name: installopenssl/global; Description: {cm:InstallOpenSSLGlobal}; Types: full; Flags: dontinheritcheck
;#endif
;#endif
Name: association; Description: {cm:AssociateGroup}; Types: custom full
Name: association/associatelfm; Description: {code:GetAssociateDesc|.lfm}; Types: custom full
Name: association/associatelpi; Description: {code:GetAssociateDesc|.lpi}; Types: custom full
@ -173,12 +173,12 @@ Source: {#CHMHELPFILES}\*.*; DestDir: {app}\docs\chm; Components: installhelp; F
#endif
#endif
#ifdef HasOpenSSL
#if HasOpenSSL!=""
Source: {#OpenSSLDir}\*.*; DestDir: {app}; Components: installopenssl; Flags: recursesubdirs
Source: {#OpenSSLDir}\*.*; DestDir: {sys}; Components: installopenssl/global; Flags: sharedfile replacesameversion
#endif
#endif
;#ifdef HasOpenSSL
;#if HasOpenSSL!=""
;Source: {#OpenSSLDir}\*.*; DestDir: {app}; Components: installopenssl; Flags: recursesubdirs
;Source: {#OpenSSLDir}\*.*; DestDir: {sys}; Components: installopenssl/global; Flags: sharedfile replacesameversion
;#endif
;#endif
[INI]
Filename: {app}\Lazarus Home Page.url; Section: InternetShortcut; Key: URL; String: http://www.lazarus.freepascal.org/