From 2b968202bbc150f1ec6158749097ce713fde7bb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Tue, 21 Jul 2020 17:38:50 +0200
Subject: [PATCH] win_installer: include online-help in msi

---
 .github/workflows/release-windows.yml | 7 ++++++-
 win_installer/config.wxi              | 1 +
 win_installer/cppcheck.wxs            | 6 ++++++
 win_installer/productInfo.wxi         | 1 +
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release-windows.yml b/.github/workflows/release-windows.yml
index 8c30db65c..49961914f 100644
--- a/.github/workflows/release-windows.yml
+++ b/.github/workflows/release-windows.yml
@@ -50,7 +50,7 @@ jobs:
       - name: Install Qt
         uses: jurplel/install-qt-action@v2
         with:
-          modules: 'qtcharts'
+          modules: 'qtcharts qthelp'
 
       - name: Create .qm
         run: |
@@ -58,6 +58,11 @@ jobs:
           lupdate gui.pro
           lrelease gui.pro -removeidentical
 
+      - name: Create online-help
+        run: |
+          cd gui\help
+          qhelpgenerator online-help.qhcp -o online-help.qhc
+
       - name: Matchcompiler
         run: python tools\matchcompiler.py --write-dir lib
 
diff --git a/win_installer/config.wxi b/win_installer/config.wxi
index fc95836b8..f37694229 100644
--- a/win_installer/config.wxi
+++ b/win_installer/config.wxi
@@ -2,6 +2,7 @@
 <Include>
   <?define CliBuildDir = "..\bin" ?>
   <?define GuiBuildDir = "..\bin" ?>
+  <?define GuiHelpDir = "..\gui\help" ?>
   <?define TranslationsDir = "..\gui" ?>
   <?define CfgsDir = "..\cfg" ?>
   <?define PtfsDir = "..\platforms" ?>
diff --git a/win_installer/cppcheck.wxs b/win_installer/cppcheck.wxs
index 8db358f3b..8ed3271c2 100644
--- a/win_installer/cppcheck.wxs
+++ b/win_installer/cppcheck.wxs
@@ -55,6 +55,12 @@
               <File Id='qwindowsvistastyledll' Name='qwindowsvistastyle.dll' Source='$(var.QtDllDir)\styles\qwindowsvistastyle.dll' />
             </Component>
           </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'>
             <Component Id='GuiTranslations' Guid='$(var.guiTranslationsGUID)'>
               <File Id='cppcheck_de.qm' Name='cppcheck_de.qm' Source='$(var.TranslationsDir)\cppcheck_de.qm' />
diff --git a/win_installer/productInfo.wxi b/win_installer/productInfo.wxi
index 7c910c35e..817f46048 100644
--- a/win_installer/productInfo.wxi
+++ b/win_installer/productInfo.wxi
@@ -21,4 +21,5 @@
   <?define optionalPtfsGUID = "F9EB9DB1-C0F1-4548-A5B0-27B51CD43A34" ?>
   <?define basedocsGUID = "9F62B23C-CD2B-4826-A567-6AB6F75A2AEA" ?>
   <?define registrykeysGUID = "8CB515B1-6EF6-4A2A-97A0-F8A13E3A505E" ?>
+  <?define guihelpGUID = "0A0C93BF-59E8-4919-B08F-D4BA63B9C93C" ?>
 </Include>