[geos-commits] r4388 - in trunk: . capi tools

[Sandro Santilli]

Author: strk
Date: 2017-03-31 12:26:16 -0700 (Fri, 31 Mar 2017)
New Revision: 4388

Modified:
   trunk/.gitignore
   trunk/CMakeLists.txt
   trunk/Makefile.am
   trunk/autogen.bat
   trunk/capi/geos_ts_c.cpp
   trunk/tools/svn_repo_revision.sh
Log:
Rename geos_svn_revision.h to geos_revision.h

See #794

Modified: trunk/.gitignore
===================================================================
--- trunk/.gitignore	2017-03-30 01:47:37 UTC (rev 4387)
+++ trunk/.gitignore	2017-03-31 19:26:16 UTC (rev 4388)
@@ -2,7 +2,7 @@
 aclocal.m4
 Makefile.in
 Makefile
-geos_svn_revision.h
+geos_revision.h
 .libs
 .deps
 .vimrc

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2017-03-30 01:47:37 UTC (rev 4387)
+++ trunk/CMakeLists.txt	2017-03-31 19:26:16 UTC (rev 4388)
@@ -244,8 +244,8 @@
 # for including build-specific version.h, platform.h and geos_c.h
 include_directories(${PROJECT_BINARY_DIR}/include)
 
-# for geos_ts.cpp which does #include "../geos_svn_revision.h" whereas
-# CMake generates geos_svn_revision.h in build directory,
+# for geos_ts.cpp which does #include "../geos_revision.h" whereas
+# CMake generates geos_revision.h in build directory,
 # to not to pollute source tree.
 include_directories(${PROJECT_BINARY_DIR})
 
@@ -275,11 +275,11 @@
   GET_SVN_REVISION()
 endif()
 
-# geos_svn_revision.h does not exists in source or binary directory, we generate it
-if( NOT EXISTS "${PROJECT_SOURCE_DIR}/geos_svn_revision.h" AND
-    NOT EXISTS "${PROJECT_BINARY_DIR}/geos_svn_revision.h")
+# geos_revision.h does not exists in source or binary directory, we generate it
+if( NOT EXISTS "${PROJECT_SOURCE_DIR}/geos_revision.h" AND
+    NOT EXISTS "${PROJECT_BINARY_DIR}/geos_revision.h")
 
-  message(STATUS "Generating GEOS revision header in ${PROJECT_BINARY_DIR}/geos_svn_revision.h")
+  message(STATUS "Generating GEOS revision header in ${PROJECT_BINARY_DIR}/geos_revision.h")
 
   # CI builds (Travis CI, AppVeyor, etc.) perform git clone, not svn checkout.
   # So, CI environment needs a dummy revision to generate the required header.
@@ -291,19 +291,19 @@
      set( GEOS_SVN_REVISION ${Project_WC_REVISION} )
      configure_file (
         "${PROJECT_SOURCE_DIR}/tools/geos_svn_revision_cmake.h.in"
-        "${PROJECT_BINARY_DIR}/geos_svn_revision.h" )
+        "${PROJECT_BINARY_DIR}/geos_revision.h" )
   else()
      find_program(SH sh)
      if(SH)
         execute_process(COMMAND ${SH} -c
         "cd ${PROJECT_SOURCE_DIR} && ${PROJECT_SOURCE_DIR}/tools/svn_repo_revision.sh")
 
-        file(RENAME "${PROJECT_SOURCE_DIR}/geos_svn_revision.h"
-        "${PROJECT_BINARY_DIR}/geos_svn_revision.h")
+        file(RENAME "${PROJECT_SOURCE_DIR}/geos_revision.h"
+        "${PROJECT_BINARY_DIR}/geos_revision.h")
      else()
-        message("*** sh-compatible command not found, cannot create geos_svn_revision.h")
+        message("*** sh-compatible command not found, cannot create geos_revision.h")
         message("*** Check SVN revision and create revision header manually:")
