chore: add vendored_openssl feature

This commit is contained in:
nathan 2022-09-18 09:30:59 +08:00
parent 92a751b32a
commit 27f4cf2d12
8 changed files with 123 additions and 92 deletions

View File

@ -139,8 +139,7 @@ LINUX_ARCH = "arm64"
APP_ENVIRONMENT = "production"
[tasks.echo_env]
script = [
'''
script = ['''
echo "-------- Env Parameters --------"
echo CRATE_TYPE: ${CRATE_TYPE}
echo BUILD_FLAG: ${BUILD_FLAG}
@ -151,8 +150,7 @@ script = [
echo APP_ENVIRONMENT: ${APP_ENVIRONMENT}
echo ${platforms}
echo ${BUILD_ARCHS}
'''
]
''']
script_runner = "@shell"
[env.production-ios]
@ -166,6 +164,14 @@ BUILD_FLAG = "debug"
TARGET_OS = "android"
CRATE_TYPE = "cdylib"
FLUTTER_OUTPUT_DIR = "Debug"
FEATURES = "flutter,openssl_vendored"
[env.production-android]
BUILD_FLAG = "release"
TARGET_OS = "android"
CRATE_TYPE = "cdylib"
FLUTTER_OUTPUT_DIR = "Release"
FEATURES = "flutter,openssl_vendored"
[tasks.setup-crate-type]
private = true
@ -193,10 +199,8 @@ script_runner = "@duckscript"
[tasks.test-build]
condition = { env_set = ["FLUTTER_FLOWY_SDK_PATH"] }
script = [
"""
script = ["""
cd ${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/rust-lib/flowy-net
cargo build -vv --features=dart
""",
]
"""]
script_runner = "@shell"

View File

@ -29,8 +29,6 @@ dependencies:
path: flowy_infra_ui_web
appflowy_popover:
path: ../appflowy_popover
# Flowy packages
flowy_infra:
path: ../flowy_infra

View File

@ -35,7 +35,7 @@ packages:
path: "packages/appflowy_editor"
relative: true
source: path
version: "0.0.4"
version: "0.0.5"
appflowy_popover:
dependency: "direct main"
description:
@ -43,6 +43,13 @@ packages:
relative: true
source: path
version: "0.0.1"
archive:
dependency: transitive
description:
name: archive
url: "https://pub.dartlang.org"
source: hosted
version: "3.3.1"
args:
dependency: transitive
description:
@ -660,6 +667,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "0.17.0"
intl_utils:
dependency: transitive
description:
name: intl_utils
url: "https://pub.dartlang.org"
source: hosted
version: "2.7.0"
io:
dependency: transitive
description:

View File

@ -12,7 +12,7 @@ crate-type = ["staticlib"]
[dependencies]
allo-isolate = {version = "^0.1", features = ["catch-unwind",]}
allo-isolate = { version = "^0.1", features = ["catch-unwind"] }
byteorder = { version = "1.3.4" }
ffi-support = { version = "0.4.2" }
protobuf = { version = "2.20.0" }
@ -34,8 +34,10 @@ flowy-derive = {path = "../../../shared-lib/flowy-derive" }
default = ["flowy-sdk/dart", "dart-notify/dart", "flutter"]
flutter = []
http_sync = ["flowy-sdk/http_sync", "flowy-sdk/use_bunyan"]
#use_serde = ["bincode"]
#use_protobuf= ["protobuf"]
openssl_vendored = ["flowy-sdk/openssl_vendored"]
[build-dependencies]
lib-infra = { path = "../../../shared-lib/lib-infra", features = ["protobuf_file_gen", "dart"] }
lib-infra = { path = "../../../shared-lib/lib-infra", features = [
"protobuf_file_gen",
"dart",
] }

View File

@ -12,3 +12,6 @@ diesel_migrations = {version = "1.4.0", features = ["sqlite"]}
lib-sqlite = { path = "../lib-sqlite" }
log = "0.4"
lazy_static = "1.4.0"
[features]
openssl_vendored = ["lib-sqlite/openssl_vendored"]

View File

@ -41,4 +41,12 @@ futures-util = "0.3.15"
http_sync = ["flowy-folder/cloud_sync", "flowy-text-block/cloud_sync"]
native_sync = ["flowy-folder/cloud_sync", "flowy-text-block/cloud_sync"]
use_bunyan = ["lib-log/use_bunyan"]
dart = ["flowy-user/dart", "flowy-net/dart", "flowy-folder/dart", "flowy-sync/dart", "flowy-grid/dart", "flowy-text-block/dart"]
dart = [
"flowy-user/dart",
"flowy-net/dart",
"flowy-folder/dart",
"flowy-sync/dart",
"flowy-grid/dart",
"flowy-text-block/dart",
]
openssl_vendored = ["flowy-database/openssl_vendored"]

View File

@ -24,6 +24,7 @@ use tokio::sync::{mpsc, oneshot};
pub struct TextBlockEditor {
pub doc_id: String,
#[allow(dead_code)]
rev_manager: Arc<RevisionManager>,
#[cfg(feature = "sync")]
ws_manager: Arc<flowy_revision::RevisionWebSocketManager>,

View File

@ -15,6 +15,7 @@ lazy_static = "1.4.0"
scheduled-thread-pool = "0.2.5"
error-chain = "=0.12.0"
log = "0.4.11"
openssl = { version = "0.10.38", features = ["vendored"] }
#[features]
#windows = ["libsqlite3-sys/bundled-windows"]
openssl = { version = "0.10.38", optional = true }
[features]
openssl_vendored = ["openssl/vendored"]