Skip to content
This repository has been archived by the owner on Dec 1, 2024. It is now read-only.

Removed additional build step, freezed build_version, updated rocksdb.gyp #142

Merged
merged 1 commit into from
Sep 22, 2019
Merged

Removed additional build step, freezed build_version, updated rocksdb.gyp #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions deps/rocksdb/build_version.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#include "rocksdb/util/build_version.h"
const char* rocksdb_build_git_sha = "rocksdb_build_git_sha:None";
const char* rocksdb_build_git_date = "rocksdb_build_git_date:None";
const char* rocksdb_build_compile_date = "None";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, that's nice. I'll merge this in a litte bit, currently reviewing filoozom's other changes.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the meanwhile I'll prepare intermediate results that I have for RocksDB upgrade

44 changes: 24 additions & 20 deletions deps/rocksdb/rocksdb.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,32 @@
{
'targets': [{
'target_name': 'rocksdb'
, 'variables': {
'git_sha': '4e0065015d3dab1d94ef7cb2b4b1d1fecfa0e926'
}
, 'type': 'static_library'
# Overcomes an issue with the linker and thin .a files on SmartOS
, 'standalone_static_library': 1
, 'actions': [
{
'action_name': 'build-version',
'inputs': [
'rocksdb.gyp',
'rocksdb/util/build_version.cc.in',
'<(module_root_dir)/scripts/build-version.js'
],
'outputs': [
'<(INTERMEDIATE_DIR)/build_version.cc'
],
'action': [
'node',
'<(module_root_dir)/scripts/build-version.js',
'<@(_outputs)'
],
'message': 'Generate build_version.cc'
}
]
# , 'actions': [
# {
# 'action_name': 'build-version',
# 'inputs': [
# 'rocksdb.gyp',
# 'rocksdb/util/build_version.cc.in',
# '<(module_root_dir)/scripts/build-version.js'
# ],
# 'outputs': [
# '<(INTERMEDIATE_DIR)/build_version.cc'
# ],
# 'action': [
# 'node',
# '<(module_root_dir)/scripts/build-version.js',
# '<@(_outputs)',
# '<(git_sha)'
# ],
# 'message': 'Generate build_version.cc'
# }
# ]
, 'dependencies': [
'../snappy/snappy.gyp:snappy'
]
Expand Down Expand Up @@ -285,7 +289,7 @@
, 'rocksdb/tools/dump/db_dump_tool.cc'
, 'rocksdb/util/arena.cc'
, 'rocksdb/util/bloom.cc'
, '<(INTERMEDIATE_DIR)/build_version.cc'
, 'build_version.cc'
, 'rocksdb/util/cf_options.cc'
, 'rocksdb/util/clock_cache.cc'
, 'rocksdb/util/coding.cc'
Expand Down