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

Installer, Win: Add open-ssl libraries for OPM

Browse Source 
git-svn-id: trunk@61178 -
This commit is contained in:
martin 2019-05-08 16:59:52 +00:00
parent d879259b62
commit 8894d42fe2
4 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

2
tools/install/win/lazarus.de.isl
View File

@ -8,6 +8,8 @@ CleanUp=Aufr
InstallQt=QT-Interface-DLL global installieren InstallQt=QT-Interface-DLL global installieren
InstallChm=CHM-Hilfedateien installieren InstallChm=CHM-Hilfedateien installieren
InstallOpenSSL=Openssl dll installieren (Benötigt für den Online-Packet-Manager)
InstallOpenSSLGlobal=Openssl dll global installieren
AssociateGroup=Dateierweiterungen registrieren AssociateGroup=Dateierweiterungen registrieren
FolderHasSpaces=Gewählter Ordner enthält Leerzeichen, bitte wählen Sie einen Ordner ohne Leerzeichen. FolderHasSpaces=Gewählter Ordner enthält Leerzeichen, bitte wählen Sie einen Ordner ohne Leerzeichen.

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

@ -8,6 +8,8 @@ CleanUp=Clean up:
InstallQt=Globally install Qt interface DLL InstallQt=Globally install Qt interface DLL
InstallChm=Install CHM help files InstallChm=Install CHM help files
InstallOpenSSL=Install openssl libraries (required by OnlinePackageManager)
InstallOpenSSLGlobal=Globally Install openssl libraries
AssociateGroup=Associate file extensions AssociateGroup=Associate file extensions
CheckSecondClick=Create a new secondary installation CheckSecondClick=Create a new secondary installation

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

@ -20,6 +20,8 @@ EnableISX=true
#define SetupDate GetEnv('DateStamp') #define SetupDate GetEnv('DateStamp')
#define BuildDir GetEnv('BuildDir') #define BuildDir GetEnv('BuildDir')
#define QtInfDir GetEnv('QTINFDIR') #define QtInfDir GetEnv('QTINFDIR')
#define HasOpenSSL GetEnv('HASOPENSSL')
#define OpenSSLDir GetEnv('OPENSSLDIR')
#define IDEWidgetSet GetEnv('IDE_WidgetSet') #define IDEWidgetSet GetEnv('IDE_WidgetSet')
#define OutputFileName GetEnv('OutputFileName') #define OutputFileName GetEnv('OutputFileName')
#define CHMHELPFILES GetEnv('CHMHELPFILES') #define CHMHELPFILES GetEnv('CHMHELPFILES')
@ -71,14 +73,20 @@ Name: delusersettings; Description: {cm:DelUserConf}; GroupDescription: {cm:Clea
;unchecked checkedonce ;unchecked checkedonce
[Components] [Components]
#ifdef CHMHELPFILES
#if CHMHELPFILES!=""
Name: installhelp; Description: {cm:InstallChm}; Types: custom full
#endif
#endif
#if FPCTargetOS=="win32" #if FPCTargetOS=="win32"
#if IDEWidgetSet!="qt" #if IDEWidgetSet!="qt"
Name: installqtintfdll; Description: {cm:InstallQt}; Types: custom full compact Name: installqtintfdll; Description: {cm:InstallQt}; Types: custom full compact
#endif #endif
#endif #endif
#ifdef CHMHELPFILES #ifdef HasOpenSSL
#if CHMHELPFILES!="" #if HasOpenSSL!=""
Name: installhelp; Description: {cm:InstallChm}; Types: custom full Name: installopenssl; Description: {cm:InstallOpenSSL}; Types: custom full compact; Flags: checkablealone
Name: installopenssl/global; Description: {cm:InstallOpenSSLGlobal}; Types: full; Flags: dontinheritcheck
#endif #endif
#endif #endif
Name: association; Description: {cm:AssociateGroup}; Types: custom full Name: association; Description: {cm:AssociateGroup}; Types: custom full
@ -126,6 +134,14 @@ Source: {#BuildDir}\fpc\{#FPCVersion}\bin\{#FPCFullTarget}\cpp.exe; DestDir: {ap
#ifdef CHMHELPFILES #ifdef CHMHELPFILES
#if CHMHELPFILES!="" #if CHMHELPFILES!=""
Source: {#CHMHELPFILES}\*.*; DestDir: {app}\docs\chm; Components: installhelp; Flags: recursesubdirs Source: {#CHMHELPFILES}\*.*; DestDir: {app}\docs\chm; Components: installhelp; Flags: recursesubdirs
Source: {#CHMHELPFILES}\*.*; DestDir: {app}\docs\chm; Components: installhelp; Flags: recursesubdirs
#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
#endif #endif