The build-date.h would be re-calculated on certain events, which caused (#3394)

CMakeLists.txt

@@ -75,7 +75,6 @@ set(ARANGODB_VERSION_MAJOR      "3")
 set(ARANGODB_VERSION_MINOR      "3")
 set(ARANGODB_VERSION_REVISION   "devel")
 set(ARANGODB_PACKAGE_REVISION   "1")
-
 # version for the windows rc file needs to be numeric:
 if (ARANGODB_VERSION_REVISION GREATER -1)
   set(ARANGODB_NUMERIC_VERSION_REVISION "${ARANGODB_VERSION_REVISION}")
@@ -144,11 +143,16 @@ configure_file (
   NEWLINE_STYLE UNIX
 )
 
-configure_file (
+if (NOT DEFINED GENERATE_BUILD_DATE OR GENERATE_BUILD_DATE)
-  "${CMAKE_CURRENT_SOURCE_DIR}/lib/Basics/build-date.h.in"
+  set(GENERATE_BUILD_DATE ON CACHE INTERNAL "whether we should generate the build date")
-  "${CMAKE_CURRENT_BINARY_DIR}/lib/Basics/build-date.h"
+  configure_file (
-  NEWLINE_STYLE UNIX
+    "${CMAKE_CURRENT_SOURCE_DIR}/lib/Basics/build-date.h.in"
-)
+    "${CMAKE_CURRENT_BINARY_DIR}/lib/Basics/build-date.h"
+    NEWLINE_STYLE UNIX
+    )
+else()
+  set(GENERATE_BUILD_DATE OFF CACHE INTERNAL "whether we should generate the build date")
+endif()
 
 configure_file(
   "${CMAKE_CURRENT_SOURCE_DIR}/lib/Basics/VERSION.in"

Installation/Jenkins/build.sh

@@ -147,7 +147,7 @@ MAKE=make
 PACKAGE_MAKE=make
 MAKE_PARAMS=()
 MAKE_CMD_PREFIX=""
-CONFIGURE_OPTIONS+=("$CMAKE_OPENSSL")
+CONFIGURE_OPTIONS+=("$CMAKE_OPENSSL -DGENERATE_BUILD_DATE=OFF")
 INSTALL_PREFIX="/"
 MAINTAINER_MODE="-DUSE_MAINTAINER_MODE=off"
 
@@ -820,6 +820,8 @@ if [ -n "$CPACK" ] && [ -n "${TARGET_DIR}" ] && [ -z "${MSVC}" ];  then
     fi
 fi
 
+mkdir -p "${BUILD_DIR}/lib/Basics/"
+cat "${SOURCE_DIR}/lib/Basics/build.h.in" | sed "s;@ARANGODB_VERSION@;$(date "+%Y-%m-%d %H:%M:%S");" >"${BUILD_DIR}/lib/Basics/build.h"
 TRIES=0;
 set +e
 while /bin/true; do

cmake/packages/client/rpm.txt

@@ -1,84 +0,0 @@
-################################################################################
-# the client package is a complete cmake sub package.
-################################################################################
-project(PACKAGE-CLIENT)
-cmake_minimum_required(VERSION 2.8)
-
-################################################################################
-# variables from the main build have to be explicitely forwarded:
-################################################################################
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "@PROJECT_BINARY_DIR@/bin/")
-
-################################################################################
-#   Substitute the install binaries:
-################################################################################
-set(BIN_ARANGOBENCH @BIN_ARANGOBENCH@)
-set(BIN_ARANGODUMP @BIN_ARANGODUMP@)
-set(BIN_ARANGOIMP @BIN_ARANGOIMP@)
-set(BIN_ARANGORESTORE @BIN_ARANGORESTORE@)
-set(BIN_ARANGOSH @BIN_ARANGOSH@)
-set(BIN_ARANGOVPACK @BIN_ARANGOVPACK@)
-
-################################################################################
-#   build specific variables:
-################################################################################
-set(ARANGODB_URL_INFO_ABOUT @ARANGODB_URL_INFO_ABOUT@)
-set(ARANGODB_SOURCE_DIR @ARANGODB_SOURCE_DIR@)
-set(ARANGODB_VERSION @ARANGODB_VERSION@)
-set(ARANGODB_PACKAGE_CONTACT @ARANGODB_PACKAGE_CONTACT@)
-set(ARANGODB_PACKAGE_REVISION @ARANGODB_PACKAGE_REVISION@)
-
-set(CMAKE_INSTALL_FULL_BINDIR @CMAKE_INSTALL_FULL_BINDIR@)
-set(CMAKE_TARGET_ARCHITECTURES @CMAKE_TARGET_ARCHITECTURES@)
-
-set(CMAKE_INSTALL_SYSCONFDIR_ARANGO @CMAKE_INSTALL_SYSCONFDIR_ARANGO@)
-set(CMAKE_INSTALL_FULL_SYSCONFDIR_ARANGO @CMAKE_INSTALL_FULL_SYSCONFDIR_ARANGO@)
-
-set(ORIGINAL_SOURCE_DIR @PROJECT_SOURCE_DIR@)
-set(PROJECT_SOURCE_DIR @PROJECT_SOURCE_DIR@)
-
-################################################################################
-# Get the final values for cpack:
-################################################################################
-set(CPACK_GENERATOR "RPM")
-set(CPACK_PACKAGE_VERSION "${ARANGODB_VERSION}")
-set(CPACK_PACKAGE_NAME "arangodb3-client")
-set(CPACK_PACKAGE_CONTACT ${ARANGODB_PACKAGE_CONTACT})
-set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${ARANGODB_URL_INFO_ABOUT})
-set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
-set(CPACK_DEBIAN_PACKAGE_CONFLICTS "arangodb, arangodb3")
-set(CPACK_DEBIAN_COMPRESSION_TYPE "xz")
-set(CPACK_COMPONENTS_ALL debian-extras)
-
-if (USE_ENTERPRISE)
-  set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/enterprise/LICENSE")
-else ()
-  set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
-endif ()
-
-file(READ "${PROJECT_SOURCE_DIR}/Installation/debian/client_packagedesc.txt"
-  CPACK_DEBIAN_PACKAGE_DESCRIPTION)
-
-################################################################################
-# specify which target archcitecture the package is going to be:
-################################################################################
-if(CMAKE_TARGET_ARCHITECTURES MATCHES ".*x86_64.*")
-  set(ARANGODB_PACKAGE_ARCHITECTURE "amd64")
-elseif(CMAKE_TARGET_ARCHITECTURES MATCHES "aarch64")
-  set(ARANGODB_PACKAGE_ARCHITECTURE "arm64")
-elseif(CMAKE_TARGET_ARCHITECTURES MATCHES "armv7")
-  set(ARANGODB_PACKAGE_ARCHITECTURE "arm7")
-else()
-  set(ARANGODB_PACKAGE_ARCHITECTURE "i386")
-endif()
-
-set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${ARANGODB_PACKAGE_REVISION}_${ARANGODB_PACKAGE_ARCHITECTURE}")
-
-################################################################################
-# Install the external files into the package directory:
-################################################################################
-include(${ORIGINAL_SOURCE_DIR}/cmake/InstallMacros.cmake)
-include(${ORIGINAL_SOURCE_DIR}/cmake/InstallArangoDBJSClient.cmake)
-include(${ORIGINAL_SOURCE_DIR}/arangosh/install.cmake)
-
-include(CPack)

