From 1b6ea11d48949f5d2315626717a15b4a0b167a28 Mon Sep 17 00:00:00 2001 From: Philippe Schommers Date: Thu, 1 Nov 2018 13:16:25 +0100 Subject: [PATCH] Move RocksDB to git submodule --- .gitmodules | 3 + .npmignore | 28 +-- README.md | 18 ++ appveyor.yml | 3 +- binding.gyp | 2 +- deps/rocksdb/build_version.cc | 4 + deps/rocksdb/rocksdb | 1 + deps/rocksdb/rocksdb.gyp | 364 ++++++++++++++++++++++++++++++++++ 8 files changed, 407 insertions(+), 16 deletions(-) create mode 100644 .gitmodules create mode 100644 deps/rocksdb/build_version.cc create mode 160000 deps/rocksdb/rocksdb create mode 100644 deps/rocksdb/rocksdb.gyp diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..8184b83a --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "deps/rocksdb/rocksdb"] + path = deps/rocksdb/rocksdb + url = https://github.com/facebook/rocksdb.git diff --git a/.npmignore b/.npmignore index 4d2b85e0..a635b808 100644 --- a/.npmignore +++ b/.npmignore @@ -1,20 +1,20 @@ deps/**/*.md deps/**/.git -deps/leveldb/leveldb-rocksdb/arcanist_util/ -deps/leveldb/leveldb-rocksdb/build_tools/ -deps/leveldb/leveldb-rocksdb/coverage/ -deps/leveldb/leveldb-rocksdb/docs/ -deps/leveldb/leveldb-rocksdb/examples/ -deps/leveldb/leveldb-rocksdb/hdfs/setup.sh -deps/leveldb/leveldb-rocksdb/java/ -deps/leveldb/leveldb-rocksdb/third-party/gtest-*/ -deps/leveldb/leveldb-rocksdb/tools/*.sh -deps/leveldb/leveldb-rocksdb/tools/*.py -deps/leveldb/leveldb-rocksdb/tools/*.dmp -deps/leveldb/leveldb-rocksdb/tools/rdb/ -deps/leveldb/leveldb-rocksdb/README.md -deps/leveldb/leveldb-rocksdb/HISTORY.md +deps/rocksdb/rocksdb/arcanist_util/ +deps/rocksdb/rocksdb/build_tools/ +deps/rocksdb/rocksdb/coverage/ +deps/rocksdb/rocksdb/docs/ +deps/rocksdb/rocksdb/examples/ +deps/rocksdb/rocksdb/hdfs/setup.sh +deps/rocksdb/rocksdb/java/ +deps/rocksdb/rocksdb/third-party/gtest-*/ +deps/rocksdb/rocksdb/tools/*.sh +deps/rocksdb/rocksdb/tools/*.py +deps/rocksdb/rocksdb/tools/*.dmp +deps/rocksdb/rocksdb/tools/rdb/ +deps/rocksdb/rocksdb/README.md +deps/rocksdb/rocksdb/HISTORY.md deps/snappy/snappy*/testdata/ deps/snappy/snappy*/*.txt diff --git a/README.md b/README.md index 0b7b1e8c..5d5f3e14 100644 --- a/README.md +++ b/README.md @@ -68,6 +68,24 @@ Please refer to [`leveldown`](https://github.com/Level/leveldown#api) for API do See the [Contribution Guide](https://github.com/Level/community/blob/master/CONTRIBUTING.md) for more details. +### Git Submodules + +This project uses Git Submodules. This means that you should clone it recursively if you're planning on working on it: + +```bash +$ git clone --recurse-submodules https://github.com/Level/leveldown.git +``` + +Alternatively, you can initalize submodules inside the cloned folder: + +```bash +$ git submodule update --init --recursive +``` + +### Windows + +A large portion of the Windows support comes from code by [Krzysztof Kowalczyk](http://blog.kowalczyk.info/) [@kjk](https://twitter.com/kjk), see his Windows LevelDB port [here](http://code.google.com/r/kkowalczyk-leveldb/). If you're using LevelUP on Windows, you should give him your thanks! + ### Publishing 1. Increment the version: `npm version ..` diff --git a/appveyor.yml b/appveyor.yml index fd59246d..46db0ae7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,7 +14,8 @@ platform: install: - SET PATH=C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\bin;%PATH% - ps: Install-Product node $env:nodejs_version $env:platform - - SET PATH=%APPDATA%\npm;%APPVEYOR_BUILD_FOLDER%\node_modules\.bin;%PATH% + - set PATH=%APPDATA%\npm;%APPVEYOR_BUILD_FOLDER%\node_modules\.bin;%PATH% + - git submodule update --init --recursive - npm i test_script: diff --git a/binding.gyp b/binding.gyp index 8a2d479d..c6f9815b 100644 --- a/binding.gyp +++ b/binding.gyp @@ -54,7 +54,7 @@ }] ] , "dependencies": [ - "<(module_root_dir)/deps/leveldb/leveldb.gyp:leveldb" + "<(module_root_dir)/deps/rocksdb/rocksdb.gyp:rocksdb" ] , "include_dirs" : [ "