Merge pull request #1682 from DARMA-tasking/1679-release-1-1-1-beta-7

1679:  Create `1.1.1 beta v7` release candidate

Author: nmm0

.clang-format

@@ -60,7 +60,7 @@ FixNamespaceComments: true
 IncludeBlocks: Preserve
 IndentCaseLabels: false
 IndentGotoLabels: false
-IndentPPDirectives: BeforeHash
+IndentPPDirectives: PPDIS_None
 IndentWidth: 2
 IndentWrappedFunctionNames: false
 KeepEmptyLinesAtTheStartOfBlocks: false

CMakeLists.txt

@@ -1,5 +1,8 @@
 cmake_minimum_required(VERSION 3.17 FATAL_ERROR)
-project(vt VERSION 1.1.0)
+
+file(READ "VERSION" _vt_version_str)
+string(STRIP "${_vt_version_str}" _vt_version_str)
+project(vt VERSION ${_vt_version_str})
 
 # To generate output file with compilation errors and warnings
 # CMake generator needs to be known
@@ -64,8 +67,6 @@ include(cmake/link_vt.cmake)
 # Load packages that are required for core VT build
 include(cmake/load_packages.cmake)
 
-include(cmake/build_git_info.cmake)
-
 include(cmake/check_compiler.cmake)
 
 option(vt_gold_linker_enabled "Build VT using the `gold' linker" ON)

cmake-modules/GetGitRevisionDescription.cmake

@@ -1,34 +1,46 @@
+find_package(Git REQUIRED)
 
-include(GetGitRevisionDescription)
+set(GIT_DIR)
+set(HEAD_FILE)
+execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --git-dir
+        WORKING_DIRECTORY
+        "${PROJECT_BASE_DIR}"
+        RESULT_VARIABLE
+        res
+        OUTPUT_VARIABLE
+        REL_GIT_DIR
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+if (NOT res EQUAL 0)
+    message(STATUS "git invocation failed, git info cannot be obtained")
+else()
+    get_filename_component(GIT_DIR ${REL_GIT_DIR} ABSOLUTE BASE_DIR ${PROJECT_BASE_DIR})
+    message(STATUS "Git DIR: ${GIT_DIR}")
+    if (NOT GIT_DIR)
+        message(STATUS "no git directory present")
+    else()
+        if(NOT EXISTS "${GIT_DIR}/HEAD")
+            message(STATUS "no such file: \"${GIT_DIR}/HEAD\"")
+        else()
+            set(HEAD_FILE "${GIT_DIR}/HEAD")
+            message(STATUS "Git HEAD file: \"${HEAD_FILE}\"")
+        endif()
+    endif()
+endif()
 
-get_git_head_revision(GIT_REFSPEC GIT_SHA1)
+set(VT_GIT_CONFIG_FILE "${PROJECT_BIN_DIR}/src/vt/configs/generated/vt_git_revision.cc")
+add_custom_command(
+        OUTPUT ${VT_GIT_CONFIG_FILE}
+        COMMAND ${CMAKE_COMMAND}
+        -DIN_FILE=${PROJECT_BASE_DIR}/vt_git_revision.cc.in
+        -DOUT_FILE=${VT_GIT_CONFIG_FILE}
+        -DGIT_EXECUTABLE=${GIT_EXECUTABLE}
+        -DGIT_DIR=${GIT_DIR}
+        -DHEAD_FILE=${HEAD_FILE}
+        -DPROJECT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}
+        -DPROJECT_VERSION_MINOR=${PROJECT_VERSION_MINOR}
+        -DPROJECT_VERSION_PATCH=${PROJECT_VERSION_PATCH}
+        -P ${CMAKE_CURRENT_LIST_DIR}/run-git.cmake
+        DEPENDS ${GIT_DIR}
+        )
 
-# set some variables related to GIT state information
-get_git_head_revision(GIT_REFSPEC GIT_SHA1)
-git_describe(GIT_EXACT_TAG --tags --abbrev=0 --all)
-git_describe(GIT_DESCRIPTION --abbrev=10 --always --tags --long --all)
-git_local_changes(GIT_CLEAN_STATUS)
-
-message(STATUS "REF:${GIT_REFSPEC}")
-message(STATUS "REF:${GIT_SHA1}")
-message(STATUS "REF:${GIT_DESCRIPTION}")
-message(STATUS "REF:${GIT_CLEAN_STATUS}")
-message(STATUS "REF:${GIT_EXACT_TAG}")
-
-configure_file(
-  ${PROJECT_BASE_DIR}/vt_git_revision.cc.in
-  ${PROJECT_BIN_DIR}/src/vt/configs/generated/vt_git_revision.cc
-  @ONLY
-)
-
-# install(
-#   FILES            "${PROJECT_BINARY_DIR}/${cur_build_type}/cmake_config.h"
-#   DESTINATION      include
-#   CONFIGURATIONS   ${cur_build_type}
-# )
-
-# configure_file(
-#   "${PROJECT_SOURCE_DIR}/vt_git_revision.cc.in"
-#   "${CMAKE_CURRENT_BINARY_DIR}/vt_git_revision.cc"
-#   @ONLY
-# )
+target_sources(${VIRTUAL_TRANSPORT_LIBRARY} PRIVATE ${VT_GIT_CONFIG_FILE})

cmake-modules/GetGitRevisionDescription.cmake.in

@@ -10,9 +10,9 @@ if (${vt_doxygen_enabled})
     set(doxygen_out ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
 
     set(DOXYGEN_PROJECT_NAME "vt")
-    set(VERSION_MAJOR "1")
-    set(VERSION_MINOR "0")
-    set(VERSION_PATCH "0")
+    set(VERSION_MAJOR "${PROJECT_VERSION_MAJOR}")
+    set(VERSION_MINOR "${PROJECT_VERSION_MINOR}")
+    set(VERSION_PATCH "${PROJECT_VERSION_PATCH}")
     set(DOXYGEN_INPUT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/")
     set(DOXYGEN_CHECKPOINT_SHARED_DOCS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lib/checkpoint/docs/shared")
     set(DOXYGEN_CHECKPOINT_EXAMPLE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lib/checkpoint/examples")