Skip to content

Commit

Permalink
Initial commit
Browse files Browse the repository at this point in the history
  • Loading branch information
rustyconover committed Jul 5, 2024
1 parent 76f5bc7 commit 0810a5b
Show file tree
Hide file tree
Showing 20 changed files with 1,253 additions and 1,536 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/MainDistributionPipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: duckdb/extension-ci-tools/.github/workflows/[email protected]
with:
duckdb_version: v1.0.0
extension_name: lindel
extension_name: evalexpr_rhai
enable_rust: true
# exclude_archs: "wasm_mvp;wasm_eh;wasm_threads"

Expand All @@ -28,6 +28,6 @@ jobs:
secrets: inherit
with:
duckdb_version: v1.0.0
extension_name: lindel
extension_name: evalexpr_rhai
deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }}
# exclude_archs: "wasm_mvp;wasm_eh;wasm_threads"
14 changes: 7 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,12 @@ FetchContent_Declare(
FetchContent_MakeAvailable(Corrosion)

# Import targets defined in a package or workspace manifest `Cargo.toml` file
corrosion_import_crate(MANIFEST_PATH "${CMAKE_SOURCE_DIR}/../duckdb_lindel_rust/Cargo.toml"
CRATES "duckdb_lindel_rust"
corrosion_import_crate(MANIFEST_PATH "${CMAKE_SOURCE_DIR}/../duckdb_evalexpr_rhai_rust/Cargo.toml"
CRATES "duckdb_evalexpr_rhai_rust"
)

# Set extension name here
set(TARGET_NAME lindel)
set(TARGET_NAME evalexpr_rhai)

set(EXTENSION_NAME ${TARGET_NAME}_extension)
set(LOADABLE_EXTENSION_NAME ${TARGET_NAME}_loadable_extension)
Expand All @@ -92,15 +92,15 @@ project(${TARGET_NAME})

include_directories(src/include)

set(EXTENSION_SOURCES src/lindel_extension.cpp)
set(EXTENSION_SOURCES src/evalexpr_rhai_extension.cpp)

build_static_extension(${TARGET_NAME} ${EXTENSION_SOURCES})
build_loadable_extension(${TARGET_NAME} " " ${EXTENSION_SOURCES})

get_target_property(fake_includes duckdb_lindel_rust INCLUDE_DIRECTORIES)
get_target_property(fake_includes duckdb_evalexpr_rhai_rust INCLUDE_DIRECTORIES)

target_link_libraries(${EXTENSION_NAME} duckdb_lindel_rust-static)
target_link_libraries(${LOADABLE_EXTENSION_NAME} duckdb_lindel_rust)
target_link_libraries(${EXTENSION_NAME} duckdb_evalexpr_rhai_rust-static)
target_link_libraries(${LOADABLE_EXTENSION_NAME} duckdb_evalexpr_rhai_rust)

install(
TARGETS ${EXTENSION_NAME}
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
PROJ_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))

# Configuration of extension
EXT_NAME=lindel
EXT_NAME=evalexpr_rhai
EXT_CONFIG=${PROJ_DIR}extension_config.cmake

# Include the Makefile from extension-ci-tools
include extension-ci-tools/makefiles/duckdb_extension.Makefile

rust_binding_headers:
cd duckdb_lindel_rust && cbindgen --config ./cbindgen.toml --crate duckdb_lindel_rust --output ../src/include/rust.h
cd duckdb_evalexpr_rust && cbindgen --config ./cbindgen.toml --crate duckdb_evalexpr_rust --output ../src/include/rust.h

clean_all: clean
cd duckdb_lindel_rust && cargo clean
cd duckdb_evalexpr_rust && cargo clean
387 changes: 137 additions & 250 deletions README.md

Large diffs are not rendered by default.

Loading

0 comments on commit 0810a5b

Please sign in to comment.