Skip to content

Commit c182ae7

Browse files
KangLinKangLin
committed
CI: add macos_script.yml
1 parent be45daf commit c182ae7

File tree

8 files changed

+160
-29
lines changed

8 files changed

+160
-29
lines changed

‎.github/workflows/build.yml‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ jobs:
5757
uses: ./.github/workflows/macos.yml
5858
secrets: inherit
5959

60+
macos_script:
61+
uses: ./.github/workflows/macos_script.yml
62+
secrets: inherit
63+
6064
android:
6165
uses: ./.github/workflows/android.yml
6266
secrets: inherit
@@ -231,9 +235,9 @@ jobs:
231235
echo "" >> ${{github.workspace}}/Release.md
232236
echo "| | x86-64 (64-bit) | x86-32 (32-bit) | AArch64 (ARM64) | ARMv7 (32-bit) |Remark|" >> ${{github.workspace}}/Release.md
233237
echo "|:- | :-------------- | :-------------- | :-------------- | :------------- |:-----|" >> ${{github.workspace}}/Release.md
234-
echo "|Windows 7 SP1 or later|[EXE](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win64_msvc2022_64_qt6.9.2_Setup.exe) [Portable](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win64_msvc2022_64_qt6.9.2_Portable.zip)|[EXE](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win32_msvc2019_qt5.15.2_Setup.exe) [Portable](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win32_msvc2019_qt5.15.2_Portable.zip)| | |Unzip the portable zip file and execute \`bin/RabbitRemoteControl.exe\` to run the program. If this is the first run, execute \`npcap-1.80.exe\` to install npcap driver. the wake on lan depends on it.|" >> ${{github.workspace}}/Release.md
238+
echo "|Windows 7 SP1 or later|[EXE](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win64_msvc2022_64_qt6.9.2_Setup.exe) [Portable](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win64_msvc2022_64_qt6.9.2_Portable.zip)|[EXE](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win32_msvc2019_qt5.15.2_Setup.exe) [Portable](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_win32_msvc2019_qt5.15.2_Portable.zip)| | |Unzip the portable zip file and execute \`bin/RabbitRemoteControl.exe\` to run the program. If this is the first run, execute \`npcap-1.80.exe\` to install npcap driver. the wake on lan depends on it.|" >> ${{github.workspace}}/Release.md
235239
echo "|Android|[APK](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_android_x86_64_qt6.9.2_Release.apk) | |[APK](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_android_arm64_v8a_qt6.9.2_Release.apk)| |Experiment|" >> ${{github.workspace}}/Release.md
236-
echo "|Macos|[App zip](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_macos.zip)[dmg](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_macos.dmg)||||Experiment|" >> ${{github.workspace}}/Release.md
240+
echo "|Macos|[App zip](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_macos.zip) [dmg](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_macos.dmg)||||Experiment|" >> ${{github.workspace}}/Release.md
237241
#echo "|Linux|[AppImage](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_x86_64.AppImage) [Setup zip file](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_x86_64_Setup.zip)| |[AppImage](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_aarch64.AppImage) [Setup zip file](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_aarch64_Setup.zip)| |sudo chmod u+x RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_x86_64.AppImage|" >> ${{github.workspace}}/Release.md
238242
echo "|Linux|[zip file of install AppImage](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_x86_64_Setup.zip)| |[zip file of install AppImage](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_aarch64_Setup.zip)| |Unzip the zip file, then execute \`install.sh\` to install shortcuts for application, links, and directories in graphical user interfaces (GUIs), or execute \`./RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_Linux_x86_64.AppImage\` to run program in the terminal.|" >> ${{github.workspace}}/Release.md
239243
echo "|Ubuntu 24.04|[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_ubuntu-24.04_amd64.deb)| |[DEB](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/rabbitremotecontrol_${{env.RabbitRemoteControl_VERSION}}_ubuntu-24.04-arm_arm64.deb)| |sudo apt install \"deb file\" |" >> ${{github.workspace}}/Release.md
@@ -246,7 +250,7 @@ jobs:
246250
if [ "${{ github.ref_name }}" == "master" ]; then
247251
export BRANCH_NAME=test_${{ github.ref_name }}
248252
fi
249-
echo "|Flatpak|[flatpak](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_Linux_x86_64.flatpak)| |[flatpak](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v0.0.36_Linux_aarch64.flatpak)||flatpak install \"flatpak File\" [--user] |" >> ${{github.workspace}}/Release.md
253+
echo "|Flatpak|[flatpak](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_Linux_x86_64.flatpak)| |[flatpak](https://github.com/KangLin/RabbitRemoteControl/releases/download/${BRANCH_NAME}/RabbitRemoteControl_v${{env.RabbitRemoteControl_VERSION}}_Linux_aarch64.flatpak)||flatpak install \"flatpak File\" [--user] |" >> ${{github.workspace}}/Release.md
250254
251255
- name: Add snap donwload in Release.md file
252256
run: |

