Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move RocksDB to git submodule #141

Merged
merged 3 commits into from
Apr 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "deps/rocksdb/rocksdb"]
path = deps/rocksdb/rocksdb
url = https://github.com/facebook/rocksdb.git
42 changes: 28 additions & 14 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -1,20 +1,31 @@
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/buckifier/
deps/rocksdb/rocksdb/build_tools/
deps/rocksdb/rocksdb/coverage/
deps/rocksdb/rocksdb/docs/
deps/rocksdb/rocksdb/examples/
deps/rocksdb/rocksdb/fuzz/
deps/rocksdb/rocksdb/hdfs/setup.sh
deps/rocksdb/rocksdb/java/
deps/rocksdb/rocksdb/third-party/gtest-*/
deps/rocksdb/rocksdb/third-party/folly/
deps/rocksdb/rocksdb/tools/advisor/
deps/rocksdb/rocksdb/tools/block_cache_analyzer/
deps/rocksdb/rocksdb/tools/rdb/
deps/rocksdb/rocksdb/tools/dbench_monitor
deps/rocksdb/rocksdb/tools/pflag
deps/rocksdb/rocksdb/tools/*.sh
deps/rocksdb/rocksdb/tools/*.py
deps/rocksdb/rocksdb/tools/*.dmp
deps/rocksdb/rocksdb/README.md
deps/rocksdb/rocksdb/HISTORY.md
deps/rocksdb/rocksdb/.circleci/
deps/rocksdb/rocksdb/.github/
deps/rocksdb/rocksdb/.lgtm.yml
deps/rocksdb/rocksdb/defs.bzl

deps/snappy/snappy*/testdata/
deps/snappy/snappy*/*.txt
Expand All @@ -38,6 +49,7 @@ libleveldb.a
*.sln
*.vcxproj
*.vcxproj.filters
.vscode

# Benchmarks and tests
bench/
Expand All @@ -47,6 +59,7 @@ test/

# Misc
.nyc_output/
.github/
yarn.lock
.gitmodules
.travis.yml
Expand All @@ -57,6 +70,7 @@ Dockerfile
Vagrantfile
.arcconfig
.clang-format
.watchmanconfig

# Unknown
leakydb
Expand Down
14 changes: 14 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,20 @@ 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/rocksdb.git
```

Alternatively, you can initialize submodules after cloning:

```bash
$ git submodule update --init --recursive
```

### Publishing

1. Increment the version: `npm version ..`
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ platform:
- x64

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:
Expand Down
3 changes: 2 additions & 1 deletion binding.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
, 'VCLinkerTool': {
'AdditionalDependencies': [
# SDK import libs.
'Shlwapi.lib',
'rpcrt4.lib'
]
}
Expand Down Expand Up @@ -54,7 +55,7 @@
}]
]
, "dependencies": [
"<(module_root_dir)/deps/leveldb/leveldb.gyp:leveldb"
"<(module_root_dir)/deps/rocksdb/rocksdb.gyp:rocksdb"
]
, "include_dirs" : [
"<!(node -e \"require('napi-macros')\")"
Expand Down
17 changes: 0 additions & 17 deletions deps/leveldb/leveldb-rocksdb/.arcconfig

This file was deleted.

5 changes: 0 additions & 5 deletions deps/leveldb/leveldb-rocksdb/.clang-format

This file was deleted.

73 changes: 0 additions & 73 deletions deps/leveldb/leveldb-rocksdb/.gitignore

This file was deleted.

60 changes: 0 additions & 60 deletions deps/leveldb/leveldb-rocksdb/.travis.yml

This file was deleted.

11 changes: 0 additions & 11 deletions deps/leveldb/leveldb-rocksdb/AUTHORS

This file was deleted.

Loading