Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #517 from vincentdchan/feat/native-support-for-m1-mac

Browse Source 
feat: native support for m1 mac
This commit is contained in:
Nathan.fooo 2022-05-31 09:33:30 +08:00 committed by GitHub
commit 4e3d2672ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yaml vendored
View File

@ -18,7 +18,7 @@ jobs:
- os: ubuntu-latest - os: ubuntu-latest
flutter_profile: development-linux-x86 flutter_profile: development-linux-x86
- os: macos-latest - os: macos-latest
flutter_profile: development-mac flutter_profile: development-mac-x86_64
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
steps: steps:

2
.github/workflows/release.yml vendored
View File

@ -113,7 +113,7 @@ jobs:
working-directory: frontend working-directory: frontend
run: | run: |
flutter config --enable-macos-desktop flutter config --enable-macos-desktop
cargo make --env APP_VERSION=${{ github.ref_name }} --profile production-mac-x86 appflowy cargo make --env APP_VERSION=${{ github.ref_name }} --profile production-mac-x86_64 appflowy
- name: Archive macOS app - name: Archive macOS app
working-directory: ${{ env.MACOS_APP_RELEASE_PATH }} working-directory: ${{ env.MACOS_APP_RELEASE_PATH }}

14
frontend/Makefile.toml
View File

@ -45,7 +45,15 @@ APP_ENVIRONMENT = "local"
FLUTTER_FLOWY_SDK_PATH="app_flowy/packages/flowy_sdk" FLUTTER_FLOWY_SDK_PATH="app_flowy/packages/flowy_sdk"
PROTOBUF_DERIVE_CACHE="../shared-lib/flowy-derive/src/derive_cache/derive_cache.rs" PROTOBUF_DERIVE_CACHE="../shared-lib/flowy-derive/src/derive_cache/derive_cache.rs"
[env.development-mac] [env.development-mac-arm64]
RUST_LOG = "info"
TARGET_OS = "macos"
RUST_COMPILE_TARGET = "aarch64-apple-darwin"
BUILD_FLAG = "debug"
FLUTTER_OUTPUT_DIR = "Debug"
PRODUCT_EXT = "app"
[env.development-mac-x86_64]
RUST_LOG = "info" RUST_LOG = "info"
TARGET_OS = "macos" TARGET_OS = "macos"
RUST_COMPILE_TARGET = "x86_64-apple-darwin" RUST_COMPILE_TARGET = "x86_64-apple-darwin"
@ -53,7 +61,7 @@ BUILD_FLAG = "debug"
FLUTTER_OUTPUT_DIR = "Debug" FLUTTER_OUTPUT_DIR = "Debug"
PRODUCT_EXT = "app" PRODUCT_EXT = "app"
[env.production-mac-aarch64] [env.production-mac-arm64]
BUILD_FLAG = "release" BUILD_FLAG = "release"
TARGET_OS = "macos" TARGET_OS = "macos"
RUST_COMPILE_TARGET = "aarch64-apple-darwin" RUST_COMPILE_TARGET = "aarch64-apple-darwin"
@ -61,7 +69,7 @@ FLUTTER_OUTPUT_DIR = "Release"
PRODUCT_EXT = "app" PRODUCT_EXT = "app"
APP_ENVIRONMENT = "production" APP_ENVIRONMENT = "production"
[env.production-mac-x86] [env.production-mac-x86_64]
BUILD_FLAG = "release" BUILD_FLAG = "release"
TARGET_OS = "macos" TARGET_OS = "macos"
RUST_COMPILE_TARGET = "x86_64-apple-darwin" RUST_COMPILE_TARGET = "x86_64-apple-darwin"

6
frontend/app_flowy/macos/Runner.xcodeproj/project.pbxproj
View File

@ -421,7 +421,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
EXCLUDED_ARCHS = arm64; EXCLUDED_ARCHS = "";
INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
@ -553,7 +553,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
EXCLUDED_ARCHS = arm64; EXCLUDED_ARCHS = "";
INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",
@ -577,7 +577,7 @@
CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES; COMBINE_HIDPI_IMAGES = YES;
EXCLUDED_ARCHS = arm64; EXCLUDED_ARCHS = "";
INFOPLIST_FILE = Runner/Info.plist; INFOPLIST_FILE = Runner/Info.plist;
LD_RUNPATH_SEARCH_PATHS = ( LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)", "$(inherited)",

2
frontend/scripts/build_sdk.sh
View File

@ -25,7 +25,7 @@ Linux-x86)
;; ;;
macOS) macOS)
cargo make --profile development-mac flowy-sdk-dev cargo make --profile "development-mac-$(uname -m)" flowy-sdk-dev
;; ;;
Windows) Windows)