mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-22 20:03:02 +01:00
Fixed the naming of some files:
interbase.msg => firebird.msg interbase.log => firebird.log SINIX-Z: don't distribute build programms
This commit is contained in:
eku
parent
9d465288db
commit
9cf71556b3
@ -28,7 +28,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.firebird,v 1.7 2002-09-19 15:25:38 skidder Exp $
|
||||
# $Id: Makefile.in.firebird,v 1.8 2002-09-20 10:23:14 eku Exp $
|
||||
#
|
||||
|
||||
ROOT=..
|
||||
@ -283,7 +283,7 @@ isc4.gdb: gdef isql # build the security database
|
||||
basic_targets: ref_databases msgs msgs_intl intl extlib includes examples \
|
||||
otherfiles
|
||||
|
||||
msgs: # messages file for user $(FIREBIRD)/interbase.msg
|
||||
msgs: # messages file for user $(FIREBIRD)/firebird.msg
|
||||
$(MAKE) -f $(MAKE_ROOT)/Makefile.msgs $@
|
||||
|
||||
msgs_intl: # international version of msgs file
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.msgs,v 1.3 2002-09-19 15:25:38 skidder Exp $
|
||||
# $Id: Makefile.in.msgs,v 1.4 2002-09-20 10:23:14 eku Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleName=msgs
|
||||
@ -134,7 +134,7 @@ $(CHANGE_MESSAGES): $(CHANGE_Objects) $(LIBFBSTATIC_A) $(LIBFBCOMMON_A)
|
||||
|
||||
|
||||
|
||||
message_file : $(FIREBIRD)/interbase.msg
|
||||
message_file : $(FIREBIRD)/firebird.msg
|
||||
|
||||
$(INTERBASE_MSG) : $(BUILD_FILE) indicator.msg
|
||||
$(BIN)/build_file -d $(MSGSDIR)master_msg_db -f $@
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: make.defaults,v 1.1 2002-07-29 15:04:06 skywalker Exp $
|
||||
# $Id: make.defaults,v 1.2 2002-09-20 10:23:14 eku Exp $
|
||||
#
|
||||
|
||||
|
||||
@ -188,7 +188,7 @@ GPRE_CURRENT = $(BIN)/gpre_current$(EXEC_EXT)
|
||||
# From msgs
|
||||
CHECK_MESSAGES = $(BIN)/check_messages$(EXEC_EXT)
|
||||
BUILD_FILE = $(BIN)/build_file$(EXEC_EXT)
|
||||
INTERBASE_MSG = $(FIREBIRD)/interbase.msg
|
||||
INTERBASE_MSG = $(FIREBIRD)/firebird.msg
|
||||
|
||||
ENTER_MESSAGES = $(BIN)/enter_messages$(EXEC_EXT)
|
||||
MODIFY_MESSAGES = $(BIN)/modify_messages$(EXEC_EXT)
|
||||
|
||||
@ -17,15 +17,15 @@
|
||||
#
|
||||
# Erik Kunze, Philosys GmbH, <kunze@philosys.de>
|
||||
#
|
||||
# $Id: prefix.sinixz,v 1.4 2002-09-19 15:25:38 skidder Exp $
|
||||
# $Id: prefix.sinixz,v 1.5 2002-09-20 10:23:14 eku Exp $
|
||||
#
|
||||
|
||||
|
||||
# use the following to define conditional DEV/PROD compile
|
||||
|
||||
DEBUG_Sources = nodebug.cpp
|
||||
PROD_FLAGS=-DNDEBUG -w -DSINIXZ -DUNIX
|
||||
DEV_FLAGS=-ggdb -Wall -W -DSINIXZ -DUNIX
|
||||
PROD_FLAGS=-DNDEBUG -w -DSINIXZ -DUNIX -fwritable-strings
|
||||
DEV_FLAGS=-ggdb -Wall -W -DSINIXZ -DUNIX -fwritable-strings
|
||||
|
||||
#CFLAGS:= $(CFLAGS) -DSINIXZ -DUNIX -fwritable-strings
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# $Header: /home/job/firebird/cvs-backup/firebird2/src/install/arch-specific/sinixz/prototype.in,v 1.2 2002-09-17 05:58:35 eku Exp $
|
||||
# $Header: /home/job/firebird/cvs-backup/firebird2/src/install/arch-specific/sinixz/prototype.in,v 1.3 2002-09-20 10:23:15 eku Exp $
|
||||
#-------------------------------------------------------------------------------
|
||||
|
||||
!SRCDIR=@NEW_FIREBIRD_DIR@
|
||||
@ -17,7 +17,7 @@ d none /opt ? ? ?
|
||||
d none @prefix@ 0755 root root
|
||||
|
||||
f none @prefix@/isc4.gdb=$SRCDIR/isc4.gdb 0444 root root
|
||||
f none @prefix@/interbase.msg=$SRCDIR/interbase.msg 0644 root root
|
||||
f none @prefix@/firebird.msg=$SRCDIR/firebird.msg 0644 root root
|
||||
#f none @prefix@/de_DE.msg=$SRCDIR/de_DE.msg 0644 root root
|
||||
#f none @prefix@/fr_FR.msg=$SRCDIR/fr_FR.msg 0644 root root
|
||||
#f none @prefix@/ja_JP.msg=$SRCDIR/ja_JP.msg 0644 root root
|
||||
@ -27,10 +27,10 @@ d none @prefix@/bin 0755 root root
|
||||
#f none @prefix@/bin/CSrestoreRootRunUser.sh=$SRCDIR/bin/CSrestoreRootRunUser.sh 0555 root root
|
||||
#f none @prefix@/bin/build_file=$SRCDIR/bin/build_file 0755 root root
|
||||
#f none @prefix@/bin/changeDBAPassword.sh=$SRCDIR/bin/changeDBAPassword.sh 0555 root root
|
||||
f none @prefix@/bin/change_messages=$SRCDIR/bin/change_messages 0755 root root
|
||||
f none @prefix@/bin/check_messages=$SRCDIR/bin/check_messages 0755 root root
|
||||
f none @prefix@/bin/create_db=$SRCDIR/bin/create_db 0755 root root
|
||||
f none @prefix@/bin/enter_messages=$SRCDIR/bin/enter_messages 0755 root root
|
||||
#f none @prefix@/bin/change_messages=$SRCDIR/bin/change_messages 0755 root root
|
||||
#f none @prefix@/bin/check_messages=$SRCDIR/bin/check_messages 0755 root root
|
||||
#f none @prefix@/bin/create_db=$SRCDIR/bin/create_db 0755 root root
|
||||
#f none @prefix@/bin/enter_messages=$SRCDIR/bin/enter_messages 0755 root root
|
||||
f none @prefix@/bin/fb_inet_server=$SRCDIR/bin/fb_inet_server 0755 root root
|
||||
f none @prefix@/bin/gbak=$SRCDIR/bin/gbak 0755 root root
|
||||
#f none @prefix@/bin/gbak_static=$SRCDIR/bin/gbak_static 0755 root root
|
||||
@ -46,7 +46,7 @@ f none @prefix@/bin/gsec=$SRCDIR/bin/gsec 0755 root root
|
||||
f none @prefix@/bin/gstat=$SRCDIR/bin/gstat 0755 root root
|
||||
f none @prefix@/bin/isql=$SRCDIR/bin/isql 0755 root root
|
||||
#f none @prefix@/bin/isql_static=$SRCDIR/bin/isql_static 0755 root root
|
||||
f none @prefix@/bin/modify_messages=$SRCDIR/bin/modify_messages 0755 root root
|
||||
#f none @prefix@/bin/modify_messages=$SRCDIR/bin/modify_messages 0755 root root
|
||||
|
||||
#d none @prefix@/examples 0755 root root
|
||||
#d none @prefix@/examples/v5 0755 root root
|
||||
@ -69,8 +69,8 @@ d none @prefix@/lib 0755 root root
|
||||
f none @prefix@/lib/ib_util.so=$SRCDIR/lib/ib_util.so 0755 root root
|
||||
#f none @prefix@/lib/libfbcommon.a=$SRCDIR/lib/libfbcommon.a 0644 root root
|
||||
f none @prefix@/lib/libfbembed.so.1.5.0=$SRCDIR/lib/libfbembed.so.1.5.0 0755 root root
|
||||
s none @prefix@/lib/libfbembed.so.1=libfbembed.so.1.5.0
|
||||
s none @prefix@/lib/libfbembed.so=libfbembed.so.1
|
||||
s none @prefix@/lib/libfbembed.so.1=@prefix@/lib/libfbembed.so.1/libfbembed.so.1.5.0
|
||||
s none @prefix@/lib/libfbembed.so=@prefix@/lib/libfbembed.so.1/libfbembed.so.1
|
||||
#f none @prefix@/lib/libfbstatic.a=$SRCDIR/lib/libfbstatic.a 0644 root root
|
||||
|
||||
d none @prefix@/UDF 0755 root root
|
||||
|
||||
@ -4548,7 +4548,7 @@ static SSHORT lock_buffer(
|
||||
|
||||
/* Case: lock manager detected a deadlock, probably caused by locking the
|
||||
bdb's in an unfortunate order. Nothing we can do about it, return the
|
||||
error, and log it to interbase.log. */
|
||||
error, and log it to firebird.log. */
|
||||
|
||||
gds__msg_format(0, JRD_BUGCHK, 215, sizeof(errmsg), errmsg,
|
||||
(TEXT *) bdb->bdb_page, (TEXT *) page_type, 0, 0, 0);
|
||||
@ -4592,7 +4592,7 @@ static SSHORT lock_buffer(
|
||||
|
||||
/* Case: lock manager detected a deadlock, probably caused by locking the
|
||||
bdb's in an unfortunate order. Nothing we can do about it, return the
|
||||
error, and log it to interbase.log. */
|
||||
error, and log it to firebird.log. */
|
||||
|
||||
gds__msg_format(0, JRD_BUGCHK, 216, sizeof(errmsg), errmsg,
|
||||
(TEXT *) bdb->bdb_page, (TEXT *) page_type, 0, 0, 0);
|
||||
|
||||
@ -274,7 +274,7 @@ void DLL_EXPORT ERR_log(int facility, int number, CONST TEXT* message)
|
||||
**************************************
|
||||
*
|
||||
* Functional description
|
||||
* Log a message to the interbase.log
|
||||
* Log a message to the firebird.log
|
||||
*
|
||||
**************************************/
|
||||
TEXT errmsg[MAX_ERRMSG_LEN + 1];
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
*
|
||||
*/
|
||||
|
||||
/* $Id: isc_ipc.cpp,v 1.17 2002-09-11 11:30:44 eku Exp $ */
|
||||
/* $Id: isc_ipc.cpp,v 1.18 2002-09-20 10:23:15 eku Exp $ */
|
||||
|
||||
#ifdef SHLIB_DEFS
|
||||
#define LOCAL_SHLIB_DEFS
|
||||
@ -749,9 +749,7 @@ static void isc_signal2(
|
||||
if (!sig) {
|
||||
#if (defined WIN_NT || defined PC_PLATFORM)
|
||||
#pragma FB_COMPILER_MESSAGE("Fix! Ugly function pointer casts!")
|
||||
ptr =
|
||||
(void (*)()) signal(signal_number,
|
||||
(void (*)(int)) signal_handler);
|
||||
ptr = (SIG_FPTR) signal(signal_number, (SIG_FPTR) signal_handler);
|
||||
#else
|
||||
|
||||
SIGVEC vec, old_vec;
|
||||
|
||||
@ -1192,7 +1192,7 @@ STATUS GDS_DETACH(STATUS* user_status, RDB* handle)
|
||||
release_statement(&port->port_statement);
|
||||
|
||||
/* If there is a network error, don't try to send another packet, just
|
||||
free the packet and disconnect the port. Put something into interbase.log
|
||||
free the packet and disconnect the port. Put something into firebird.log
|
||||
informing the user of the following. */
|
||||
|
||||
if (user_status[1])
|
||||
|
||||
@ -20,7 +20,7 @@
|
||||
*
|
||||
* All Rights Reserved.
|
||||
* Contributor(s): ______________________________________.
|
||||
* $Id: srvrmgr.cpp,v 1.5 2002-09-18 12:50:05 eku Exp $
|
||||
* $Id: srvrmgr.cpp,v 1.6 2002-09-20 10:23:15 eku Exp $
|
||||
*/
|
||||
|
||||
#include "firebird.h"
|
||||
@ -272,7 +272,7 @@ gds__msg_format (0, MSG_FAC, number, MSG_LEN, msg,
|
||||
strcpy(msg, "can not quit now, use shut -ign");
|
||||
break;
|
||||
case MSG_STARTERR:
|
||||
strcpy(msg, "check $INTERBASE/interbase.log file for errors");
|
||||
strcpy(msg, "check $FIREBIRD/firebird.log file for errors");
|
||||
break;
|
||||
case MSG_STARTFAIL:
|
||||
strcpy(msg, "can not start server");
|
||||
|
||||
Loading…
Reference in New Issue
Block a user