Scripts updates

CMakeLists.txt

@@ -70,25 +70,6 @@ else()
     # set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 endif()
 
-set(TIMEMORY_GIT_DESCRIBE "unknown")
-set(TIMEMORY_GIT_REVISION "unknown")
-
-find_package(Git QUIET)
-if(Git_FOUND)
-    execute_process(
-        COMMAND             ${GIT_EXECUTABLE} describe --tags
-        WORKING_DIRECTORY   ${PROJECT_SOURCE_DIR}
-        OUTPUT_VARIABLE     TIMEMORY_GIT_DESCRIBE
-        ERROR_QUIET
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-    execute_process(
-        COMMAND             ${GIT_EXECUTABLE} rev-parse HEAD
-        WORKING_DIRECTORY   ${PROJECT_SOURCE_DIR}
-        OUTPUT_VARIABLE     TIMEMORY_GIT_REVISION
-        ERROR_QUIET
-        OUTPUT_STRIP_TRAILING_WHITESPACE)
-endif()
-
 # install directories
 include(GNUInstallDirs)
 # cmake installation folder -- change CMAKE_INSTALL_DATAROOTDIR to tweak this

MANIFEST.in

@@ -46,3 +46,7 @@ recursive-exclude _skbuild *
 recursive-exclude build *
 recursive-exclude dist *
 recursive-exclude external/hatchet/build *
+
+# bypass global exclude of git files
+
+include docs/.gitinfo

cmake/Modules/ProjectSetup.cmake

@@ -79,3 +79,46 @@ math(EXPR TIMEMORY_VERSION_CODE
 if(SKBUILD AND TIMEMORY_USE_PYTHON)
     set(CMAKE_INSTALL_LIBDIR lib)
 endif()
+
+#----------------------------------------------------------------------------------------#
+#   Git info
+#----------------------------------------------------------------------------------------#
+
+set(TIMEMORY_GIT_DESCRIBE "unknown")
+set(TIMEMORY_GIT_REVISION "unknown")
+
+# the docs/.gitinfo only exists in releases
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/docs/.gitinfo")
+    file(READ "${CMAKE_CURRENT_SOURCE_DIR}/docs/.gitinfo" _GIT_INFO)
+    string(REGEX REPLACE "[\n\r\t ]" ";" _GIT_INFO "${_GIT_INFO}")
+    string(REGEX REPLACE ";$" "" _GIT_INFO "${_GIT_INFO}")
+    list(LENGTH _GIT_INFO _GIT_INFO_LEN)
+    if(_GIT_INFO_LEN GREATER 1)
+        list(GET _GIT_INFO 0 TIMEMORY_GIT_REVISION)
+        list(GET _GIT_INFO 1 TIMEMORY_GIT_DESCRIBE)
+    endif()
+endif()
+
+find_package(Git QUIET)
+if(Git_FOUND)
+    execute_process(
+        COMMAND             ${GIT_EXECUTABLE} describe --tags
+        WORKING_DIRECTORY   ${CMAKE_CURRENT_SOURCE_DIR}
+        OUTPUT_VARIABLE     TIMEMORY_GIT_DESCRIBE
+        ERROR_QUIET
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(
+        COMMAND             ${GIT_EXECUTABLE} rev-parse HEAD
+        WORKING_DIRECTORY   ${CMAKE_CURRENT_SOURCE_DIR}
+        OUTPUT_VARIABLE     TIMEMORY_GIT_REVISION
+        ERROR_QUIET
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+endif()
+
+if(NOT "${TIMEMORY_GIT_REVISION}" STREQUAL "unknown")
+    message(STATUS "[timemory] git revision: ${TIMEMORY_GIT_REVISION}")
+endif()
+
+if(NOT "${TIMEMORY_GIT_DESCRIBE}" STREQUAL "unknown")
+    message(STATUS "[timemory] git describe: ${TIMEMORY_GIT_DESCRIBE}")
+endif()

docs/.gitignore

@@ -6,3 +6,4 @@
 /Doxyfile.timemory
 /installation.md
 /CONTRIBUTING.md
+/.gitinfo

scripts/bundle-sdist.sh

@@ -4,14 +4,20 @@ set -o errexit
 
 : ${PYTHON_EXE:=python3}
 
-if [ ${PWD} = ${BASH_SOURCE[0]} ]; then
-    cd ../../
-fi
+_SCRIPT_DIR=$(bash -c "cd $(dirname ${BASH_SOURCE[0]}) && pwd")
+_SOURCE_DIR=$(dirname ${_SCRIPT_DIR})
 
-rm -rf TiMemory.* .eggs build dist
+cd ${_SOURCE_DIR}
+
+rm -f docs/.gitinfo
+./scripts/generate-gitinfo.sh
+echo "############### git info ###############"
+cat ./docs/.gitinfo
+echo "########################################"
+
+rm -rf dist
 ${PYTHON_EXE} setup.py sdist
 cd dist
 sha256sum *
 gpg --detach-sign -a *
 # twine upload *
-