Cleanup obsolete and generated Fortran files. (#6819)

builds/install/arch-specific/hpux/super/makeinstallImage.sh.in

@@ -182,7 +182,7 @@ copyFiles() {
 
 
 # link include files to /usr/include
-	for i in gds.h iberror.h ibase.h ib_util.h
+	for i in iberror.h ibase.h ib_util.h
 	   do
 		   ln -s ../../$FBRootDir/include/$i $TargetDir/usr/include/$i
 	   done

builds/install/arch-specific/solx86gcc/CS/prototype.in

@@ -109,7 +109,6 @@ f none @prefix@/help/help.fdb=$SRCDIR/help/help.fdb  0444 root root
 
 d none @prefix@/include  0755 root root
 f none @prefix@/include/blr.h=$SRCDIR/include/blr.h  0644 root root
-f none @prefix@/include/gds.h=$SRCDIR/include/gds.h  0644 root root
 f none @prefix@/include/ib_util.h=$SRCDIR/include/ib_util.h  0644 root root
 f none @prefix@/include/ibase.h=$SRCDIR/include/ibase.h  0644 root root
 f none @prefix@/include/iberror.h=$SRCDIR/include/iberror.h  0644 root root

builds/mac_os_x/CS/CS.pbproj/project.pbxproj

@@ -1961,11 +1961,6 @@
 			path = files.txt;
 			refType = 4;
 		};
-		F616C45A0200B0CF01EF0ADE = {
-			isa = PBXFileReference;
-			path = gds_codes.ftn;
-			refType = 4;
-		};
 		F616C45B0200B0CF01EF0ADE = {
 			isa = PBXFileReference;
 			path = gds_codes.pas;
@@ -5675,21 +5670,11 @@
 			path = codetext.h;
 			refType = 4;
 		};
-		F616C7F70200B0D001EF0ADE = {
-			isa = PBXFileReference;
-			path = gds_codes.ftn;
-			refType = 4;
-		};
 		F616C7F80200B0D001EF0ADE = {
 			isa = PBXFileReference;
 			path = gds_codes.pas;
 			refType = 4;
 		};
-		F616C7F90200B0D001EF0ADE = {
-			isa = PBXFileReference;
-			path = gds_header.txt;
-			refType = 4;
-		};
 		F616C7FA0200B0D001EF0ADE = {
 			isa = PBXFileReference;
 			path = help.gbak;

lang_helpers/README.txt

@@ -1,6 +1,6 @@
 
-The files gds_codes.ftn and gds_codes.pas in this directory are generated by the program codes.e
+The file gds_codes.pas in this directory is generated by the program codes.e
 
-They should not be edited directly rather the msg.gdb database should be 
+It should not be edited directly rather the src/msgs scripts should be
-updated and then these files should be regenerated with the build scripts.
+updated and then this file should be regenerated with the build scripts.
 

lang_helpers/gds.h

@@ -1,39 +0,0 @@
-
-#ifndef INCLUDE_gds
-#define INCLUDE_gds
-
-/*
- * Module: gds.h
- *
- * This file comes in two forms this one which is used in the
- * build tree and does a #include of all components and the
- * generated one used for external compilation which contains
- * a concatination of all the following files.
- *
- * The content of this file was generated by the Firebird project
- * and is a concatination of several header source files, that may
- * also explain the unusual #ifdef structures within this file.
- * 
- * 
- */
-
-
-#include "../jrd/y_ref.h"
-#include "../jrd/ibase.h"
-#include "../jrd/gdsold.h"
-
-#ifdef NOT_USED_OR_REPLACED
-
-/* The public version of this file also contains the following header files
-   these are not included explicitly here as they are included in the two 
-   above files.  They have been placed here as a reminder of what is in
-   the public version of this file.
-*/
-#include "fb_types.h"
-#include "../jrd/blr.h"
-#include "../include/gen/iberror.h"
-#include "../include/gen/codes.h"
-#endif
-
-#endif /* INCLUDE_gds */
-

src/include/firebird/impl/blr.h

@@ -56,7 +56,7 @@
 #define blr_blob		(unsigned short)261
 #define blr_cstring		(unsigned char)40
 #define blr_cstring2    	(unsigned char)41	/* added in 3.2 JPN */
-#define blr_blob_id     	(unsigned char)45	/* added from gds.h */
+#define blr_blob_id     	(unsigned char)45
 #define blr_sql_date		(unsigned char)12
 #define blr_sql_time		(unsigned char)13
 #define blr_int64           (unsigned char)16
@@ -105,7 +105,7 @@
 
 #define blr_assignment		(unsigned char)1
 #define blr_begin		(unsigned char)2
-#define blr_dcl_variable  	(unsigned char)3	/* added from gds.h */
+#define blr_dcl_variable  	(unsigned char)3
 #define blr_message		(unsigned char)4
 #define blr_erase		(unsigned char)5
 #define blr_fetch		(unsigned char)6
@@ -147,7 +147,7 @@
 #define blr_parameter2		(unsigned char)41
 #define blr_from		(unsigned char)42
 #define blr_via			(unsigned char)43
-#define blr_user_name   	(unsigned char)44	/* added from gds.h */
+#define blr_user_name   	(unsigned char)44
 #define blr_null		(unsigned char)45
 
 #define blr_equiv			(unsigned char)46

src/include/gen/files.txt

@@ -1,5 +1,4 @@
 gds_codes.pas
-gds_codes.ftn
 iberror.h
 codetext.h
 msgs.h

src/misc/codes.epp

@@ -37,7 +37,6 @@
 DATABASE DB = FILENAME "msg.fdb";
 
 const char* CODES_PAS	= "gds_codes.pas";
-const char* CODES_FTN	= "gds_codes.ftn";
 //const char* CODES_H	= "codes.h"
 const char* IBERROR_H	= "iberror.h";
 const char* CODETEXT_H	= "codetext.h";
@@ -51,8 +50,7 @@ enum formatStyle
 {
 	CSTYLE 		=	1,
 	PASSTYLE	=	2,
-	FTNSTYLE	=	3,
+	CPPSTYLE	=	3
-	CPPSTYLE	=	4
 };
 
 
@@ -64,7 +62,7 @@ static void move_if_not_identical(const char *, const char *, const char*);
 static void add_text(FILE*, formatStyle, const char**);
 
 static const char* genDirectory = NULL;
-static const char* genFtnPasDirectory = NULL;
+static const char* genPasDirectory = NULL;
 
 static void check_open(FILE*& f, const char* name, const char* tmp, const char* mode)
 {
@@ -240,40 +238,6 @@ static const SCHAR *pas_boiler_plate[] =
 	"",
 };
 
-static const SCHAR *ftn_boiler_plate_data[] =
-{
-	"",
-	"      PARAMETER (",
-	"     + GDS_ARG_END          = 0,   { end of argument list }",
-	"     + GDS_ARG_GDS          = 1,   { generic DSRI status value }",
-	"     + GDS_ARG_STRING       = 2,   { string argument }",
-	"     + GDS_ARG_CSTRING      = 3,   { count & string argument }",
-	"     + GDS_ARG_NUMBER       = 4,   { numeric argument (long) }",
-	"     + GDS_ARG_INTERPRETED  = 5,   { interpreted status code (string) }",
-	"     + GDS_ARG_VMS          = 6,   { VAX/VMS status code (long) }",
-	"     + GDS_ARG_UNIX         = 7,   { UNIX error code }",
-	"     + GDS_ARG_DOMAIN       = 8,   { Apollo/Domain error code }",
-	"     + GDS_ARG_DOS          = 9)   { MSDOS/OS2 error code }",
-	"",
-};
-
-static const SCHAR *ftn_boiler_plate_decls[] =
-{
-	"      INTEGER*4",
-	"     + GDS_ARG_END,          { end of argument list }",
-	"     + GDS_ARG_GDS,          { generic DSRI status value }",
-	"     + GDS_ARG_STRING,       { string argument }",
-	"     + GDS_ARG_CSTRING,      { count & string argument }",
-	"     + GDS_ARG_NUMBER,       { numeric argument (long) }",
-	"     + GDS_ARG_INTERPRETED,  { interpreted status code (string) }",
-	"     + GDS_ARG_VMS,          { VAX/VMS status code (long) }",
-	"     + GDS_ARG_UNIX,         { UNIX error code }",
-	"     + GDS_ARG_DOMAIN,       { Apollo/Domain error code }",
-	"     + GDS_ARG_DOS           { MSDOS/OS2 error code }",
-	"",
-};
-
-
 int CLIB_ROUTINE main( int argc, char *argv[])
 {
 /*************************************
@@ -301,7 +265,7 @@ int CLIB_ROUTINE main( int argc, char *argv[])
 		genDirectory = argv[1];
 	}
 	if (argc >= 2 ) {
-		genFtnPasDirectory = argv[2];
+		genPasDirectory = argv[2];
 	}
 
 	START_TRANSACTION;
@@ -698,8 +662,6 @@ static void build_other_headers()
 
 	FILE* pas_codes = NULL;
 	check_open(pas_codes, CODES_PAS, "tmpcode4", "w");
-	FILE* ftn_codes = NULL;
-	check_open(ftn_codes, CODES_FTN, "tmpcode5", "w");
 	FILE* code_text = NULL;
 	check_open(code_text, CODETEXT_H, "tmpcode6", "w");
 	FILE* msgs = NULL;
@@ -713,8 +675,6 @@ static void build_other_headers()
 
 	add_text(pas_codes, PASSTYLE, license);
 	add_text(pas_codes, PASSTYLE, warn);
-	add_text(ftn_codes, FTNSTYLE, license);
-	add_text(ftn_codes, FTNSTYLE, warn);
 	add_text(code_text, CSTYLE, license);
 	add_text(code_text, CSTYLE, warn);
 	add_text(msgs, CSTYLE, license);
@@ -754,31 +714,6 @@ static void build_other_headers()
 		fprintf(pas_codes, "%s\n", pas_boiler_plate[i]);
 	}
 
-	// Start the FORTRAN codes file
-
-	fprintf(ftn_codes, "\n"
-		"      INTEGER*4\n"
-		"     + GDS_FACILITY,\n"
-		"     + GDS_ERR_BASE,\n"
-		"     + GDS_ERR_FACTOR\n");
-
-	numLines = FB_NELEM(ftn_boiler_plate_decls);
-	for (i = 0; i < numLines; i++) {
-		fprintf(ftn_codes, "%s\n", ftn_boiler_plate_decls[i]);
-	}
-
-	fprintf(ftn_codes, "\n"
-		"      PARAMETER (\n"
-		"     + GDS_FACILITY    = %d,\n"
-		"     + GDS_ERR_BASE    = %d,\n"
-		"     + GDS_ERR_FACTOR  = %d)\n",
-		gds_facility_local, gds_base_local, gds_factor_local);
-
-	numLines = FB_NELEM(ftn_boiler_plate_data);
-	for (i = 0; i < numLines; i++) {
-		fprintf(ftn_codes, "%s\n", ftn_boiler_plate_data[i]);
-	}
-
 	// Start the codetext.h
 
 	fprintf(code_text, "static const struct {\n");
@@ -828,9 +763,6 @@ static void build_other_headers()
 
 		fprintf(pas_codes, "\tisc_%-32.32s = %lu;\n", S.GDS_SYMBOL, new_code);
 		fprintf(pas_codes, "\tgds_%-32.32s = %lu;\n", S.GDS_SYMBOL, new_code);
-		fprintf(ftn_codes,
-				   "      INTEGER*4 GDS__%-32.32s\n      PARAMETER (GDS__%-32.32s = %lu)\n",
-				   S.GDS_SYMBOL, S.GDS_SYMBOL, new_code);
 
 		SCHAR* q = text;
 		const SCHAR* const end = q + sizeof(text) - 1;
@@ -911,8 +843,7 @@ static void build_other_headers()
 	fprintf(sql_states, "\t{0, NULL}\n");
 	fprintf(sql_states, "};\n");
 
-	check_close(pas_codes, CODES_PAS, "tmpcode4", genFtnPasDirectory);
+	check_close(pas_codes, CODES_PAS, "tmpcode4", genPasDirectory);
-	check_close(ftn_codes, CODES_FTN, "tmpcode5", genFtnPasDirectory);
 	check_close(code_text, CODETEXT_H, "tmpcode6", genDirectory);
 	check_close(msgs, MSGS_H, "tmpcode7", genDirectory);
 	check_close(sql_codes, SQL_CODES_H, "tmpcode9", genDirectory);
@@ -995,10 +926,6 @@ static void add_text(FILE* fd, formatStyle style, const char** text)
 		fprintf(fd, "(*\n");
 		break;
 
-	case FTNSTYLE:
-		fprintf(fd, "C --\n");
-		break;
-
 	case CPPSTYLE:
 		fprintf(fd, "//\n");
 		break;
@@ -1018,10 +945,6 @@ static void add_text(FILE* fd, formatStyle style, const char** text)
 			fprintf(fd, " *");
 			break;
 
-		case FTNSTYLE:
-			fprintf(fd, "C --");
-			break;
-
 		case CPPSTYLE:
 			fprintf(fd, "//");
 			break;
@@ -1041,10 +964,6 @@ static void add_text(FILE* fd, formatStyle style, const char** text)
 		fprintf(fd, " *)\n");
 		break;
 
-	case FTNSTYLE:
-		fprintf(fd, "C --\n");
-		break;
-
 	case CPPSTYLE:
 		fprintf(fd, "//\n");
 		break;

src/misc/gds_header.txt

@@ -1,11 +0,0 @@
-/*
- * Module: gds.h
- *
- * The content of this file was generated by the Firebird project
- * and is a concatenation of several header source files, that may
- * also explain the unusual #ifdef structures within this file.
- * 
- * 
- *  This file is automatically generated - do not edit!
- * 
- */