ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-20 11:05:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to RocksBD 6.7.3

Browse Source
This commit is contained in:
Miguel Portilla
2020-04-14 16:09:33 -04:00
committed by manojsdoshi
parent cd78ce3118
commit bd8dbb87b6
3 changed files with 5 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@@ -344,9 +344,7 @@ matrix:
install: install:
- choco upgrade cmake.install - choco upgrade cmake.install
- choco install ninja visualstudio2017-workload-vctools -y - choco install ninja visualstudio2017-workload-vctools -y
#Force install 14.24 to fix build issue. TODO - this should be deleted when rocksdb fixes their issue with the new compiler. - choco install visualstudio2019buildtools visualstudio2019community visualstudio2019-workload-vctools -y
- choco install visualstudio2019buildtools visualstudio2019community -y
- choco install visualstudio2019-workload-vctools --package-parameters "--add Microsoft.VisualStudio.Component.VC.14.24.x86.x64" -y
script: script:
- export BOOST_TOOLSET=msvc-14.1 - export BOOST_TOOLSET=msvc-14.1
- travis_wait ${MAX_TIME_MIN} Builds/containers/shared/install_boost.sh - travis_wait ${MAX_TIME_MIN} Builds/containers/shared/install_boost.sh
@@ -385,9 +383,7 @@ matrix:
install: install:
- choco upgrade cmake.install - choco upgrade cmake.install
- choco install ninja -y - choco install ninja -y
#Force install 14.24 to fix build issue. TODO - this should be deleted when rocksdb fixes their issue with the new compiler. - choco install visualstudio2019buildtools visualstudio2019community visualstudio2019-workload-vctools -y
- choco install visualstudio2019buildtools visualstudio2019community -y
- choco install visualstudio2019-workload-vctools --package-parameters "--add Microsoft.VisualStudio.Component.VC.14.24.x86.x64" -y
before_script: before_script:
- export BLD_CONFIG=Release - export BLD_CONFIG=Release
# we want to use the boost build from cache, which was built using the # we want to use the boost build from cache, which was built using the

6
Builds/CMake/deps/Rocksdb.cmake
View File

@@ -8,7 +8,7 @@ set_target_properties (rocksdb_lib
option (local_rocksdb "use local build of rocksdb." OFF) option (local_rocksdb "use local build of rocksdb." OFF)
if (NOT local_rocksdb) if (NOT local_rocksdb)
find_package (RocksDB 6.5 QUIET CONFIG) find_package (RocksDB 6.7 QUIET CONFIG)
if (TARGET RocksDB::rocksdb) if (TARGET RocksDB::rocksdb)
message (STATUS "Found RocksDB using config.") message (STATUS "Found RocksDB using config.")
get_target_property (_rockslib_l RocksDB::rocksdb IMPORTED_LOCATION_DEBUG) get_target_property (_rockslib_l RocksDB::rocksdb IMPORTED_LOCATION_DEBUG)
@@ -40,7 +40,7 @@ if (NOT local_rocksdb)
# TBD if there is some way to extract transitive deps..then: # TBD if there is some way to extract transitive deps..then:
#set (RocksDB_USE_STATIC ON) #set (RocksDB_USE_STATIC ON)
else () else ()
find_package (RocksDB 6.5 MODULE) find_package (RocksDB 6.7 MODULE)
if (ROCKSDB_FOUND) if (ROCKSDB_FOUND)
if (RocksDB_LIBRARY_DEBUG) if (RocksDB_LIBRARY_DEBUG)
set_target_properties (rocksdb_lib PROPERTIES IMPORTED_LOCATION_DEBUG ${RocksDB_LIBRARY_DEBUG}) set_target_properties (rocksdb_lib PROPERTIES IMPORTED_LOCATION_DEBUG ${RocksDB_LIBRARY_DEBUG})
@@ -60,7 +60,7 @@ if (local_rocksdb)
ExternalProject_Add (rocksdb ExternalProject_Add (rocksdb
PREFIX ${nih_cache_path} PREFIX ${nih_cache_path}
GIT_REPOSITORY https://github.com/facebook/rocksdb.git GIT_REPOSITORY https://github.com/facebook/rocksdb.git
GIT_TAG v6.5.3 GIT_TAG v6.7.3
PATCH_COMMAND PATCH_COMMAND
# only used by windows build # only used by windows build
${CMAKE_COMMAND} -E copy ${CMAKE_COMMAND} -E copy

6
bin/sh/setup-msvc.sh
View File

@@ -22,10 +22,6 @@ while read line ; do
fi fi
fi fi
done <<EOL done <<EOL
"C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Auxiliary/Build/vcvarsall.bat" x86_amd64 -vcvars_ver=14.24
"C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build/vcvarsall.bat" x86_amd64 -vcvars_ver=14.24
"C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Auxiliary/Build/vcvarsall.bat" x86_amd64 -vcvars_ver=14.24
"C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvarsall.bat" x86_amd64 -vcvars_ver=14.24
"C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Auxiliary/Build/vcvarsall.bat" x86_amd64 "C:/Program Files (x86)/Microsoft Visual Studio/2019/BuildTools/VC/Auxiliary/Build/vcvarsall.bat" x86_amd64
"C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build/vcvarsall.bat" x86_amd64 "C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/VC/Auxiliary/Build/vcvarsall.bat" x86_amd64
"C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Auxiliary/Build/vcvarsall.bat" x86_amd64 "C:/Program Files (x86)/Microsoft Visual Studio/2017/BuildTools/VC/Auxiliary/Build/vcvarsall.bat" x86_amd64
@@ -36,8 +32,6 @@ done <<EOL
"C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/vcvarsall.bat" amd64 "C:/Program Files (x86)/Microsoft Visual Studio 12.0/VC/vcvarsall.bat" amd64
EOL EOL
# TODO: update the list above as needed to support newer versions of msvc tools # TODO: update the list above as needed to support newer versions of msvc tools
# MSVC 19.25.28610.4 causes the rocksdb's compilation to fail, for VS2019, we will choose 14.24 VCTools for now
# TODO: Delete lines with -vcars_ver=14.24 once rocksdb becomes compatible with newer compiler version.
rm -f getenv.bat rm -f getenv.bat