Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

support unstable c api #1

Closed
wants to merge 1 commit into from
Closed

support unstable c api #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,23 @@
###
# Configuration
###
if(NOT DEFINED MINIMUM_DUCKDB_VERSION_MAJOR OR
NOT DEFINED MINIMUM_DUCKDB_VERSION_MINOR OR
NOT DEFINED MINIMUM_DUCKDB_VERSION_PATCH)
message(FATAL_ERROR "DuckDB minimum version is required")
if(NOT DEFINED TARGET_DUCKDB_VERSION_MAJOR OR
NOT DEFINED TARGET_DUCKDB_VERSION_MINOR OR
NOT DEFINED TARGET_DUCKDB_VERSION_PATCH)
message(FATAL_ERROR "DuckDB target version is required")

Check failure on line 9 in CMakeLists.txt

View workflow job for this annotation

GitHub Actions / Build extension binaries / Windows (windows_amd64, x64-windows-static-md) 

DuckDB target version is required

Check failure on line 9 in CMakeLists.txt

View workflow job for this annotation

GitHub Actions / Build extension binaries / MacOS (osx_amd64, x86_64, x64-osx) 

DuckDB target version is required

Check failure on line 9 in CMakeLists.txt

View workflow job for this annotation

GitHub Actions / Build extension binaries / MacOS (osx_amd64, x86_64, x64-osx) 

DuckDB target version is required

Check failure on line 9 in CMakeLists.txt

View workflow job for this annotation

GitHub Actions / Build extension binaries / Windows (windows_amd64, x64-windows-static-md) 

DuckDB target version is required
endif()
if(NOT DEFINED EXTENSION_NAME)
message(FATAL_ERROR "DuckDB extension name is required")
endif()
add_definitions(-DDUCKDB_EXTENSION_API_VERSION_MAJOR=${MINIMUM_DUCKDB_VERSION_MAJOR})
add_definitions(-DDUCKDB_EXTENSION_API_VERSION_MINOR=${MINIMUM_DUCKDB_VERSION_MINOR})
add_definitions(-DDUCKDB_EXTENSION_API_VERSION_PATCH=${MINIMUM_DUCKDB_VERSION_PATCH})
add_definitions(-DDUCKDB_EXTENSION_API_VERSION_MAJOR=${TARGET_DUCKDB_VERSION_MAJOR})
add_definitions(-DDUCKDB_EXTENSION_API_VERSION_MINOR=${TARGET_DUCKDB_VERSION_MINOR})
add_definitions(-DDUCKDB_EXTENSION_API_VERSION_PATCH=${TARGET_DUCKDB_VERSION_PATCH})
add_definitions(-DDUCKDB_EXTENSION_NAME=${EXTENSION_NAME})

if (DEFINED DUCKDB_EXTENSION_API_VERSION_UNSTABLE)
add_definitions(-DDUCKDB_EXTENSION_API_VERSION_UNSTABLE=${DUCKDB_EXTENSION_API_VERSION_UNSTABLE})
endif()

###
# Build
###
Expand Down
11 changes: 7 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@ PROJ_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))

# Main extension configuration
EXTENSION_NAME=capi_quack
MINIMUM_DUCKDB_VERSION_MAJOR=0
MINIMUM_DUCKDB_VERSION_MINOR=0
MINIMUM_DUCKDB_VERSION_PATCH=1
MINIMUM_DUCKDB_VERSION=v$(MINIMUM_DUCKDB_VERSION_MAJOR).$(MINIMUM_DUCKDB_VERSION_MINOR).$(MINIMUM_DUCKDB_VERSION_PATCH)
TARGET_DUCKDB_VERSION_MAJOR=1
TARGET_DUCKDB_VERSION_MINOR=2
TARGET_DUCKDB_VERSION_PATCH=0
TARGET_DUCKDB_VERSION=v$(TARGET_DUCKDB_VERSION_MAJOR).$(TARGET_DUCKDB_VERSION_MINOR).$(TARGET_DUCKDB_VERSION_PATCH)

# Set to 1 to target the unstable C API.
USE_UNSTABLE_C_API=0

all: configure release

Expand Down
8 changes: 4 additions & 4 deletions duckdb_capi/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# DuckDB C API Headers
This directory contains the C API headers of DuckDB. These headers should generally match the `MINIMUM_DUCKDB_VERSION`
This directory contains the C API headers of DuckDB. These headers should generally match the `TARGET_DUCKDB_VERSION`
that is specified in the `Makefile`. Note that these headers can be updated automatically
to match the `MINIMUM_DUCKDB_VERSION` makefile variable by running (assuming the default makefile setup):
to match the `TARGET_DUCKDB_VERSION` makefile variable by running (assuming the default makefile setup):

```shell
make update_duckdb_headers
```

Of course manually updating the headers is also fine, just make sure that the headers are always from the same
DuckDB version and that they are not from a later release of DuckDB than is specified in the `MINIMUM_DUCKDB_VERSION`
build variable. Using headers from an older version than `MINIMUM_DUCKDB_VERSION` is allowed, but you probably don't want
DuckDB version and that they are not from a later release of DuckDB than is specified in the `TARGET_DUCKDB_VERSION`
build variable. Using headers from an older version than `TARGET_DUCKDB_VERSION` is allowed, but you probably don't want
that.
Loading
Loading