‎.github/workflows/macos.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
VCPKGGITCOMMITID: 44a1e4eca5211434b5fefcc25a69bba246c3f861
4444
VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
4545
VCPKG_DEFAULT_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
46-
VCPKG_MANIFEST_FEATURES: "vnc"
46+
VCPKG_MANIFEST_FEATURES: "freerdp,vnc,terminal"
4747
artifact_name: build_macos
4848
RabbitRemoteControl_VERSION: v0.0.36
4949

@@ -81,7 +81,7 @@ jobs:
8181

8282
- name: install nasm
8383
run: |
84-
brew install nasm qt doxygen graphviz freerdp libvncserver libssh zstd libpcap
84+
brew install nasm zstd libpcap libvncserver
8585
8686
- name: build RabbitVNC
8787
if: false
@@ -126,7 +126,6 @@ jobs:
126126
fi
127127
128128
- name: Install Qt
129-
if: false
130129
uses: jurplel/install-qt-action@v3
131130
with:
132131
dir: '${{env.TOOLS_DIR}}/qt' # optional
@@ -348,7 +347,7 @@ jobs:
348347
fi
349348
350349
echo "executable bin/macdeployqt `pwd`/RabbitRemoteControl.App -dmg -verbose=3"
351-
macdeployqt `pwd`/RabbitRemoteControl.App -dmg -verbose=3
350+
macdeployqt RabbitRemoteControl.App -dmg -verbose=3
352351
353352
7z a RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_${{matrix.os}}.zip ./RabbitRemoteControl.App
354353
if [ -f RabbitRemoteControl.dmg ]; then
@@ -366,8 +365,8 @@ jobs:
366365
echo "RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_${{matrix.os}}.zip md5sum: ${MD5SUM}"
367366
RabbitRemoteControl.App/Contents/MacOS/RabbitRemoteControlApp \
368367
--file-name RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_${{matrix.os}}.zip \
369-
-u "https://github.com/KangLin/RabbitRemoteControl/releases/download/v${{env.RabbitRemoteControl_VERSION}}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_${{matrix.os}}.zip;https://master.dl.sourceforge.net/project/rabbitremotecontrol/v${{env.RabbitRemoteControl_VERSION}}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_${{matrix.os}}.zip?viasf=1" \
370-
--md5 "${MD5SUM}"
368+
--md5 "${MD5SUM}" \
369+
-u "https://github.com/KangLin/RabbitRemoteControl/releases/download/v${{env.RabbitRemoteControl_VERSION}}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_${{matrix.os}}.zip;https://master.dl.sourceforge.net/project/rabbitremotecontrol/v${{env.RabbitRemoteControl_VERSION}}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_${{matrix.os}}.zip?viasf=1"
371370
372371
- name: Update artifact
373372
uses: actions/upload-artifact@v4

