Skip to content

Commit 6142693

Browse files
justinshannonjustinshannon
authored
Merge pull request #176 from xpilot-project/next
v2.0.0-beta.50
2 parents b7a2375 + b972101 commit 6142693

File tree

168 files changed

+3775
-3314
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+3775
-3314
lines changed

‎.github/workflows/linux.yml

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ env:
88
BUILD_TYPE: Release
99
VATSIM_CLIENT_ID: ${{ secrets.VATSIM_CLIENT_ID }}
1010
VATSIM_CLIENT_KEY: ${{ secrets.VATSIM_CLIENT_KEY }}
11+
VATSIM_TOWERVIEW_CLIENT_ID: ${{ secrets.VATSIM_TOWERVIEW_CLIENT_ID }}
1112
CONFIG_ENCRYPTION_KEY: ${{ secrets.CONFIG_ENCRYPTION_KEY }}
1213
CLIENT_DIR: ${{ github.workspace }}/client
1314
PLUGIN_DIR: ${{ github.workspace }}/plugin
1415
IB_URL: https://xpilot-project.org/ib/installbuilder-enterprise-23.1.0-linux-x64-installer.run
1516
IB_LICENSE: ${{ secrets.INSTALLBUILDER_LICENSE }}
17+
QT_VERSION: "v6.5.2"
1618

1719
jobs:
1820
build:
@@ -21,21 +23,26 @@ jobs:
2123
steps:
2224
- name: Install dependencies
2325
run: |
24-
sudo apt-get update
25-
sudo apt-get install libfontconfig1-dev libfreetype6-dev libx11-dev libx11-xcb-dev libxext-dev \
26-
libxfixes-dev libxi-dev libxrender-dev libxcb1-dev libxcb-glx0-dev libxcb-keysyms1-dev libxcb-image0-dev \
27-
libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev \
28-
libxcb-render-util0-dev libxcb-util-dev libxcb-xinerama0-dev libxcb-xkb-dev libxkbcommon-dev libxkbcommon-x11-dev \
26+
sudo apt-get update && sudo apt-get install \
27+
libfontconfig1-dev libfreetype6-dev libx11-dev libx11-xcb-dev libxext-dev libxfixes-dev libxi-dev libxrender-dev libxcb1-dev libxcb-cursor-dev libxcb-glx0-dev libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxcb-util-dev libxcb-xinerama0-dev libxcb-xkb-dev libxkbcommon-dev libxkbcommon-x11-dev xorg-dev \
2928
libglu1-mesa-dev freeglut3-dev mesa-common-dev libglfw3-dev libgles2-mesa-dev \
30-
libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libgstreamer-plugins-bad1.0-dev \
31-
gstreamer1.0-plugins-base gstreamer1.0-plugins-good gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly \
32-
gstreamer1.0-libav gstreamer1.0-doc gstreamer1.0-tools gstreamer1.0-x gstreamer1.0-alsa gstreamer1.0-gl \
33-
gstreamer1.0-gtk3 gstreamer1.0-qt5 gstreamer1.0-pulseaudio
29+
libpulse-dev
3430
3531
- uses: actions/checkout@v3
3632
with:
3733
submodules: recursive
3834

35+
- name: Delete dummy auth library
36+
shell: bash
37+
run: rm -rf dependencies/vatsim-auth
38+
39+
- name: Checkout auth library
40+
uses: actions/checkout@v3
41+
with:
42+
repository: xpilot-project/vatsim-auth
43+
path: dependencies/vatsim-auth
44+
token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
45+
3946
### Buid Plugin ###
4047

4148
- name: Build plugin
@@ -71,7 +78,7 @@ jobs:
7178
uses: robinraju/release-downloader@v1.6
7279
with:
7380
repository: "xpilot-project/qt6"
74-
tag: "v6.3.2"
81+
tag: ${{ env.QT_VERSION }}
7582
fileName: "linux.7z"
7683
token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
7784

@@ -92,9 +99,10 @@ jobs:
9299
-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} \
93100
-DVATSIM_CLIENT_ID=${{ env.VATSIM_CLIENT_ID }} \
94101
-DVATSIM_CLIENT_KEY=${{ env.VATSIM_CLIENT_KEY }} \
102+
-DVATSIM_TOWERVIEW_CLIENT_ID=${{ env.VATSIM_TOWERVIEW_CLIENT_ID }} \
95103
-DCONFIG_ENCRYPTION_KEY=${{ env.CONFIG_ENCRYPTION_KEY }} \
96104
-DCMAKE_PREFIX_PATH=${{ env.Qt6_DIR }} \
97-
-DOPENSSL_ROOT_DIR=${{ github.workspace }}/externals/linux/openssl
105+
-DOPENSSL_ROOT_DIR=${{ github.workspace }}/dependencies/linux/openssl
98106
cmake --build . --config ${{ env.BUILD_TYPE }}
99107
mv ${{ env.CLIENT_DIR }}/build/xPilot ${{ env.CLIENT_DIR }}/build/xpilot
100108

