svn path=/Database/trunk/; revision=16563

COMSQL.H

@@ -14,6 +14,7 @@
 #define STRINGIZE(a) #@a
 #define _EVALCONCAT(a, b) a ## b
 #define EVALCONCAT(a, b) _EVALCONCAT(a, b)
+#define _MKSTRING(a) STRINGIZE(a)
 
 /*
  * The database schema version; must increase with every release
@@ -21,9 +22,10 @@
  */
 /* The minimum required software version */
 #define _VERSIONMAJ 5
-#define _VERSIONMIN 2
-#define _VERSIONPATCH STRINGIZE(2)
-#define _VERSION '5.2.2'
+#define _VERSIONMIN 3
+#define _VERSIONPATCH STRINGIZE(1)
+#define _VERSION '5.3.1'
+#define _DBV_STRING _MKSTRING(_DBV)
 
 #define REGISTERONCE(f, r) \
 BEGIN adm.systrackscript(f, r, 1); END;~/

FCLT.NMK

@@ -60,8 +60,8 @@ PROJEXE=z:\Project\FACILITOR\BUILD
 ##
 ## New style using schemanumbers
 ##
-CURRENTVERSION=16
-NEXTVERSION=17
+CURRENTVERSION=17
+NEXTVERSION=18
 FILEVERSION=
 NEXTCAREVERSION=19
 NEXTROOT=DB$(NEXTVERSION)$(FILEVERSION)
@@ -87,7 +87,7 @@ EXE=$(PROJEXE)
 
 PRECOMP=$(MAKTOOLS)\CL
 WRAP1=$(MAKTOOLS)\WRAP10.EXE
-PRECOMP_OPTIONS=/EP /D_VER=$(CURRENTUPDATE) /D_DBV=$(NEXTVERSION)
+PRECOMP_OPTIONS=/EP /D_VER=$(CURRENTUPDATE)$(FILEVERSION) /D_DBV=$(NEXTVERSION)$(FILEVERSION)
 CLEANUP1=$(MAKTOOLS)\sedclean.bat
 
 ##