‎.github/workflows/macos_script.yml‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
# Author: Kang Lin <[email protected]>
2+
3+
name: macos
4+
5+
on:
6+
workflow_call:
7+
outputs:
8+
name:
9+
description: "The artifact name"
10+
value: ${{ jobs.build_macos.outputs.name }}
11+
12+
env:
13+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
14+
15+
jobs:
16+
build_macos:
17+
strategy:
18+
matrix:
19+
include:
20+
- VCPKG_TARGET_TRIPLET: x64-osx
21+
os: macos-13
22+
23+
- VCPKG_TARGET_TRIPLET: arm64-osx
24+
os: macos-14
25+
26+
# See: [About GitHub-hosted runners](https://docs.github.com/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners)
27+
# See: [Choosing the runner for a job](https://docs.github.com/actions/writing-workflows/choosing-where-your-workflow-runs/choosing-the-runner-for-a-job)
28+
# See: https://github.com/actions/runner-images/
29+
runs-on: ${{matrix.os}}
30+
defaults:
31+
run:
32+
shell: bash
33+
34+
env:
35+
BUILD_DIR: ${{github.workspace}}/build
36+
SOURCE_DIR: ${{github.workspace}}/.cache/source
37+
TOOLS_DIR: ${{github.workspace}}/.cache/tools
38+
INSTALL_DIR: ${{github.workspace}}/.cache/install
39+
qt_modules: ${{matrix.qt_modules}}
40+
VCPKGGITCOMMITID: 44a1e4eca5211434b5fefcc25a69bba246c3f861
41+
VCPKG_TARGET_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
42+
VCPKG_DEFAULT_TRIPLET: ${{matrix.VCPKG_TARGET_TRIPLET}}
43+
#VCPKG_MANIFEST_FEATURES: "freerdp;vnc;wol"
44+
artifact_name: build_macos
45+
RabbitRemoteControl_VERSION: v0.0.36
46+
47+
# Map the job outputs to step outputs
48+
outputs:
49+
name: ${{ env.artifact_name }}
50+
51+
steps:
52+
- name: Checkout Repository
53+
uses: actions/checkout@v3
54+
with:
55+
submodules: true
56+
fetch-depth: 0
57+
58+
- name: Make directories
59+
run: |
60+
cmake -E make_directory ${{env.BUILD_DIR}}
61+
cmake -E make_directory ${{env.SOURCE_DIR}}
62+
cmake -E make_directory ${{env.TOOLS_DIR}}
63+
cmake -E make_directory ${{env.INSTALL_DIR}}
64+
65+
- name: Cache installed
66+
uses: actions/cache@v4
67+
id: cache-installed
68+
with:
69+
path: |
70+
${{env.INSTALL_DIR}}
71+
key: install_${{matrix.os}}
72+
73+
- name: run-vcpkg
74+
uses: lukka/run-vcpkg@v11
75+
with:
76+
vcpkgGitCommitId: ${{env.VCPKGGITCOMMITID}}
77+
vcpkgDirectory: ${{env.SOURCE_DIR}}/vcpkg
78+
79+
- name: git clone RabbitCommon
80+
working-directory: ${{env.SOURCE_DIR}}
81+
run: git clone https://github.com/KangLin/RabbitCommon.git
82+
83+
- name: Run build_macos.sh
84+
run: |
85+
export RabbitCommon_ROOT=${{env.SOURCE_DIR}}/RabbitCommon
86+
brew install qt doxygen freerdp libvncserver libssh zstd libpcap
87+
./Script/build_macos.sh --build=${{env.BUILD_DIR}} --install=${{env.INSTALL_DIR}} --source=${{env.SOURCE_DIR}}
88+
89+
- name: Update configure file
90+
if: false
91+
working-directory: build_linux
92+
run: |
93+
MD5SUM=`md5sum RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_macos.zip|awk '{print $4}'`
94+
echo "MD5SUM RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_macos.zip: ${MD5SUM}"
95+
RabbitRemoteControl.App/Contents/MacOS/RabbitRemoteControlApp \
96+
--file-name RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_macos.zip \
97+
-u "https://github.com/KangLin/RabbitRemoteControl/releases/download/v${{env.RabbitRemoteControl_VERSION}}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_macos.zip;https://master.dl.sourceforge.net/project/rabbitremotecontrol/v${{env.RabbitRemoteControl_VERSION}}/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_macos.zip?viasf=1" \
98+
--md5 "${MD5SUM}"
99+
100+
- name: Update artifact
101+
uses: actions/upload-artifact@v4
102+
with:
103+
name: ${{ env.artifact_name }}_${{matrix.qt_version}}_${{matrix.qt_arch}}_${{matrix.WITH_MACOSX_BUNDLE}}
104+
path: |
105+
${{github.workspace}}/build/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_macos.zip
106+
${{github.workspace}}/build/RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_macos.dmg

