move makefile to extension-ci-tools

duckdb · Feb 28, 2024 · 30e1914 · 30e1914
1 parent 645002d
commit 30e1914
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 119 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -2,3 +2,7 @@
 	path = duckdb
 	url = https://github.com/duckdb/duckdb
 	branch = main
+[submodule "extension-ci-tools"]
+	path = extension-ci-tools
+	url = [email protected]:duckdb/extension-ci-tools.git
+	branch = main
diff --git a/Makefile b/Makefile
@@ -1,6 +1,8 @@
 PROJ_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 
+# Configuration of extension
 EXT_NAME=quack
 EXT_CONFIG=${PROJ_DIR}extension_config.cmake
 
-include out-of-tree-extension.Makefile
+# Include the Makefile from extension-ci-tools
+include extension-ci-tools/makefiles/duckdb_extension.Makefile
diff --git a/extension-ci-tools b/extension-ci-tools
diff --git a/extension_config.cmake b/extension_config.cmake
@@ -1,11 +1,10 @@
-# Config to build this extension
+# This file is included by DuckDB's build system. It specifies which extension to load
+
+# Extension from this repo
 duckdb_extension_load(quack
     SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}
-    INCLUDE_PATH ${CMAKE_CURRENT_LIST_DIR}src/include
-    TEST_PATH ${CMAKE_CURRENT_LIST_DIR}src/include
     LOAD_TESTS
-    DONT_LINK
 )
 
-# Load more extensions in your builds by adding them here. E.g.:
-# duckdb_extension_load(json)
+# Any extra extensions
+# e.g.: duckdb_extension_load(json)
diff --git a/out-of-tree-extension.Makefile b/out-of-tree-extension.Makefile