diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml index 2366573c..1da69c6c 100644 --- a/.github/workflows/MainDistributionPipeline.yml +++ b/.github/workflows/MainDistributionPipeline.yml @@ -29,6 +29,7 @@ jobs: duckdb_version: main extension_name: spatial ci_tools_version: main + vcpkg_commit: 5e5d0e1cd7785623065e77eff011afdeec1a3574 duckdb-latest-deploy: name: Deploy extension binaries @@ -37,5 +38,6 @@ jobs: secrets: inherit with: duckdb_version: main + ci_tools_version: main extension_name: spatial deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }} diff --git a/.github/workflows/StableDistributionPipeline.yml b/.github/workflows/StableDistributionPipeline.yml index 09c96d93..3923ad42 100644 --- a/.github/workflows/StableDistributionPipeline.yml +++ b/.github/workflows/StableDistributionPipeline.yml @@ -29,6 +29,8 @@ jobs: duckdb_version: v1.1.3 extension_name: spatial ci_tools_version: v1.1.3 + vcpkg_commit: 5e5d0e1cd7785623065e77eff011afdeec1a3574 + duckdb-stable-deploy: name: Deploy extension binaries @@ -37,5 +39,6 @@ jobs: secrets: inherit with: duckdb_version: v1.1.3 + ci_tools_version: v1.1.3 extension_name: spatial deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/v1.1.3' }} diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index e9fc6822..d6bb4b98 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -35,7 +35,7 @@ set(PATCH_NAME_ENDING ) if (EMSCRIPTEN) set(CMAKE_FLAGS_POINTER_SIZE -DCMAKE_SIZEOF_VOID_P=4 -DCMAKE_SIZEOF_VOIDP=4) set(CMAKE_PROJ_FLAGS -DCMAKE_MODULE_PATH=${LOCAL_INSTALL_DIR}/lib/cmake -DSQLITE3_INCLUDE_DIR=${LOCAL_INSTALL_DIR}/include -DSQLITE3_LIBRARY=${LOCAL_INSTALL_DIR}/lib/libsqlite3.a) - set(CMAKE_GDAL_FLAGS -DACCEPT_MISSING_LINUX_FS_HEADER=ON -DSIZEOF_INT=4 -DSIZEOF_UNSIGNED_LONG=4 -DSIZEOF_OFF_T=4 -DGEOS_DIR=${LOCAL_INSTALL_DIR}/lib/cmake/geos -DGeographicLib_DIR=${LOCAL_INSTALL_DIR}/lib/cmake/GeographicLib -DSQLITE3_LIBRARY=${LOCAL_INSTALL_DIR}/lib/libsqlite3.a) + set(CMAKE_GDAL_FLAGS -DACCEPT_MISSING_LINUX_FS_HEADER=ON -DSIZEOF_INT=4 -DSIZEOF_UNSIGNED_LONG=4 -DSIZEOF_OFF_T=4 -DSQLITE3_LIBRARY=${LOCAL_INSTALL_DIR}/lib/libsqlite3.a) set(PATCH_NAME_ENDING _wasm) set(OGR_ENABLE_DRIVER_OPENFILEGDB OFF) endif() @@ -158,59 +158,7 @@ ExternalProject_Add( ) set(GDAL_DEPENDENCIES ${GDAL_DEPENDENCIES} EXPAT) - -# GEOS -ExternalProject_Add( - GEOS - URL ${CMAKE_CURRENT_SOURCE_DIR}/vendor/geos-3.13.0.tar.bz2 - CONFIGURE_HANDLED_BY_BUILD TRUE - CMAKE_ARGS - # CMake options - -DCMAKE_INSTALL_PREFIX:PATH=${LOCAL_INSTALL_DIR} - -DCMAKE_PREFIX_PATH=${LOCAL_INSTALL_DIR} - -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES_PACKED} - -DCMAKE_POSITION_INDEPENDENT_CODE=ON - ${CMAKE_FLAGS_POINTER_SIZE} - # vcpkg options - -DVCPKG_MANIFEST_DIR='${VCPKG_MANIFEST_DIR}' - -DVCPKG_INSTALLED_DIR='${VCPKG_INSTALLED_DIR}' - -DCMAKE_TOOLCHAIN_FILE='${CMAKE_TOOLCHAIN_FILE}' - -DVCPKG_TARGET_TRIPLET='${VCPKG_TARGET_TRIPLET}' - -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE='${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}' - # GEOS options - -DBUILD_SHARED_LIBS=OFF - -DBUILD_TESTING=OFF - -DBUILD_DOCUMENTATION=OFF - -DBUILD_ASTYLE=OFF - -DBUILD_GEOSOP=OFF -) -set(GDAL_DEPENDENCIES ${GDAL_DEPENDENCIES} GEOS) - -# GeographicLib -ExternalProject_Add( - GEOGRAPHICLIB - URL ${CMAKE_CURRENT_SOURCE_DIR}/vendor/GeographicLib-2.2.zip - CONFIGURE_HANDLED_BY_BUILD TRUE - PATCH_COMMAND patch -p1 < "${CMAKE_CURRENT_LIST_DIR}/patches/geographiclib${PATCH_NAME_ENDING}.patch" - CMAKE_ARGS - -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -DCMAKE_INSTALL_PREFIX:PATH=${LOCAL_INSTALL_DIR} - -DCMAKE_PREFIX_PATH=${LOCAL_INSTALL_DIR} - -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES_PACKED} - -DCMAKE_POSITION_INDEPENDENT_CODE=ON - ${CMAKE_FLAGS_POINTER_SIZE} - # vcpkg options - -DVCPKG_MANIFEST_DIR='${VCPKG_MANIFEST_DIR}' - -DVCPKG_INSTALLED_DIR='${VCPKG_INSTALLED_DIR}' - -DCMAKE_TOOLCHAIN_FILE='${CMAKE_TOOLCHAIN_FILE}' - -DVCPKG_TARGET_TRIPLET='${VCPKG_TARGET_TRIPLET}' - -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE='${VCPKG_CHAINLOAD_TOOLCHAIN_FILE}' - # GeographicLib options - -DBUILD_SHARED_LIBS=OFF - -DGEOGRAPHICLIB_DATA=${LOCAL_INSTALL_DIR}/share/GeographicLib - -DBUILD_DOCUMENTATION=OFF -) +set(GDAL_DEPENDENCIES ${GDAL_DEPENDENCIES}) # GDAL ExternalProject_Add( diff --git a/deps/vendor/GeographicLib-2.2.zip b/deps/vendor/GeographicLib-2.2.zip deleted file mode 100644 index 11d4fd72..00000000 Binary files a/deps/vendor/GeographicLib-2.2.zip and /dev/null differ diff --git a/deps/vendor/apache-arrow-10.0.1.zip b/deps/vendor/apache-arrow-10.0.1.zip deleted file mode 100644 index 8fca4a85..00000000 Binary files a/deps/vendor/apache-arrow-10.0.1.zip and /dev/null differ diff --git a/deps/vendor/geos-3.13.0.tar.bz2 b/deps/vendor/geos-3.13.0.tar.bz2 deleted file mode 100644 index 6027d42a..00000000 Binary files a/deps/vendor/geos-3.13.0.tar.bz2 and /dev/null differ diff --git a/deps/vendor/openssl-openssl-3.0.7.zip b/deps/vendor/openssl-openssl-3.0.7.zip deleted file mode 100644 index fa0483cc..00000000 Binary files a/deps/vendor/openssl-openssl-3.0.7.zip and /dev/null differ diff --git a/deps/vendor/zlib1213.zip b/deps/vendor/zlib1213.zip deleted file mode 100644 index f0bcb4e1..00000000 Binary files a/deps/vendor/zlib1213.zip and /dev/null differ diff --git a/vcpkg.json b/vcpkg.json index e438d290..282efc0f 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,8 @@ { - "dependencies": [ - "openssl", - "zlib" - ] + "dependencies": [ + "openssl", + "zlib", + "geographiclib", + "geos" + ] }