MB-22191: Always set PRODUCT_VERSION reasonably

Make PRODUCT_VERSION a cached variable to avoid losing it between builds.
If it is set to "" (the default), override the cached value by attempting
to introspect the VERSION from the manifest plus a build number of 0000.
If introspection fails, ultimate default value is "0.0.0-9999".

Since we produce a better default, we removed the ability to easily
override it via Makefile. In general it's bad to automatically pass -D
arguments to CMake with default values because CMake assumes those are
the most correct values.

Change-Id: I209456870c900cdd392ab010cb03e3512a78da27
Reviewed-on: http://review.couchbase.org/77692
Reviewed-by: Kenneth Lareau <[email protected]>
Tested-by: Build Bot <[email protected]>

Author: ceejatec

CMakeLists.txt

@@ -97,11 +97,6 @@ OPTION (CB_DEVELOPER_BUILD "Produce Developer builds" ON)
 MESSAGE(STATUS "Using cmake version: ${CMAKE_VERSION}")
 MESSAGE(STATUS "Installing to ${CMAKE_INSTALL_PREFIX}")
 MESSAGE(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
-IF (BUILD_ENTERPRISE)
-  MESSAGE (STATUS "Building Couchbase Server Enterprise Edition")
-ELSE ()
-  MESSAGE (STATUS "Building Couchbase Server Community Edition")
-ENDIF ()
 
 INCLUDE(CouchbaseAddressSanitizer)
 INCLUDE(CouchbaseAsciiDocs)
@@ -127,19 +122,29 @@ INCLUDE(FindCouchbaseV8)
 INCLUDE(FindCouchbaseNlohmannJson)
 INCLUDE(FindCouchbaseMaven)
 
+# Declare PRODUCT_VERSION in cache, but then override user-defined value
+# if it is an empty string
+SET (PRODUCT_VERSION "" CACHE STRING "Product version with build number")
 IF ("${PRODUCT_VERSION}" STREQUAL "")
   IF (PYTHON_EXECUTABLE)
     # Try to determine product version from manifest
     EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} tlm/scripts/get_version.py
       WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
-      OUTPUT_VARIABLE PRODUCT_VERSION
+      OUTPUT_VARIABLE _product_version
       ERROR_QUIET
       OUTPUT_STRIP_TRAILING_WHITESPACE)
   ELSE (PYTHON_EXECUTABLE)
-    SET(PRODUCT_VERSION "0.0.0-9999")
+    SET(_product_version "0.0.0-9999")
   ENDIF (PYTHON_EXECUTABLE)
+  SET (PRODUCT_VERSION ${_product_version} CACHE STRING "Product version with build number" FORCE)
 ENDIF ("${PRODUCT_VERSION}" STREQUAL "")
 
+IF (BUILD_ENTERPRISE)
+  MESSAGE (STATUS "Building Couchbase Server ${PRODUCT_VERSION} Enterprise Edition")
+ELSE ()
+  MESSAGE (STATUS "Building Couchbase Server ${PRODUCT_VERSION} Community Edition")
+ENDIF ()
+
 IF (WIN32)
    SET(COUCHBASE_NETWORK_LIBS "Ws2_32")
 ELSEIF ("${CMAKE_SYSTEM_NAME}" STREQUAL "SunOS")

Makefile

@@ -28,8 +28,7 @@ SEPARATOR=\\
 
 CMAKE=cmake
 
-CMAKE_ARGS=-G "$(MAKETYPE)" -D PRODUCT_VERSION=$(PRODUCT_VERSION) \
-                            $(EXTRA_CMAKE_OPTIONS)
+CMAKE_ARGS=-G "$(MAKETYPE)" $(EXTRA_CMAKE_OPTIONS)
 
 
 all: CMakeLists.txt Makefile GNUmakefile build/Makefile compile