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

Commitb150906

Browse files
committed
We don't need config.status substituting anything into Gen_fmgrtab.sh, we
just pass in CPP and AWK via the environment from the Makefile.
1 parent9e8d591 commitb150906

File tree

6 files changed

+21
-37
lines changed

6 files changed

+21
-37
lines changed

‎configure‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8902,7 +8902,6 @@ trap 'rm -fr `echo "GNUmakefile
89028902
src/Makefile.global
89038903
src/backend/port/Makefile
89048904
src/backend/catalog/genbki.sh
8905-
src/backend/utils/Gen_fmgrtab.sh
89068905
src/include/version.h
89078906
src/test/regress/GNUmakefile
89088907
src/include/config.h"| sed"s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
@@ -9073,7 +9072,6 @@ CONFIG_FILES=\${CONFIG_FILES-"GNUmakefile
90739072
src/Makefile.global
90749073
src/backend/port/Makefile
90759074
src/backend/catalog/genbki.sh
9076-
src/backend/utils/Gen_fmgrtab.sh
90779075
src/include/version.h
90789076
src/test/regress/GNUmakefile
90799077
"}

‎configure.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1198,7 +1198,6 @@ AC_OUTPUT(
11981198
src/Makefile.global
11991199
src/backend/port/Makefile
12001200
src/backend/catalog/genbki.sh
1201-
src/backend/utils/Gen_fmgrtab.sh
12021201
src/include/version.h
12031202
src/test/regress/GNUmakefile
12041203
)

‎src/GNUmakefile.in‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.54 2000/06/28 18:29:13 petere Exp $
10+
# $Header: /cvsroot/pgsql/src/Attic/GNUmakefile.in,v 1.55 2000/07/01 21:16:42 petere Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

@@ -54,7 +54,6 @@ distclean maintainer-clean:
5454
-$(MAKE) -C utils clean
5555
-$(MAKE) -C backend clean
5656
rm -f backend/port/Makefile backend/catalog/genbki.sh \
57-
backend/utils/Gen_fmgrtab.sh \
5857
backend/port/tas.s backend/port/dynloader.c
5958
-$(MAKE) -C interfaces $@
6059
-$(MAKE) -C bin $@

‎src/Makefile.global.in‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.83 2000/07/0115:02:16 petere Exp $
10+
# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.84 2000/07/0121:16:42 petere Exp $
1111
#
1212
# NOTES
1313
# Essentially all Postgres make files include this file and use the
@@ -183,6 +183,7 @@ LN_S= @LN_S@
183183
TAR= @tar@
184184
GZCAT= @GZCAT@
185185
PERL = @PERL@
186+
AWK = @AWK@
186187
CXX=@CXX@
187188
CXXFLAGS=@CXXFLAGS@ @INCLUDES@
188189

‎src/backend/utils/Gen_fmgrtab.sh.in‎renamed to ‎src/backend/utils/Gen_fmgrtab.sh‎

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
#
1010
#
1111
# IDENTIFICATION
12-
# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh.in,v 1.25 2000/06/0716:26:48 petere Exp $
12+
# $Header: /cvsroot/pgsql/src/backend/utils/Attic/Gen_fmgrtab.sh,v 1.15 2000/07/01 21:16:44 petere Exp $
1313
#
1414
#-------------------------------------------------------------------------
1515

1616
CMDNAME=`basename$0`
1717

18-
AWK="@AWK@"
19-
CPP="@CPP@"
18+
:${AWK='awk'}
19+
:${CPP='cc -E'}
2020

2121
cleanup(){
22-
[ x"$noclean"!= x"t" ]&& rm -f"$CPPTMPFILE""$RAWFILE""$OIDSFILE.tmp""$TABLEFILE.tmp"
22+
[ x"$noclean"!= x"t" ]&& rm -f"$CPPTMPFILE""$RAWFILE"
2323
}
2424

2525
BKIOPTS=
@@ -46,6 +46,10 @@ do
4646
echo"Usage:"
4747
echo"$CMDNAME [ -D define [...] ]"
4848
echo
49+
echo"The environment variables CPP and AWK determine which C"
50+
echo"preprocessor and Awk program to use. The defaults are"
51+
echo"\`cc -E' and\`awk'."
52+
echo
4953
echo"Report bugs to <pgsql-bugs@postgresql.org>."
5054
exit 0
5155
;;
@@ -119,7 +123,7 @@ cpp_define=`echo $OIDSFILE | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTU
119123
#
120124
# Generate fmgroids.h
121125
#
122-
cat>"${OIDSFILE}.tmp"<<FuNkYfMgRsTuFf
126+
cat>"$OIDSFILE"<<FuNkYfMgRsTuFf
123127
/*-------------------------------------------------------------------------
124128
*
125129
*$OIDSFILE
@@ -160,15 +164,15 @@ FuNkYfMgRsTuFf
160164
tr'abcdefghijklmnopqrstuvwxyz''ABCDEFGHIJKLMNOPQRSTUVWXYZ'<$RAWFILE| \
161165
$AWK'
162166
BEGIN{ OFS = ""; }
163-
{ if (seenit[$(NF-1)]++ == 0) print "#define F_", $(NF-1), " ", $1; }'>>"${OIDSFILE}.tmp"
167+
{ if (seenit[$(NF-1)]++ == 0) print "#define F_", $(NF-1), " ", $1; }'>>"$OIDSFILE"
164168

165169
if [$?-ne 0 ];then
166170
cleanup
167171
echo"$CMDNAME failed"
168172
exit 1
169173
fi
170174

171-
cat>>"${OIDSFILE}.tmp"<<FuNkYfMgRsTuFf
175+
cat>>"$OIDSFILE"<<FuNkYfMgRsTuFf
172176
173177
#endif/*$cpp_define */
174178
FuNkYfMgRsTuFf
@@ -182,7 +186,7 @@ FuNkYfMgRsTuFf
182186
# this table definition as a separate C file that won't need to include any
183187
# "real" declarations for those functions!
184188
#
185-
cat>"${TABLEFILE}.tmp"<<FuNkYfMgRtAbStUfF
189+
cat>"$TABLEFILE"<<FuNkYfMgRtAbStUfF
186190
/*-------------------------------------------------------------------------
187191
*
188192
*$TABLEFILE
@@ -213,7 +217,7 @@ cat > "${TABLEFILE}.tmp" <<FuNkYfMgRtAbStUfF
213217
214218
FuNkYfMgRtAbStUfF
215219

216-
$AWK'{ print "extern Datum", $(NF-1), "(PG_FUNCTION_ARGS);"; }'$RAWFILE>>"${TABLEFILE}.tmp"
220+
$AWK'{ print "extern Datum", $(NF-1), "(PG_FUNCTION_ARGS);"; }'$RAWFILE>>"$TABLEFILE"
217221

218222
if [$?-ne 0 ];then
219223
cleanup
@@ -222,7 +226,7 @@ if [ $? -ne 0 ]; then
222226
fi
223227

224228

225-
cat>>"${TABLEFILE}.tmp"<<FuNkYfMgRtAbStUfF
229+
cat>>"$TABLEFILE"<<FuNkYfMgRtAbStUfF
226230
227231
const FmgrBuiltin fmgr_builtins[] = {
228232
FuNkYfMgRtAbStUfF
@@ -239,15 +243,15 @@ $AWK 'BEGIN {
239243
}
240244
{ printf (" { %d, \"%s\", %d, %s, %s, %s },\n"), \
241245
$1, $(NF-1), $9, Strict[$8], OldStyle[$4], $(NF-1)
242-
}'$RAWFILE>>"${TABLEFILE}.tmp"
246+
}'$RAWFILE>>"$TABLEFILE"
243247

244248
if [$?-ne 0 ];then
245249
cleanup
246250
echo"$CMDNAME failed"
247251
exit 1
248252
fi
249253

250-
cat>>"${TABLEFILE}.tmp"<<FuNkYfMgRtAbStUfF
254+
cat>>"$TABLEFILE"<<FuNkYfMgRtAbStUfF
251255
/* dummy entry is easier than getting rid of comma after last real one */
252256
/* (not that there has ever been anything wrong with *having* a
253257
comma after the last field in an array initializer) */
@@ -259,22 +263,5 @@ const int fmgr_nbuiltins = (sizeof(fmgr_builtins) / sizeof(FmgrBuiltin)) - 1;
259263
260264
FuNkYfMgRtAbStUfF
261265

262-
263-
264-
# Now we check if the files fmgroids.h and fmgrtab.c already exist and
265-
# are identical to what we would make them. In that case we avoid
266-
# writing our new version, so as to not cause unnecessary recompilation
267-
# because of changed timestamps.
268-
269-
forfilein"$OIDSFILE""$TABLEFILE";do
270-
iftest -f"$file"&& cmp -s"$file""${file}.tmp";then
271-
echo"$file unchanged"
272-
rm -f"${file}.tmp"
273-
else
274-
mv"${file}.tmp""$file"
275-
fi
276-
done
277-
278-
279266
cleanup
280267
exit 0

‎src/backend/utils/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Makefile for utils
55
#
66
# IDENTIFICATION
7-
# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.15 2000/06/17 00:09:43 petere Exp $
7+
# $Header: /cvsroot/pgsql/src/backend/utils/Makefile,v 1.16 2000/07/01 21:16:44 petere Exp $
88
#
99
#-------------------------------------------------------------------------
1010

@@ -34,7 +34,7 @@ submake:
3434

3535

3636
fmgroids.hfmgrtab.c: Gen_fmgrtab.sh$(SRCDIR)/include/catalog/pg_proc.h
37-
$(SHELL)$(SHOPTS) Gen_fmgrtab.sh$(SRCDIR)/include/catalog/pg_proc.h
37+
CPP='$(CPP)' AWK='$(AWK)'$(SHELL)$<$(SRCDIR)/include/catalog/pg_proc.h
3838

3939

4040
clean:

0 commit comments

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