#3269 define TOKUDB_REVISION in CPPFLAGS refs[t:3269]

git-svn-id: file:///svn/toku/tokudb@28217 c7de825b-a66e-492c-adef-691d508d4ae1

newbrt/brt-internal.h

@@ -11,7 +11,7 @@
 #if defined(TOKUDB_REVISION)
 #define BUILD_ID TOKUDB_REVISION
 #else
-#define BUILD_ID 1000
+#error
 #endif
 
 #include "brt_layout_version.h"

src/Makefile

@@ -12,10 +12,6 @@ DEPEND_COMPILE += \
 include $(TOKUROOT)toku_include/Makefile.include
 CPPFLAGS+=-D_GNU_SOURCE -D_THREAD_SAFE
 
-ifneq ($(TOKUDB_REVISION),)
-CPPFLAGS += -DTOKUDB_REVISION=$(TOKUDB_REVISION)
-endif
-
 YDB=ydb.$(AEXT)
 YDB_BUNDLE=ydb.bundle
 TYDB=tydb.$(AEXT)

src/ydb.c

@@ -5964,7 +5964,7 @@ db_version(int *major, int *minor, int *patch) {
 #define str(X) #X
     return "tokudb " xstr(DB_VERSION_MAJOR) "." xstr(DB_VERSION_MINOR) "." xstr(DB_VERSION_PATCH) " build " xstr(TOKUDB_REVISION);
 #else
-    return DB_VERSION_STRING;
+#error
 #endif
 }
  

toku_include/Makefile.include

@@ -86,6 +86,11 @@ ifeq ($(SYSTEM),sunos)
 CPPFLAGS += -DTOKU_ALLOW_DEPRECATED
 endif
 
+ifeq ($(TOKUDB_REVISION),)
+TOKUDB_REVISION = 0
+endif
+CPPFLAGS += -DTOKUDB_REVISION=$(TOKUDB_REVISION)
+
 #CFLAG default options
 # Add -Wconversion #DISABLED for now.