From e525bb16ea5ca8882d340533fa801866a31e9cce Mon Sep 17 00:00:00 2001 From: Igor Canadi Date: Tue, 29 Apr 2014 11:59:36 -0400 Subject: [PATCH] Make kMajorVersion and kMinorVersion take version from version macros --- Makefile | 2 +- README.fb | 3 --- include/rocksdb/db.h | 5 ++--- include/rocksdb/version.h | 1 + 4 files changed, 4 insertions(+), 7 deletions(-) delete mode 100644 README.fb diff --git a/Makefile b/Makefile index 3e62211f41..697527326e 100644 --- a/Makefile +++ b/Makefile @@ -147,7 +147,7 @@ SHARED3 = $(SHARED1) SHARED = $(SHARED1) else # Update db.h if you change these. -SHARED_MAJOR = 2 +SHARED_MAJOR = 3 SHARED_MINOR = 0 SHARED1 = ${LIBNAME}.$(PLATFORM_SHARED_EXT) SHARED2 = $(SHARED1).$(SHARED_MAJOR) diff --git a/README.fb b/README.fb deleted file mode 100644 index d3cc4110b7..0000000000 --- a/README.fb +++ /dev/null @@ -1,3 +0,0 @@ -* Detailed instructions on how to compile using fbcode and jemalloc - -* Latest release is 2.7.fb diff --git a/include/rocksdb/db.h b/include/rocksdb/db.h index 15955cc493..6e4f976d82 100644 --- a/include/rocksdb/db.h +++ b/include/rocksdb/db.h @@ -41,9 +41,8 @@ struct ColumnFamilyDescriptor { : name(_name), options(_options) {} }; -// Update Makefile if you change these -static const int kMajorVersion = 3; -static const int kMinorVersion = 0; +static const int kMajorVersion = __ROCKSDB_MAJOR__; +static const int kMinorVersion = __ROCKSDB_MINOR__; struct Options; struct ReadOptions; diff --git a/include/rocksdb/version.h b/include/rocksdb/version.h index 2e71bad900..6aeabc28c6 100644 --- a/include/rocksdb/version.h +++ b/include/rocksdb/version.h @@ -1,5 +1,6 @@ #pragma once +// Also update Makefile if you change these #define __ROCKSDB_MAJOR__ 3 #define __ROCKSDB_MINOR__ 0 #define __ROCKSDB_PATCH__ 0