Rely on extension-ci-tools for Makefile

Author: carlopi

Makefile

@@ -1,47 +1,25 @@
-.PHONY: all clean format debug release duckdb_debug duckdb_release pull update
+PROJ_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 
 all: release
 
-MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
-PROJ_DIR := $(dir $(MKFILE_PATH))
-
-EXTRA_CMAKE_VARIABLES :=
-
-# These flags will make DuckDB build the extension
-EXTRA_CMAKE_VARIABLES += -DEXTENSION_STATIC_BUILD=1 -DBUILD_EXTENSIONS="tpch;json" ${OSX_ARCH_FLAG}
-EXTRA_CMAKE_VARIABLES += -DDUCKDB_EXTENSION_NAMES="substrait"
-EXTRA_CMAKE_VARIABLES += -DDUCKDB_EXTENSION_SUBSTRAIT_SHOULD_LINK=1
-EXTRA_CMAKE_VARIABLES += -DDUCKDB_EXTENSION_SUBSTRAIT_LOAD_TESTS=1
-EXTRA_CMAKE_VARIABLES += -DDUCKDB_EXTENSION_SUBSTRAIT_PATH=$(PROJ_DIR)
-EXTRA_CMAKE_VARIABLES += -DDUCKDB_EXTENSION_SUBSTRAIT_TEST_PATH=$(PROJ_DIR)test
-EXTRA_CMAKE_VARIABLES += -DDUCKDB_EXTENSION_SUBSTRAIT_INCLUDE_PATH="$(PROJ_DIR)src/include"
-export
-
-DUCKDB_DIRECTORY=
-ifndef DUCKDB_DIR
-	DUCKDB_DIRECTORY=./duckdb
-else
-	DUCKDB_DIRECTORY=${DUCKDB_DIR}
+# Configuration of extension
+EXT_NAME=substrait
+EXT_CONFIG=${PROJ_DIR}extension_config.cmake
+
+CORE_EXTENSIONS='tpch;json'
+
+# Set this flag during building to enable the benchmark runner
+ifeq (${BUILD_BENCHMARK}, 1)
+	TOOLCHAIN_FLAGS:=${TOOLCHAIN_FLAGS} -DBUILD_BENCHMARKS=1
 endif
 
+# Include the Makefile from extension-ci-tools
+include extension-ci-tools/makefiles/duckdb_extension.Makefile
+
 pull:
 	git submodule init
 	git submodule update --recursive --remote
 
-clean:
-	rm -rf ${DUCKDB_DIRECTORY}/build
-	rm -rf testext
-	cd ${DUCKDB_DIRECTORY} && make clean
-
-# Main builds
-debug:
-# Have to actually cd here because the makefile assumes it's called from within duckdb
-	cd ${DUCKDB_DIRECTORY} && $(MAKE) -C . debug
-
-release:
-# Have to actually cd here because the makefile assumes it's called from within duckdb
-	cd ${DUCKDB_DIRECTORY} && $(MAKE) -C . release
-
 # Client builds
 %_js: export BUILD_NODE=1
 debug_js: debug
@@ -62,10 +40,10 @@ release_python: release
 test: test_release
 
 test_release: release
-	${DUCKDB_DIRECTORY}/build/release/test/unittest "$(PROJ_DIR)test/*"
+	build/release/test/unittest "$(PROJ_DIR)test/*"
 
 test_debug: debug
-	${DUCKDB_DIRECTORY}/build/debug/test/unittest "$(PROJ_DIR)test/*"
+	build/debug/test/unittest "$(PROJ_DIR)test/*"
 
 # Client tests
 test_python: test_debug_python
@@ -88,4 +66,4 @@ format:
 	rm .clang-format
 
 update:
-	git submodule update --remote --merge
+	git submodule update --remote --merge

extension_config.cmake

@@ -0,0 +1,7 @@
+# This file is included by DuckDB's build system. It specifies which extension to load
+
+# Extension from this repo
+duckdb_extension_load(substrait
+    SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}
+    INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/src/include
+)