Update to TileDB 2.10.3 (#82)

TileDB-Inc · Aug 4, 2022 · d0cac1a · d0cac1a
1 parent d6519a7
commit d0cac1a
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 28 deletions.
diff --git a/.github/scripts/download_tiledb.sh b/.github/scripts/download_tiledb.sh
@@ -1,12 +1,18 @@
 set -e -x
-wget https://github.com/TileDB-Inc/TileDB/releases/download/2.10.2/tiledb-windows-x86_64-2.10.2-9ab84f9.zip
-unzip tiledb-windows-x86_64-2.10.2-9ab84f9.zip -d tiledb-windows
+TAG=2.10.3
+ID=7a5d1cd
+
+RELEASE=x86_64-$TAG-$ID
+wget https://github.com/TileDB-Inc/TileDB/releases/download/$TAG/tiledb-windows-$RELEASE.zip
+unzip tiledb-windows-$RELEASE.zip -d tiledb-windows
 cp ./tiledb-windows/bin/tiledb.dll ./sources/TileDB.CSharp/runtimes/win-x64/native/
-wget https://github.com/TileDB-Inc/TileDB/releases/download/2.10.2/tiledb-linux-x86_64-2.10.2-9ab84f9.tar.gz
+
+wget https://github.com/TileDB-Inc/TileDB/releases/download/$TAG/tiledb-linux-$RELEASE.tar.gz
 mkdir tiledb-linux
-tar xvfz tiledb-linux-x86_64-2.10.2-9ab84f9.tar.gz --directory tiledb-linux
-cp ./tiledb-linux/lib/libtiledb.so.2.10 ./sources/TileDB.CSharp/runtimes/linux-x64/native/
-wget https://github.com/TileDB-Inc/TileDB/releases/download/2.10.2/tiledb-macos-x86_64-2.10.2-9ab84f9.tar.gz
+tar xvfz tiledb-linux-$RELEASE.tar.gz --directory tiledb-linux
+cp ./tiledb-linux/lib/libtiledb.so.${TAG%.*} ./sources/TileDB.CSharp/runtimes/linux-x64/native/
+
+wget https://github.com/TileDB-Inc/TileDB/releases/download/$TAG/tiledb-macos-$RELEASE.tar.gz
 mkdir tiledb-macos
-tar xvfz tiledb-macos-x86_64-2.10.2-9ab84f9.tar.gz --directory tiledb-macos
-cp ./tiledb-macos/lib/libtiledb.dylib ./sources/TileDB.CSharp/runtimes/osx-x64/native/
+tar xvfz tiledb-macos-$RELEASE.tar.gz --directory tiledb-macos
+cp ./tiledb-macos/lib/libtiledb.dylib ./sources/TileDB.CSharp/runtimes/osx-x64/native/
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -5,7 +5,7 @@
 # setup
 cmake_minimum_required(VERSION 3.16)
 
-set(TILEDB_VERSION "2.10.2" CACHE STRING "TileDB version")
+set(TILEDB_VERSION "2.10.3" CACHE STRING "TileDB version")
 set(TILEDB_GIT_TAG "dev" CACHE STRING "git branch")
 
 project(TileDB-CSharp)
@@ -66,7 +66,7 @@ endif()
 ###########################################
 # Download released tiledb or build tiledb
 ##########################################
- 
+
 # src
 include(./cmake/TileDB.cmake)
- 
+
diff --git a/cpp/cmake/TileDB.cmake b/cpp/cmake/TileDB.cmake
@@ -9,7 +9,18 @@ message(STATUS "start to set tiledb for version:${TILEDB_VERSION}")
 if(${TILEDB_VERSION} MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)$")
 message(STATUS "start to set TILEDB_DOWNLOAD_URL and TILEDB_DOWNLOAD_SHA1")
 
-if(${TILEDB_VERSION} STREQUAL "2.10.2")
+if(${TILEDB_VERSION} STREQUAL "2.10.3")
+  if (WIN32) # Windows
+    SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.3/tiledb-windows-x86_64-2.10.3-7a5d1cd.zip")
+    SET(TILEDB_DOWNLOAD_SHA1 "aa4030a55339d23ef25a0d9593dbad76e9246742")
+  elseif(APPLE) # OSX
+    SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.3/tiledb-macos-x86_64-2.10.3-7a5d1cd.tar.gz")
+    SET(TILEDB_DOWNLOAD_SHA1 "897c17caec445f74114ac1c6e7d453d6f6d1c2e7")
+  else() # Linux
+    SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.3/tiledb-linux-x86_64-2.10.3-7a5d1cd.tar.gz")
+    SET(TILEDB_DOWNLOAD_SHA1 "49387ad851693a748d17d638a7d716ad62ac8706")
+  endif()
+elseif(${TILEDB_VERSION} STREQUAL "2.10.2")
   if (WIN32) # Windows
     SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.2/tiledb-windows-x86_64-2.10.2-9ab84f9.zip")
     SET(TILEDB_DOWNLOAD_SHA1 "fe6dac320afb08dd3f2f40f2705306f6eb245f8b")
@@ -19,7 +30,7 @@ if(${TILEDB_VERSION} STREQUAL "2.10.2")
   else() # Linux
     SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.2/tiledb-linux-x86_64-2.10.2-9ab84f9.tar.gz")
     SET(TILEDB_DOWNLOAD_SHA1 "03f6d4892f11cbd939660b78c923325396bd600f")
-  endif()
+endif()
 elseif(${TILEDB_VERSION} STREQUAL "2.10.1")
   if (WIN32) # Windows
     SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.1/tiledb-windows-x86_64-2.10.1-6535d4c.zip")
@@ -352,14 +363,14 @@ elseif(${TILEDB_VERSION} STREQUAL "2.0.7")
   endif()
 else()
   if (WIN32) # Windows
-    SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.2/tiledb-windows-x86_64-2.10.2-9ab84f9.zip")
-    SET(TILEDB_DOWNLOAD_SHA1 "fe6dac320afb08dd3f2f40f2705306f6eb245f8b")
+    SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.3/tiledb-windows-x86_64-2.10.3-7a5d1cd.zip")
+    SET(TILEDB_DOWNLOAD_SHA1 "aa4030a55339d23ef25a0d9593dbad76e9246742")
   elseif(APPLE) # OSX
-    SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.2/tiledb-macos-x86_64-2.10.2-9ab84f9.tar.gz")
-    SET(TILEDB_DOWNLOAD_SHA1 "2be62a6c48c0bd7aeea786414aa32aef26fe6a64")
+    SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.3/tiledb-macos-x86_64-2.10.3-7a5d1cd.tar.gz")
+    SET(TILEDB_DOWNLOAD_SHA1 "897c17caec445f74114ac1c6e7d453d6f6d1c2e7")
   else() # Linux
-    SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.2/tiledb-linux-x86_64-2.10.2-9ab84f9.tar.gz")
-    SET(TILEDB_DOWNLOAD_SHA1 "03f6d4892f11cbd939660b78c923325396bd600f")
+    SET(TILEDB_DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.10.3/tiledb-linux-x86_64-2.10.3-7a5d1cd.tar.gz")
+    SET(TILEDB_DOWNLOAD_SHA1 "49387ad851693a748d17d638a7d716ad62ac8706")
   endif()
 endif()
 

diff --git a/examples/TileDB.CSharp.Example/TileDB.CSharp.Example.csproj b/examples/TileDB.CSharp.Example/TileDB.CSharp.Example.csproj
@@ -5,7 +5,7 @@
     <RootNamespace>TileDB.CSharp.Examples</RootNamespace>
     <TargetFramework>net5.0</TargetFramework>
     <RollForward>Major</RollForward>
-    <Version>5.1.1</Version>
+    <Version>5.1.2</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/examples/bindings/quickstart_sparse_string/quickstart_sparse_string.csproj b/examples/bindings/quickstart_sparse_string/quickstart_sparse_string.csproj
@@ -5,7 +5,7 @@
     <OutputType>Exe</OutputType>
     <RollForward>Major</RollForward>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>5.1.0</Version>
+    <Version>5.1.2</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/scripts/generate/README.md b/scripts/generate/README.md
@@ -81,9 +81,9 @@ source ~/.zshrc
 Install specific version of TileDB in `/usr/local`
 
 ```bash
-git clone https://github.com/TileDB-Inc/TileDB.git -b 2.10.2
-mv TileDB TileDB_2.10.2
-cd TileDB_2.10.2
+git clone https://github.com/TileDB-Inc/TileDB.git -b 2.10.3
+mv TileDB TileDB_2.10.3
+cd TileDB_2.10.3
 mkdir build && cd build
 #cmake 3.22.2
 cmake -DTILEDB_VERBOSE=OFF -DTILEDB_S3=ON -DTILEDB_SERIALIZATION=ON -DTILEDB_AZURE=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr/local ..

diff --git a/sources/TileDB.CSharp/TileDB.CSharp.csproj b/sources/TileDB.CSharp/TileDB.CSharp.csproj
@@ -6,7 +6,7 @@
     <RollForward>Major</RollForward>
     <RootNamespace>TileDB.CSharp</RootNamespace>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>5.1.1</Version>
+    <Version>5.1.2</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/sources/TileDB.CSharp/TileDB.CSharp.nuspec b/sources/TileDB.CSharp/TileDB.CSharp.nuspec
@@ -2,14 +2,14 @@
 <package >
   <metadata>
     <id>TileDB.CSharp</id>
-    <version>5.1.1</version>
+    <version>5.1.2</version>
     <title>$title$</title>
     <authors>TileDB Inc</authors>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/TileDB-Inc/TileDB-CSharp</projectUrl>
     <description>CSharp wrapper of TileDB universal data engine</description>
-    <releaseNotes>This package is the csharp wrapper of TileDB 2.10.2.</releaseNotes>
+    <releaseNotes>This package is the csharp wrapper of TileDB 2.10.3.</releaseNotes>
     <copyright>$copyright$</copyright>
     <tags>tiledb</tags>
     <dependencies>

diff --git a/sources/TileDB.Interop/TileDB.Interop.csproj b/sources/TileDB.Interop/TileDB.Interop.csproj
@@ -4,6 +4,6 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <RollForward>Major</RollForward>
     <TargetFramework>net5.0</TargetFramework>
-    <Version>5.1.1</Version>
+    <Version>5.1.2</Version>
   </PropertyGroup>
 </Project>