cmake/packages/rpm.cmake

@@ -1,19 +1,18 @@
 # -*- mode: CMAKE; -*-
 
+
 set(CPACK_GENERATOR "RPM")
 if (CMAKE_DEBUG_FILENAMES_SHA_SUM)
   set(CPACK_DEBUG_DIRECTORY_PATTERN "/usr/lib*/debug/.build-id/*")
 else()
   set(CPACK_DEBUG_DIRECTORY_PATTERN "/usr/lib*/debug/*")
 endif()
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_X ${PROJECT_BINARY_DIR}/bin)
+include(arangosh/dbg.cmake)
+include(arangod/dbg.cmake)
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/Installation/rpm/arangodb.spec.in" "${CMAKE_CURRENT_BINARY_DIR}/arangodb.spec" @ONLY IMMEDIATE)
 set(CPACK_RPM_USER_BINARY_SPECFILE "${CMAKE_CURRENT_BINARY_DIR}/arangodb.spec")
 
-
-################################################################################
-# This produces the RPM packages, using client/rpm.txt for the second package.
-################################################################################
-
 # deploy the Init script:
 if (RPM_DISTRO STREQUAL "SUSE13")
   set(RPM_INIT_SCRIPT "${PROJECT_SOURCE_DIR}/Installation/rpm/rc.arangod.OpenSuSE_13")
@@ -55,10 +54,6 @@ set(CPACK_RPM_PACKAGE_RELOCATABLE FALSE)
 set(CPACK_TEMPORARY_DIRECTORY         "${PROJECT_BINARY_DIR}/_CPack_Packages/${CMAKE_SYSTEM_NAME}/RPM/RPMS/${ARANGODB_PACKAGE_ARCHITECTURE}")
 set(CPACK_TEMPORARY_PACKAGE_FILE_NAME "${CPACK_TEMPORARY_DIRECTORY}/${CPACK_PACKAGE_FILE_NAME}.rpm")
 
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_X ${PROJECT_BINARY_DIR}/bin)
-include(arangosh/dbg.cmake)
-include(arangod/dbg.cmake)
-
 add_custom_target(package-arongodb-server
   COMMAND ${CMAKE_COMMAND} .
   COMMAND ${CMAKE_CPACK_COMMAND} -G RPM