win_installer: include online-help in msi

This commit is contained in:
Daniel Marjamäki 2020-07-21 17:38:50 +02:00
parent 453cd93fae
commit 2b968202bb
4 changed files with 14 additions and 1 deletions

View File

@ -50,7 +50,7 @@ jobs:
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v2
with: with:
modules: 'qtcharts' modules: 'qtcharts qthelp'
- name: Create .qm - name: Create .qm
run: | run: |
@ -58,6 +58,11 @@ jobs:
lupdate gui.pro lupdate gui.pro
lrelease gui.pro -removeidentical lrelease gui.pro -removeidentical
- name: Create online-help
run: |
cd gui\help
qhelpgenerator online-help.qhcp -o online-help.qhc
- name: Matchcompiler - name: Matchcompiler
run: python tools\matchcompiler.py --write-dir lib run: python tools\matchcompiler.py --write-dir lib

View File

@ -2,6 +2,7 @@
<Include> <Include>
<?define CliBuildDir = "..\bin" ?> <?define CliBuildDir = "..\bin" ?>
<?define GuiBuildDir = "..\bin" ?> <?define GuiBuildDir = "..\bin" ?>
<?define GuiHelpDir = "..\gui\help" ?>
<?define TranslationsDir = "..\gui" ?> <?define TranslationsDir = "..\gui" ?>
<?define CfgsDir = "..\cfg" ?> <?define CfgsDir = "..\cfg" ?>
<?define PtfsDir = "..\platforms" ?> <?define PtfsDir = "..\platforms" ?>

View File

@ -55,6 +55,12 @@
<File Id='qwindowsvistastyledll' Name='qwindowsvistastyle.dll' Source='$(var.QtDllDir)\styles\qwindowsvistastyle.dll' /> <File Id='qwindowsvistastyledll' Name='qwindowsvistastyle.dll' Source='$(var.QtDllDir)\styles\qwindowsvistastyle.dll' />
</Component> </Component>
</Directory> </Directory>
<Directory Id='GuiHelpFolder' Name='help'>
<Component Id='GuiHelp' DiskId='1' Guid='$(var.guihelpGUID)'>
<File Id='onlinehelpqhc' Name='online-help.qhc' Source='$(var.GuiHelpDir)\online-help.qhc' />
<File Id='onlinehelpqch' Name='online-help.qch' Source='$(var.GuiHelpDir)\online-help.qch' />
</Component>
</Directory>
<Directory Id='TranslationsFolder' Name='lang'> <Directory Id='TranslationsFolder' Name='lang'>
<Component Id='GuiTranslations' Guid='$(var.guiTranslationsGUID)'> <Component Id='GuiTranslations' Guid='$(var.guiTranslationsGUID)'>
<File Id='cppcheck_de.qm' Name='cppcheck_de.qm' Source='$(var.TranslationsDir)\cppcheck_de.qm' /> <File Id='cppcheck_de.qm' Name='cppcheck_de.qm' Source='$(var.TranslationsDir)\cppcheck_de.qm' />

View File

@ -21,4 +21,5 @@
<?define optionalPtfsGUID = "F9EB9DB1-C0F1-4548-A5B0-27B51CD43A34" ?> <?define optionalPtfsGUID = "F9EB9DB1-C0F1-4548-A5B0-27B51CD43A34" ?>
<?define basedocsGUID = "9F62B23C-CD2B-4826-A567-6AB6F75A2AEA" ?> <?define basedocsGUID = "9F62B23C-CD2B-4826-A567-6AB6F75A2AEA" ?>
<?define registrykeysGUID = "8CB515B1-6EF6-4A2A-97A0-F8A13E3A505E" ?> <?define registrykeysGUID = "8CB515B1-6EF6-4A2A-97A0-F8A13E3A505E" ?>
<?define guihelpGUID = "0A0C93BF-59E8-4919-B08F-D4BA63B9C93C" ?>
</Include> </Include>