diff options
| author | Toni Saario <toni.saario@qt.io> | 2021-06-15 13:09:33 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-16 22:22:31 +0000 |
| commit | 51e88c7313c048c79dcc28f76b3d65a7bd360119 (patch) | |
| tree | 4fa2618c73119e1fcb554dae7b52e6ce038ea3e0 | |
| parent | a22e9d7674a72aefaf7240d8f64a04bf15bba670 (diff) | |
Archive global and config from qtbase in doc build
Copy the global and config folder from under qtbase to directory from
which the documentation.tar.gz is created. This is similar to how these
are added in qmake builds.
Task-number: QTBUG-94443
Change-Id: I1dfd6dd05057bb1bfdaeec9cf5d03fbfe474a5d1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 7ed6d04410d5f6d1db2a92332baadf0e42b81f40)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | coin/module_config.yaml | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/coin/module_config.yaml b/coin/module_config.yaml index d73063c4..98c46462 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -35,8 +35,16 @@ instructions: maxTimeBetweenOutput: 1200 userMessageOnFailure: > Failed to generate docs. - - type: MakeDirectory - directory: "{{.BuildDir}}/qtbase/doc/global" + - type: ExecuteCommand + command: "cp -r {{.BuildDir}}/qtbase/doc/config {{.BuildDir}}/doc" + maxTimeInSeconds: 12000 + maxTimeBetweenOutput: 1200 + userMessageOnFailure: "Failed to copy qtbase/doc/config to documentation directory." + - type: ExecuteCommand + command: "cp -r {{.BuildDir}}/qtbase/doc/global {{.BuildDir}}/doc" + maxTimeInSeconds: 12000 + maxTimeBetweenOutput: 1200 + userMessageOnFailure: "Failed to copy qtbase/doc/global to documentation directory." - type: UploadArtifact archiveDirectory: '{{.BuildDir}}/doc' transferType: UploadModuleDocumentation |