‎.github/workflows/msvc.yml‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,16 @@ jobs:
2222
qt_arch: win64_msvc2022_64
2323
qt_modules: qtscxml qtmultimedia qtimageformats qtserialport qt5compat qtwebsockets qtpositioning qtwebchannel
2424
BUILD_TYPE: Release
25+
os: windows-latest
2526

2627
- CMAKE_GENERATOR_PLATFORM: arm64
2728
VCPKG_TARGET_TRIPLET: arm64-windows
2829
VCPKG_PLATFORM_TOOLSET: v143
2930
qt_version: 6.9.2
3031
qt_arch: win64_msvc2022_arm64
31-
qt_modules: qtscxml qtmultimedia qtimageformats qtserialport qt5compat qtwebsockets qtpositioning qtwebchannel
32+
qt_modules: qt5compat qtimageformats qtmultimedia qtpositioning qtscxml qtserialport qtwebchannel qtwebsockets
3233
BUILD_TYPE: Release
34+
os: windows-11-arm
3335

3436
- CMAKE_GENERATOR_PLATFORM: Win32
3537
VCPKG_TARGET_TRIPLET: x86-windows
@@ -39,6 +41,7 @@ jobs:
3941
qt_version: 5.15.2
4042
qt_arch: win32_msvc2019
4143
BUILD_TYPE: Release
44+
os: windows-latest
4245

4346
# - CMAKE_GENERATOR_PLATFORM: Win32
4447
# VCPKG_TARGET_TRIPLET: x86-windows
@@ -52,7 +55,7 @@ jobs:
5255
# See: [About GitHub-hosted runners](https://docs.github.com/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners)
5356
# See: [Choosing the runner for a job](https://docs.github.com/actions/writing-workflows/choosing-where-your-workflow-runs/choosing-the-runner-for-a-job)
5457
# See: https://github.com/actions/runner-images/
55-
runs-on: windows-latest
58+
runs-on: ${{matrix.os}}
5659

