Merge pull request #48 from robocup-logistics/thofmann/use-year-in-ve…

…rsion-string Use year in version string
robocup-logistics · Jul 12, 2019 · dc294d0 · dc294d0
2 parents 77c65b6 + 9884288
commit dc294d0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/games/rcll/net.clp b/src/games/rcll/net.clp
@@ -14,7 +14,11 @@
   (pb-set-field ?vi "version_minor" ?*VERSION-MINOR*)
   (pb-set-field ?vi "version_micro" ?*VERSION-MICRO*)
   (pb-set-field ?vi "version_string"
-		(str-cat ?*VERSION-MAJOR* "." ?*VERSION-MINOR* "." ?*VERSION-MICRO*))
+		(str-cat ?*VERSION-MAJOR*
+		         (if (> ?*VERSION-MINOR* 0) then (str-cat "." ?*VERSION-MINOR*) else "")
+		         (if (> ?*VERSION-MICRO* 0) then (str-cat "." ?*VERSION-MICRO*) else "")
+		)
+	)
   (return ?vi)
 )
 

diff --git a/src/libs/core/version.h b/src/libs/core/version.h
@@ -24,8 +24,8 @@
 #ifndef __CORE_VERSION_H_
 #define __CORE_VERSION_H_
 
-#define FAWKES_VERSION_MAJOR  1
-#define FAWKES_VERSION_MINOR  1
+#define FAWKES_VERSION_MAJOR  2019
+#define FAWKES_VERSION_MINOR  0
 #define FAWKES_VERSION_MICRO  0
 
 #define FAWKES_VERSION_GT(major, minor) ((FAWKES_MAJOR_VERSION  > major) || (FAWKES_MAJOR_VERSION == major) && (FAWKES_MINOR_VERSION  > minor))