Skip to content

Commit

Permalink
feat: add cargo config auto-gen (#51)
Browse files Browse the repository at this point in the history 
Co-authored-by: Hu Yueh-Wei <[email protected]>
  • Loading branch information
@leoadonia @halajohn
leoadonia and halajohn authored Oct 11, 2024
1 parent ba34a4c commit 6fb1f11
Show file tree
Hide file tree
Showing 11 changed files with 447 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_linux_ubuntu1804.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
echo $PATH
go env -w GOFLAGS="-buildvcs=false"
rustup default nightly
tgn gen linux x64 ${{ matrix.build_type }} -- is_clang=false log_level=1 enable_serialized_actions=true ten_enable_integration_tests=false ten_enable_private_tests=false ten_rust_enable_tests=false ten_enable_package_manager=false
tgn gen linux x64 ${{ matrix.build_type }} -- is_clang=false log_level=1 enable_serialized_actions=true ten_enable_integration_tests=false ten_enable_private_tests=false ten_rust_enable_tests=false ten_enable_package_manager=false ten_rust_enable_gen_cargo_config=false
tgn build linux x64 ${{ matrix.build_type }}
tree -I 'gen|obj' out
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_linux_ubuntu2204.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
go env -w GOFLAGS="-buildvcs=false"
go1.20.12 download
rustup default nightly
tgn gen linux x64 ${{ matrix.build_type }} -- is_clang=${{ matrix.compiler == 'gcc' && 'false' || 'true' }} log_level=1 enable_serialized_actions=true ten_enable_integration_tests=false ten_enable_private_tests=false ten_rust_enable_tests=false ten_package_manager_enable_tests=false
tgn gen linux x64 ${{ matrix.build_type }} -- is_clang=${{ matrix.compiler == 'gcc' && 'false' || 'true' }} log_level=1 enable_serialized_actions=true ten_enable_integration_tests=false ten_enable_private_tests=false ten_rust_enable_tests=false ten_package_manager_enable_tests=false ten_rust_enable_gen_cargo_config=false
tgn build linux x64 ${{ matrix.build_type }}
tree -I 'gen|obj' out
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_mac.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
fi
export PATH=$(pwd)/core/ten_gn:$PATH
echo $PATH
tgn gen mac arm64 ${{ matrix.build_type }} -- log_level=1 enable_serialized_actions=true ten_enable_integration_tests=false ten_enable_private_tests=false ten_rust_enable_tests=false
tgn gen mac arm64 ${{ matrix.build_type }} -- log_level=1 enable_serialized_actions=true ten_enable_integration_tests=false ten_enable_private_tests=false ten_rust_enable_tests=false ten_rust_enable_gen_cargo_config=false
tgn build mac arm64 ${{ matrix.build_type }}
tree -I 'gen|obj' out
Expand Down Expand Up @@ -173,7 +173,7 @@ jobs:
fi
export PATH=$(pwd)/core/ten_gn:$PATH
echo $PATH
tgn gen mac x64 ${{ matrix.build_type }} -- log_level=1 enable_serialized_actions=true ten_enable_integration_tests=false ten_enable_private_tests=false ten_rust_enable_tests=false ten_package_manager_enable_tests=false
tgn gen mac x64 ${{ matrix.build_type }} -- log_level=1 enable_serialized_actions=true ten_enable_integration_tests=false ten_enable_private_tests=false ten_rust_enable_tests=false ten_package_manager_enable_tests=false ten_rust_enable_gen_cargo_config=false
tgn build mac x64 ${{ matrix.build_type }}
tree -I 'gen|obj' out
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_win.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
- name: Build
run: |
$ENV:PATH += ";$PWD/core/ten_gn"
tgn gen win x64 ${{ matrix.build_type }} -- vs_version=2022 log_level=1 enable_serialized_actions=true ten_enable_integration_tests=false ten_enable_private_tests=false ten_rust_enable_tests=false ten_package_manager_enable_tests=false
tgn gen win x64 ${{ matrix.build_type }} -- vs_version=2022 log_level=1 enable_serialized_actions=true ten_enable_integration_tests=false ten_enable_private_tests=false ten_rust_enable_tests=false ten_package_manager_enable_tests=false ten_rust_enable_gen_cargo_config=false
tgn build win x64 ${{ matrix.build_type }}
- name: Run Tests (ten_utils_unit_test)
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ package-lock.json
core/src/ten_manager/target/
core/src/ten_rust/src/schema/bindings.rs
core/src/ten_rust/target/
/.cargo

# private modules
packages/private_apps
Expand Down
7 changes: 6 additions & 1 deletion .vscode/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,13 @@
"editor.wordWrapColumn": 80
},
"[python]": {
"editor.tabSize": 4
"editor.tabSize": 4,
"editor.defaultFormatter": "ms-python.black-formatter"
},
"black-formatter.args": [
"--line-length",
"80"
],
"debug.allowBreakpointsEverywhere": true,
"doxdocgen.c.commentPrefix": "/// ",
"doxdocgen.c.firstLine": "///",
Expand Down
146 changes: 136 additions & 10 deletions build/common/rust/rust.gni
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,31 @@ template("rust_target") {
_rustflags = invoker._rustflags
}

