Remove GIT_COMMIT_HASH entirely

azhi · May 23, 2019 · 7699310 · 7699310
1 parent 5e6fed5
commit 7699310
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 69 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -26,7 +26,6 @@ BUILT_SOURCES =
 
 EXTRA_DIST = acsite.m4 .editorconfig \
 	Version.txt CMakeLists.txt \
-	cmake/GetGitRevision.cmake \
 	cmake/cmake_uninstall.cmake.in \
 	cmake/geos-config.cmake \
 	README.md

diff --git a/capi/CMakeLists.txt b/capi/CMakeLists.txt
@@ -9,21 +9,6 @@
 # See the COPYING file for more information.
 ################################################################################
 
-include(GetGitRevision)
-
-get_git_revision(
-  HASH_LENGTH 7
-  HASH  GIT_COMMIT_HASH
-  DIRTY GEOS_GIT_IS_DIRTY)
-
-if (${GEOS_GIT_IS_DIRTY})
-  set(GIT_COMMIT_HASH "${GIT_COMMIT_HASH} (dirty)")
-endif()
-
-message(STATUS "GEOS: GEOS_REVISION=${GIT_COMMIT_HASH}")
-
-################################################################################
-
 file(GLOB_RECURSE _headers ${CMAKE_CURRENT_LIST_DIR}/*.cpp  CONFIGURE_DEPEND)
 target_sources(geos_c PRIVATE ${_headers})
 unset(_headers)

diff --git a/capi/geos_c.h.in b/capi/geos_c.h.in
@@ -67,10 +67,6 @@ extern "C" {
 #define GEOS_JTS_PORT "@JTS_PORT@"
 #endif
 
-#ifndef GEOS_REVISION
-#define GEOS_REVISION "@GIT_COMMIT_HASH@"
-#endif
-
 #define GEOS_CAPI_VERSION_MAJOR @CAPI_VERSION_MAJOR@
 #define GEOS_CAPI_VERSION_MINOR @CAPI_VERSION_MINOR@
 #define GEOS_CAPI_VERSION_PATCH @CAPI_VERSION_PATCH@

diff --git a/capi/geos_ts_c.cpp b/capi/geos_ts_c.cpp
@@ -3546,7 +3546,7 @@ extern "C" {
     const char* GEOSversion()
     {
         static char version[256];
-        sprintf(version, "%s " GEOS_REVISION, GEOS_CAPI_VERSION);
+        sprintf(version, "%s ", GEOS_CAPI_VERSION);
         return version;
     }
 

diff --git a/cmake/GetGitRevision.cmake b/cmake/GetGitRevision.cmake
diff --git a/configure.ac b/configure.ac
@@ -52,13 +52,6 @@ dnl -- JTS_PORT: the version of JTS this release is bound to
 dnl JTS_PORT=1.13.0
 JTS_PORT=`cat $VERTXT | awk -F= '/^JTS_PORT/ {print $2}'`
 
-AC_MSG_CHECKING([git revision hash])
-if [ test -d $srcdir/.git ]; then
-	GIT_COMMIT_HASH=`git -C "$srcdir" log -1 --format=%h`
-else
-	GIT_COMMIT_HASH=
-fi
-AC_MSG_RESULT([$GIT_COMMIT_HASH])
 
 dnl Hush warnings
 AC_DEFINE(USE_UNSTABLE_GEOS_CPP_API, [1], [We know])
@@ -394,7 +387,6 @@ AC_SUBST(VERSION_MINOR)
 AC_SUBST(VERSION_PATCH)
 AC_SUBST(VERSION_RELEASE)
 AC_SUBST(JTS_PORT)
-AC_SUBST(GIT_COMMIT_HASH)
 AC_SUBST(CAPI_VERSION)
 AC_SUBST(CAPI_VERSION_MAJOR)
 AC_SUBST(CAPI_VERSION_MINOR)