Skip to content

Commit 6f878d9

Browse files
herclogonherclogon
authored
Merge pull request #1 from postgres/master
Update from base
2 parents d435542 + 0b59b0e commit 6f878d9

File tree

4,551 files changed

+1114919
-747461
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,551 files changed

+1114919
-747461
lines changed

‎.dir-locals.el

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
(fill-column . 78)
66
(indent-tabs-mode . t)
77
(tab-width . 4)))
8-
(dsssl-mode . ((indent-tabs-mode . nil)))
9-
(nxml-mode . ((indent-tabs-mode . nil)))
8+
(nxml-mode . ((fill-column . 78)
9+
(indent-tabs-mode . nil)))
1010
(perl-mode . ((perl-indent-level . 4)
11-
(perl-continued-statement-offset . 4)
11+
(perl-continued-statement-offset . 2)
1212
(perl-continued-brace-offset . 4)
1313
(perl-brace-offset . 0)
1414
(perl-brace-imaginary-offset . 0)

‎.gitattributes

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,9 @@ README.* conflict-marker-size=32
1313

1414
# Certain data files that contain special whitespace, and other special cases
1515
*.data -whitespace
16-
contrib/tsearch2/sql/tsearch2.sql whitespace=space-before-tab,blank-at-eof,-blank-at-eol
1716
contrib/pgcrypto/sql/pgp-armor.sql whitespace=-blank-at-eol
1817
doc/bug.template whitespace=space-before-tab,-blank-at-eof,blank-at-eol
1918
src/backend/catalog/sql_features.txt whitespace=space-before-tab,blank-at-eof,-blank-at-eol
20-
src/backend/tsearch/hunspell_sample.affix whitespace=-blank-at-eof
2119

2220
# Test output files that contain extra whitespace
2321
*.out -whitespace

‎.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
# Global excludes across all subdirectories
22
*.o
33
*.obj
4+
*.bc
45
*.so
56
*.so.[0-9]
67
*.so.[0-9].[0-9]
8+
*.so.[0-9].[0-9][0-9]
79
*.sl
810
*.sl.[0-9]
911
*.sl.[0-9].[0-9]
12+
*.sl.[0-9].[0-9][0-9]
1013
*.dylib
1114
*.dll
1215
*.exp
@@ -19,8 +22,9 @@ objfiles.txt
1922
*.gcda
2023
*.gcov
2124
*.gcov.out
22-
lcov.info
25+
lcov*.info
2326
coverage/
27+
coverage-html-stamp
2428
*.vcproj
2529
*.vcxproj
2630
win32ver.rc

‎COPYRIGHT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PostgreSQL Database Management System
22
(formerly known as Postgres, then as Postgres95)
33

4-
Portions Copyright (c) 1996-2015, PostgreSQL Global Development Group
4+
Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
55

66
Portions Copyright (c) 1994, The Regents of the University of California
77

‎GNUmakefile.in

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ install-world:
3939
# build src/ before contrib/
4040
install-world-contrib-recurse: install-world-src-recurse
4141

42-
$(call recurse,installdirs uninstall coverage init-po update-po,doc src config)
42+
$(call recurse,installdirs uninstall init-po update-po,doc src config)
4343

44-
$(call recurse,distprep,doc src config contrib)
44+
$(call recurse,distprep coverage,doc src config contrib)
4545

4646
# clean, distclean, etc should apply to contrib too, even though
4747
# it's not built by default
@@ -63,7 +63,7 @@ distclean maintainer-clean:
6363
@rm -rf autom4te.cache/
6464
rm -f config.cache config.log config.status GNUmakefile
6565

66-
check check-tests installcheck installcheck-parallel installcheck-tests:
66+
check check-tests installcheck installcheck-parallel installcheck-tests: submake-generated-headers
6767
$(MAKE) -C src/test/regress $@
6868

6969
$(call recurse,check-world,src/test src/pl src/interfaces/ecpg contrib src/bin,check)
@@ -78,7 +78,6 @@ GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
7878

7979
distdir = postgresql-$(VERSION)
8080
dummy = =install=
81-
garbage = =* "#"* ."#"* *~* *.orig *.rej core postgresql-*
8281

8382
dist: $(distdir).tar.gz $(distdir).tar.bz2
8483
rm -rf $(distdir)

‎HISTORY

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Release notes for all versions of PostgreSQL can be found on-line at
2-
http://www.postgresql.org/docs/current/static/release.html
2+
https://www.postgresql.org/docs/current/static/release.html
33

44
Distribution file sets include release notes for their version and preceding
55
versions. Visit the file doc/src/sgml/html/release.html in an HTML browser.

‎Makefile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
# GNUmakefile won't exist yet, so we catch that case as well.
1212

1313

14+
# AIX make defaults to building *every* target of the first rule. Start with
15+
# a single-target, empty rule to make the other targets non-default.
16+
all:
17+
1418
all check install installdirs installcheck installcheck-parallel uninstall clean distclean maintainer-clean dist distcheck world check-world install-world installcheck-world:
1519
@if [ ! -f GNUmakefile ] ; then \
1620
echo "You need to run the 'configure' program first. See the file"; \
@@ -29,6 +33,7 @@ all check install installdirs installcheck installcheck-parallel uninstall clean
2933
\
3034
if [ x"$${GMAKE+set}" = xset ]; then \
3135
echo "Using GNU make found at $${GMAKE}"; \
36+
unset MAKEFLAGS; unset MAKELEVEL; \
3237
$${GMAKE} $@ ; \
3338
else \
3439
echo "You must use GNU make to build PostgreSQL." ; \

‎README

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ and functions. This distribution also contains C language bindings.
1111

1212
PostgreSQL has many language interfaces, many of which are listed here:
1313

14-
http://www.postgresql.org/download
14+
https://www.postgresql.org/download
1515

1616
See the file INSTALL for instructions on how to build and install
1717
PostgreSQL. That file also lists supported operating systems and
@@ -23,5 +23,5 @@ distribution; it can be read as described in the installation
2323
instructions.
2424

2525
The latest version of this software may be obtained at
26-
http://www.postgresql.org/download/. For more information look at our
27-
web site located at http://www.postgresql.org/.
26+
https://www.postgresql.org/download/. For more information look at our
27+
web site located at https://www.postgresql.org/.

‎README.git

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ git and so will not be present if you are using a git checkout.
66

77
If you are using a git checkout, you can view the most recent installation
88
instructions at:
9-
http://www.postgresql.org/docs/devel/static/installation.html
9+
https://www.postgresql.org/docs/devel/static/installation.html
1010

1111
Users compiling from git will also need compatible versions of Bison, Flex,
1212
and Perl, as discussed in the install documentation. These programs are not

‎aclocal.m4

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
dnl aclocal.m4
22
m4_include([config/ac_func_accept_argtypes.m4])
3+
m4_include([config/ax_prog_perl_modules.m4])
34
m4_include([config/ax_pthread.m4])
45
m4_include([config/c-compiler.m4])
56
m4_include([config/c-library.m4])
67
m4_include([config/docbook.m4])
78
m4_include([config/general.m4])
89
m4_include([config/libtool.m4])
10+
m4_include([config/llvm.m4])
911
m4_include([config/perl.m4])
12+
m4_include([config/pkg.m4])
1013
m4_include([config/programs.m4])
1114
m4_include([config/python.m4])
1215
m4_include([config/tcl.m4])

0 commit comments

Comments
 (0)