Northern_Lights/nekoray_Mahdi-zarei
1
0
Fork 0
mirror of https://github.com/Mahdi-zarei/nekoray.git synced 2025-12-19 13:50:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: Improve build system &&

Browse Source 
Allow for older mac users
This commit is contained in:
Nova 2024-11-22 17:37:18 +03:30
parent f61a317970
commit ee730b2b83
No known key found for this signature in database
GPG Key ID: 389787EC83F5D73A
3 changed files with 28 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
.github/workflows/build-qv2ray-cmake.yml vendored
View File

@ -40,7 +40,7 @@ jobs:
if: steps.cache-common.outputs.cache-hit != 'true' && matrix.cross_os != 'windows7'
uses: actions/setup-go@v5.0.2
with:
go-version: '1.23.2'
go-version: '1.23.3'
- name: Install Older Golang
if: steps.cache-common.outputs.cache-hit != 'true' && matrix.cross_os == 'windows7'
uses: actions/setup-go@v5.0.2
@ -67,18 +67,18 @@ jobs:
strategy:
matrix:
include:
- platform: windows-2022
arch: x64
- platform: windows-latest
qt_version: "6.8.0"
- platform: ubuntu-22.04
arch: x64
target: amd64
- platform: ubuntu-latest
qt_version: "6.8.0"
- platform: macos-13
arch: amd64
target: amd64
- platform: macos-latest
qt_version: "6.8.0"
- platform: macos-14
arch: arm64
target: x86_64
- platform: macos-latest
qt_version: "6.8.0"
target: arm64
fail-fast: false
runs-on: ${{ matrix.platform }}
env:
@ -89,30 +89,21 @@ jobs:
with:
submodules: "recursive"
- name: Install MSVC compiler
if: matrix.platform == 'windows-2022'
if: matrix.platform == 'windows-latest'
uses: ilammy/msvc-dev-cmd@v1.13.0
with:
arch: ${{ matrix.arch }}
- name: Download Artifacts
uses: actions/download-artifact@v4.1.8
with:
path: download-artifact
# ========================================================================================================= Qt Install
- name: Install Qt
if: matrix.platform != 'windows-2022'
uses: jurplel/install-qt-action@v4.1.1
with:
version: ${{ matrix.qt_version }}
setup-python: true
cache: true
cache-key-prefix: QtCache-${{ matrix.platform }}-${{ matrix.arch }}
- name: Install Qt Windows
if: matrix.platform == 'windows-2022'
uses: jurplel/install-qt-action@v4.1.1
with:
version: ${{ matrix.qt_version }}
cache: true
cache-key-prefix: QtCache-${{ matrix.platform }}-${{ matrix.arch }}
cache-key-prefix: QtCache-${{ matrix.platform }}-${{ matrix.target }}
# ========================================================================================================= 编译与 Qt 无关的依赖
- name: Install ninja-build tool
uses: seanmiddleditch/gha-setup-ninja@v5
@ -121,15 +112,15 @@ jobs:
uses: actions/cache@v4.0.2
with:
path: libs/deps
key: DepsCache-${{ matrix.platform }}-${{ matrix.arch }}-${{ hashFiles('libs/build_deps_*.sh') }}-Qt${{ matrix.qt_version }}
key: DepsCache-${{ matrix.platform }}-${{ matrix.target }}-${{ hashFiles('libs/build_deps_*.sh') }}-Qt${{ matrix.qt_version }}
- name: Build Dependencies
shell: bash
if: steps.cache-deps.outputs.cache-hit != 'true'
run: ./libs/build_deps_all.sh
run: ./libs/build_deps_all.sh ${{ matrix.target }}
# ========================================================================================================= Generate MakeFile and Build
- name: Windows - Generate MakeFile and Build
shell: bash
if: matrix.platform == 'windows-2022'
if: matrix.platform == 'windows-latest'
env:
CC: cl.exe
CXX: cl.exe
@ -142,7 +133,7 @@ jobs:
./libs/deploy_windows64.sh
- name: Linux - Generate MakeFile and Build
shell: bash
if: matrix.platform == 'ubuntu-22.04'
if: matrix.platform == 'ubuntu-latest'
run: |
sudo apt update && sudo apt upgrade -y
mkdir build
@ -153,14 +144,14 @@ jobs:
./libs/deploy_linux64.sh
- name: macOS - Generate MakeFile and Build
shell: bash
if: matrix.platform == 'macos-14' || matrix.platform == 'macos-13'
if: matrix.platform == 'macos-latest'
run: |
mkdir build
cd build
cmake -GNinja -DQT_VERSION_MAJOR=6 -DCMAKE_BUILD_TYPE=Release -DNKR_PACKAGE_MACOS=1 ..
cmake -GNinja -DQT_VERSION_MAJOR=6 -DCMAKE_BUILD_TYPE=Release -DNKR_PACKAGE_MACOS=1 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_OSX_ARCHITECTURES=${{ matrix.target }} ..
ninja
cd ..
./libs/deploy_macos.sh
./libs/deploy_macos.sh ${{ matrix.target }}
# ========================================================================================================= Deployments
- name: Tar files
shell: bash
@ -168,7 +159,7 @@ jobs:
- name: Uploading Artifact
uses: actions/upload-artifact@v4.4.0
with:
name: NekoRay-${{ github.sha }}-${{ matrix.platform }}-${{ matrix.arch }}-Qt${{ matrix.qt_version }}
name: NekoRay-${{ github.sha }}-${{ matrix.platform }}-${{ matrix.target }}-Qt${{ matrix.qt_version }}
path: artifacts.tgz
publish:
name: Pack & Publish Release

