Add journal and archive to posix build

2025-01-22 19:23:02 +01:00 · 2003-11-05 16:53:37 +00:00 · 2003-11-05 16:53:37 +00:00 · 6fb1964481
commit 6fb1964481
parent d8a50d8503
8 changed files with 341 additions and 7 deletions
--- a/builds/posix/Makefile.in.client.archive
+++ b/builds/posix/Makefile.in.client.archive
@ -0,0 +1,72 @@
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+# You may obtain a copy of the Licence at
+# http://www.gnu.org/licences/lgpl.html
+# 
+# As a special exception this file can also be included in modules
+# with other source code as long as that source code has been 
+# released under an Open Source Initiative certificed licence.  
+# More information about OSI certification can be found at: 
+# http://www.opensource.org 
+# 
+# This module is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public Licence for more details.
+# 
+# This module was created by members of the firebird development 
+# team.  All individual contributions remain the Copyright (C) of 
+# those individuals and all rights are reserved.  Contributors to 
+# this file are either listed below or can be obtained from a CVS 
+# history command.
+#
+#  Created by:  Mark O'Donohue <mark.odonohue@ludwig.edu.au>
+#
+#  Contributor(s):
+# 
+#
+#  $Id: Makefile.in.client.archive,v 1.1 2003-11-05 16:53:12 brodsom Exp $
+#
+
+ROOT=..
+ObjModuleName=client.journal
+
+include     $(ROOT)/gen/make.defaults
+include     $(ROOT)/gen/make.platform
+include     $(ROOT)/gen/make.rules
+include     $(ROOT)/gen/make.shared.variables
+
+@SET_MAKE@
+
+
+ARCHIVE_Files = archive.cpp
+ARCHIVE_Sources = $(addprefix journal/, $(ARCHIVE_Files))
+ARCHIVE_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(ARCHIVE_Sources))))
+
+JRD_Files= iberr.cpp jrn.cpp llio.cpp misc.cpp status.cpp
+JRD_Sources = $(addprefix jrd/, $(JRD_Files))
+JRD_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(JRD_Sources))))
+
+WALF_Files= walf.cpp
+WALF_Sources = $(addprefix wal/, $(WALF_Files))
+WALF_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(WALF_Sources))))
+
+AllObjects = $(ARCHIVE_Objects) $(JRD_Objects) $(WALF_Objects)
+Dependencies = $(AllObjects:.o=.d) 
+
+
+.PHONY: all archive
+
+all: archive
+
+archive : $(LIBFBCLIENT_SO) $(ARCHIVE)
+
+$(ARCHIVE):	$(ARCHIVE_Objects) $(JRD_Objects) $(WALF_Objects)
+	$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
+
+
+include $(ROOT)/gen/make.shared.targets
+
+-include $(Dependencies)
--- a/builds/posix/Makefile.in.client.journal
+++ b/builds/posix/Makefile.in.client.journal
@ -0,0 +1,74 @@
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+# You may obtain a copy of the Licence at
+# http://www.gnu.org/licences/lgpl.html
+# 
+# As a special exception this file can also be included in modules
+# with other source code as long as that source code has been 
+# released under an Open Source Initiative certificed licence.  
+# More information about OSI certification can be found at: 
+# http://www.opensource.org 
+# 
+# This module is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public Licence for more details.
+# 
+# This module was created by members of the firebird development 
+# team.  All individual contributions remain the Copyright (C) of 
+# those individuals and all rights are reserved.  Contributors to 
+# this file are either listed below or can be obtained from a CVS 
+# history command.
+#
+#  Created by:  Mark O'Donohue <mark.odonohue@ludwig.edu.au>
+#
+#  Contributor(s):
+# 
+#
+#  $Id: Makefile.in.client.journal,v 1.1 2003-11-05 16:53:12 brodsom Exp $
+#
+
+ROOT=..
+ObjModuleName=client.journal
+
+include     $(ROOT)/gen/make.defaults
+include     $(ROOT)/gen/make.platform
+include     $(ROOT)/gen/make.rules
+include     $(ROOT)/gen/make.shared.variables
+
+@SET_MAKE@
+
+
+JOURNAL_Files = console.cpp  gjrn.cpp \
+			 miscj.cpp oldr.cpp rebuild.epp server.epp
+
+JOURNAL_Sources = $(addprefix journal/, $(JOURNAL_Files))
+JOURNAL_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(JOURNAL_Sources))))
+
+JRD_Files= iberr.cpp isc.cpp isc_file.cpp llio.cpp misc.cpp status.cpp
+JRD_Sources = $(addprefix jrd/, $(JRD_Files))
+JRD_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(JRD_Sources))))
+
+WALF_Files= walf.cpp walr.cpp
+WALF_Sources = $(addprefix wal/, $(WALF_Files))
+WALF_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(WALF_Sources))))
+
+AllObjects = $(JOURNAL_Objects) $(JRD_Objects) $(WALF_Objects)
+Dependencies = $(AllObjects:.o=.d) 
+
+
+.PHONY: all journal
+
+all: journal
+
+journal : $(LIBFBCLIENT_SO) $(JOURNAL)
+
+$(JOURNAL):	$(JOURNAL_Objects) $(JRD_Objects) $(WALF_Objects)
+	$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
+
+
+include $(ROOT)/gen/make.shared.targets
+
+-include $(Dependencies)
--- a/builds/posix/Makefile.in.embed.archive
+++ b/builds/posix/Makefile.in.embed.archive
@ -0,0 +1,72 @@
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+# You may obtain a copy of the Licence at
+# http://www.gnu.org/licences/lgpl.html
+# 
+# As a special exception this file can also be included in modules
+# with other source code as long as that source code has been 
+# released under an Open Source Initiative certificed licence.  
+# More information about OSI certification can be found at: 
+# http://www.opensource.org 
+# 
+# This module is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public Licence for more details.
+# 
+# This module was created by members of the firebird development 
+# team.  All individual contributions remain the Copyright (C) of 
+# those individuals and all rights are reserved.  Contributors to 
+# this file are either listed below or can be obtained from a CVS 
+# history command.
+#
+#  Created by:  Mark O'Donohue <mark.odonohue@ludwig.edu.au>
+#
+#  Contributor(s):
+# 
+#
+#  $Id: Makefile.in.embed.archive,v 1.1 2003-11-05 16:53:12 brodsom Exp $
+#
+
+ROOT=..
+ObjModuleName=client.journal
+
+include     $(ROOT)/gen/make.defaults
+include     $(ROOT)/gen/make.platform
+include     $(ROOT)/gen/make.rules
+include     $(ROOT)/gen/make.shared.variables
+
+@SET_MAKE@
+
+
+ARCHIVE_Files = archive.cpp
+ARCHIVE_Sources = $(addprefix journal/, $(ARCHIVE_Files))
+ARCHIVE_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(ARCHIVE_Sources))))
+
+JRD_Files= iberr.cpp jrn.cpp llio.cpp misc.cpp status.cpp
+JRD_Sources = $(addprefix jrd/, $(JRD_Files))
+JRD_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(JRD_Sources))))
+
+WALF_Files= walf.cpp
+WALF_Sources = $(addprefix wal/, $(WALF_Files))
+WALF_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(WALF_Sources))))
+
+AllObjects = $(ARCHIVE_Objects) $(JRD_Objects) $(WALF_Objects)
+Dependencies = $(AllObjects:.o=.d) 
+
+
+.PHONY: all archive
+
+all: archive
+
+archive : $(LIBFBEMBED_SO) $(ARCHIVE)
+
+$(ARCHIVE):	$(ARCHIVE_Objects) $(JRD_Objects) $(WALF_Objects)
+	$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
+
+
+include $(ROOT)/gen/make.shared.targets
+
+-include $(Dependencies)
--- a/builds/posix/Makefile.in.embed.journal
+++ b/builds/posix/Makefile.in.embed.journal
@ -0,0 +1,74 @@
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+# You may obtain a copy of the Licence at
+# http://www.gnu.org/licences/lgpl.html
+# 
+# As a special exception this file can also be included in modules
+# with other source code as long as that source code has been 
+# released under an Open Source Initiative certificed licence.  
+# More information about OSI certification can be found at: 
+# http://www.opensource.org 
+# 
+# This module is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public Licence for more details.
+# 
+# This module was created by members of the firebird development 
+# team.  All individual contributions remain the Copyright (C) of 
+# those individuals and all rights are reserved.  Contributors to 
+# this file are either listed below or can be obtained from a CVS 
+# history command.
+#
+#  Created by:  Mark O'Donohue <mark.odonohue@ludwig.edu.au>
+#
+#  Contributor(s):
+# 
+#
+#  $Id: Makefile.in.embed.journal,v 1.1 2003-11-05 16:53:12 brodsom Exp $
+#
+
+ROOT=..
+ObjModuleName=client.journal
+
+include     $(ROOT)/gen/make.defaults
+include     $(ROOT)/gen/make.platform
+include     $(ROOT)/gen/make.rules
+include     $(ROOT)/gen/make.shared.variables
+
+@SET_MAKE@
+
+
+JOURNAL_Files = console.cpp  gjrn.cpp \
+			 miscj.cpp oldr.cpp rebuild.epp server.epp
+
+JOURNAL_Sources = $(addprefix journal/, $(JOURNAL_Files))
+JOURNAL_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(JOURNAL_Sources))))
+
+JRD_Files= iberr.cpp isc.cpp isc_file.cpp llio.cpp misc.cpp status.cpp
+JRD_Sources = $(addprefix jrd/, $(JRD_Files))
+JRD_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(JRD_Sources))))
+
+WALF_Files= walf.cpp walr.cpp
+WALF_Sources = $(addprefix wal/, $(WALF_Files))
+WALF_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(WALF_Sources))))
+
+AllObjects = $(JOURNAL_Objects) $(JRD_Objects) $(WALF_Objects)
+Dependencies = $(AllObjects:.o=.d) 
+
+
+.PHONY: all journal
+
+all: journal
+
+journal : $(LIBFBEMBED_SO) $(JOURNAL)
+
+$(JOURNAL):	$(JOURNAL_Objects) $(JRD_Objects) $(WALF_Objects)
+	$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
+
+
+include $(ROOT)/gen/make.shared.targets
+
+-include $(Dependencies)
--- a/builds/posix/Makefile.in.firebird
+++ b/builds/posix/Makefile.in.firebird
@ -27,7 +27,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.firebird,v 1.48 2003-10-28 17:58:12 skidder Exp $
+#  $Id: Makefile.in.firebird,v 1.49 2003-11-05 16:53:12 brodsom Exp $
 #

 ROOT=..
