Skip to content

Commit 30c3ede

Browse files
update to TileDB-2.17.0-rc0
1 parent e8e6d34 commit 30c3ede

14 files changed

+3016
-2084
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins {
99
}
1010

1111
group 'io.tiledb'
12-
version '0.18.0-SNAPSHOT'
12+
version '0.19.0-SNAPSHOT'
1313

1414
repositories {
1515
jcenter()

cmake/Modules/FindTileDB_EP.cmake

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ if (NOT TILEDB_FOUND)
4848
# Try to download prebuilt artifacts unless the user specifies to build from source
4949
if(DOWNLOAD_TILEDB_PREBUILT)
5050
if (WIN32) # Windows
51-
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.16.3/tiledb-windows-x86_64-2.16.3-194b5ae.zip")
52-
SET(DOWNLOAD_SHA1 "8e986b6143ef9509201c7f2b3c0a7a53ff41095a")
51+
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.17.0-rc0/tiledb-windows-x86_64-2.17.0-rc0-46b9ca5.zip")
52+
SET(DOWNLOAD_SHA1 "740c7885b5191a467cb742b3420a51ae7b2a0a99")
5353
elseif(APPLE) # macOS
54-
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.16.3/tiledb-macos-x86_64-2.16.3-194b5ae.tar.gz")
55-
SET(DOWNLOAD_SHA1 "b4d35306771d1c30b49bf2a98651e8e24c91037e")
54+
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.17.0-rc0/tiledb-macos-x86_64-2.17.0-rc0-46b9ca5.tar.gz")
55+
SET(DOWNLOAD_SHA1 "a3280bfaad8697080f9804b2d0756887962bdaa5")
5656
else() # Linux
57-
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.16.3/tiledb-linux-x86_64-2.16.3-194b5ae.tar.gz")
58-
SET(DOWNLOAD_SHA1 "6ccafbee52137478d0b8146e71a11323755c9ed5")
57+
SET(DOWNLOAD_URL "https://github.com/TileDB-Inc/TileDB/releases/download/2.17.0-rc0/tiledb-linux-x86_64-2.17.0-rc0-46b9ca5.tar.gz")
58+
SET(DOWNLOAD_SHA1 "f7fe14f444ab3ea9799844ebed247f18f6e40a90")
5959
endif()
6060

6161
ExternalProject_Add(ep_tiledb

generate_tiledb_jni

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@ if [[ ! -x `which swig` ]]; then
9595
die "swig wrapper generator not found in path"
9696
fi
9797

98-
# define the necessary macro constants
99-
# (removed during preprocessor macro expansion)
100-
g++ -dM -I ${prefix_dir}/include -x c++-header -E ${tiledb_header} ${tiledb_experimental_header} | grep "#define TILEDB" > swig/tiledb_generated.h ||
101-
die "could not write ./swig/tiledb_generated.h tmp file"
102-
103-
## remove system headers
104-
awk '!/#\s*include/ || /tiledb_/ || /tiledb\/api/ {print}' ${tiledb_header} ${tiledb_experimental_header} |
105-
g++ -E -P -nostdinc++ -I "${prefix_dir}/include/tiledb" -I "${prefix_dir}/include/" -x c++ - >> swig/tiledb_generated.h ||
106-
die "error generating temp combined swig/tiledb_generated.h header for swig generation"
98+
## define the necessary macro constants
99+
## (removed during preprocessor macro expansion)
100+
#g++ -dM -I ${prefix_dir}/include -x c++-header -E ${tiledb_header} ${tiledb_experimental_header} | grep "#define TILEDB" > swig/tiledb_generated.h ||
101+
# die "could not write ./swig/tiledb_generated.h tmp file"
102+
#
103+
### remove system headers
104+
#awk '!/#\s*include/ || /tiledb_/ || /tiledb\/api/ {print}' ${tiledb_header} ${tiledb_experimental_header} |
105+
# g++ -E -P -nostdinc++ -I "${prefix_dir}/include/tiledb" -I "${prefix_dir}/include/" -x c++ - >> swig/tiledb_generated.h ||
106+
# die "error generating temp combined swig/tiledb_generated.h header for swig generation"
107107

108108
# if existing libtiledb generated source exists, delete it
109109
cleanup_java() {

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
TILEDB_GIT_REPOSITORY=https://github.com/TileDB-Inc/TileDB
2-
TILEDB_GIT_TAG=2.16.3
2+
TILEDB_GIT_TAG=2.17.0-rc0
33
TILEDB_VERBOSE=ON
44
TILEDB_S3=ON
55
TILEDB_AZURE=OFF
66
TILEDB_HDFS=OFF
77
TILEDB_SERIALIZATION=OFF
8-
FORCE_BUILD_TILEDB=OFF
8+
FORCE_BUILD_TILEDB=ON
99
DOWNLOAD_TILEDB_PREBUILT=ON
1010
TILEDB_SKIP_S3AWSSDK_DIR_LENGTH_CHECK=ON

0 commit comments

Comments
 (0)