‎.github/workflows/macos.yml

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,13 @@ env:
99
BUILD_TYPE: Release
1010
VATSIM_CLIENT_ID: ${{ secrets.VATSIM_CLIENT_ID }}
1111
VATSIM_CLIENT_KEY: ${{ secrets.VATSIM_CLIENT_KEY }}
12+
VATSIM_TOWERVIEW_CLIENT_ID: ${{ secrets.VATSIM_TOWERVIEW_CLIENT_ID }}
1213
CONFIG_ENCRYPTION_KEY: ${{ secrets.CONFIG_ENCRYPTION_KEY }}
1314
CLIENT_DIR: ${{ github.workspace }}/client
1415
PLUGIN_DIR: ${{ github.workspace }}/plugin
1516
IB_URL: https://xpilot-project.org/ib/installbuilder-enterprise-23.1.0-osx-installer.dmg
1617
IB_LICENSE: ${{ secrets.INSTALLBUILDER_LICENSE }}
18+
QT_VERSION: "v6.5.2"
1719

1820
jobs:
1921
build:
@@ -24,6 +26,17 @@ jobs:
2426
with:
2527
submodules: recursive
2628

29+
- name: Delete dummy auth library
30+
shell: bash
31+
run: rm -rf dependencies/vatsim-auth
32+
33+
- name: Checkout auth library
34+
uses: actions/checkout@v3
35+
with:
36+
repository: xpilot-project/vatsim-auth
37+
path: dependencies/vatsim-auth
38+
token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
39+
2740
- name: Load developer certificate
2841
env:
2942
CERTIFICATE: ${{ secrets.APPLE_SIGNING_CERTIFICATE }}
@@ -63,7 +76,7 @@ jobs:
6376
uses: robinraju/release-downloader@v1.6
6477
with:
6578
repository: "xpilot-project/qt6"
66-
tag: "v6.3.2"
79+
tag: ${{ env.QT_VERSION }}
6780
fileName: "macos.7z"
6881
token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
6982

@@ -73,6 +86,8 @@ jobs:
7386
echo "Qt6_DIR=$(pwd)/qt6" >> $GITHUB_ENV
7487
echo "QT_PLUGIN_PATH=$(pwd)/qt6/plugins" >> $GITHUB_ENV
7588
echo "QML2_IMPORT_PATH=$(pwd)/qt6/qml" >> $GITHUB_ENV
89+
echo "$(pwd)/qt6/bin" >> $GITHUB_PATH
90+
chmod -R +x qt6
7691
7792
- name: Build client
7893
working-directory: ${{ env.CLIENT_DIR }}
@@ -82,9 +97,10 @@ jobs:
8297
-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} \
8398
-DVATSIM_CLIENT_ID=${{ env.VATSIM_CLIENT_ID }} \
8499
-DVATSIM_CLIENT_KEY=${{ env.VATSIM_CLIENT_KEY }} \
100+
-DVATSIM_TOWERVIEW_CLIENT_ID=${{ env.VATSIM_TOWERVIEW_CLIENT_ID }} \
85101
-DCONFIG_ENCRYPTION_KEY=${{ env.CONFIG_ENCRYPTION_KEY }} \
86102
-DCMAKE_PREFIX_PATH=${{ env.Qt6_DIR }} \
87-
-DOPENSSL_ROOT_DIR=${{ github.workspace }}/externals/macos/openssl \
103+
-DOPENSSL_ROOT_DIR=${{ github.workspace }}/dependencies/macos/openssl \
88104
-DCMAKE_OSX_DEPLOYMENT_TARGET=${{ env.MIN_OS_VERSION }}
89105
cmake --build . --config ${{ env.BUILD_TYPE }}
90106
@@ -121,12 +137,7 @@ jobs:
121137
122138
- name: Notarize installer
123139
shell: bash
124-
run: |
125-
xcrun altool --notarize-app \
126-
--primary-bundle-id "org.vatsim.xpilot" \
127-
--username "${{ secrets.NOTARIZATION_USERNAME }}" \
128-
--password "${{ secrets.NOTARIZATION_PASSWORD }}" \
129-
--file xPilot.dmg
140+
run: xcrun notarytool submit xPilot.dmg --apple-id "${{ secrets.NOTARIZATION_USERNAME }}" --password "${{ secrets.NOTARIZATION_PASSWORD }}" --team-id "${{ secrets.APPLE_TEAM_ID }}"
130141