@ -336,7 +336,7 @@ otherfiles: misc_files
 .PHONY: embed_gpre embed_util

 classic_targets: libfbembed inet_server embed_gfix embed_gbak embed_isql \
-	embed_gpre embed_util embed_gdef embed_qli embed_fbudf libfbclient
+	embed_gpre embed_util embed_gdef embed_qli embed_fbudf embed_archive embed_journal libfbclient

 libfbembed:
 	$(MAKE) -f $(GEN_ROOT)/Makefile.libfbembed $@
@ -368,13 +368,20 @@ embed_qli:
 embed_fbudf:
 	$(MAKE) -f $(GEN_ROOT)/Makefile.embed.fbudf

+embed_archive:
+	$(MAKE) -f $(GEN_ROOT)/Makefile.embed.archive
+
+embed_journal:
+	$(MAKE) -f $(GEN_ROOT)/Makefile.embed.journal
+
 #_ Firebird Server Targets (super and super client)__________________________

 .PHONY: libfbserver fbserver 
 .PHONY: libfbclient client_gfix client_gbak client_isql client_gpre client_util client_fbudf

 super_targets: libfbserver fbserver libfbclient client_gfix client_gbak \
-			client_isql client_gpre client_util client_fbudf client_gdef client_qli
+			client_isql client_gpre client_util client_fbudf client_gdef client_qli \
+			client_archive client_journal

 libfbserver:
 	$(MAKE) -f $(GEN_ROOT)/Makefile.libfbserver $@