if (is_debug) {
if (ten_rust_enable_asan) {
if (enable_sanitizer) {
_rustflags = "${_rustflags} -Zsanitizer=address"
}
if (!ten_rust_enable_gen_cargo_config && enable_sanitizer &&
ten_rust_enable_asan) {
asan_args = [
"--action",
"print",
"--compiler",
]
if (is_clang) {
asan_args += [ "clang" ]
} else {
asan_args += [ "gcc" ]
}

asan_args += [
"--target-os",
target_os,
"--target-arch",
target_cpu,
]

flags = exec_script("//build/common/rust/rust_gen_cargo_config.py",
asan_args,
"trim string")

_rustflags = "${_rustflags} ${flags}"
}

if (_rustflags != "") {
Expand Down Expand Up @@ -209,12 +228,31 @@ template("rust_test") {
_rustflags = invoker._rustflags
}

if (is_debug) {
if (ten_rust_enable_asan) {
if (enable_sanitizer) {
_rustflags = "${_rustflags} -Zsanitizer=address"
}
if (!ten_rust_enable_gen_cargo_config && enable_sanitizer &&
ten_rust_enable_asan) {
asan_args = [
"--action",
"print",
"--compiler",
]
if (is_clang) {
asan_args += [ "clang" ]
} else {
asan_args += [ "gcc" ]
}

asan_args += [
"--target-os",
target_os,
"--target-arch",
target_cpu,
]

flags = exec_script("//build/common/rust/rust_gen_cargo_config.py",
asan_args,
"trim string")

_rustflags = "${_rustflags} ${flags}"
}

if (_rustflags != "") {
Expand Down Expand Up @@ -353,3 +391,91 @@ template("rust_cbindgen") {
outputs = [ _output ]
}
}

template("rust_gen_cargo_config") {
assert(defined(invoker.project_root), "project_root is not defined")

_project_root = rebase_path(invoker.project_root)
_target_name = target_name
_target_path = target_gen_dir

action("${_target_name}") {
script = "//build/common/rust/rust_gen_cargo_config.py"
_output = "${_target_path}/${_target_name}_gen_cargo_config"

args = [
"--project-root",
_project_root,
"--tg-timestamp-proxy-file",
rebase_path(_output),
]

args += [ "--compiler" ]
if (is_clang) {
args += [ "clang" ]
} else {
args += [ "gcc" ]
}

if (is_win) {
if (target_cpu == "x86") {
target = "i686-pc-windows-msvc"
} else if (target_cpu == "x64") {
target = "x86_64-pc-windows-msvc"
} else if (target_cpu == "arm64") {
target = "aarch64-pc-windows-msvc"
}
} else if (is_linux) {
if (target_cpu == "arm64") {
target = "aarch64-unknown-linux-gnu"
} else if (target_cpu == "arm") {
target = "armv7-unknown-linux-gnueabi"
} else if (target_cpu == "x86") {
target = "i686-unknown-linux-gnu"
} else if (target_cpu == "x64") {
target = "x86_64-unknown-linux-gnu"
}
} else if (is_mac) {
if (target_cpu == "arm64") {
target = "aarch64-apple-darwin"
} else if (target_cpu == "x86") {
target = "i686-apple-darwin"
} else if (target_cpu == "x64") {
target = "x86_64-apple-darwin"
}
}

args += [
"--target",
target,
"--target-os",
target_os,
"--target-arch",
target_cpu,
]

if (enable_sanitizer && ten_rust_enable_gen_cargo_config) {
args += [
"--action",
"gen",
]
} else {
# Delete `.cargo/config.toml` file to remove all configurations related to
# Rust + ASan.
args += [
"--action",
"delete",
]
}

forward_variables_from(invoker,
[
"deps",
"public_deps",
"data_deps",
"public_configs",
])

outputs = [ _output ]
}
}
Loading

0 comments on commit 6fb1f11

Please sign in to comment.