Move sources to src/ directory

Author: Mytherin

CMakeLists.txt

@@ -1,47 +1,26 @@
 cmake_minimum_required(VERSION 2.8.12...3.29)
 
-set(HTTPFS_BASE_FOLDER "extension/httpfs")
+set(HTTPFS_BASE_FOLDER "src")
 
 project(HTTPFsExtension)
 
 add_extension_definitions()
 
-include_directories(extension/httpfs/include
-                    ${DUCKDB_MODULE_BASE_DIR}/third_party/httplib)
-
 if (NOT EMSCRIPTEN)
-  set(EXTRA_SOURCES extension/httpfs/crypto.cpp extension/httpfs/httpfs_httplib_client.cpp extension/httpfs/httpfs_curl_client.cpp)
   add_definitions(-DOVERRIDE_ENCRYPTION_UTILS=1)
 else()
-  set(EXTRA_SOURCES extension/httpfs/httpfs_client_wasm.cpp)
   set (DUCKDB_EXTENSION_HTTPFS_LINKED_LIBS "../../third_party/mbedtls/libduckdb_mbedtls.a")
 endif()
 
-build_static_extension(
-  httpfs
-  extension/httpfs/hffs.cpp
-  extension/httpfs/s3fs.cpp
-  extension/httpfs/httpfs.cpp
-  extension/httpfs/http_state.cpp
-  extension/httpfs/crypto.cpp
-  extension/httpfs/hash_functions.cpp
-  extension/httpfs/create_secret_functions.cpp
-  extension/httpfs/httpfs_extension.cpp
-  ${EXTRA_SOURCES} )
+include_directories(src/include
+                    ${DUCKDB_MODULE_BASE_DIR}/third_party/httplib)
+add_subdirectory(src)
+set(EXTENSION_SOURCES ${ALL_OBJECT_FILES})
+
+build_static_extension(httpfs ${EXTENSION_SOURCES})
 
 set(PARAMETERS "-warnings")
-build_loadable_extension(
-  httpfs
-  ${PARAMETERS}
-  extension/httpfs/hffs.cpp
-  extension/httpfs/s3fs.cpp
-  extension/httpfs/httpfs.cpp
-  extension/httpfs/http_state.cpp
-  extension/httpfs/crypto.cpp
-  extension/httpfs/hash_functions.cpp
-  extension/httpfs/create_secret_functions.cpp
-  extension/httpfs/httpfs_extension.cpp
-  ${EXTRA_SOURCES} )
+build_loadable_extension(httpfs ${PARAMETERS} ${EXTENSION_SOURCES})
 
 if(MINGW)
   set(OPENSSL_USE_STATIC_LIBS TRUE)

extension_config.cmake

@@ -6,5 +6,5 @@ duckdb_extension_load(parquet)
 
 duckdb_extension_load(httpfs
 	SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}
-	INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/extension/httpfs/include
+	INCLUDE_DIR ${CMAKE_CURRENT_LIST_DIR}/src/include
 )

src/CMakeLists.txt

@@ -0,0 +1,20 @@
+set(HTTPFS_SOURCES
+  hffs.cpp
+  s3fs.cpp
+  httpfs.cpp
+  http_state.cpp
+  crypto.cpp
+  hash_functions.cpp
+  create_secret_functions.cpp
+  httpfs_extension.cpp
+)
+if (NOT EMSCRIPTEN)
+  set(HTTPFS_SOURCES ${HTTPFS_SOURCES} crypto.cpp httpfs_httplib_client.cpp httpfs_curl_client.cpp)
+else()
+  set(HTTPFS_SOURCES ${HTTPFS_SOURCES} httpfs_client_wasm.cpp)
+endif()
+
+add_library(httpfs_library OBJECT ${HTTPFS_SOURCES})
+set(ALL_OBJECT_FILES
+    ${ALL_OBJECT_FILES} $<TARGET_OBJECTS:httpfs_library>
+    PARENT_SCOPE)