@ -403,6 +410,12 @@ client_util:
 client_fbudf:
 	$(MAKE) -f $(GEN_ROOT)/Makefile.client.fbudf

+client_archive:
+	$(MAKE) -f $(GEN_ROOT)/Makefile.client.archive
+
+client_journal:
+	$(MAKE) -f $(GEN_ROOT)/Makefile.client.journal
+
 # Not sure we need this target in super - problems with WAL includes
 # MOD 04-Oct-2002

--- a/builds/posix/Makefile.in.refDatabases
+++ b/builds/posix/Makefile.in.refDatabases
@ -27,7 +27,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.refDatabases,v 1.18 2003-07-11 02:23:58 brodsom Exp $
+#  $Id: Makefile.in.refDatabases,v 1.19 2003-11-05 16:53:12 brodsom Exp $
 #
 ROOT=..
 ObjModuleName=refDatabases
@ -84,7 +84,7 @@ yachts.lnk: empty.fdb

 .PHONY: ref_databases

-ref_databases : msg.fdb help.fdb metadata.fdb security.fdb
+ref_databases : msg.fdb help.fdb metadata.fdb security.fdb journal.fdb

 msg.fdb:	$(BLD_ROOT)/misc/msg.gbak
 	$(BIN)/gbak_static -MODE read_only -R $< $@
