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

[Sandro Santilli]

Author: strk
Date: 2017-03-31 13:10:34 -0700 (Fri, 31 Mar 2017)
New Revision: 4390

Added:
   trunk/tools/geos_revision_cmake.h.in
Removed:
   trunk/tools/geos_svn_revision_cmake.h.in
Modified:
   trunk/CMakeLists.txt
   trunk/autogen.bat
   trunk/capi/geos_ts_c.cpp
   trunk/tools/repo_revision.sh
Log:
Rename GEOS_SVN_REVISION macro and cmake script to GEOS_REVISION

... even if it's still just the SVN revision that it contains
See #794

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2017-03-31 19:44:55 UTC (rev 4389)
+++ trunk/CMakeLists.txt	2017-03-31 20:10:34 UTC (rev 4390)
@@ -288,9 +288,9 @@
   endif()
 
   if ( NOT ${Project_WC_REVISION} EQUAL 0 )
-     set( GEOS_SVN_REVISION ${Project_WC_REVISION} )
+     set( GEOS_REVISION ${Project_WC_REVISION} )
      configure_file (
-        "${PROJECT_SOURCE_DIR}/tools/geos_svn_revision_cmake.h.in"
+        "${PROJECT_SOURCE_DIR}/tools/geos_revision_cmake.h.in"
         "${PROJECT_BINARY_DIR}/geos_revision.h" )
   else()
      find_program(SH sh)
@@ -303,7 +303,7 @@
      else()
         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_revision.h")
+        message("*** echo '#define GEOS_REVISION XYZ' > ${PROJECT_SOURCE_DIR}/geos_revision.h")
      endif()
   endif()
 endif()

Modified: trunk/autogen.bat
===================================================================
--- trunk/autogen.bat	2017-03-31 19:44:55 UTC (rev 4389)
+++ trunk/autogen.bat	2017-03-31 20:10:34 UTC (rev 4390)
@@ -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_revision.h
\ No newline at end of file
+ at ECHO #define GEOS_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-31 19:44:55 UTC (rev 4389)
+++ trunk/capi/geos_ts_c.cpp	2017-03-31 20:10:34 UTC (rev 4390)
@@ -3796,7 +3796,7 @@
 const char* GEOSversion()
 {
   static char version[256];
-  sprintf(version, "%s r%d", GEOS_CAPI_VERSION, GEOS_SVN_REVISION);
+  sprintf(version, "%s r%d", GEOS_CAPI_VERSION, GEOS_REVISION);
   return version;
 }
 

Added: trunk/tools/geos_revision_cmake.h.in
===================================================================
--- trunk/tools/geos_revision_cmake.h.in	                        (rev 0)
+++ trunk/tools/geos_revision_cmake.h.in	2017-03-31 20:10:34 UTC (rev 4390)
@@ -0,0 +1 @@
+#define GEOS_REVISION @GEOS_REVISION@

Deleted: trunk/tools/geos_svn_revision_cmake.h.in
===================================================================
--- trunk/tools/geos_svn_revision_cmake.h.in	2017-03-31 19:44:55 UTC (rev 4389)
+++ trunk/tools/geos_svn_revision_cmake.h.in	2017-03-31 20:10:34 UTC (rev 4390)
@@ -1 +0,0 @@
-#define GEOS_SVN_REVISION @GEOS_SVN_REVISION@ 

Modified: trunk/tools/repo_revision.sh
===================================================================
--- trunk/tools/repo_revision.sh	2017-03-31 19:44:55 UTC (rev 4389)
+++ trunk/tools/repo_revision.sh	2017-03-31 20:10:34 UTC (rev 4390)
@@ -68,14 +68,14 @@
   # Do not override the file if new detected
   # revision isn't zero nor different from the existing one
   if test -f $rev_file; then
-    oldrev=`grep GEOS_SVN_REVISION ${rev_file} | awk '{print $2}'`
+    oldrev=`grep GEOS_REVISION ${rev_file} | awk '{print $2}'`
     if test "$rev" = 0 -o "$rev" = "$oldrev"; then
       echo "Not updating existing rev file at $oldrev" >&2
       return;
     fi
   fi
 
-  echo "#define GEOS_SVN_REVISION $rev" | tee $rev_file
+  echo "#define GEOS_REVISION $rev" | tee $rev_file
   echo "Wrote rev '$rev' in file '$rev_file'" >&2
 }