diff options
| author | Simo Fält <simo.falt@qt.io> | 2021-05-27 10:14:40 +0300 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2021-06-03 11:51:21 +0300 |
| commit | eb18ef9b8511297d1acdcfdee189c9c037e0af1c (patch) | |
| tree | 0c69abc1b1576c915b013c803a91af1eeec148ed | |
| parent | ad6642ec0dd50ce10f4cea3f02364dc5068afbe7 (diff) | |
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>
| -rw-r--r-- | coin/instructions/make_instructions.yaml | 11 | ||||
| -rw-r--r-- | coin/instructions/make_win_docs_instructions.yaml | 33 |
2 files changed, 34 insertions, 10 deletions
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] |