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

Installer, Win: Add qt5pas.dll

Browse Source 
git-svn-id: trunk@61180 -
This commit is contained in:
martin 2019-05-08 16:59:56 +00:00
parent 78618555a7
commit 8152045409
4 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,6 +119,11 @@ for /F %%i in ('dir /b "%OPENSSLDIR%\*.*"') do (
:: http://users.pandora.be/Jan.Van.hijfte/qtforfpc/fpcqt4.html
SET QTINFDIR=%LAZSVNBINDIR%\%FPCFULLTARGET%\qt
SET QT5INFDIR=%LAZSVNBINDIR%\%FPCFULLTARGET%\qt5
for /F %%i in ('dir /b "%QT5INFDIR%\*.*"') do (
SET HASQT5=1
)
::---------------------------------------------------------------------
FOR /F %%L IN ('%FPCBINDIR%\gdate.exe +%%Y%%m%%d') DO SET DATESTAMP=%%L
SET BUILDDRIVE=%BUILDDIR:~,2%

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

@ -8,6 +8,8 @@ CleanUp=Aufr
InstallQtLocal=QT4-Interface-DLL installieren
InstallQt=QT4-Interface-DLL global installieren
InstallQt5Local=QT5-Interface-DLL installieren
InstallQt5Global=QT5-Interface-DLL global installieren
InstallChm=CHM-Hilfedateien installieren
InstallOpenSSL=Openssl dll installieren (Benötigt für den Online-Packet-Manager)
InstallOpenSSLGlobal=Openssl dll global installieren

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

@ -8,6 +8,8 @@ CleanUp=Clean up:
InstallQtLocal=Install Qt4 interface DLL
InstallQt=Globally install Qt4 interface DLL
InstallQt5Local=Install Qt5 interface DLL
InstallQt5Global=Globally install Qt5 interface DLL
InstallChm=Install CHM help files
InstallOpenSSL=Install openssl libraries (required by OnlinePackageManager)
InstallOpenSSLGlobal=Globally Install openssl libraries

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

@ -20,6 +20,8 @@ EnableISX=true
#define SetupDate GetEnv('DateStamp')
#define BuildDir GetEnv('BuildDir')
#define QtInfDir GetEnv('QTINFDIR')
#define HasQT5 GetEnv('HASQT5')
#define Qt5InfDir GetEnv('QT5INFDIR')
#define HasOpenSSL GetEnv('HASOPENSSL')
#define OpenSSLDir GetEnv('OPENSSLDIR')
#define IDEWidgetSet GetEnv('IDE_WidgetSet')
@ -80,13 +82,25 @@ Name: installhelp; Description: {cm:InstallChm}; Types: custom full
#endif
#if FPCTargetOS=="win32"
#if IDEWidgetSet!="qt"
;// #if IDEWidgetSet!="qt"
Name: install4qtintfdll; Description: {cm:InstallQtLocal}; Types: custom full; Flags: checkablealone
#else
Name: install4qtintfdll; Description: {cm:InstallQtLocal}; Types: custom full compact; Flags: checkablealone fixed
#endif
;// #else
;//Name: install4qtintfdll; Description: {cm:InstallQtLocal}; Types: custom full compact; Flags: checkablealone fixed
;// #endif
Name: install4qtintfdll/global; Description: {cm:InstallQt}; Types: full; Flags: dontinheritcheck
#endif
#ifdef HasQT5
#if HasQT5!=""
#if IDEWidgetSet!="qt"
Name: install5qtintfdll; Description: {cm:InstallQt5Local}; Types: custom full; Flags: checkablealone
#else
Name: install5qtintfdll; Description: {cm:InstallQt5Local}; Types: custom full compact; Flags: checkablealone fixed
#endif
Name: install5qtintfdll/global; Description: {cm:InstallQt5Global}; Types: full; Flags: dontinheritcheck
#endif
#endif
#ifdef HasOpenSSL
#if HasOpenSSL!=""
Name: installopenssl; Description: {cm:InstallOpenSSL}; Types: custom full compact; Flags: checkablealone
@ -123,18 +137,30 @@ Name: {code:GetPCPForDelete}userschemes\*.xml; Type: files; Tasks: delusersettin
[Files]
Source: {#BuildDir}\*.*; DestDir: {app}; Flags: recursesubdirs
Source: environmentoptions.xml; DestDir: {app}; AfterInstall: UpdateEnvironmentOptions; DestName: environmentoptions.xml
#if FPCTargetOS=="win32"
#if IDEWidgetSet=="qt"
Source: {#QtInfDir}\*.dll; DestDir: {sys}; Flags: sharedfile replacesameversion
#else
;//#if IDEWidgetSet=="qt"
;//Source: {#QtInfDir}\*.dll; DestDir: {sys}; Flags: sharedfile replacesameversion
;//#else
Source: {#QtInfDir}\*.dll; DestDir: {sys}; Flags: sharedfile replacesameversion; Components: install4qtintfdll/global
#endif
;//#endif
Source: {#QtInfDir}\*.dll; DestDir: {app}; Components: install4qtintfdll
#if FPCVersion=="2.2.0"
Source: {#BuildDir}\fpc\{#FPCVersion}\bin\{#FPCFullTarget}\cpp.exe; DestDir: {app}\ide; MinVersion: 1,0
#endif
#endif
#ifdef HasQT5
#if HasQT5!=""
#if IDEWidgetSet=="qt"
Source: {#Qt5InfDir}\*.dll; DestDir: {sys}; Flags: sharedfile replacesameversion
#else
Source: {#Qt5InfDir}\*.dll; DestDir: {sys}; Flags: sharedfile replacesameversion; Components: install5qtintfdll/global
#endif
Source: {#Qt5InfDir}\*.dll; DestDir: {app}; Components: install5qtintfdll
#endif
#endif
#ifdef CHMHELPFILES
#if CHMHELPFILES!=""
Source: {#CHMHELPFILES}\*.*; DestDir: {app}\docs\chm; Components: installhelp; Flags: recursesubdirs