From 8d950d0ccd360d8648d0606ee6081b7f9def00d5 Mon Sep 17 00:00:00 2001 From: alexpeshkoff Date: Wed, 1 Sep 2004 11:53:38 +0000 Subject: [PATCH] fixed msg.fdb build on windows terminal server remote session posix is also in sync --- builds/posix/Makefile.in.refDatabases | 5 +++-- builds/win32/prepare.bat | 26 ++++++++++++++------------ src/msgs/facilities.sql | 2 -- src/msgs/history.sql | 2 -- src/msgs/locales.sql | 2 -- src/msgs/messages.sql | 2 -- src/msgs/msg.sql | 2 -- src/msgs/symbols.sql | 2 -- src/msgs/system_errors.sql | 2 -- src/msgs/templates.sql | 2 -- src/msgs/transmsgs.de_DE.sql | 2 -- src/msgs/transmsgs.fr_FR.sql | 2 -- 12 files changed, 17 insertions(+), 34 deletions(-) diff --git a/builds/posix/Makefile.in.refDatabases b/builds/posix/Makefile.in.refDatabases index db4158d740..e7d1716e07 100644 --- a/builds/posix/Makefile.in.refDatabases +++ b/builds/posix/Makefile.in.refDatabases @@ -27,7 +27,7 @@ # Contributor(s): # # -# $Id: Makefile.in.refDatabases,v 1.22 2004-08-23 09:53:54 aafemt Exp $ +# $Id: Makefile.in.refDatabases,v 1.23 2004-09-01 11:53:28 alexpeshkoff Exp $ # ROOT=.. ObjModuleType=std @@ -91,7 +91,8 @@ ref_databases : msg.timestamp help.fdb metadata.fdb security.fdb msg.timestamp: $(MSG_FILES) $(RM) msg.fdb - for sn in $(MSG_FILES); do $(ISQL_STATIC) -i $$sn || exit; done + echo create database \'msg.fdb\'\; | $(ISQL_STATIC) + for sn in $(MSG_FILES); do (echo $$sn; $(ISQL_STATIC) -i $$sn msg.fdb) || exit; done # $(CHMOD) 444 msg.fdb $(TOUCH) $@ diff --git a/builds/win32/prepare.bat b/builds/win32/prepare.bat index 3a443b6812..f563984eff 100644 --- a/builds/win32/prepare.bat +++ b/builds/win32/prepare.bat @@ -41,21 +41,23 @@ @rmdir /s /q %ROOT_PATH%\gen 2>nul @mkdir %ROOT_PATH%\gen\dbs 2>nul -@cd %ROOT_PATH%\gen\dbs @"%FIREBIRD%\bin\gbak" -r %ROOT_PATH%\builds\misc\metadata.gbak %SERVER_NAME%:%DB_PATH%\gen\dbs\metadata.fdb @"%FIREBIRD%\bin\gbak" -r %ROOT_PATH%\builds\misc\security.gbak %SERVER_NAME%:%DB_PATH%\gen\dbs\security.fdb -@"%FIREBIRD%\bin\isql" -q -i %ROOT_PATH%\src\msgs\msg.sql -@"%FIREBIRD%\bin\isql" -q -i %ROOT_PATH%\src\msgs\facilities.sql -@"%FIREBIRD%\bin\isql" -q -i %ROOT_PATH%\src\msgs\locales.sql -@"%FIREBIRD%\bin\isql" -q -i %ROOT_PATH%\src\msgs\history.sql -@"%FIREBIRD%\bin\isql" -q -i %ROOT_PATH%\src\msgs\messages.sql -@"%FIREBIRD%\bin\isql" -q -i %ROOT_PATH%\src\msgs\symbols.sql -@"%FIREBIRD%\bin\isql" -q -i %ROOT_PATH%\src\msgs\system_errors.sql -@"%FIREBIRD%\bin\isql" -q -i %ROOT_PATH%\src\msgs\transmsgs.fr_FR.sql -@"%FIREBIRD%\bin\isql" -q -i %ROOT_PATH%\src\msgs\transmsgs.de_DE.sql -@"%FIREBIRD%\bin\gbak" -r %ROOT_PATH%\builds\misc\help.gbak %SERVER_NAME%:%DB_PATH%\gen\dbs\help.fdb + +@echo create database '%SERVER_NAME%:%DB_PATH%\gen\dbs\msg.fdb'; | "%FIREBIRD%\bin\isql" -q +@set MSG_ISQL=@"%FIREBIRD%\bin\isql" -q %SERVER_NAME%:%DB_PATH%\gen\dbs\msg.fdb -i %ROOT_PATH%\src\msgs\ +@%MSG_ISQL%msg.sql +@%MSG_ISQL%facilities.sql +@%MSG_ISQL%locales.sql +@%MSG_ISQL%history.sql +@%MSG_ISQL%messages.sql +@%MSG_ISQL%symbols.sql +@%MSG_ISQL%system_errors.sql +@%MSG_ISQL%transmsgs.fr_FR.sql +@%MSG_ISQL%transmsgs.de_DE.sql + +@"%FIREBIRD%\bin\gbak" -r %ROOT_PATH%\builds\misc\help.gbak %SERVER_NAME%:%DB_PATH%\gen\dbs\help.fdb @copy metadata.fdb yachts.lnk > nul -@cd %ROOT_PATH%\builds\win32 @echo. @echo Completed Preparations for build diff --git a/src/msgs/facilities.sql b/src/msgs/facilities.sql index aff96d93a1..9eccf67153 100644 --- a/src/msgs/facilities.sql +++ b/src/msgs/facilities.sql @@ -1,5 +1,3 @@ -CONNECT "msg.fdb"; - INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES ('2004-08-28 16:14:00', 'JRD', 0, 519); INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES ('1996-11-07 13:38:37', 'QLI', 1, 509); INSERT INTO FACILITIES (LAST_CHANGE, FACILITY, FAC_CODE, MAX_NUMBER) VALUES ('1996-11-07 13:38:37', 'GDEF', 2, 345); diff --git a/src/msgs/history.sql b/src/msgs/history.sql index c61cacffe5..563aafc3e4 100644 --- a/src/msgs/history.sql +++ b/src/msgs/history.sql @@ -1,5 +1,3 @@ -CONNECT "msg.fdb"; - INSERT INTO HISTORY (CHANGE_NUMBER, CHANGE_WHO, CHANGE_DATE, FAC_CODE, NUMBER, OLD_TEXT, OLD_ACTION, OLD_EXPLANATION, LOCALE) VALUES (1, 'sriram', '1993-06-14 10:51:23', 16, 5, 'enter file size or to end input', NULL, NULL, 'c_pg'); INSERT INTO HISTORY (CHANGE_NUMBER, CHANGE_WHO, CHANGE_DATE, FAC_CODE, NUMBER, OLD_TEXT, OLD_ACTION, OLD_EXPLANATION, LOCALE) VALUES (2, 'sriram', '1993-06-25 15:13:23', 15, 283, 'checksum error when reading log record', NULL, NULL, 'c_pg'); INSERT INTO HISTORY (CHANGE_NUMBER, CHANGE_WHO, CHANGE_DATE, FAC_CODE, NUMBER, OLD_TEXT, OLD_ACTION, OLD_EXPLANATION, LOCALE) VALUES (3, 'caro', '1993-07-14 13:32:19', 2, 339, 'minimum of %d shared cache pages required', NULL, NULL, 'c_pg'); diff --git a/src/msgs/locales.sql b/src/msgs/locales.sql index 35076f93ee..b9f686ce3d 100644 --- a/src/msgs/locales.sql +++ b/src/msgs/locales.sql @@ -1,5 +1,3 @@ -CONNECT "msg.fdb"; - INSERT INTO LOCALES (LOCALE, DESCRIPTION) VALUES ('pg_PG', 'Pig Latin, testing locale only.'); INSERT INTO LOCALES (LOCALE, DESCRIPTION) VALUES ('fr_FR', 'French as used in France, Latin 1 codeset'); INSERT INTO LOCALES (LOCALE, DESCRIPTION) VALUES ('de_DE', 'German as used in Germany, Latin 1 codeset'); diff --git a/src/msgs/messages.sql b/src/msgs/messages.sql index bc6dcff810..3fbcb0667f 100644 --- a/src/msgs/messages.sql +++ b/src/msgs/messages.sql @@ -1,5 +1,3 @@ -CONNECT "msg.fdb"; - INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES ('', 'process_statement', 'dtr.c', NULL, 1, 351, NULL, 'Do you want to roll back your updates?', NULL, NULL); INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES (NULL, 'gen_descriptor', 'gener.c', NULL, 1, 352, NULL, 'gen_descriptor: dtype not recognized', NULL, NULL); INSERT INTO MESSAGES (SYMBOL, ROUTINE, MODULE, TRANS_NOTES, FAC_CODE, NUMBER, FLAGS, TEXT, "ACTION", EXPLANATION) VALUES (NULL, NULL, NULL, NULL, 1, 47, NULL, 'MOVQ_move: conversion not done', NULL, NULL); diff --git a/src/msgs/msg.sql b/src/msgs/msg.sql index d4ecbca720..ec4889a317 100644 --- a/src/msgs/msg.sql +++ b/src/msgs/msg.sql @@ -1,5 +1,3 @@ -CREATE DATABASE 'msg.fdb'; - CREATE GENERATOR CHANGE_NUM; /* Domain definitions */ diff --git a/src/msgs/symbols.sql b/src/msgs/symbols.sql index 4ffb3277e8..7c12ec04f9 100644 --- a/src/msgs/symbols.sql +++ b/src/msgs/symbols.sql @@ -1,5 +1,3 @@ -CONNECT "msg.fdb"; - INSERT INTO SYMBOLS (SYMBOL, "VALUE", CLASS, "TYPE", SEQUENCE) VALUES ('blr_modify', 10, 'BLR', 'STATEMENTS', 290); INSERT INTO SYMBOLS (SYMBOL, "VALUE", CLASS, "TYPE", SEQUENCE) VALUES ('blr_handler', 11, 'BLR', 'STATEMENTS', 300); INSERT INTO SYMBOLS (SYMBOL, "VALUE", CLASS, "TYPE", SEQUENCE) VALUES ('blr_receive', 12, 'BLR', 'STATEMENTS', 310); diff --git a/src/msgs/system_errors.sql b/src/msgs/system_errors.sql index 4f6e5a3247..81f6b1e93a 100644 --- a/src/msgs/system_errors.sql +++ b/src/msgs/system_errors.sql @@ -1,5 +1,3 @@ -CONNECT "msg.fdb"; - INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, NUMBER, FAC_CODE, VMS_CODE, GDS_SYMBOL, SEVERITY, SEVERITY_TEXT) VALUES (-911, NULL, NULL, 139, 0, NULL, 'rec_in_limbo', NULL, NULL); INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, NUMBER, FAC_CODE, VMS_CODE, GDS_SYMBOL, SEVERITY, SEVERITY_TEXT) VALUES (-904, NULL, NULL, 140, 0, NULL, 'shadow_missing', NULL, NULL); INSERT INTO SYSTEM_ERRORS (SQL_CODE, SQL_CLASS, SQL_SUBCLASS, NUMBER, FAC_CODE, VMS_CODE, GDS_SYMBOL, SEVERITY, SEVERITY_TEXT) VALUES (-904, NULL, NULL, 135, 0, NULL, 'shadow_accessed', NULL, NULL); diff --git a/src/msgs/templates.sql b/src/msgs/templates.sql index c3e0cd8c75..c9d247be0c 100644 --- a/src/msgs/templates.sql +++ b/src/msgs/templates.sql @@ -1,5 +1,3 @@ -CONNECT "msg.fdb"; - INSERT INTO TEMPLATES (LANGUAGE, "FILE", TEMPLATE) VALUES ('C', 'gds.h', '/* * PROGRAM: C preprocessor diff --git a/src/msgs/transmsgs.de_DE.sql b/src/msgs/transmsgs.de_DE.sql index ffbb4fc78b..98153a3c80 100644 --- a/src/msgs/transmsgs.de_DE.sql +++ b/src/msgs/transmsgs.de_DE.sql @@ -1,5 +1,3 @@ -CONNECT "msg.fdb"; - INSERT INTO TRANSMSGS (ENG_TEXT, ENG_ACTION, ENG_EXPLANATION, FAC_CODE, NUMBER, LOCALE, TEXT, "ACTION", EXPLANATION, TRANSLATOR, TRANS_DATE) VALUES ('key length (%d) for compound index %s exceeds 202', NULL, NULL, 2, 312, 'de_DE', 'Die Schlüssellänge (%d) für den zusammengesetzten Index %s überschreitet 202', NULL, NULL, 'daves', '1993-07-16 12:15:53'); INSERT INTO TRANSMSGS (ENG_TEXT, ENG_ACTION, ENG_EXPLANATION, FAC_CODE, NUMBER, LOCALE, TEXT, "ACTION", EXPLANATION, TRANSLATOR, TRANS_DATE) VALUES ('next transaction older than oldest active transaction', NULL, NULL, 15, 266, 'de_DE', 'Die nächste Transaktionsnummer ist niedriger als die älteste aktive Transaktionsnummer', NULL, NULL, 'daves', '1993-07-16 12:15:53'); INSERT INTO TRANSMSGS (ENG_TEXT, ENG_ACTION, ENG_EXPLANATION, FAC_CODE, NUMBER, LOCALE, TEXT, "ACTION", EXPLANATION, TRANSLATOR, TRANS_DATE) VALUES ('next transaction older than oldest transaction', NULL, NULL, 15, 267, 'de_DE', 'Die nächste Transaktionsnummer ist niedriger als die älteste Transaktionsnummer', NULL, NULL, 'daves', '1993-07-16 12:15:53'); diff --git a/src/msgs/transmsgs.fr_FR.sql b/src/msgs/transmsgs.fr_FR.sql index bf4a370c5e..84f122d1be 100644 --- a/src/msgs/transmsgs.fr_FR.sql +++ b/src/msgs/transmsgs.fr_FR.sql @@ -1,5 +1,3 @@ -CONNECT "msg.fdb"; - INSERT INTO TRANSMSGS (ENG_TEXT, ENG_ACTION, ENG_EXPLANATION, FAC_CODE, NUMBER, LOCALE, TEXT, "ACTION", EXPLANATION, TRANSLATOR, TRANS_DATE) VALUES ('scalar operator used on field which is not an array', NULL, NULL, 15, 261, 'fr_FR', 'Opération d''échelle effectuée sur une zone qui n''est pas un tableau', NULL, NULL, 'daves', '1993-07-16 12:11:26'); INSERT INTO TRANSMSGS (ENG_TEXT, ENG_ACTION, ENG_EXPLANATION, FAC_CODE, NUMBER, LOCALE, TEXT, "ACTION", EXPLANATION, TRANSLATOR, TRANS_DATE) VALUES ('invalid blob type for operation', 'Program attempted a seek on a non-stream (i.e. segmented) blob.', 'Program attempted to a blob seek operation on a non-stream (i.e. segmented) blob.', 0, 145, 'fr_FR', 'Type de blob non valide pour l''opération', 'Program attempted a seek on a non-stream (i.e. segmented) blob.', 'Program attempted to a blob seek operation on a non-stream (i.e.