-        message("*** echo '#define GEOS_SVN_REVISION XYZ' > ${PROJECT_SOURCE_DIR}/geos_svn_revision.h")
+        message("*** echo '#define GEOS_SVN_REVISION XYZ' > ${PROJECT_SOURCE_DIR}/geos_revision.h")
      endif()
   endif()
 endif()

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2017-03-30 01:47:37 UTC (rev 4387)
+++ trunk/Makefile.am	2017-03-31 19:26:16 UTC (rev 4388)
@@ -22,12 +22,12 @@
     tests   \
     tools
 
-BUILT_SOURCES = geos_svn_revision.h
+BUILT_SOURCES = geos_revision.h
 
 EXTRA_DIST = acsite.m4 makefile.vc nmake.opt autogen.bat CMakeLists.txt \
   cmake/modules/CheckPrototypeExists.cmake \
   cmake/modules/COPYING-CMAKE-SCRIPTS \
-  cmake/cmake_uninstall.cmake.in geos_svn_revision.h
+  cmake/cmake_uninstall.cmake.in geos_revision.h
 
 ACLOCAL_AMFLAGS = -I macros
 
@@ -53,7 +53,7 @@
 svnrebase: authors.git
 	cd $(srcdir) && git svn rebase --authors-file authors.git
 
-geos_svn_revision.h:
+geos_revision.h:
 	top_srcdir=$(srcdir) sh $(srcdir)/tools/svn_repo_revision.sh
 
 VALGRIND = $(LIBTOOL) --mode=execute valgrind --leak-check=full --error-exitcode=1
@@ -61,4 +61,4 @@
 valgrindcheck:
 	$(VALGRIND) tests/unit/geos_unit
 
-.PHONY: geos_svn_revision.h
+.PHONY: geos_revision.h

Modified: trunk/autogen.bat
===================================================================
--- trunk/autogen.bat	2017-03-30 01:47:37 UTC (rev 4387)
+++ trunk/autogen.bat	2017-03-31 19:26:16 UTC (rev 4388)
@@ -14,4 +14,4 @@
 COPY %GEOS_HEADERS%\version.h.vc %GEOS_HEADERS%\version.h 
 COPY %GEOS_HEADERS%\platform.h.vc %GEOS_HEADERS%\platform.h
 COPY capi\geos_c.h.in capi\geos_c.h
- at ECHO #define GEOS_SVN_REVISION 0 > geos_svn_revision.h
\ No newline at end of file
+ at ECHO #define GEOS_SVN_REVISION 0 > geos_revision.h
\ No newline at end of file

Modified: trunk/capi/geos_ts_c.cpp
===================================================================
--- trunk/capi/geos_ts_c.cpp	2017-03-30 01:47:37 UTC (rev 4387)
+++ trunk/capi/geos_ts_c.cpp	2017-03-31 19:26:16 UTC (rev 4388)
@@ -105,7 +105,7 @@
 #define GEOSWKBWriter_t geos::io::WKBWriter
 
 #include "geos_c.h"
-#include "../geos_svn_revision.h"
+#include "../geos_revision.h"
 
 // Intentional, to allow non-standard C elements like C99 functions to be
 // imported through C++ headers of C library, like <cmath>.

Modified: trunk/tools/svn_repo_revision.sh
===================================================================
--- trunk/tools/svn_repo_revision.sh	2017-03-30 01:47:37 UTC (rev 4387)
+++ trunk/tools/svn_repo_revision.sh	2017-03-31 19:26:16 UTC (rev 4388)
@@ -3,7 +3,7 @@
 LC_ALL="C" # what for ?
 
 [ -z "$top_srcdir" ] && top_srcdir="."
-rev_file=$top_srcdir'/geos_svn_revision.h'
+rev_file=$top_srcdir'/geos_revision.h'
 
 read_rev() {