131142
- name: Rename dmg
132143
run: |
@@ -144,9 +155,14 @@ jobs:
144155
mkdir -p macos/plugin
145156
cp -R ${{ github.workspace }}/xPilot macos/plugin/
146157
cp -R ${{ env.CLIENT_DIR }}/build/xPilot.app macos/xPilot.app
158+
cd macos
159+
zip -r ../macOS.zip plugin xPilot.app
160+
161+
- name: Notarize artifacts archive
162+
run: |
163+
xcrun notarytool submit macOS.zip --apple-id "${{ secrets.NOTARIZATION_USERNAME }}" --password "${{ secrets.NOTARIZATION_PASSWORD }}" --team-id "${{ secrets.APPLE_TEAM_ID }}"
147164
148165
- name: Upload artifacts
149166
uses: actions/upload-artifact@v3
150167
with:
151-
name: MacOS.zip
152-
path: ${{ github.workspace }}/macos
168+
path: ${{ github.workspace }}/macOS.zip

‎.github/workflows/windows.yml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ env:
88
BUILD_TYPE: Release
99
VATSIM_CLIENT_ID: ${{ secrets.VATSIM_CLIENT_ID }}
1010
VATSIM_CLIENT_KEY: ${{ secrets.VATSIM_CLIENT_KEY }}
11+
VATSIM_TOWERVIEW_CLIENT_ID: ${{ secrets.VATSIM_TOWERVIEW_CLIENT_ID }}
1112
CONFIG_ENCRYPTION_KEY: ${{ secrets.CONFIG_ENCRYPTION_KEY }}
1213
CLIENT_DIR: ${{ github.workspace }}/client
1314
PLUGIN_DIR: ${{ github.workspace }}/plugin
1415
IB_URL: https://xpilot-project.org/ib/installbuilder-enterprise-23.1.0-windows-x64-installer.exe
1516
IB_LICENSE: ${{ secrets.INSTALLBUILDER_LICENSE }}
17+
QT_VERSION: "v6.5.2"
1618

1719
jobs:
1820
build:
@@ -21,7 +23,18 @@ jobs:
2123
steps:
2224
- uses: actions/checkout@v3
2325
with:
24-
submodules: recursive
26+
submodules: recursive
27+
28+
- name: Delete dummy auth library
29+
shell: bash
30+
run: rm -rf dependencies/vatsim-auth
31+
32+
- name: Checkout auth library
33+
uses: actions/checkout@v3
34+
with:
35+
repository: xpilot-project/vatsim-auth
36+
path: dependencies/vatsim-auth
37+
token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
2538

2639
### Buid Plugin ###
2740

@@ -47,7 +60,7 @@ jobs:
4760
uses: robinraju/release-downloader@v1.6
4861
with:
4962
repository: "xpilot-project/qt6"
50-
tag: "v6.3.2"
63+
tag: ${{ env.QT_VERSION }}
5164
fileName: "windows.7z"
5265
token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
5366

@@ -57,7 +70,7 @@ jobs:
5770
echo "Qt6_DIR=$(pwd)/qt6" >> $env:GITHUB_ENV
5871
echo "QT_PLUGIN_PATH=$(pwd)/qt6/plugins" >> $env:GITHUB_ENV
5972
echo "QML2_IMPORT_PATH=$(pwd)/qt6/qml" >> $env:GITHUB_ENV
60-
echo "EXTERNAL_LIBS=$(pwd)/externals" >> $env:GITHUB_ENV
73+
echo "EXTERNAL_LIBS=$(pwd)/dependencies" >> $env:GITHUB_ENV
6174
6275
- name: Build client
6376
working-directory: ${{ env.CLIENT_DIR }}
@@ -68,9 +81,10 @@ jobs:
6881
-DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} `
6982
-DVATSIM_CLIENT_ID=${{ env.VATSIM_CLIENT_ID }} `
7083
-DVATSIM_CLIENT_KEY=${{ env.VATSIM_CLIENT_KEY }} `
84+
-DVATSIM_TOWERVIEW_CLIENT_ID=${{ env.VATSIM_TOWERVIEW_CLIENT_ID }} `
7185
-DCONFIG_ENCRYPTION_KEY=${{ env.CONFIG_ENCRYPTION_KEY }} `
7286
-DCMAKE_PREFIX_PATH=${{ env.Qt6_DIR }} `
73-
-DCMAKE_LIBRARY_PATH=${{ env.EXTERNAL_LIBS }}/windows/wmf
87+
-DCMAKE_LIBRARY_PATH=${{ env.EXTERNAL_LIBS }}/platform/windows/wmf
7488
cmake --build . --config ${{ env.BUILD_TYPE }}
7589
7690
- name: Get version

‎.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[submodule "client/afv-native"]
22
path = client/afv-native
33
url = git@github.com:xpilot-project/afv-native.git
4-
[submodule "externals"]
5-
path = externals
6-
url = git@github.com:xpilot-project/externals.git
74
[submodule "plugin/3rdparty/XPMP2"]
85
path = plugin/3rdparty/XPMP2
96
url = git@github.com:xpilot-project/XPMP2.git
107
[submodule "plugin/3rdparty/imgui"]
118
path = plugin/3rdparty/imgui
129
url = git@github.com:ocornut/imgui.git
10+
[submodule "dependencies"]
11+
path = dependencies
12+
url = git@github.com:xpilot-project/dependencies.git

0 commit comments

Comments
 (0)