Wed Mar 23 22:59:29 PST 2005
- Previous message: [Slony1-commit] By cbbrowne: Fixed makefile to build HTML output if you just type 'make'
- Next message: [Slony1-commit] By darcyb: From Andreas Pflug <pgadmin@pse-consulting.de>: In
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Log Message:
-----------
Whole raft of changes.
A) use signal() on win32 since there is no sigaction under that platform
B) have make install now install documentation if --with-docdir=<dir> is defined, This will have to be updated to have docs installed by default.
Modified Files:
--------------
slony1-engine:
Makefile.global.in (r1.25 -> r1.26)
configure (r1.44 -> r1.45)
configure.ac (r1.43 -> r1.44)
slony1-engine/config:
docs.m4 (r1.4 -> r1.5)
libc.m4 (r1.1 -> r1.2)
slony1-engine/doc:
Makefile (r1.10 -> r1.11)
slony1-engine/doc/adminguide:
Makefile (r1.9 -> r1.10)
bookindex.sgml (r1.3 -> r1.4)
slony1-engine/doc/concept:
Makefile (r1.6 -> r1.7)
slony1-engine/doc/howto:
Makefile (r1.6 -> r1.7)
slony1-engine/doc/implementation:
Makefile (r1.5 -> r1.6)
slony1-engine/makefiles:
Makefile.win (r1.4 -> r1.5)
slony1-engine/src/slon:
slon.c (r1.47 -> r1.48)
-------------- next part --------------
Index: Makefile.global.in
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/Makefile.global.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -LMakefile.global.in -LMakefile.global.in -u -w -r1.25 -r1.26
--- Makefile.global.in
+++ Makefile.global.in
@@ -60,6 +60,7 @@
DOCBOOKSTYLE= @DOCBOOKSTYLE@
COLLATEINDEX= @COLLATEINDEX@
PGAUTODOC= @PGAUTODOC@
+DOCDIR= @DOCDIR@
# support programs
PERL= @PERL@
Index: configure.ac
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure.ac,v
retrieving revision 1.43
retrieving revision 1.44
diff -Lconfigure.ac -Lconfigure.ac -u -w -r1.43 -r1.44
--- configure.ac
+++ configure.ac
@@ -35,7 +35,9 @@
freebsd*) template=freebsd ;;
hpux*) template=hpux ;;
irix*) template=irix ;;
- linux*) template=linux ;;
+ linux*|gnu*|k*bsd*-gnu)
+ template=linux ;;
+ mingw*) template=win ;;
netbsd*) template=netbsd ;;
nextstep*) template=nextstep ;;
openbsd*) template=openbsd ;;
@@ -53,6 +55,18 @@
ultrix*) template=ultrix4 ;;
esac
+if test x"$template" = x"" ; then
+ AC_MSG_ERROR([[
+*******************************************************************
+Slony-I has apparently not been ported to your platform yet.
+To try a manual configuration, look into the src/template directory
+for a similar platform and use the '--with-template=' option.
+
+Please also contact <slony1-general at gborg.postgresql.org> to see about
+rectifying this. Include the above 'checking host system type...'
+line.
+*******************************************************************]])
+fi
AC_MSG_RESULT([$template])
# Checks for programs.
@@ -116,6 +130,7 @@
AC_ARG_WITH(pgsharedir, [ --with-pgsharedir=<dir> Location of the PostgreSQL share dir. E.g. postgresql.conf.sample ])
AC_ARG_WITH(netsnmp, [ --with-netsnmp=<dir> Enable snmp support <dir> is the location of net-snmp-config. ])
AC_ARG_WITH(perltools, [ --with-perltools=<dir> Location to install the perl management tools Default $PREFIX/bin. ])
+AC_ARG_WITH(docdir, [ --with-docdir=<dir> Location to install all the documentation Default is $PREFIX/doc. ])
#Our current path
SLONYPATH=`pwd`
@@ -125,6 +140,7 @@
ACX_LIBPQ()
ACX_LIBSNMP()
ACX_SLONYTOOLS()
+ACX_SLONYDOCS()
AC_SUBST(PGINCLUDEDIR, $PG_INCLUDEDIR)
AC_SUBST(PGINCLUDESERVERDIR, $PG_INCLUDESERVERDIR)
@@ -136,6 +152,7 @@
AC_SUBST(NETSNMP_CFLAGS, $NETSNMP_CFLAGS)
AC_SUBST(NETSNMP_AGENTLIBS, $NETSNMP_AGENTLIBS)
AC_SUBST(TOOLSBIN, $TOOLSBIN)
+AC_SUBST(DOCDIR, $DOCDIR)
AC_SUBST(SLONYPATH)
AC_SUBST(HOST_OS,$host_os)
@@ -159,8 +176,7 @@
SLON_AC_CHECK_DOCBOOK(4.2)
SLON_AC_PATH_DOCBOOK_STYLESHEETS
SLON_AC_PATH_COLLATEINDEX
-AC_CHECK_PROGS(SGMLSPL, sgmlspl)
-
+AC_SUBST(SGMLSPL, $SGMLSPL)
AC_CONFIG_FILES([
Makefile.global GNUmakefile
Index: configure
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/configure,v
retrieving revision 1.44
retrieving revision 1.45
diff -Lconfigure -Lconfigure -u -w -r1.44 -r1.45
--- configure
+++ configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for postgresql-slony1-engine HEAD_20050316.
+# Generated by GNU Autoconf 2.59 for postgresql-slony1-engine HEAD_20050323.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
@@ -267,8 +267,8 @@
# Identity of this package.
PACKAGE_NAME='postgresql-slony1-engine'
PACKAGE_TARNAME='postgresql-slony1-engine'
-PACKAGE_VERSION='HEAD_20050316'
-PACKAGE_STRING='postgresql-slony1-engine HEAD_20050316'
+PACKAGE_VERSION='HEAD_20050323'
+PACKAGE_STRING='postgresql-slony1-engine HEAD_20050323'
PACKAGE_BUGREPORT=''
ac_unique_file="src"
@@ -309,7 +309,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os enable_debug CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT PERL TAR LEX YACC SED LD YFLAGS LEXFLAGS HEAD_20050316 with_gnu_ld acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS CPP EGREP HAVE_POSIX_SIGNALS PGINCLUDEDIR PGINCLUDESERVERDIR PGLIBDIR PGPKGLIBDIR PGSHAREDIR PGBINDIR HAVE_NETSNMP NETSNMP_CFLAGS NETSNMP_AGENTLIBS TOOLSBIN SLONYPATH HOST_OS PORTNAME GROFF PS2PDF DJPEG PNMTOPS PGAUTODOC NSGMLS JADE have_docbook DOCBOOKSTYLE COLLATEINDEX SGMLSPL LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os enable_debug CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT PERL TAR LEX YACC SED LD YFLAGS LEXFLAGS HEAD_20050323 with_gnu_ld acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS CPP EGREP HAVE_POSIX_SIGNALS PGINCLUDEDIR PGINCLUDESERVERDIR PGLIBDIR PGPKGLIBDIR PGSHAREDIR PGBINDIR HAVE_NETSNMP NETSNMP_CFLAGS NETSNMP_AGENTLIBS TOOLSBIN DOCDIR SLONYPATH HOST_OS PORTNAME GROFF PS2PDF DJPEG PNMTOPS PGAUTODOC NSGMLS JADE have_docbook DOCBOOKSTYLE COLLATEINDEX SGMLSPL LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -782,7 +782,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures postgresql-slony1-engine HEAD_20050316 to adapt to many kinds of systems.
+\`configure' configures postgresql-slony1-engine HEAD_20050323 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -843,7 +843,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of postgresql-slony1-engine HEAD_20050316:";;
+ short | recursive ) echo "Configuration of postgresql-slony1-engine HEAD_20050323:";;
esac
cat <<\_ACEOF
@@ -865,6 +865,7 @@
--with-pgsharedir=<dir> Location of the PostgreSQL share dir. E.g. postgresql.conf.sample
--with-netsnmp=<dir> Enable snmp support <dir> is the location of net-snmp-config.
--with-perltools=<dir> Location to install the perl management tools Default $PREFIX/bin.
+ --with-docdir=<dir> Location to install all the documentation Default is $PREFIX/doc.
Some influential environment variables:
CC C compiler command
@@ -975,7 +976,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-postgresql-slony1-engine configure HEAD_20050316
+postgresql-slony1-engine configure HEAD_20050323
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -989,7 +990,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by postgresql-slony1-engine $as_me HEAD_20050316, which was
+It was created by postgresql-slony1-engine $as_me HEAD_20050323, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1423,7 +1424,9 @@
freebsd*) template=freebsd ;;
hpux*) template=hpux ;;
irix*) template=irix ;;
- linux*) template=linux ;;
+ linux*|gnu*|k*bsd*-gnu)
+ template=linux ;;
+ mingw*) template=win ;;
netbsd*) template=netbsd ;;
nextstep*) template=nextstep ;;
openbsd*) template=openbsd ;;
@@ -1441,6 +1444,29 @@
ultrix*) template=ultrix4 ;;
esac
+if test x"$template" = x"" ; then
+ { { echo "$as_me:$LINENO: error:
+*******************************************************************
+Slony-I has apparently not been ported to your platform yet.
+To try a manual configuration, look into the src/template directory
+for a similar platform and use the '--with-template=' option.
+
+Please also contact <slony1-general at gborg.postgresql.org> to see about
+rectifying this. Include the above 'checking host system type...'
+line.
+*******************************************************************" >&5
+echo "$as_me: error:
+*******************************************************************
+Slony-I has apparently not been ported to your platform yet.
+To try a manual configuration, look into the src/template directory
+for a similar platform and use the '--with-template=' option.
+
+Please also contact <slony1-general at gborg.postgresql.org> to see about
+rectifying this. Include the above 'checking host system type...'
+line.
+*******************************************************************" >&2;}
+ { (exit 1); exit 1; }; }
+fi
echo "$as_me:$LINENO: result: $template" >&5
echo "${ECHO_T}$template" >&6
@@ -5970,12 +5996,17 @@
HAVE_POSIX_SIGNALS=$slonac_cv_func_posix_signals
else
+ if x"$template" = xwin ; then
+ echo "$as_me:$LINENO: result: \"Skipping Error on win32\"" >&5
+echo "${ECHO_T}\"Skipping Error on win32\"" >&6
+ else
echo "$as_me:$LINENO: result: \"error\"" >&5
echo "${ECHO_T}\"error\"" >&6
{ { echo "$as_me:$LINENO: error: Slony requires a POSIX compatible signal interface." >&5
echo "$as_me: error: Slony requires a POSIX compatible signal interface." >&2;}
{ (exit 1); exit 1; }; }
fi
+ fi
@@ -6037,6 +6068,12 @@
withval="$with_perltools"
fi;
+
+# Check whether --with-docdir or --without-docdir was given.
+if test "${with_docdir+set}" = set; then
+ withval="$with_docdir"
+
+fi;
#Our current path
SLONYPATH=`pwd`
@@ -9215,6 +9252,37 @@
+
+
+
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ if test -n "${with_docdir}" ; then
+ if test ${with_docdir} != "yes"; then
+ LOCATION="${with_docdir}"
+ else
+ if test ${prefix} = "NONE"; then
+ LOCATION="${ac_default_prefix}/doc"
+ else
+ LOCATION="${prefix}/doc"
+ fi
+ fi
+ fi
+ if test x"${LOCATION}" != x; then
+ DOCDIR="${LOCATION}"
+ fi
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
PGINCLUDEDIR=$PG_INCLUDEDIR
PGINCLUDESERVERDIR=$PG_INCLUDESERVERDIR
@@ -9235,6 +9303,8 @@
TOOLSBIN=$TOOLSBIN
+DOCDIR=$DOCDIR
+
HOST_OS=$host_os
@@ -9697,46 +9767,7 @@
done
fi
-for ac_prog in sgmlspl
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_SGMLSPL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$SGMLSPL"; then
- ac_cv_prog_SGMLSPL="$SGMLSPL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_SGMLSPL="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
-fi
-fi
-SGMLSPL=$ac_cv_prog_SGMLSPL
-if test -n "$SGMLSPL"; then
- echo "$as_me:$LINENO: result: $SGMLSPL" >&5
-echo "${ECHO_T}$SGMLSPL" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- test -n "$SGMLSPL" && break
-done
-
+SGMLSPL=$SGMLSPL
ac_config_files="$ac_config_files Makefile.global GNUmakefile"
@@ -10105,7 +10136,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by postgresql-slony1-engine $as_me HEAD_20050316, which was
+This file was extended by postgresql-slony1-engine $as_me HEAD_20050323, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -10165,7 +10196,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-postgresql-slony1-engine config.status HEAD_20050316
+postgresql-slony1-engine config.status HEAD_20050323
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -10380,7 +10411,7 @@
s, at LD@,$LD,;t t
s, at YFLAGS@,$YFLAGS,;t t
s, at LEXFLAGS@,$LEXFLAGS,;t t
-s, at HEAD_20050316@,$HEAD_20050316,;t t
+s, at HEAD_20050323@,$HEAD_20050323,;t t
s, at with_gnu_ld@,$with_gnu_ld,;t t
s, at acx_pthread_config@,$acx_pthread_config,;t t
s, at PTHREAD_CC@,$PTHREAD_CC,;t t
@@ -10399,6 +10430,7 @@
s, at NETSNMP_CFLAGS@,$NETSNMP_CFLAGS,;t t
s, at NETSNMP_AGENTLIBS@,$NETSNMP_AGENTLIBS,;t t
s, at TOOLSBIN@,$TOOLSBIN,;t t
+s, at DOCDIR@,$DOCDIR,;t t
s, at SLONYPATH@,$SLONYPATH,;t t
s, at HOST_OS@,$HOST_OS,;t t
s, at PORTNAME@,$PORTNAME,;t t
Index: libc.m4
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/config/libc.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lconfig/libc.m4 -Lconfig/libc.m4 -u -w -r1.1 -r1.2
--- config/libc.m4
+++ config/libc.m4
@@ -11,8 +11,12 @@
AC_DEFINE(HAVE_POSIX_SIGNALS,, [Define to 1 if you have the POSIX signal interface.])
HAVE_POSIX_SIGNALS=$slonac_cv_func_posix_signals
else
+ if x"$template" = xwin ; then
+ AC_MSG_RESULT("Skipping Error on win32")
+ else
AC_MSG_RESULT("error")
AC_MSG_ERROR(Slony requires a POSIX compatible signal interface.)
fi
+ fi
AC_SUBST(HAVE_POSIX_SIGNALS)]
)# SLON_AC_FUNC_POSIX_SIGNALS
Index: docs.m4
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/config/docs.m4,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lconfig/docs.m4 -Lconfig/docs.m4 -u -w -r1.4 -r1.5
--- config/docs.m4
+++ config/docs.m4
@@ -18,3 +18,25 @@
AC_DEFUN([SLON_AC_PROG_PGAUTODOC],
[AC_CHECK_PROGS([PGAUTODOC],[postgresql_autodoc pgautodoc])])
+
+AC_DEFUN([ACX_SLONYDOCS], [
+ AC_REQUIRE([AC_CANONICAL_HOST])
+ AC_LANG_SAVE
+ AC_LANG_C
+ if test -n "${with_docdir}" ; then
+ if test ${with_docdir} != "yes"; then
+ LOCATION="${with_docdir}"
+ else
+ if test ${prefix} = "NONE"; then
+ LOCATION="${ac_default_prefix}/doc"
+ else
+ LOCATION="${prefix}/doc"
+ fi
+ fi
+ fi
+ if test x"${LOCATION}" != x; then
+ DOCDIR="${LOCATION}"
+ fi
+ AC_LANG_RESTORE
+]) dnl ACX_SLONYDOCS
+
Index: bookindex.sgml
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/bookindex.sgml,v
retrieving revision 1.3
retrieving revision 1.4
diff -Ldoc/adminguide/bookindex.sgml -Ldoc/adminguide/bookindex.sgml -u -w -r1.3 -r1.4
--- doc/adminguide/bookindex.sgml
+++ doc/adminguide/bookindex.sgml
@@ -19,17 +19,136 @@
sequences of pages into a range.
-->
+<indexdiv><title>C</title>
+
+<indexentry>
+ <primaryie>cluster_name configuration parameter,
+ <ulink url="slon-config-connection.html" role="AEN2950">Connection settings</ulink>
+ </primaryie>
+</indexentry>
+
+<indexentry>
+ <primaryie>configuration
+ </primaryie>
+ <secondaryie>of the slon daemon,
+ <ulink url="runtime-config.html" role="AEN2853">Run-time Configuration</ulink>
+ </secondaryie>
+</indexentry>
+
+<indexentry>
+ <primaryie>conn_info configuration parameter,
+ <ulink url="slon-config-connection.html" role="AEN2959">Connection settings</ulink>
+ </primaryie>
+</indexentry>
+
+</indexdiv>
+<indexdiv><title>D</title>
+
+<indexentry>
+ <primaryie>desired_sync_time configuration parameter,
+ <ulink url="slon-config-interval.html" role="AEN3017">Event Tuning</ulink>
+ </primaryie>
+</indexentry>
+
+</indexdiv>
+<indexdiv><title>L</title>
+
+<indexentry>
+ <primaryie>log_level configuration parameter,
+ <ulink url="runtime-config.html#SLON-CONFIG-LOGGING" role="AEN2902">Logging</ulink>
+ </primaryie>
+</indexentry>
+
+<indexentry>
+ <primaryie>log_pid configuration parameter,
+ <ulink url="runtime-config.html#SLON-CONFIG-LOGGING" role="AEN2911">Logging</ulink>
+ </primaryie>
+</indexentry>
+
+<indexentry>
+ <primaryie>log_timestamp configuration parameter,
+ <ulink url="runtime-config.html#SLON-CONFIG-LOGGING" role="AEN2920">Logging</ulink>
+ </primaryie>
+</indexentry>
+
+<indexentry>
+ <primaryie>log_timestamp_format configuration parameter,
+ <ulink url="runtime-config.html#SLON-CONFIG-LOGGING" role="AEN2929">Logging</ulink>
+ </primaryie>
+</indexentry>
+
+</indexdiv>
+<indexdiv><title>P</title>
+
+<indexentry>
+ <primaryie>pid_file configuration parameter,
+ <ulink url="runtime-config.html#SLON-CONFIG-LOGGING" role="AEN2938">Logging</ulink>
+ </primaryie>
+</indexentry>
+
+</indexdiv>
<indexdiv><title>S</title>
<indexentry>
<primaryie>slon,
- <ulink url="app-slon.html" role="app-slon">slon</ulink>
+ <ulink url="slon.html" role="slon">slon</ulink>
</primaryie>
</indexentry>
<indexentry>
<primaryie>slonik,
- <ulink url="app-slonik.html" role="app-slonik">slonik</ulink>
+ <ulink url="slonik.html" role="slonik">slonik</ulink>
+ </primaryie>
+</indexentry>
+
+<indexentry>
+ <primaryie>sql_on_connection configuration parameter,
+ <ulink url="slon-config-connection.html" role="AEN2968">Connection settings</ulink>
+ </primaryie>
+</indexentry>
+
+<indexentry>
+ <primaryie>sync_group_maxsize configuration parameter,
+ <ulink url="slon-config-interval.html" role="AEN2998">Event Tuning</ulink>
+ </primaryie>
+</indexentry>
+
+<indexentry>
+ <primaryie>sync_interval configuration parameter,
+ <ulink url="slon-config-interval.html" role="AEN2980">Event Tuning</ulink>
+ </primaryie>
+</indexentry>
+
+<indexentry>
+ <primaryie>sync_interval_timeout configuration parameter,
+ <ulink url="slon-config-interval.html" role="AEN2989">Event Tuning</ulink>
+ </primaryie>
+</indexentry>
+
+<indexentry>
+ <primaryie>syslog configuration parameter,
+ <ulink url="runtime-config.html#SLON-CONFIG-LOGGING" role="AEN2875">Logging</ulink>
+ </primaryie>
+</indexentry>
+
+<indexentry>
+ <primaryie>syslog_facility configuration parameter,
+ <ulink url="runtime-config.html#SLON-CONFIG-LOGGING" role="AEN2884">Logging</ulink>
+ </primaryie>
+</indexentry>
+
+<indexentry>
+ <primaryie>syslog_ident configuration parameter,
+ <ulink url="runtime-config.html#SLON-CONFIG-LOGGING" role="AEN2893">Logging</ulink>
+ </primaryie>
+</indexentry>
+
+</indexdiv>
+<indexdiv><title>V</title>
+
+<indexentry>
+ <primaryie>vac_frequency configuration parameter,
+ <ulink url="slon-config-interval.html" role="AEN3007">Event Tuning</ulink>
</primaryie>
</indexentry>
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/adminguide/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -Ldoc/adminguide/Makefile -Ldoc/adminguide/Makefile -u -w -r1.9 -r1.10
--- doc/adminguide/Makefile
+++ doc/adminguide/Makefile
@@ -40,13 +40,18 @@
DEFAULTSECTION := $(sqlmansect_dummy)
man: slony.sgml $(ALLSGML)
+ifdef NSGMLS
+ifdef SGMLSPL
+ifdef D2MSCRIPT
$(NSGMLS) $(NSGMLS_FLAGS) $< | $(SGMLSPL) $(D2MSCRIPT) --lowercase --section $(DEFAULTSECTION) --date "`date '+%Y-%m-%d'`"
# One more time, to resolve cross-references
$(NSGMLS) $(NSGMLS_FLAGS) $< | $(SGMLSPL) $(D2MSCRIPT) --lowercase --section $(DEFAULTSECTION) --date "`date '+%Y-%m-%d'`"
mkdir -p man1 man$(DEFAULTSECTION)
mv *.1 man1/
mv *.$(DEFAULTSECTION) man$(DEFAULTSECTION)/
-
+endif
+endif
+endif
##
## HTML
@@ -54,6 +59,30 @@
all: html man
+installdirs:
+ifdef DOCDIR
+ $(mkinstalldirs) $(DOCDIR)/sgml
+ $(mkinstalldirs) $(DOCDIR)/html
+ $(mkinstalldirs) $(DOCDIR)/man1
+ $(mkinstalldirs) $(DOCDIR)/man$(DEFAULTSECTION)
+endif
+
+install: all man installdirs
+ifdef DOCDIR
+ for file in $(ALLSGML) ; do \
+ $(INSTALL_DATA) $$file $(DOCDIR)/sgml; \
+ done
+ for file in $(wildcard man1/*) ; do \
+ $(INSTALL_DATA) $$file $(DOCDIR)/man1 ;\
+ done
+ for file in $(wildcard man$(DEFAULTSECTION)/*) ; do \
+ $(INSTALL_DATA) $$file $(DOCDIR)/man$(DEFAULTSECTION) ;\
+ done
+ for file in $(wildcard *.html) stylesheet.css ; do \
+ $(INSTALL_DATA) $$file $(DOCDIR)/html ;\
+ done
+endif
+
.PHONY: html
ifndef JADE
@@ -61,7 +90,7 @@
@echo "You must have jade installed to build the documentation." && exit;
else
html: slony.sgml $(ALLSGML) stylesheet.dsl
- @rm -f *.html
+ @rm -f *.html ;\
$(JADE) $(JADEFLAGS) $(SGMLINCLUDE) $(CATALOG) -d stylesheet.dsl -ioutput-html -t sgml $<
ifeq ($(vpath_build), yes)
@cp $(srcdir)/stylesheet.css .
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/concept/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -Ldoc/concept/Makefile -Ldoc/concept/Makefile -u -w -r1.6 -r1.7
--- doc/concept/Makefile
+++ doc/concept/Makefile
@@ -11,12 +11,8 @@
slony_top_builddir = ../..
include $(slony_top_builddir)/Makefile.global
-GROFF = groff
GOPTS = -U -t -p -ms -mpspic
-PS2PDF = ps2pdf
-DJPEG = djpeg
-PNMTOPS = pnmtops
# IMG_WID = 1799
# IMG_HT = 1440
IMG_WID = 900
@@ -46,7 +42,17 @@
all-txt: $(TXT)
-install installdirs: all
+installdirs:
+ifdef DOCDIR
+ $(mkinstalldirs) $(DOCDIR)/concept
+endif
+
+install: installdirs all
+ifdef DOCDIR
+ for file in $(PS) $(PDF) $(TXT) Slon_$(IMG_WID)x$(IMG_HT).jpg ; do \
+ $(INSTALL_DATA) $$file $(DOCDIR)/concept ; \
+ done
+endif
clean distclean maintainer-clean:
rm -f $(PS) $(PDF) $(TXT) tmp.* Slon.eps
@@ -56,9 +62,12 @@
Slony-I-concept.txt: $(SRC_CONCEPT)
Slon.eps: Slon_$(IMG_WID)x$(IMG_HT).jpg
- djpeg $< | pnmtops -rle -noturn >$@
+ifdef DJPEG
+ $(DJPEG) $< | $(PNMTOPS) -rle -noturn >$@
+endif
%.ps: %.nr
+ifdef GROFF
@echo ".XS 1" > tmp.idx
@echo "dummy" >>tmp.idx
@echo ".XE" >>tmp.idx
@@ -73,8 +82,10 @@
$(GROFF) $(GOPTS) $< >$@ ; \
done
@rm -f tmp.*
+endif
%.txt: %.nr
+ifdef GROFF
@echo ".XS 1" > tmp.idx
@echo "dummy" >>tmp.idx
@echo ".XE" >>tmp.idx
@@ -89,9 +100,12 @@
$(GROFF) -Tlatin1 $(GOPTS) $< >$@ ; \
done
@rm -f tmp.*
+endif
%.pdf: %.ps
+ifdef PS2PDF
$(PS2PDF) $<
+endif
distdir: $(DISTFILES)
mkdir $(distdir)/$(subdir)
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/howto/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -Ldoc/howto/Makefile -Ldoc/howto/Makefile -u -w -r1.6 -r1.7
--- doc/howto/Makefile
+++ doc/howto/Makefile
@@ -18,35 +18,16 @@
cp $$file $(distdir)/$(subdir)/$$file ; \
done
-# Here's a somewhat fiddly way of generating documentation for the set
-# of functions and tables using Rod Taylor's postgresql_autodoc tool
-# schemadoc is actually likely to be checked into CVS, so you don't
-# _always_ want to recreate it
+all:
-# Assumptions:
-# - it's safe to create database "schemadoc" on a local database
-# - my "createlang" hides in a bit of an odd place
-# - "make clean" should really drop the database
-# - you need to manually drop the database before regenning the docs
+installdirs:
+ifdef DOCDIR
+ $(mkinstalldirs) $(DOCDIR)/howto
+endif
-BASEDIR=$(slony_top_builddir)/src/backend
-BASESQL=$(BASEDIR)/slony1_base.sql
-BASEFUNS=$(BASEDIR)/slony1_funcs.sql
-XIDSQL=localxid.sql
-# Might want to add version-specific functions, too...
-TEMPDB=schemadoc
-TEMPSCHEMA=schemadoc
-CREATELANG=$(pgbindir)/createlang # That's how it is for me...
-AUTODOC=postgresql_autodoc
-
-schemadoc.html: $(BASESQL) $(BASEFUNS) $(XIDDIR)
- $(pgbindir)/createdb $(TEMPDB) && ( \
- $(CREATELANG) plpgsql $(TEMPDB) && \
- echo "drop schema $(TEMPSCHEMA);create schema $(TEMPSCHEMA);" | $(pgbindir)/psql $(TEMPDB) && \
- cat $(XIDSQL) $(BASEFUNS) $(BASESQL) | sed -e "s/@NAMESPACE@/$(TEMPSCHEMA)/g" -e "s/@CLUSTERNAME@/$(TEMPSCHEMA)/g" | $(pgbindir)/psql $(TEMPDB) && \
- $(AUTODOC) -d $(TEMPDB) -s $(TEMPSCHEMA) -t html ;\
- @$(pgbindir)/dropdb $(TEMPDB) >/dev/null 2>&1
- ) || echo "unable to createdb $(TEMPDB)"
-
-clean:
- @$(pgbindir)/dropdb $(TEMPDB) || echo "unable to dropdb $(TEMPDB)"
+install: all installdirs
+ifdef DOCDIR
+ for file in $(wildcard *.txt) $(wildcard *.html ); do \
+ $(INSTALL_DATA) $$file $(DOCDIR)/howto ; \
+ done
+endif
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/implementation/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -Ldoc/implementation/Makefile -Ldoc/implementation/Makefile -u -w -r1.5 -r1.6
--- doc/implementation/Makefile
+++ doc/implementation/Makefile
@@ -11,12 +11,8 @@
slony_top_builddir = ../..
include $(slony_top_builddir)/Makefile.global
-GROFF = groff
GOPTS = -U -t -p -ms -mpspic
-PS2PDF = ps2pdf
-DJPEG = djpeg
-PNMTOPS = pnmtops
# IMG_WID = 1799
# IMG_HT = 1440
IMG_WID = 900
@@ -44,7 +40,17 @@
all-txt: $(TXT)
-install installdirs: all
+installdirs:
+ifdef DOCDIR
+ $(mkinstalldirs) $(DOCDIR)/implementation
+endif
+
+install: all installdirs
+ifdef DOCDIR
+ for file in $(PS) $(PDF) $(TXT) Slon.eps Slon_$(IMG_WID)x$(IMG_HT).jpg ; do \
+ $(INSTALL_DATA) $$file $(DOCDIR)/implementation ; \
+ done
+endif
clean distclean maintainer-clean:
rm -f $(PS) $(PDF) $(TXT) tmp.* Slon.eps
@@ -54,9 +60,12 @@
Slony-I-implementation.txt: $(SRC_CONCEPT)
Slon.eps: Slon_$(IMG_WID)x$(IMG_HT).jpg
- djpeg $< | pnmtops -rle -noturn >$@
+ifdef DJPEG
+ $(DJPEG) $< | $(PNMTOPS) -rle -noturn >$@
+endif
%.ps: %.nr
+ifdef GROFF
@echo ".XS 1" > tmp.idx
@echo "dummy" >>tmp.idx
@echo ".XE" >>tmp.idx
@@ -71,8 +80,10 @@
$(GROFF) $(GOPTS) $< >$@ ; \
done
@rm -f tmp.*
+endif
%.txt: %.nr
+ifdef GROFF
@echo ".XS 1" > tmp.idx
@echo "dummy" >>tmp.idx
@echo ".XE" >>tmp.idx
@@ -87,9 +98,12 @@
$(GROFF) -Tlatin1 $(GOPTS) $< >$@ ; \
done
@rm -f tmp.*
+endif
%.pdf: %.ps
+ifdef PS2PDF
$(PS2PDF) $<
+endif
distdir: $(DISTFILES)
mkdir $(distdir)/$(subdir)
Index: Makefile.win
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/makefiles/Makefile.win,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lmakefiles/Makefile.win -Lmakefiles/Makefile.win -u -w -r1.4 -r1.5
--- makefiles/Makefile.win
+++ makefiles/Makefile.win
@@ -14,7 +14,7 @@
AROPT = crs
DLSUFFIX = .dll
CFLAGS_SL =
-override CFLAGS += -I/usr/include/postgresql/server -DCYGWIN=1
+override CFLAGS += -DCYGWIN=1
%.dll: %.o
$(DLLTOOL) --export-all --output-def $*.def $<
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/doc/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -Ldoc/Makefile -Ldoc/Makefile -u -w -r1.10 -r1.11
--- doc/Makefile
+++ doc/Makefile
@@ -11,13 +11,11 @@
slony_top_builddir = ..
include $(slony_top_builddir)/Makefile.global
-SUBDIRS = concept implementation howto adminguide support
+SUBDIRS = concept implementation howto adminguide
DISTFILES = Makefile
-all install installdirs:
-
-clean distclean maintainer-clean:
+all clean distclean maintainer-clean install installdirs:
@for subdir in $(SUBDIRS) ; do \
$(MAKE) -C $$subdir $@ ; \
done
Index: slon.c
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/src/slon/slon.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -Lsrc/slon/slon.c -Lsrc/slon/slon.c -u -w -r1.47 -r1.48
--- src/slon/slon.c
+++ src/slon/slon.c
@@ -82,8 +82,10 @@
pid_t pid;
extern int optind;
extern char *optarg;
- struct sigaction act;
+#ifndef CYGWIN
+ struct sigaction act;
+#endif
InitializeConfOptions();
while ((c = getopt(argc, argv, "f:a:d:s:t:g:c:p:o:hv")) != EOF)
@@ -671,15 +673,20 @@
slon_log(SLON_DEBUG2, "slon: begin signal handler setup\n");
+#ifndef (CYGWIN)
act.sa_handler = &sighandler;
sigemptyset(&act.sa_mask);
act.sa_flags = SA_NODEFER;
if (sigaction(SIGHUP,&act,NULL) < 0)
+#else
+ if (signal(SIGHUP,sighandler) == SIG_ERR)
+#endif
{
slon_log(SLON_FATAL, "slon: SIGHUP signal handler setup failed -(%d) %s\n", errno,strerror(errno));
slon_exit(-1);
}
+
if (signal(SIGINT,sighandler) == SIG_ERR)
{
slon_log(SLON_FATAL, "slon: SIGINT signal handler setup failed -(%d) %s\n", errno,strerror(errno));
- Previous message: [Slony1-commit] By cbbrowne: Fixed makefile to build HTML output if you just type 'make'
- Next message: [Slony1-commit] By darcyb: From Andreas Pflug <pgadmin@pse-consulting.de>: In
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Slony1-commit mailing list