From edbdf43f07e5afd014c45817b27c72397709640b Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 19 Aug 2019 22:57:51 +0200 Subject: [PATCH] makepanda: PANDA_VERSION_STR should contain the full version number --- makepanda/makepanda.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 9013c80c55..9124dc3b2d 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -2707,7 +2707,7 @@ PANDAVERSION_H=""" #define PANDA_SEQUENCE_VERSION $VERSION3 #define PANDA_VERSION $NVERSION #define PANDA_NUMERIC_VERSION $NVERSION -#define PANDA_VERSION_STR "$VERSION1.$VERSION2.$VERSION3" +#define PANDA_VERSION_STR "$VERSION" #define PANDA_ABI_VERSION_STR "$VERSION1.$VERSION2" #define PANDA_DISTRIBUTOR "$DISTRIBUTOR" #define PANDA_PACKAGE_VERSION_STR "$RTDIST_VERSION" @@ -2826,6 +2826,7 @@ def CreatePandaVersionFiles(): pandaversion_h = pandaversion_h.replace("$VERSION1",str(version1)) pandaversion_h = pandaversion_h.replace("$VERSION2",str(version2)) pandaversion_h = pandaversion_h.replace("$VERSION3",str(version3)) + pandaversion_h = pandaversion_h.replace("$VERSION",VERSION) pandaversion_h = pandaversion_h.replace("$NVERSION",str(nversion)) pandaversion_h = pandaversion_h.replace("$DISTRIBUTOR",DISTRIBUTOR) pandaversion_h = pandaversion_h.replace("$RTDIST_VERSION",RTDIST_VERSION)