From eb18ef9b8511297d1acdcfdee189c9c037e0af1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simo=20F=C3=A4lt?= <simo.falt@qt.io>
Date: Thu, 27 May 2021 10:14:40 +0300
Subject: Patch the windows documentation build

While we can't build qdoc within static build, we have to extract it
separately to be able to use it.

Change-Id: Ifa97edd9cc197cdc7f765e2323f1149cb29e9990
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
---
 coin/instructions/make_instructions.yaml          | 11 +-------
 coin/instructions/make_win_docs_instructions.yaml | 33 +++++++++++++++++++++++
 2 files changed, 34 insertions(+), 10 deletions(-)
 create mode 100644 coin/instructions/make_win_docs_instructions.yaml

(limited to 'coin')

diff --git a/coin/instructions/make_instructions.yaml b/coin/instructions/make_instructions.yaml
index bcf3c55af..0eaf2bfd2 100644
--- a/coin/instructions/make_instructions.yaml
+++ b/coin/instructions/make_instructions.yaml
@@ -61,16 +61,7 @@ instructions:
         maxTimeInSeconds: 36000
         maxTimeBetweenOutput: 3600
         userMessageOnFailure: "Failed to run jom/make, check logs."
-      - type: ExecuteCommand
-        command: ['jom', 'html_docs']
-        maxTimeInSeconds: 36000
-        maxTimeBetweenOutput: 3600
-        userMessageOnFailure: 'Could not build documentation.'
-      - type: UploadArtifact
-        archiveDirectory: '{{.BuildDir}}\\doc'
-        transferType: UploadModuleDocumentation
-        maxTimeInSeconds: 1800
-        maxTimeBetweenOutput: 1800
+      - !include "{{installer-framework/installer-framework}}/make_win_docs_instructions.yaml"
       - type: ExecuteCommand
         command: "nmake install INSTALL_ROOT={{.InstallRoot}}"
         maxTimeInSeconds: 1800
diff --git a/coin/instructions/make_win_docs_instructions.yaml b/coin/instructions/make_win_docs_instructions.yaml
new file mode 100644
index 000000000..5d5f28f67
--- /dev/null
+++ b/coin/instructions/make_win_docs_instructions.yaml
@@ -0,0 +1,33 @@
+type: Group
+instructions:
+  - type: Group
+    instructions:
+      - type: ChangeDirectory
+        directory: "{{.SourceDir}}\\doc"
+        maxTimeInSeconds: 300
+        maxTimeBetweenOutput: 120
+        userMessageOnFailure: "Failed to change dir"
+      - type: ExecuteCommand
+        command: ['sed', '-i', 's/Users\\qt\\work\\install/Utils\\qt-bld-dynamic\\qtbase/g', 'qdoc_wrapper.bat']
+        maxTimeInSeconds: 36000
+        maxTimeBetweenOutput: 3600
+        userMessageOnFailure: 'Failed to patch qdoc_wrapper.bat.'
+      - type: ChangeDirectory
+        directory: "{{.BuildDir}}"
+        maxTimeInSeconds: 300
+        maxTimeBetweenOutput: 120
+        userMessageOnFailure: "Failed to change dir"
+      - type: ExecuteCommand
+        command: ['jom', 'html_docs']
+        maxTimeInSeconds: 36000
+        maxTimeBetweenOutput: 3600
+        userMessageOnFailure: 'Could not build documentation.'
+      - type: UploadArtifact
+        archiveDirectory: '{{.BuildDir}}\\doc'
+        transferType: UploadModuleDocumentation
+        maxTimeInSeconds: 1800
+        maxTimeBetweenOutput: 1800
+    enable_if:
+      condition: property
+      property: target.compiler
+      in_values: [MSVC2013, MSVC2015, MSVC2017, MSVC2019]
-- 
cgit v1.2.3