Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +01:00
Code Releases Activity

Windows: Update installer with correct paths

Browse Source
This commit is contained in:
David Rosca 2018-03-24 08:44:15 +01:00
parent 050fd7528c
commit 1183fc5809
No known key found for this signature in database
GPG Key ID: EBC3FC294452C6D8
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
windows/installer.nsi
View File

@ -16,7 +16,8 @@
!define MSVC_VER 140 !define MSVC_VER 140
!define OPENSSL_BIN_DIR . !define OPENSSL_BIN_DIR .
!define MSVC_REDIST_DIR . !define MSVC_REDIST_DIR .
!define QZ_BIN_DIR . !define FALKON_SRC_DIR ..\..\
!define FALKON_BIN_DIR .
!define ICU_BIN_DIR . !define ICU_BIN_DIR .
!define QT_DIR . !define QT_DIR .
!define QT_BIN_DIR . !define QT_BIN_DIR .
@ -59,7 +60,7 @@ SetCompressor /SOLID /FINAL lzma
!define MUI_UNWELCOMEFINISHPAGE_BITMAP "wininstall\welcome.bmp" !define MUI_UNWELCOMEFINISHPAGE_BITMAP "wininstall\welcome.bmp"
!insertmacro MUI_PAGE_WELCOME !insertmacro MUI_PAGE_WELCOME
!insertmacro MUI_PAGE_LICENSE ${QZ_BIN_DIR}\COPYRIGHT.txt !insertmacro MUI_PAGE_LICENSE ${FALKON_BIN_DIR}\COPYRIGHT.txt
!insertmacro MUI_PAGE_COMPONENTS !insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_DIRECTORY
!insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_PAGE_INSTFILES
@ -127,10 +128,10 @@ notRunning:
SetOverwrite on SetOverwrite on
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
File "${QZ_BIN_DIR}\COPYRIGHT.txt" File "${FALKON_BIN_DIR}\COPYRIGHT.txt"
File "${QZ_BIN_DIR}\falkon.exe" File "${FALKON_BIN_DIR}\falkon.exe"
File "${QZ_BIN_DIR}\falkon.dll" File "${FALKON_BIN_DIR}\falkon.dll"
File "${QZ_BIN_DIR}\qt.conf" File "${FALKON_BIN_DIR}\qt.conf"
File "${OPENSSL_BIN_DIR}\libeay32.dll" File "${OPENSSL_BIN_DIR}\libeay32.dll"
File "${OPENSSL_BIN_DIR}\ssleay32.dll" File "${OPENSSL_BIN_DIR}\ssleay32.dll"
File "${MSVC_REDIST_DIR}\*" File "${MSVC_REDIST_DIR}\*"
@ -204,38 +205,38 @@ SectionGroup $(TITLE_SecThemes) SecThemes
Section Default SecDefault Section Default SecDefault
SectionIn RO SectionIn RO
SetOutPath "$INSTDIR\themes\windows" SetOutPath "$INSTDIR\themes\windows"
File "${QZ_BIN_DIR}\themes\windows\*" File "${FALKON_SRC_DIR}\themes\windows\*"
SetOutPath "$INSTDIR\themes\windows\images" SetOutPath "$INSTDIR\themes\windows\images"
File "${QZ_BIN_DIR}\themes\windows\images\*" File "${FALKON_SRC_DIR}\themes\windows\images\*"
SectionEnd SectionEnd
Section Chrome SecChrome Section Chrome SecChrome
SetOutPath "$INSTDIR\themes\chrome" SetOutPath "$INSTDIR\themes\chrome"
File "${QZ_BIN_DIR}\themes\chrome\*" File "${FALKON_SRC_DIR}\themes\chrome\*"
SetOutPath "$INSTDIR\themes\chrome\images" SetOutPath "$INSTDIR\themes\chrome\images"
File "${QZ_BIN_DIR}\themes\chrome\images\*" File "${FALKON_SRC_DIR}\themes\chrome\images\*"
SectionEnd SectionEnd
Section Mac SecMac Section Mac SecMac
SetOutPath "$INSTDIR\themes\mac" SetOutPath "$INSTDIR\themes\mac"
File "${QZ_BIN_DIR}\themes\mac\*" File "${FALKON_SRC_DIR}\themes\mac\*"
SetOutPath "$INSTDIR\themes\mac\images" SetOutPath "$INSTDIR\themes\mac\images"
File "${QZ_BIN_DIR}\themes\mac\images\*" File "${FALKON_SRC_DIR}\themes\mac\images\*"
SectionEnd SectionEnd
SectionGroupEnd SectionGroupEnd
Section $(TITLE_SecTranslations) SecTranslations Section $(TITLE_SecTranslations) SecTranslations
SetOutPath "$INSTDIR\locale" #SetOutPath "$INSTDIR\locale"
File "${QZ_BIN_DIR}\locale\*.qm" #File "${FALKON_BIN_DIR}\locale\*.qm"
SetOutPath "$INSTDIR\qtwebengine_dictionaries\doc" #SetOutPath "$INSTDIR\qtwebengine_dictionaries\doc"
File "${QTWEBENGINE_DICTIONARIES_DIR}\doc\*" #File "${QTWEBENGINE_DICTIONARIES_DIR}\doc\*"
SetOutPath "$INSTDIR\qtwebengine_dictionaries" #SetOutPath "$INSTDIR\qtwebengine_dictionaries"
File "${QTWEBENGINE_DICTIONARIES_DIR}\*.bdic" #File "${QTWEBENGINE_DICTIONARIES_DIR}\*.bdic"
SectionEnd SectionEnd
Section $(TITLE_SecPlugins) SecPlugins Section $(TITLE_SecPlugins) SecPlugins
SetOutPath "$INSTDIR\plugins" SetOutPath "$INSTDIR\plugins"
File "${QZ_BIN_DIR}\plugins\*.dll" File "${FALKON_BIN_DIR}\plugins\*.dll"
SectionEnd SectionEnd