@ -109,6 +109,15 @@ $(FIREBIRD)/security.fdb:	$(BLD_ROOT)/misc/security.gbak
 	$(TOUCH) $@
 	$(CHMOD) 666 $@

+journal.fdb:	$(FIREBIRD)/journal.fdb
+	$(RM) -f $@
+	$(LN) -f $^ $@
+
+$(FIREBIRD)/journal.fdb:	$(BLD_ROOT)/misc/journal.gbak
+	$(BIN)/gbak_static  -R $< $@
+	$(TOUCH) $@
+	$(CHMOD) 666 $@
+
 metadata.fdb:	$(BLD_ROOT)/misc/metadata.gbak
 	$(BIN)/gbak_static -MODE read_only -R $< $@
 	$(TOUCH) $@
--- a/builds/posix/make.defaults
+++ b/builds/posix/make.defaults
@ -26,7 +26,7 @@
 #   Contributor(s):
 # 
 # 
-#   $Id: make.defaults,v 1.31 2003-09-26 10:22:28 aafemt Exp $
+#   $Id: make.defaults,v 1.32 2003-11-05 16:53:12 brodsom Exp $
 # 


@ -241,6 +241,7 @@ MUISQL          = $(BIN)/muisql$(EXEC_EXT)
 # From burp
 GBAK_STATIC     = $(BIN)/gbak_static$(EXEC_EXT)
 GBAK            = $(BIN)/gbak$(EXEC_EXT)
+GSPLIT          = $(BIN)/gsplit$(EXEC_EXT)

 # From gpre
 # (gpre current is a link to one of the others)
@ -259,6 +260,9 @@ ENTER_MESSAGES  = $(BIN)/enter_messages$(EXEC_EXT)
 MODIFY_MESSAGES = $(BIN)/modify_messages$(EXEC_EXT)
 CHANGE_MESSAGES = $(BIN)/change_messages$(EXEC_EXT)

+ARCHIVE			= $(BIN)/archive$(EXEC_EXT)
+JOURNAL			= $(BIN)/journal$(EXEC_EXT)
+
 fr_FR_MSG       = $(FIREBIRD)/fr_FR.msg
 de_DE_MSG       = $(FIREBIRD)/de_DE.msg
 ja_JP_MSG       = $(FIREBIRD)/ja_JP.msg
--- a/configure.in
+++ b/configure.in
@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.177 2003-11-04 08:34:42 eku Exp $
+dnl $Id: configure.in,v 1.178 2003-11-05 16:53:37 brodsom Exp $

 dnl ############################# INITIALISATION ###############################

@ -644,6 +644,9 @@ mkdir -p temp/libfbclient/common/classes
 mkdir -p temp/libfbclient/common/config
 mkdir -p temp/libfbclient/jrd/os/posix
 mkdir -p temp/libfbclient/jrd/os/win32
+mkdir -p temp/client.archive/journal
+mkdir -p temp/client.archive/jrd
+mkdir -p temp/client.archive/wal
 mkdir -p temp/client.fbudf/fbudf
 mkdir -p temp/client.gbak/burp
 mkdir -p temp/client.gfix/alice
