Updated the build num process

configure

@@ -2261,9 +2261,20 @@ FIREBIRD_ARCH_TYPE=classic
 #FIREBIRD_ARCH_TYPE=super
 
 
-FIREBIRD_VERSION=2.0.0
+# THe following file defines the version number strings
+source src/misc/writeBuildNum.sh
 
 
+#AC_DEFINE_UNQUOTED(FB_BUILD_TYPE, "$BuildType")
+#AC_DEFINE_UNQUOTED(FB_MAJOR_VER, "$MajorVer")
+#AC_DEFINE_UNQUOTED(FB_MINOR_VER, "$MinorVer")
+#AC_DEFINE_UNQUOTED(FB_REV_NO, "$RevNo")
+#AC_DEFINE_UNQUOTED(FB_BUILD_SUFFIX, "$BuildSuffix")
+#AC_DEFINE_UNQUOTED(PRODUCT_VER_STRING, "$PRODUCT_VER_STRING")
+#AC_DEFINE_UNQUOTED(FILE_VER_NUMBER, $FILE_VER_NUMBER)
+#AC_DEFINE_UNQUOTED(FILE_VER_STRING, "$FILE_VER_STRING")
+#AC_DEFINE_UNQUOTED(LICENSE_VER_STRING, "$FILE_VER_STRING")
+
 PROD_BUILD_FLG= 
 #PROD_BUILD_FLG=Y
 

configure.in

@@ -65,8 +65,19 @@ FIREBIRD_ARCH_TYPE=classic
 #FIREBIRD_ARCH_TYPE=super
 AC_SUBST(FIREBIRD_ARCH_TYPE)
 
-FIREBIRD_VERSION=2.0.0
+# THe following file defines the version number strings
+source src/misc/writeBuildNum.sh
+
 AC_SUBST(FIREBIRD_VERSION)
+#AC_DEFINE_UNQUOTED(FB_BUILD_TYPE, "$BuildType")
+#AC_DEFINE_UNQUOTED(FB_MAJOR_VER, "$MajorVer")
+#AC_DEFINE_UNQUOTED(FB_MINOR_VER, "$MinorVer")
+#AC_DEFINE_UNQUOTED(FB_REV_NO, "$RevNo")
+#AC_DEFINE_UNQUOTED(FB_BUILD_SUFFIX, "$BuildSuffix")
+#AC_DEFINE_UNQUOTED(PRODUCT_VER_STRING, "$PRODUCT_VER_STRING")
+#AC_DEFINE_UNQUOTED(FILE_VER_NUMBER, $FILE_VER_NUMBER)
+#AC_DEFINE_UNQUOTED(FILE_VER_STRING, "$FILE_VER_STRING")
+#AC_DEFINE_UNQUOTED(LICENSE_VER_STRING, "$FILE_VER_STRING")
 
 PROD_BUILD_FLG= 
 #PROD_BUILD_FLG=Y

src/jrd/build_no.h

@@ -1,14 +1,17 @@
-/*FILE GENERATED BY BUILD_NO.KSH. DO NOT EDIT*/
-/*TO CHANGE ANY INFORMATION IN HERE PLEASE*/
-/*EDIT BUILD_NO.KSH IN THE BUILD_WIN32 COMPONENT*/
-/*FORMAL BUILD NUMBER:34*/
-#define PRODUCT_VER_STRING "0.9.4.34\\0"
-#define FILE_VER_STRING "WI-T0.9.4.34\\0"
-#define LICENSE_VER_STRING "WI-T0.9.4.34"
-#define FILE_VER_NUMBER 0, 9, 4, 34
-#define FB_MAJOR_VER "0"
-#define FB_MINOR_VER "9"
-#define FB_REV_NO "4"
-#define FB_BUILD_NO "34"
+/*
+  FILE GENERATED BY BUILD_NO.KSH. DO NOT EDIT
+  TO CHANGE ANY INFORMATION IN HERE PLEASE
+  EDIT BUILD_NO.KSH IN THE BUILD_WIN32 COMPONENT
+  FORMAL BUILD NUMBER:35 
+*/
+
+#define PRODUCT_VER_STRING "2.0.0.35"
+#define FILE_VER_STRING "WI-T2.0.0.35"
+#define LICENSE_VER_STRING "WI-T2.0.0.35"
+#define FILE_VER_NUMBER 2, 0, 0, 35
+#define FB_MAJOR_VER "2"
+#define FB_MINOR_VER "0"
+#define FB_REV_NO "0"
+#define FB_BUILD_NO "35"
 #define FB_BUILD_TYPE "T"
-#define FB_BUILD_SUFFIX "Firebird Test1"
+#define FB_BUILD_SUFFIX "Firebird2 Dev1"

src/make.new/config/config.h.in

@@ -68,5 +68,4 @@
 #undef IMP
 #undef EPSON
 
-
 #endif

src/misc/writeBuildNum.sh

@@ -0,0 +1,67 @@
+#!/bin/sh
+
+# This file is used both to rebuild the header file and to set the 
+# environment variables on the config call
+
+BuildVersion="$Id: writeBuildNum.sh,v 1.1 2001-08-15 08:44:11 skywalker Exp $"
+
+BuildType=T
+MajorVer=2
+MinorVer=0
+RevNo=0
+BuildNum=35
+BuildSuffix="Firebird2 Dev1"
+
+FIREBIRD_VERSION="$MajorVer.$MinorVer.$RevNo"
+PRODUCT_VER_STRING="$MajorVer.$MinorVer.$RevNo.$BuildNum"
+FILE_VER_STRING="WI-$BuildType$MajorVer.$MinorVer.$RevNo.$BuildNum"
+FILE_VER_NUMBER="$MajorVer, $MinorVer, $RevNo, $BuildNum"
+
+
+headerFile=src/jrd/build_no.h
+tempfile=gen/test.header.txt
+
+#______________________________________________________________________________
+# Routine to build a new jrd/build_no.h file. If required.
+
+rebuildHeaderFile() {
+
+cat > $tempfile <<eof
+/*
+  FILE GENERATED BY BUILD_NO.KSH. DO NOT EDIT
+  TO CHANGE ANY INFORMATION IN HERE PLEASE
+  EDIT BUILD_NO.KSH IN THE BUILD_WIN32 COMPONENT
+  FORMAL BUILD NUMBER:$BuildNum 
+*/
+
+#define PRODUCT_VER_STRING "$PRODUCT_VER_STRING"
+#define FILE_VER_STRING "$FILE_VER_STRING"
+#define LICENSE_VER_STRING "$FILE_VER_STRING"
+#define FILE_VER_NUMBER $FILE_VER_NUMBER
+#define FB_MAJOR_VER "$MajorVer"
+#define FB_MINOR_VER "$MinorVer"
+#define FB_REV_NO "$RevNo"
+#define FB_BUILD_NO "$BuildNum"
+#define FB_BUILD_TYPE "$BuildType"
+#define FB_BUILD_SUFFIX "$BuildSuffix"
+eof
+    cmp -s $headerFile tempfile
+    Result=$?
+    if [ $Result -lt 0 ]
+       then
+         echo "error compareing $tempfile and $headerFile"
+    elif [ $Result -gt 0 ]
+      then
+      echo "updating header file $headerFile"
+      cp $tempfile $headerFile
+    else
+      echo "files are identical"
+    fi
+}
+
+
+
+if [ "$1" == "rebuildHeader" ]
+  then
+    rebuildHeaderFile
+fi