Eliminate need for cpp-from-stdin by using a temp file.

This commit is contained in:
Tom Lane 1998-10-28 19:38:47 +00:00
parent 1f27facc90
commit a787b88e3c
2 changed files with 14 additions and 9 deletions

View File

@ -10,7 +10,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/catalog/Attic/genbki.sh.in,v 1.1 1998/10/14 16:05:01 thomas Exp $ # $Header: /cvsroot/pgsql/src/backend/catalog/Attic/genbki.sh.in,v 1.2 1998/10/28 19:38:46 tgl Exp $
# #
# NOTES # NOTES
# non-essential whitespace is removed from the generated file. # non-essential whitespace is removed from the generated file.
@ -18,7 +18,7 @@
# end can be changed into another awk script or something smarter.. # end can be changed into another awk script or something smarter..
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
trap "rm -f /tmp/genbki.tmp" 0 1 2 3 15 trap "rm -f /tmp/genbki.tmp /tmp/genbkitmp.c" 0 1 2 3 15
# make sure it is empty # make sure it is empty
>/tmp/genbki.tmp >/tmp/genbki.tmp
@ -261,8 +261,9 @@ END {
reln_open = 0; reln_open = 0;
} }
} }
' | \ ' >/tmp/genbkitmp.c
@CPP@ @CPPSTDIN@ $BKIOPTS | \
@CPP@ $BKIOPTS /tmp/genbkitmp.c | \
sed -e '/^[ ]*$/d' \ sed -e '/^[ ]*$/d' \
-e 's/[ ][ ]*/ /g' || exit 1 -e 's/[ ][ ]*/ /g' || exit 1

View File

@ -8,7 +8,7 @@
# #
# #
# IDENTIFICATION # IDENTIFICATION
# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.11 1998/10/26 01:04:04 tgl Exp $ # $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.12 1998/10/28 19:38:47 tgl Exp $
# #
# NOTES # NOTES
# Passes any -D options on to cpp prior to generating the list # Passes any -D options on to cpp prior to generating the list
@ -40,6 +40,7 @@ done
INFILE=$1 INFILE=$1
RAWFILE=fmgr.raw RAWFILE=fmgr.raw
CPPTMPFILE=fmgrtmp.c
HFILE=fmgr.h HFILE=fmgr.h
TABCFILE=fmgrtab.c TABCFILE=fmgrtab.c
@ -62,11 +63,14 @@ sed -e 's/^.*OID[^=]*=[^0-9]*//' \
-e 's/[ ]*).*$//' | \ -e 's/[ ]*).*$//' | \
awk ' awk '
/^#/ { print; next; } /^#/ { print; next; }
$4 == "11" { print; next; }' | \ $4 == "11" { print; next; }' > $CPPTMPFILE
@CPP@ @CPPSTDIN@ $BKIOPTS | \
@CPP@ $BKIOPTS $CPPTMPFILE | \
egrep '^[0-9]' | \ egrep '^[0-9]' | \
sort -n > $RAWFILE sort -n > $RAWFILE
rm -f $CPPTMPFILE
# #
# Generate fmgr.h # Generate fmgr.h
# #
@ -79,7 +83,7 @@ cat > $HFILE <<FuNkYfMgRsTuFf
* *
* Copyright (c) 1994, Regents of the University of California * Copyright (c) 1994, Regents of the University of California
* *
* $Id: Gen_fmgrtab.sh.in,v 1.11 1998/10/26 01:04:04 tgl Exp $ * $Id: Gen_fmgrtab.sh.in,v 1.12 1998/10/28 19:38:47 tgl Exp $
* *
* NOTES * NOTES
* ****************************** * ******************************
@ -193,7 +197,7 @@ cat > $TABCFILE <<FuNkYfMgRtAbStUfF
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.11 1998/10/26 01:04:04 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.12 1998/10/28 19:38:47 tgl Exp $
* *
* NOTES * NOTES
* *