5760
env:
5861
BUILD_DIR: ${{github.workspace}}/build
@@ -114,6 +117,7 @@ jobs:
114117
vcpkg install --triplet ${{matrix.VCPKG_TARGET_TRIPLET}} --x-feature=vnc
115118
116119
- name: build npcap
120+
if: ${{matrix.os != 'windows-11-arm'}}
117121
working-directory: ${{env.SOURCE_DIR}}
118122
run: |
119123
IF NOT EXIST ${{env.INSTALL_DIR}}/npcap (
@@ -125,6 +129,7 @@ jobs:
125129
# 因为 vcpkg 中 PcapPlusPlus 依赖 winpcap , winpcap 不能在 windows 10 上工作，
126130
# 所以编译依赖于 npcap
127131
- name: build PcapPlusPlus
132+
if: ${{matrix.os != 'windows-11-arm'}}
128133
working-directory: ${{env.SOURCE_DIR}}
129134
run: |
130135
IF NOT EXIST ${{env.INSTALL_DIR}}/lib/cmake/pcapplusplus (
@@ -144,7 +149,9 @@ jobs:
144149
-DVCPKG_TARGET_TRIPLET=${{matrix.VCPKG_TARGET_TRIPLET}} ^
145150
-DX_VCPKG_APPLOCAL_DEPS_INSTALL=OFF ^
146151
-DVCPKG_APPLOCAL_DEPS=OFF ^
147-
-DVCPKG_TRACE_FIND_PACKAGE=ON
152+
-DVCPKG_TRACE_FIND_PACKAGE=ON ^
153+
-DPCAPPP_BUILD_TESTS=OFF ^
154+
-DPCAPPP_BUILD_EXAMPLES=OFF
148155
cmake --build . --config ${{matrix.BUILD_TYPE}}
149156
cmake --install . --config ${{matrix.BUILD_TYPE}} --strip
150157
)
@@ -335,7 +342,7 @@ jobs:
335342
run: git clone https://github.com/KangLin/RabbitCommon.git
336343

337344
- name: Build RabbitRemoteControl with cmake preset
338-
if: ${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.9.2' && startsWith(github.ref, 'refs/heads/master')}}
345+
if: false #${{ matrix.BUILD_TYPE == 'Release' && matrix.qt_version == '6.9.2' && startsWith(github.ref, 'refs/heads/master')}}
339346
working-directory: ${{github.workspace}}
340347
env:
341348
RabbitCommon_ROOT: ${{env.SOURCE_DIR}}/RabbitCommon
@@ -369,7 +376,7 @@ jobs:
369376
-DRABBIT_ENABLE_INSTALL_DEPENDENT=ON ^
370377
-DRABBIT_ENABLE_INSTALL_QT=ON ^
371378
-DRABBIT_ENABLE_INSTALL_TO_BUILD_PATH=ON ^
372-
-DBUILD_FREERDP=ON ^
379+
-DBUILD_FREERDP=ON
373380
cmake --build . --config ${{matrix.BUILD_TYPE}}
374381
IF "${{matrix.BUILD_TYPE}}" == "Release" (
375382
echo "cmake install config: ${{matrix.BUILD_TYPE}} component: DependLibraries"

‎Script/build_depend.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ if command -V getopt >/dev/null; then
6666
# 后面没有冒号表示没有参数。后跟有一个冒号表示有参数。跟两个冒号表示有可选参数。
6767
# -l 或 --long 选项后面是可接受的长选项，用逗号分开，冒号的意义同短选项。
6868
# -n 选项后接选项解析错误时提示的脚本名字
69-
OPTS=help,install:,source:,tools:,build:,verbose::,package:,package-tool:,system_update::,base::,default::,qt::,rabbitcommon::,freerdp::,tigervnc::,libssh::,pcapplusplus::,libdatachannel::,QtService::,qtermwidget::
69+
OPTS=help,install:,source:,tools:,build:,verbose::,package:,package-tool:,system_update::,base::,default::,macos::,qt::,rabbitcommon::,freerdp::,tigervnc::,libssh::,pcapplusplus::,libdatachannel::,QtService::,qtermwidget::
7070
ARGS=`getopt -o h,v:: -l $OPTS -n $(basename $0) -- "$@"`
7171
if [ $? != 0 ]; then
7272
echo "exec getopt fail: $?"
@@ -410,6 +410,7 @@ fi
410410

411411
if [ $MACOS -eq 1 ]; then
412412
echo "Install macos tools and dependency libraries ......"
413+
brew install qt doxygen freerdp libvncserver libssh zstd libpcap pcapplusplus
413414
fi
414415

415416
if [ $RabbitCommon -eq 1 ]; then

‎Script/build_linux.sh‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -309,13 +309,16 @@ fi
309309

310310
if [ $MACOS -eq 1 ]; then
311311
echo "build macos bundle package ......"
312-
./build_depend.sh --macos --package-tool=dnf \
313-
--rabbitcommon --tigervnc --pcapplusplus --libssh \
312+
./build_depend.sh --macos \
313+
--rabbitcommon --tigervnc \
314314
--install=${INSTALL_DIR} \
315315
--source=${SOURCE_DIR} \
316316
--tools=${TOOLS_DIR} \
317317
--verbose=${BUILD_VERBOSE}
318-
318+
./build_macos.sh --install=${INSTALL_DIR} \
319+
--source=${SOURCE_DIR} \
320+
--tools=${TOOLS_DIR} \
321+
--verbose=${BUILD_VERBOSE}
319322
fi
320323

321324
popd

0 commit comments

Comments
 (0)