Browse Source

GIS_H_DATE: switch to date -Iseconds format (#485)

Co-authored-by: Huidae Cho <grass4u@gmail.com>
Martin Landa 5 years ago
parent
commit
f89b009b52
4 changed files with 684 additions and 740 deletions
  1. 674 725
      configure
  2. 5 5
      configure.in
  3. 2 7
      general/g.version/main.c
  4. 3 3
      include/version.h.in

File diff suppressed because it is too large
+ 674 - 725
configure


+ 5 - 5
configure.in

@@ -142,8 +142,8 @@ changequote([,])
 GRASS_VERSION_GIT="exported"
 GRASS_VERSION_GIT="exported"
 # get git short hash + date of last change in GRASS headers
 # get git short hash + date of last change in GRASS headers
 # (and anything else in include)
 # (and anything else in include)
-GRASS_HEADERS_GIT_HASH=`date`
-GRASS_HEADERS_GIT_DATE=`date`
+GRASS_HEADERS_GIT_HASH=`date -u -Iseconds`
+GRASS_HEADERS_GIT_DATE=`date -u -Iseconds`
 AC_PATH_PROG(GIT, git, no)
 AC_PATH_PROG(GIT, git, no)
 if test "$GIT" != "no" ; then
 if test "$GIT" != "no" ; then
    GRASS_VERSION_GIT=`$GIT rev-parse --short HEAD 2>/dev/null`
    GRASS_VERSION_GIT=`$GIT rev-parse --short HEAD 2>/dev/null`
@@ -152,11 +152,11 @@ if test "$GIT" != "no" ; then
    fi
    fi
    GRASS_HEADERS_GIT_HASH=`$GIT log -1 --pretty=format:"%h" -- "${SRCDIR}/include" 2>/dev/null`
    GRASS_HEADERS_GIT_HASH=`$GIT log -1 --pretty=format:"%h" -- "${SRCDIR}/include" 2>/dev/null`
    if test -z "$GRASS_HEADERS_GIT_HASH"; then
    if test -z "$GRASS_HEADERS_GIT_HASH"; then
-      GRASS_HEADERS_GIT_HASH=`date`
+      GRASS_HEADERS_GIT_HASH=`date -u -Iseconds`
    fi
    fi
-   GRASS_HEADERS_GIT_DATE=`$GIT log -1 --pretty=format:"%cd" -- "${SRCDIR}/include" 2>/dev/null`
+   GRASS_HEADERS_GIT_DATE=`date -d $($GIT log -1 --pretty=format:"%cI" -- "${SRCDIR}/include") -u -Iseconds` 2>/dev/null
    if test -z "$GRASS_HEADERS_GIT_DATE"; then
    if test -z "$GRASS_HEADERS_GIT_DATE"; then
-      GRASS_HEADERS_GIT_DATE=`date`
+      GRASS_HEADERS_GIT_DATE=`date -u -Iseconds`
    fi
    fi
 fi
 fi
 
 

+ 2 - 7
general/g.version/main.c

@@ -150,13 +150,8 @@ int main(int argc, char *argv[])
 
 
 	if (*rev_ver && *rev_time) {
 	if (*rev_ver && *rev_time) {
 	    if (shell->answer) {
 	    if (shell->answer) {
-                fprintf(stdout, "libgis_revision=");
-                if (strchr(rev_ver, ' ') != NULL)
-                    fprintf(stdout, "\"%s\"", rev_ver);
-                else
-                    fprintf(stdout, "%s", rev_ver);
-                fprintf(stdout, "\n");
-		fprintf(stdout, "libgis_date=\"%s\"\n", rev_time);
+                fprintf(stdout, "libgis_revision=%s\n", rev_ver);
+                fprintf(stdout, "libgis_date=%s\n", rev_time);
 	    }
 	    }
 	    else {
 	    else {
 		fprintf(stdout, "libgis revision: %s\n", rev_ver);
 		fprintf(stdout, "libgis revision: %s\n", rev_ver);

+ 3 - 3
include/version.h.in

@@ -1,6 +1,6 @@
 #define GRASS_VERSION_STRING   "@GRASS_VERSION_NUMBER@ (@GRASS_VERSION_DATE@)"
 #define GRASS_VERSION_STRING   "@GRASS_VERSION_NUMBER@ (@GRASS_VERSION_DATE@)"
 #define GRASS_VERSION_MAJOR    @GRASS_VERSION_MAJOR@
 #define GRASS_VERSION_MAJOR    @GRASS_VERSION_MAJOR@
 #define GRASS_VERSION_MINOR    @GRASS_VERSION_MINOR@
 #define GRASS_VERSION_MINOR    @GRASS_VERSION_MINOR@
-#define GRASS_VERSION_RELEASE  @GRASS_VERSION_RELEASE@
-#define GRASS_HEADERS_VERSION "@GRASS_HEADERS_GIT_HASH@"
-#define GRASS_HEADERS_DATE "@GRASS_HEADERS_GIT_DATE@"
+#define GRASS_VERSION_RELEASE  "@GRASS_VERSION_RELEASE@"
+#define GRASS_HEADERS_VERSION  "@GRASS_HEADERS_GIT_HASH@"
+#define GRASS_HEADERS_DATE     "@GRASS_HEADERS_GIT_DATE@"