flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

[CI] Fork install-qt-action, install Qt docs on Linux and debug info on Windows

Browse Source 
Docs are needed for Doxygen links, debug info for linking qtmain.pdb
This commit is contained in:
Mat Sutcliffe
2020-06-21 20:40:15 +01:00
parent 170727fca2
commit aff4a0e1cf
2 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
.github/workflows/build.yml vendored
View File

@@ -67,15 +67,17 @@ jobs:
needs: preBuild
env:
BITROCK_BUILDER: ~/installbuilder/bin/builder
QDOC_PATH: $(GITHUB_WORKSPACE)/../Qt/Docs/Qt-5.15.0
outputs:
warnings: ${{ steps.warnings.outputs.warnings }}
steps:
- name: Install Qt
uses: jurplel/install-qt-action@v2
uses: swift-project/install-qt-action@swift
with:
version: 5.15.0
aqtversion: ==0.8
aqtversion: ==0.9.2
doc: true
- name: Download InstallBuilder
run: |
wget -O ~/installbuilder.run https://installbuilder.com/installbuilder-qt-professional-20.4.0-linux-x64-installer.run
@@ -142,8 +144,16 @@ jobs:
uses: jurplel/install-qt-action@v2
with:
version: 5.15.0
arch: "win64_msvc2019_64"
aqtversion: ">=0.9.0"
arch: win64_msvc2019_64
aqtversion: ==0.9.2
- name: Install Qt debug info
uses: jurplel/install-qt-action@v2
with:
version: 5.15.0
arch: win64_msvc2019_64
aqtversion: ==0.9.2
modules: debug_info
extra: --archives qtbase
- name: Download InstallBuilder
run: |
curl.exe --output "$HOME\installbuilder.exe" -L --url https://installbuilder.com/installbuilder-qt-professional-20.4.0-windows-x64-installer.exe
@@ -210,8 +220,16 @@ jobs:
uses: jurplel/install-qt-action@v2
with:
version: 5.15.0
arch: "win32_msvc2019"
aqtversion: ">=0.9.0"
arch: win32_msvc2019
aqtversion: ==0.9.2
- name: Install Qt debug info
uses: jurplel/install-qt-action@v2
with:
version: 5.15.0
arch: win32_msvc2019
aqtversion: ==0.9.2
modules: debug_info
extra: --archives qtbase
- name: Download InstallBuilder
run: |
curl.exe --output "$HOME\installbuilder.exe" -L --url https://installbuilder.com/installbuilder-qt-professional-20.4.0-windows-installer.exe
@@ -278,6 +296,7 @@ jobs:
uses: jurplel/install-qt-action@v2
with:
version: 5.15.0
aqtversion: ==0.9.2
- name: Download InstallBuilder
run: |
wget -O $HOME/installbuilder.dmg https://installbuilder.com/installbuilder-qt-professional-20.4.0-osx-installer.dmg

20
docs/docs.pro
View File

@@ -13,22 +13,22 @@ else: DOXYGEN_BIN = $$system(which doxygen 2> /dev/null)
!isEmpty(DOXYGEN_BIN) {
DOXYFILE = Doxyfile.qmake
QDOC_PATH = $$(QDOC_PATH)
DOXY_INPUT = .
win32-g++ {
doxy.commands = set DOXY_SRC_ROOT=$$SourceRoot & \
set QDOC_PATH=$$[QT_INSTALL_DOCS] & \
doxygen $$PWD/$$DOXYFILE
doxy.commands = set DOXY_SRC_ROOT=$$SourceRoot &
isEmpty(QDOC_PATH): doxy.commands += set QDOC_PATH=$$[QT_INSTALL_DOCS] &
doxy.commands += doxygen $$PWD/$$DOXYFILE
}
else:win32 {
doxy.commands = set DOXY_SRC_ROOT=$$SourceRoot & \
set QDOC_PATH=$$[QT_INSTALL_DOCS] & \
doxygen $$PWD\\$$DOXYFILE
doxy.commands = set DOXY_SRC_ROOT=$$SourceRoot &
isEmpty(QDOC_PATH): doxy.commands += set QDOC_PATH=$$[QT_INSTALL_DOCS] &
doxy.commands += doxygen $$PWD\\$$DOXYFILE
}
else {
doxy.commands = DOXY_SRC_ROOT="$$SourceRoot" \
QDOC_PATH="$$[QT_INSTALL_DOCS]" \
doxygen $$PWD/$$DOXYFILE
doxy.commands = DOXY_SRC_ROOT="$$SourceRoot"
isEmpty(QDOC_PATH): doxy.commands += QDOC_PATH="$$[QT_INSTALL_DOCS]"
doxy.commands += doxygen $$PWD/$$DOXYFILE
}
doxy.CONFIG = no_link target_predeps