From: Frank Schlottmann-G. <fs...@us...> - 2000-12-08 16:18:23
|
Update of /cvsroot/firebird/interbase/jrd In directory slayer.i.sourceforge.net:/tmp/cvs-serv7830/interbase/jrd Modified Files: build_no.h license.h Log Message: Preliminary changes to get IB_BUILD_NO automatically increased on commits. setup_dirs will create 'jrd/build_no.h' by a call to a slightly modified 'builds_win32/original/build_no.ksh' that gets IB_BUILD_NO from 'this_build', that hopefully will be increased automatically in the near future :-) I have changed 'jrd/iblicense.h' to use IB_BUILD_TYPE from 'jrd/build_no.h'. So all changes to version numbers, build types etc. can now be done in 'builds_win32/original/build_no.ksh'. Index: build_no.h =================================================================== RCS file: /cvsroot/firebird/interbase/jrd/build_no.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** build_no.h 2000/08/03 20:49:37 1.1.1.1 --- build_no.h 2000/12/08 16:18:21 1.2 *************** *** 2,12 **** /*TO CHANGE ANY INFORMATION IN HERE PLEASE*/ /*EDIT BUILD_NO.KSH IN THE BUILD_WIN32 COMPONENT*/ ! /*FORMAL BUILD NUMBER:627*/ ! #define PRODUCT_VER_STRING "6.0.0.627\0" ! #define FILE_VER_STRING "WI-V6.0.0.627\0" ! #define LICENSE_VER_STRING "WI-V6.0.0.627" ! #define FILE_VER_NUMBER 6, 0, 0, 627 #define IB_MAJOR_VER "6" #define IB_MINOR_VER "0" ! #define IB_REV_NO "0" ! #define IB_BUILD_NO "627" --- 2,13 ---- /*TO CHANGE ANY INFORMATION IN HERE PLEASE*/ /*EDIT BUILD_NO.KSH IN THE BUILD_WIN32 COMPONENT*/ ! /*FORMAL BUILD NUMBER:1*/ ! #define PRODUCT_VER_STRING "6.0.9.1\0" ! #define FILE_VER_STRING "WI-T6.0.9.1\0" ! #define LICENSE_VER_STRING "WI-T6.0.9.1" ! #define FILE_VER_NUMBER 6, 0, 9, 1 #define IB_MAJOR_VER "6" #define IB_MINOR_VER "0" ! #define IB_REV_NO "9" ! #define IB_BUILD_NO "1" ! #define IB_BUILD_TYPE "T" Index: license.h =================================================================== RCS file: /cvsroot/firebird/interbase/jrd/license.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** license.h 2000/10/12 02:52:17 1.4 --- license.h 2000/12/08 16:18:21 1.5 *************** *** 20,23 **** --- 20,38 ---- * All Rights Reserved. * Contributor(s): ______________________________________. + * $Log$ + * Revision 1.5 2000/12/08 16:18:21 fsg + * Preliminary changes to get IB_BUILD_NO automatically + * increased on commits. + * + * setup_dirs will create 'jrd/build_no.h' by a call to + * a slightly modified 'builds_win32/original/build_no.ksh' + * that gets IB_BUILD_NO from 'this_build', that hopefully + * will be increased automatically in the near future :-) + * + * I have changed 'jrd/iblicense.h' to use IB_BUILD_TYPE + * from 'jrd/build_no.h'. + * So all changes to version numbers, build types etc. can + * now be done in 'builds_win32/original/build_no.ksh'. + * */ *************** *** 30,47 **** #ifdef hp9000s300 #ifdef HP300 ! #define IB_PLATFORM "H3-V" #endif #ifdef HM300 ! #define IB_PLATFORM "HM-V" #endif #else #ifdef HP700 ! #define IB_PLATFORM "HP-V" #endif #ifdef HP800 ! #define IB_PLATFORM "HO-V" #endif #ifdef HP10 ! #define IB_PLATFORM "HU-V" #endif /* HP10 */ #endif --- 45,62 ---- #ifdef hp9000s300 #ifdef HP300 ! #define IB_PLATFORM "H3" #endif #ifdef HM300 ! #define IB_PLATFORM "HM" #endif #else #ifdef HP700 ! #define IB_PLATFORM "HP" #endif #ifdef HP800 ! #define IB_PLATFORM "HO" #endif #ifdef HP10 ! #define IB_PLATFORM "HU" #endif /* HP10 */ #endif *************** *** 49,60 **** #ifdef mpexl ! #define IB_PLATFORM "HX-V" /* HP MPE/XL */ #endif #ifdef apollo #if _ISP__A88K ! #define IB_PLATFORM "AP-V" #else ! #define IB_PLATFORM "AX-V" #endif #endif --- 64,75 ---- #ifdef mpexl ! #define IB_PLATFORM "HX" /* HP MPE/XL */ #endif #ifdef apollo #if _ISP__A88K ! #define IB_PLATFORM "AP" #else ! #define IB_PLATFORM "AX" #endif #endif *************** *** 63,79 **** #ifdef sparc #ifdef SOLARIS ! #define IB_PLATFORM "SO-V" #else ! #define IB_PLATFORM "S4-V" #endif #endif #ifdef i386 ! #define IB_PLATFORM "SI-V" #endif #ifdef SUN3_3 ! #define IB_PLATFORM "SU-V" #endif #ifndef IB_PLATFORM ! #define IB_PLATFORM "S3-V" #endif #endif --- 78,94 ---- #ifdef sparc #ifdef SOLARIS ! #define IB_PLATFORM "SO" #else ! #define IB_PLATFORM "S4" #endif #endif #ifdef i386 ! #define IB_PLATFORM "SI" #endif #ifdef SUN3_3 ! #define IB_PLATFORM "SU" #endif #ifndef IB_PLATFORM ! #define IB_PLATFORM "S3" #endif #endif *************** *** 81,87 **** #ifdef ultrix #ifdef mips ! #define IB_PLATFORM "MU-V" #else ! #define IB_PLATFORM "UL-V" #endif #endif --- 96,102 ---- #ifdef ultrix #ifdef mips ! #define IB_PLATFORM "MU" #else ! #define IB_PLATFORM "UL" #endif #endif *************** *** 89,108 **** #ifdef VMS #ifdef __ALPHA ! #define IB_PLATFORM "AV-V" #else ! #define IB_PLATFORM "VM-V" #endif #endif #ifdef MAC ! #define IB_PLATFORM "MA-V" #endif #ifdef PC_PLATFORM #ifdef WINDOWS_ONLY ! #define IB_PLATFORM "WS-V" #else #ifdef DOS_ONLY ! #define IB_PLATFORM "DS-V" #endif #endif --- 104,123 ---- #ifdef VMS #ifdef __ALPHA ! #define IB_PLATFORM "AV" #else ! #define IB_PLATFORM "VM" #endif #endif #ifdef MAC ! #define IB_PLATFORM "MA" #endif #ifdef PC_PLATFORM #ifdef WINDOWS_ONLY ! #define IB_PLATFORM "WS" #else #ifdef DOS_ONLY ! #define IB_PLATFORM "DS" #endif #endif *************** *** 112,155 **** #ifdef NETWARE_386 ! #define IB_PLATFORM "NW-V" #endif #ifdef OS2_ONLY ! #define IB_PLATFORM "O2-V" #endif #ifdef AIX ! #define IB_PLATFORM "IA-V" #endif #ifdef AIX_PPC ! #define IB_PLATFORM "PA-V" #endif #ifdef IMP ! #define IB_PLATFORM "IM-V" #endif #ifdef DELTA ! #define IB_PLATFORM "DL-V" #endif #ifdef XENIX #ifdef SCO_UNIX ! #define IB_PLATFORM "SI-V" /* 5.5 SCO Port */ #else ! #define IB_PLATFORM "XN-V" #endif #endif #ifdef sgi ! #define IB_PLATFORM "SG-V" #endif #ifdef DGUX #ifdef DG_X86 ! #define IB_PLATFORM "DI-V" /* DG INTEL */ #else ! #define IB_PLATFORM "DA-V" /* DG AViiON */ #define M88K_DEFINED #endif /* DG_X86 */ --- 127,170 ---- #ifdef NETWARE_386 ! #define IB_PLATFORM "NW" #endif #ifdef OS2_ONLY ! #define IB_PLATFORM "O2" #endif #ifdef AIX ! #define IB_PLATFORM "IA" #endif #ifdef AIX_PPC ! #define IB_PLATFORM "PA" #endif #ifdef IMP ! #define IB_PLATFORM "IM" #endif #ifdef DELTA ! #define IB_PLATFORM "DL" #endif #ifdef XENIX #ifdef SCO_UNIX ! #define IB_PLATFORM "SI" /* 5.5 SCO Port */ #else ! #define IB_PLATFORM "XN" #endif #endif #ifdef sgi ! #define IB_PLATFORM "SG" #endif #ifdef DGUX #ifdef DG_X86 ! #define IB_PLATFORM "DI" /* DG INTEL */ #else ! #define IB_PLATFORM "DA" /* DG AViiON */ #define M88K_DEFINED #endif /* DG_X86 */ *************** *** 160,178 **** #if (defined SUPERCLIENT || defined SUPERSERVER) #if (defined WIN95) ! #define IB_PLATFORM "WI-V" #else ! #define IB_PLATFORM "NIS-V" #endif /* WIN95 */ #else ! #define IB_PLATFORM "NI-V" #endif #else #ifdef alpha ! #define IB_PLATFORM "NA-V" #else #ifdef mips ! #define IB_PLATFORM "NM-V" #else /* PowerPC */ ! #define IB_PLATFORM "NP-V" #endif #endif --- 175,193 ---- #if (defined SUPERCLIENT || defined SUPERSERVER) #if (defined WIN95) ! #define IB_PLATFORM "WI" #else ! #define IB_PLATFORM "NIS" #endif /* WIN95 */ #else ! #define IB_PLATFORM "NI" #endif #else #ifdef alpha ! #define IB_PLATFORM "NA" #else #ifdef mips ! #define IB_PLATFORM "NM" #else /* PowerPC */ ! #define IB_PLATFORM "NP" #endif #endif *************** *** 182,233 **** #ifdef NeXT #ifdef i386 ! #define IB_PLATFORM "XI-V" #else /* m68040 */ ! #define IB_PLATFORM "XM-V" #endif #endif #ifdef EPSON ! #define IB_PLATFORM "EP-V" /* epson */ #endif #ifdef _CRAY ! #define IB_PLATFORM "CR-V" /* Cray */ #endif #ifdef ALPHA_NT ! #define IB_PLATFORM "AN-V" /* Alpha NT */ #endif #ifdef DECOSF ! #define IB_PLATFORM "AO-V" /* Alpha OSF-1 */ #endif #ifdef M88K ! #define IB_PLATFORM "M8-V" /* Motorola 88k */ #endif #ifdef UNIXWARE ! #define IB_PLATFORM "UW-V" /* Unixware */ #endif #ifdef NCR3000 ! #define IB_PLATFORM "NC-V" /* NCR3000 */ #endif #ifdef LINUX ! #define IB_PLATFORM "LI-T" /* Linux on Intel */ #endif #ifdef FREEBSD ! #define IB_PLATFORM "FB-B" /* FreeBSD/i386 */ #endif #ifdef NETBSD ! #define IB_PLATFORM "NB-B" /* NetBSD */ #endif #ifndef GDS_VERSION ! #define GDS_VERSION IB_PLATFORM IB_MAJOR_VER "." IB_MINOR_VER "." IB_REV_NO "." IB_BUILD_NO #endif --- 197,248 ---- #ifdef NeXT #ifdef i386 ! #define IB_PLATFORM "XI" #else /* m68040 */ ! #define IB_PLATFORM "XM" #endif #endif #ifdef EPSON ! #define IB_PLATFORM "EP" /* epson */ #endif #ifdef _CRAY ! #define IB_PLATFORM "CR" /* Cray */ #endif #ifdef ALPHA_NT ! #define IB_PLATFORM "AN" /* Alpha NT */ #endif #ifdef DECOSF ! #define IB_PLATFORM "AO" /* Alpha OSF-1 */ #endif #ifdef M88K ! #define IB_PLATFORM "M8" /* Motorola 88k */ #endif #ifdef UNIXWARE ! #define IB_PLATFORM "UW" /* Unixware */ #endif #ifdef NCR3000 ! #define IB_PLATFORM "NC" /* NCR3000 */ #endif #ifdef LINUX ! #define IB_PLATFORM "LI" /* Linux on Intel */ #endif #ifdef FREEBSD ! #define IB_PLATFORM "FB" /* FreeBSD/i386 */ #endif #ifdef NETBSD ! #define IB_PLATFORM "NB" /* NetBSD */ #endif #ifndef GDS_VERSION ! #define GDS_VERSION IB_PLATFORM "-" IB_BUILD_TYPE IB_MAJOR_VER "." IB_MINOR_VER "." IB_REV_NO "." IB_BUILD_NO #endif |