[geos-commits] r4392 - in trunk: capi tools

[Sandro Santilli]

Author: strk
Date: 2017-04-01 04:01:09 -0700 (Sat, 01 Apr 2017)
New Revision: 4392

Modified:
   trunk/capi/geos_ts_c.cpp
   trunk/tools/repo_revision.sh
Log:
Turn GEOS_REVISION value into a string

Propedeutic to optionally use an hash in there, or other non-SVN
identifiers (see #794)

Modified: trunk/capi/geos_ts_c.cpp
===================================================================
--- trunk/capi/geos_ts_c.cpp	2017-04-01 08:28:47 UTC (rev 4391)
+++ trunk/capi/geos_ts_c.cpp	2017-04-01 11:01:09 UTC (rev 4392)
@@ -3796,7 +3796,7 @@
 const char* GEOSversion()
 {
   static char version[256];
-  sprintf(version, "%s r%d", GEOS_CAPI_VERSION, GEOS_REVISION);
+  sprintf(version, "%s " GEOS_REVISION, GEOS_CAPI_VERSION);
   return version;
 }
 

Modified: trunk/tools/repo_revision.sh
===================================================================
--- trunk/tools/repo_revision.sh	2017-04-01 08:28:47 UTC (rev 4391)
+++ trunk/tools/repo_revision.sh	2017-04-01 11:01:09 UTC (rev 4392)
@@ -35,7 +35,7 @@
     echo "Can't fetch SVN revision from git log" >&2
     echo 0
   else
-    echo $rev
+    echo r$rev
   fi
 }
 
@@ -57,7 +57,7 @@
     echo "Can't fetch SVN revision with `svn info`" >&2
     echo 0
   else
-    echo ${svn_info}
+    echo r${svn_info}
   fi
 }
 
@@ -75,7 +75,7 @@
     fi
   fi
 
-  echo "#define GEOS_REVISION $rev" | tee $rev_file
+  echo "#define GEOS_REVISION \"$rev\"" | tee $rev_file
   echo "Wrote rev '$rev' in file '$rev_file'" >&2
 }