Pārlūkot izejas kodu

Add support for patch versions (2.0.x)

(cherry picked from commit 706d576f7b24ec62effd59f66f1d7c47c813056b)
Rémi Verschelde 9 gadi atpakaļ
vecāks
revīzija
81b449908e
3 mainītis faili ar 6 papildinājumiem un 3 dzēšanām
  1. 4 0
      core/typedefs.h
  2. 2 0
      methods.py
  3. 0 3
      version.py

+ 4 - 0
core/typedefs.h

@@ -41,7 +41,11 @@
 #define _MKSTR(m_x) _STR(m_x)
 #endif
 // have to include version.h for this to work, include it in the .cpp not the .h
+#ifdef VERSION_PATCH
+#define VERSION_MKSTRING _MKSTR(VERSION_MAJOR)"." _MKSTR(VERSION_MINOR)"." _MKSTR(VERSION_PATCH)"." _MKSTR(VERSION_STATUS)"." _MKSTR(VERSION_REVISION)
+#else
 #define VERSION_MKSTRING _MKSTR(VERSION_MAJOR)"." _MKSTR(VERSION_MINOR)"." _MKSTR(VERSION_STATUS)"." _MKSTR(VERSION_REVISION)
+#endif // VERSION_PATCH
 #define VERSION_FULL_NAME _MKSTR(VERSION_NAME)" v" VERSION_MKSTRING
 
 

+ 2 - 0
methods.py

@@ -1096,6 +1096,8 @@ def update_version():
 	f.write("#define VERSION_NAME "+str(version.name)+"\n")
 	f.write("#define VERSION_MAJOR "+str(version.major)+"\n")
 	f.write("#define VERSION_MINOR "+str(version.minor)+"\n")
+	if (hasattr(version, 'patch')):
+	    f.write("#define VERSION_PATCH "+str(version.patch)+"\n")
 	f.write("#define VERSION_REVISION "+str(rev)+"\n")
 	f.write("#define VERSION_STATUS "+str(version.status)+"\n")
 	import datetime

+ 0 - 3
version.py

@@ -3,6 +3,3 @@ name="Godot Engine"
 major=2
 minor=0
 status="stable"
-
-
-