Ver código fonte

g.version -e: report also SQLite version
update wxGUI to report also SQLite


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@53964 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa 12 anos atrás
pai
commit
32b1ebf3ba

+ 1 - 0
general/g.version/g.version.html

@@ -63,6 +63,7 @@ libgis_date="2012-07-27 22:53:30 +0200 (Fri, 27 Jul 2012) "
 proj4=4.8.0
 gdal=1.9.2
 geos=3.3.5
+sqlite=3.7.14.1
 </pre></div>
 
 <h2>AUTHORS</h2>

+ 15 - 0
general/g.version/main.c

@@ -31,6 +31,10 @@
 #include <geos_c.h>
 #endif
 
+#ifdef HAVE_SQLITE
+#include <sqlite3.h>
+#endif
+
 #ifndef GRASS_VERSION_UPDATE_PKG
 #define GRASS_VERSION_UPDATE_PKG "0.1"
 #endif
@@ -158,6 +162,17 @@ int main(int argc, char *argv[])
         else
             fprintf(stdout, "%s\n", _("GRASS not compiled with GEOS support"));
 #endif
+#ifdef HAVE_SQLITE
+        if (shell->answer)
+            fprintf(stdout, "sqlite=%s\n", SQLITE_VERSION);
+        else
+            fprintf(stdout, "SQLite: %s\n", SQLITE_VERSION);
+#else
+        if (shell->answer)
+            fprintf(stdout, "sqlite=\n");
+        else
+            fprintf(stdout, "%s\n", _("GRASS not compiled with SQLite support"));
+#endif
     }
     
     return (EXIT_SUCCESS);

+ 2 - 1
gui/wxpython/lmgr/frame.py

@@ -899,12 +899,13 @@ class GMFrame(wx.Frame):
                               "GDAL/OGR: %s\n"
                               "PROJ.4: %s\n"
                               "GEOS: %s\n"
+                              "SQLite: %s\n"
                               "Python: %s\n"
                               "wxPython: %s\n"
                               "%s: %s%s\n"% (_("GRASS version"), vInfo['version'],
                                            _("GRASS SVN Revision"), vInfo['revision'],
                                            _("GIS Library Revision"), vInfo['libgis_revision'], vInfo['libgis_date'].split(' ', 1)[0],
-                                           vInfo['gdal'], vInfo['proj4'], vInfo['geos'],
+                                           vInfo['gdal'], vInfo['proj4'], vInfo['geos'], vInfo['sqlite'],
                                            platform.python_version(),
                                            wx.__version__,
                                            _("Platform"), platform.platform(), osgeo4w),