Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitbe5bfd5

Browse files
committed
Put in a new FAQ
Merged in Dr. George's src/bin tree (possibly broke monitor/psql in process)
1 parentd1724d6 commitbe5bfd5

File tree

9 files changed

+386
-525
lines changed

9 files changed

+386
-525
lines changed

‎src/bin/Makefile‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,29 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.1.1.1 1996/07/09 06:22:11 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.2 1996/07/23 03:01:58 scrappy Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

14+
MKDIR=../mk
15+
-include$(MKDIR)/../Makefile.global
16+
1417
#
1518
# C programs
1619
#
1720
SUBDIR= monitor pg_id pg_version psql pg_dump
1821

19-
ifeq ($(USE_TCL), true)
20-
SUBDIR += pgtclsh
21-
endif
22-
2322
#
2423
# Shell scripts
25-
#
24+
#
2625
SUBDIR+= cleardbdir createdb createuser destroydb destroyuser initdb
2726

27+
#
28+
# TCL/TK programs
29+
#
30+
ifeq ($(USE_TCL), true)
31+
SUBDIR += pgtclsh
32+
endif
2833

29-
include../mk/postgres.subdir.mk
34+
include$(MKDIR)/postgres.subdir.mk
3035

‎src/bin/initdb/initdb.sh‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#
1313
#
1414
# IDENTIFICATION
15-
# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.3 1996/07/20 07:33:36 scrappy Exp $
15+
# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.4 1996/07/23 03:03:19 scrappy Exp $
1616
#
1717
#-------------------------------------------------------------------------
1818

@@ -33,10 +33,6 @@ FILESDIR=$PGDATA/files
3333
PATH=$BINDIR:$PATH
3434
export PATH
3535

36-
# OPENLINK Added an fsync option to postmaster
37-
# REQUIRES: pg95 compiled with -DOPENLINK_PATCHES, see README_OPENLINK
38-
# FSYNC=-F
39-
4036
CMDNAME=`basename$0`
4137

4238
# ----------------
@@ -63,9 +59,9 @@ done
6359
# ----------------
6460
iftest"$debug" -eq 1
6561
then
66-
BACKENDARGS="-boot -C$FSYNC -d"
62+
BACKENDARGS="-boot -C-F -d"
6763
else
68-
BACKENDARGS="-boot -C$FSYNC -Q"
64+
BACKENDARGS="-boot -C-F -Q"
6965
fi
7066

7167

@@ -220,9 +216,7 @@ then
220216
echo"vacuuming template1"
221217
fi
222218

223-
echo"vacuum"| postgres$FSYNC -Q template1> /dev/null
219+
echo"vacuum"| postgres-F -Q template1> /dev/null
224220
fi
225221

226222
rm -f /tmp/create.$$
227-
228-
sync

‎src/bin/monitor/monitor.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/bin/monitor/Attic/monitor.c,v 1.4 1996/07/2302:26:41 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/bin/monitor/Attic/monitor.c,v 1.5 1996/07/2303:03:24 scrappy Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -20,7 +20,7 @@
2020
#ifndefWIN32
2121
#include<unistd.h>
2222
#endif
23-
#ifdefPORTNAME_sparc_solaris
23+
#if defined(PORTNAME_sparc_solaris)|| defined(PORTNAME_i386_solaris)
2424
#include<netdb.h>/* for MAXHOSTNAMELEN on some */
2525
#endif
2626
#include<sys/types.h>

‎src/bin/pg4_dump/common.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include<stdlib.h>
1717
#include<stdio.h>
1818
#include<sys/param.h>/* for MAXHOSTNAMELEN on most */
19-
#ifdefPORTNAME_sparc_solaris
19+
#if defined(PORTNAME_sparc_solaris)|| defined(PORTNAME_i386_solaris)
2020
#include<netdb.h>/* for MAXHOSTNAMELEN on some */
2121
#endif
2222

‎src/bin/pg4_dump/pg4_dump.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include<stdlib.h>
2929
#include<stdio.h>
3030
#include<sys/param.h>/* for MAXHOSTNAMELEN on most */
31-
#ifdefPORTNAME_sparc_solaris
31+
#if defined(PORTNAME_sparc_solaris)|| defined(PORTNAME_i386_solaris)
3232
#include<netdb.h>/* for MAXHOSTNAMELEN on some */
3333
#endif
3434

‎src/bin/pgtclsh/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.1.1.1 1996/07/09 06:22:15 scrappy Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/pgtclsh/Attic/Makefile,v 1.2 1996/07/23 03:03:36 scrappy Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

1414
MKDIR=../../mk
1515
include$(MKDIR)/postgres.mk
1616
include ../Makefile.global
1717

18-
CFLAGS+= -I$(TCL_INCDIR) -I$(TK_INCDIR)
18+
CFLAGS+= -I$(TCL_INCDIR) -I$(TK_INCDIR) -I$(X11_INCDIR) -I$(srcdir)/libpgtcl
1919

2020
# try to find libpgtcl.a in either directory
2121
LIBPGTCL= -L$(srcdir)/libpgtcl/$(objdir) -L$(LIBDIR) -lpgtcl
@@ -26,7 +26,7 @@ pgtclsh: $(objdir)/pgtclAppInit.o
2626

2727
pgtksh:$(objdir)/pgtkAppInit.o
2828
$(CC)$(CDEBUG) -o$(objdir)/$(@F)$(objdir)/pgtkAppInit.o\
29-
$(LIBPGTCL)$(LIBPQ) -L$(TCL_LIBDIR) -L$(TK_LIBDIR)\
29+
$(LIBPGTCL)$(LIBPQ) -L$(TCL_LIBDIR) -L$(TK_LIBDIR)-L$(X11_LIBDIR)\
3030
$(TK_LIB)$(TCL_LIB) -lX11 -lm$(LD_ADD)
3131

3232
install::localobj pgtclsh pgtksh

‎src/bin/pgtclsh/pgtclAppInit.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,11 @@ Tcl_AppInit(interp)
109109
* then no user-specific startup file will be run under any conditions.
110110
*/
111111

112+
#if (TCL_MAJOR_VERSION <=7)&& (TCL_MINOR_VERSION<5)
112113
tcl_RcFileName="~/.tclshrc";
114+
#else
115+
Tcl_SetVar(interp,"tcl_rcFileName","~/.tclshrc",TCL_GLOBAL_ONLY);
116+
#endif
117+
113118
returnTCL_OK;
114119
}

‎src/bin/pgtclsh/pgtkAppInit.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,11 @@ Tcl_AppInit(interp)
112112
* then no user-specific startup file will be run under any conditions.
113113
*/
114114

115+
#if (TCL_MAJOR_VERSION <=7)&& (TCL_MINOR_VERSION<5)
115116
tcl_RcFileName="~/.wishrc";
117+
#else
118+
Tcl_SetVar(interp,"tcl_rcFileName","~/.wishrc",TCL_GLOBAL_ONLY);
119+
#endif
120+
116121
returnTCL_OK;
117122
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp