From 7b00c9ac222126d118a66e2b4b4a1123b203ffcf Mon Sep 17 00:00:00 2001 From: skywalker Date: Sun, 6 Jan 2002 13:06:39 +0000 Subject: [PATCH] Changed to force write of update build #. --- src/jrd/alt_use_sec.h | 2 +- src/jrd/build_no.h | 17 ++--- src/jrd/sdl.cpp | 5 +- src/make.defaults | 2 +- src/make.new/Makefile.in.firebird | 17 ++++- src/make.new/README.makefiles | 105 ------------------------------ src/make.platform | 2 +- src/make.rules | 2 +- src/misc/writeBuildNum.sh | 9 +-- src/v5_examples/empbuild.c | 2 +- 10 files changed, 37 insertions(+), 126 deletions(-) delete mode 100644 src/make.new/README.makefiles diff --git a/src/jrd/alt_use_sec.h b/src/jrd/alt_use_sec.h index 252858baa8..6c9913d106 100644 --- a/src/jrd/alt_use_sec.h +++ b/src/jrd/alt_use_sec.h @@ -29,7 +29,7 @@ * John Bellardo * * - * $Id: alt_use_sec.h,v 1.2 2002-01-04 11:34:15 skywalker Exp $ + * $Id: alt_use_sec.h,v 1.3 2002-01-06 13:06:36 skywalker Exp $ * */ diff --git a/src/jrd/build_no.h b/src/jrd/build_no.h index 2d861d4a72..b10db77f9e 100644 --- a/src/jrd/build_no.h +++ b/src/jrd/build_no.h @@ -1,17 +1,18 @@ /* - FILE GENERATED BY BUILD_NO.KSH. DO NOT EDIT + FILE GENERATED BY src/misc/writeBuildNum.sh + *** DO NOT EDIT *** TO CHANGE ANY INFORMATION IN HERE PLEASE - EDIT BUILD_NO.KSH IN THE BUILD_WIN32 COMPONENT - FORMAL BUILD NUMBER:35 + EDIT src/misc/writeBuildNum.sh + FORMAL BUILD NUMBER:122 */ -#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 PRODUCT_VER_STRING "2.0.0.122" +#define FILE_VER_STRING "WI-T2.0.0.122" +#define LICENSE_VER_STRING "WI-T2.0.0.122" +#define FILE_VER_NUMBER 2, 0, 0, 122 #define FB_MAJOR_VER "2" #define FB_MINOR_VER "0" #define FB_REV_NO "0" -#define FB_BUILD_NO "35" +#define FB_BUILD_NO "122" #define FB_BUILD_TYPE "T" #define FB_BUILD_SUFFIX "Firebird2 Dev1" diff --git a/src/jrd/sdl.cpp b/src/jrd/sdl.cpp index c714e27760..22d30b8784 100644 --- a/src/jrd/sdl.cpp +++ b/src/jrd/sdl.cpp @@ -336,12 +336,12 @@ ADS array_desc, SLONG * variables, void (*callback) (), SLICE argument) arg.sdl_arg_status_vector = status_vector; p = sdl + 1; - while ((UCHAR) * p != gds_sdl_eoc) + while ((UCHAR) * p != gds_sdl_eoc) { switch (*p++) { case gds_sdl_struct: for (n = *p++; n; --n) { offset = p - sdl - 1; - if (!(p = sdl_desc(p, &junk))) + if (!(p = sdl_desc(p, &junk))) return error(status_vector, gds_invalid_sdl, gds_arg_number, (SLONG) offset, 0); } @@ -375,6 +375,7 @@ ADS array_desc, SLONG * variables, void (*callback) (), SLICE argument) return FAILURE; break; } + } return SUCCESS; } diff --git a/src/make.defaults b/src/make.defaults index 6df7ce47aa..8648de88eb 100644 --- a/src/make.defaults +++ b/src/make.defaults @@ -26,7 +26,7 @@ # Contributor(s): # # -# $Id: make.defaults,v 1.2 2002-01-04 11:34:13 skywalker Exp $ +# $Id: make.defaults,v 1.3 2002-01-06 13:06:35 skywalker Exp $ # diff --git a/src/make.new/Makefile.in.firebird b/src/make.new/Makefile.in.firebird index 6e90053b26..107c6a7956 100644 --- a/src/make.new/Makefile.in.firebird +++ b/src/make.new/Makefile.in.firebird @@ -26,7 +26,7 @@ # Contributor(s): # # -# $Id: Makefile.in.firebird,v 1.12 2002-01-04 11:34:16 skywalker Exp $ +# $Id: Makefile.in.firebird,v 1.13 2002-01-06 13:06:36 skywalker Exp $ # ROOT=.. @@ -62,9 +62,22 @@ dirs = alice burp dudley dsql extlib gpre intl isql journal jrd lock msgs \ .PHONY: firebird super_firebird $(dirs) -firebird: phase1 phase2 phase3 +firebird: updateBuildNum phase1 phase2 phase3 +#---------------------------------------------------------------------------- +# jrd/build_no.h contains the version and build# fields used throughout the +# program and quoted in the tools. This routine will update the build_no.h +# file with the auto update build# script file, writeBuildNum.sh. The +# writeBuildNum.sh script is autoupdated by CVS checkins. +# +.PHONY: updateBuildNum + +updateBuildNum : jrd/build_no.h + +jrd/build_no.h : misc/writeBuildNum.sh + (cd ..; ./src/misc/writeBuildNum.sh rebuildHeader) + #--------------------------------------------------------------------------- # Phase1: make a gpre_static from scratch so we can parse .e and .epp files # to build the rest of the system. It goes in two bits make a real simple diff --git a/src/make.new/README.makefiles b/src/make.new/README.makefiles deleted file mode 100644 index f2de8956d7..0000000000 --- a/src/make.new/README.makefiles +++ /dev/null @@ -1,105 +0,0 @@ - -OVERVIEW - -The new makefiles were created to fit in with autoconf, to place the object -files in seperate directories to the source files and to simplify the build -process. - -It really does rely on using gnu make so that is the best version to use. - - -MAKEFILE - -Makefiles are found in src/make.new - -make.rules -make.defaults -make.shared.variables - -prefix.xxx (where xxx = platform) - -In src/make.new there are a number of Makefile.in.xxx files and some make.xxx - - -STRUCTURE OF MAKEFILE.IN.XXX - - -Each Makefile.in.xxx has the following somewhere near the top: - -include make.rules -include make.defaults -include make.platform -include make.shared.variables - -... -... - - -These are: - -make.rules - -This contains the default rules for compiling the system components. Such as -directory macros CXX etc. - - -make.defaults - -This contains default values for macros that it is likely that the user may -want to override. - - -make.platform - -This file is created from the prefix.xxx where xxx=linux/darwin/freebsd etc. -It provides a spot for the user to override or repalce macros that have been -defined in make.rules and make.defaults. In addition extra dependancies can -be added to build extra targets. - - -make.shared.variables - -This file contains the defintion of macros that are shared across all of the -modules. The only set that are needed are those files that are contained in -the libgds.a/so library since files from many modules contribute to the library. - - - -CREATING OBJECT FILES - - -In the makefiles the object files are of two sorts .o static and .lo -which are suitable for shared libraries. On most systems the source -files need to be compiled twice to create both .o and .lo files. F -Fortunately the program libtool can help work with this. - -The general format of .o file dependancies is: - -SERVER_Sources = server.cpp -SERVER_Objects = $(SERVER_Sources:%.cpp=$(OBJ)/%.o) - - -So the .o files live in $(OBJ) where: -OBJ = $(ROOT)/gen/$ModuleName - - -Each Makefile also specifies an AllObjects and Dependancies macro which -identified all the objects that this Makefile is to create and the name -of the dependency files generated for those objects. - -AllObjects = $(Alice_Objects) - - -FILE DEPENDANCIES - -Include file dependancy information is automatically generated by the gcc -compiler. - -The gcc compiler has a flag -MMD which will generate in addition to the -.o file a .d file which contains the dependancy chain of #includes required -for the program. These are then edited and stored in the $(OBJ) directory and -are included in the bottom line of the makefile with - -Dependencies = $(All_Objects:.o=.d) - -include $(Dependancies) diff --git a/src/make.platform b/src/make.platform index 439336bf38..cf94dd5d6b 100644 --- a/src/make.platform +++ b/src/make.platform @@ -15,7 +15,7 @@ # All Rights Reserved. # Contributor(s): ______________________________________. # Start of file prefix.linux: $(VERSION) $(PLATFORM) -#$Id: make.platform,v 1.2 2002-01-04 11:34:13 skywalker Exp $ +#$Id: make.platform,v 1.3 2002-01-06 13:06:35 skywalker Exp $ #Revision 1.6 2000/12/01 11:20:31 fsg #Added SHRLIB_EXT to prefix.linux diff --git a/src/make.rules b/src/make.rules index b96443fa7c..d96aabc698 100644 --- a/src/make.rules +++ b/src/make.rules @@ -26,7 +26,7 @@ # Contributor(s): # # -# $Id: make.rules,v 1.2 2002-01-04 11:34:13 skywalker Exp $ +# $Id: make.rules,v 1.3 2002-01-06 13:06:35 skywalker Exp $ # #____________________________________________________________________________ diff --git a/src/misc/writeBuildNum.sh b/src/misc/writeBuildNum.sh index 319f35f3b6..d38c8328ae 100755 --- a/src/misc/writeBuildNum.sh +++ b/src/misc/writeBuildNum.sh @@ -3,13 +3,13 @@ # 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.92 2002-01-06 13:06:36 skywalker Exp $" +BuildVersion="$Id: writeBuildNum.sh,v 1.93 2002-01-06 13:06:36 skywalker Exp $" BuildType=T MajorVer=2 MinorVer=0 RevNo=0 -BuildNum=126 +BuildNum=123 BuildSuffix="Firebird2 Dev1" FIREBIRD_VERSION="$MajorVer.$MinorVer.$RevNo" @@ -28,9 +28,10 @@ rebuildHeaderFile() { cat > $tempfile <