@ -652,6 +655,9 @@ mkdir -p temp/client.gdef/dudley
 mkdir -p temp/client.gdef/wal
 mkdir -p temp/client.gdef/gpre
 mkdir -p temp/client.gdef/jrd
+mkdir -p temp/client.journal/journal
+mkdir -p temp/client.journal/jrd
+mkdir -p temp/client.journal/wal
 mkdir -p temp/client.qli/qli
 mkdir -p temp/client.qli/wal
 mkdir -p temp/client.qli/jrd
@ -695,6 +701,12 @@ mkdir -p temp/embed.lockmgr/lock
 mkdir -p temp/embed.util/utilities/gstat
 mkdir -p temp/embed.util/utilities/gsec
 mkdir -p temp/embed.util/lock
+mkdir -p temp/embed.archive/journal
+mkdir -p temp/embed.archive/jrd
+mkdir -p temp/embed.archive/wal
+mkdir -p temp/embed.journal/journal
+mkdir -p temp/embed.journal/jrd
+mkdir -p temp/embed.journal/wal
 mkdir -p temp/embed.gbak/burp
 mkdir -p temp/embed.gfix/alice
 mkdir -p temp/embed.isql/isql
@ -796,12 +808,14 @@ gen/Makefile.refDatabases:${MAKE_SRC_DIR}/Makefile.in.refDatabases
 gen/Makefile.libfbserver:${MAKE_SRC_DIR}/Makefile.in.libfbserver
 gen/Makefile.fbserver:${MAKE_SRC_DIR}/Makefile.in.fbserver
 gen/Makefile.libfbclient:${MAKE_SRC_DIR}/Makefile.in.libfbclient
+gen/Makefile.client.archive:${MAKE_SRC_DIR}/Makefile.in.client.archive
 gen/Makefile.client.fbudf:${MAKE_SRC_DIR}/Makefile.in.client.fbudf
 gen/Makefile.client.gbak:${MAKE_SRC_DIR}/Makefile.in.client.gbak
 gen/Makefile.client.gfix:${MAKE_SRC_DIR}/Makefile.in.client.gfix
 gen/Makefile.client.gdef:${MAKE_SRC_DIR}/Makefile.in.client.gdef
 gen/Makefile.client.qli:${MAKE_SRC_DIR}/Makefile.in.client.qli
 gen/Makefile.client.isql:${MAKE_SRC_DIR}/Makefile.in.client.isql
+gen/Makefile.client.journal:${MAKE_SRC_DIR}/Makefile.in.client.journal
 gen/Makefile.client.gpre:${MAKE_SRC_DIR}/Makefile.in.client.gpre
 gen/Makefile.client.util:${MAKE_SRC_DIR}/Makefile.in.client.util
 gen/Makefile.intl:${MAKE_SRC_DIR}/Makefile.in.intl
@ -812,10 +826,12 @@ gen/Makefile.libfbembed:${MAKE_SRC_DIR}/Makefile.in.libfbembed
 gen/Makefile.inet_server:${MAKE_SRC_DIR}/Makefile.in.inet_server
 gen/Makefile.embed.lockmgr:${MAKE_SRC_DIR}/Makefile.in.embed.lockmgr
 gen/Makefile.embed.util:${MAKE_SRC_DIR}/Makefile.in.embed.util
+gen/Makefile.embed.archive:${MAKE_SRC_DIR}/Makefile.in.embed.archive
 gen/Makefile.embed.fbudf:${MAKE_SRC_DIR}/Makefile.in.embed.fbudf
 gen/Makefile.embed.gfix:${MAKE_SRC_DIR}/Makefile.in.embed.gfix
 gen/Makefile.embed.gbak:${MAKE_SRC_DIR}/Makefile.in.embed.gbak
 gen/Makefile.embed.isql:${MAKE_SRC_DIR}/Makefile.in.embed.isql
+gen/Makefile.embed.journal:${MAKE_SRC_DIR}/Makefile.in.embed.journal
 gen/Makefile.embed.gdef:${MAKE_SRC_DIR}/Makefile.in.embed.gdef
 gen/Makefile.embed.qli:${MAKE_SRC_DIR}/Makefile.in.embed.qli
 gen/Makefile.embed.gpre:${MAKE_SRC_DIR}/Makefile.in.embed.gpre