12
libs/build_deps_all.sh
View File

@ -31,7 +31,7 @@ cd zxing-*
mkdir -p build
cd build
$cmake .. -GNinja -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DBUILD_BLACKBOX_TESTS=OFF -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX
$cmake .. -GNinja -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DBUILD_BLACKBOX_TESTS=OFF -DCMAKE_OSX_ARCHITECTURES=$1 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX
ninja && ninja install
cd ../..
@ -44,7 +44,7 @@ cd yaml-*
mkdir -p build
cd build
$cmake .. -GNinja -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX
$cmake .. -GNinja -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=$1 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX
ninja && ninja install
cd ../..
@ -63,6 +63,8 @@ $cmake .. -GNinja \
-DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX \
-Dprotobuf_BUILD_PROTOBUF_BINARIES=ON \
-Dprotobuf_BUILD_LIBUPB=OFF \
-DCMAKE_OSX_ARCHITECTURES=$1 \
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 \
-DCMAKE_CXX_STANDARD=17
ninja && ninja install
@ -84,7 +86,7 @@ if [[ "$(uname -s)" == *"NT"* ]]; then
git checkout bb01c8db702fb41e5497aee9c0559ddf4bf13749
sed -i 's/find_package(CURL COMPONENTS HTTP HTTPS)/find_package(CURL REQUIRED)/g' CMakeLists.txt
mkdir build && cd build
cmake -GNinja .. -DCMAKE_BUILD_TYPE=Release -DCPR_USE_SYSTEM_CURL=ON -DBUILD_SHARED_LIBS=OFF -DCURL_STATICLIB=ON -DCURL_LIBRARY=../../built/x64-windows-static/lib -DCURL_INCLUDE_DIR=../../built/x64-windows-static/include -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX
cmake -GNinja .. -DCMAKE_BUILD_TYPE=Release -DCPR_USE_SYSTEM_CURL=ON -DBUILD_SHARED_LIBS=OFF -DCURL_STATICLIB=ON -DCMAKE_OSX_ARCHITECTURES=$1 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCURL_LIBRARY=../../built/x64-windows-static/lib -DCURL_INCLUDE_DIR=../../built/x64-windows-static/include -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX
ninja && ninja install
cd ../..
@ -94,7 +96,7 @@ if [[ "$(uname -s)" == *"NT"* ]]; then
cd curl
git checkout 7eb8c048470ed2cc14dca75be9c1cdae7ac8498b
mkdir build && cd build
cmake -GNinja .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX -DCURL_STATICLIB=ON -DUSE_LIBIDN2=OFF
cmake -GNinja .. -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=OFF -DCMAKE_OSX_ARCHITECTURES=$1 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX -DCURL_STATICLIB=ON -DUSE_LIBIDN2=OFF
ninja && ninja install
cd ../..
@ -103,7 +105,7 @@ if [[ "$(uname -s)" == *"NT"* ]]; then
cd cpr
git checkout bb01c8db702fb41e5497aee9c0559ddf4bf13749
mkdir build && cd build
cmake -GNinja .. -DCMAKE_BUILD_TYPE=Release -DCPR_USE_SYSTEM_CURL=ON -DBUILD_SHARED_LIBS=OFF -DCURL_STATICLIB=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX
cmake -GNinja .. -DCMAKE_BUILD_TYPE=Release -DCPR_USE_SYSTEM_CURL=ON -DBUILD_SHARED_LIBS=OFF -DCURL_STATICLIB=ON -DCMAKE_OSX_ARCHITECTURES=$1 -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX
ninja && ninja install
cd ../..

2
libs/deploy_macos.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
set -e
if [[ $(uname -m) == 'aarch64' || $(uname -m) == 'arm64' ]]; then
if [[ $1 == 'arm64' ]]; then
ARCH="arm64"
else
ARCH="amd64"