git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e7b3349)
Add new make targets "world", "install-world" and "installcheck-world" to build,...
author Andrew Dunstan <andrew@dunslane.net>
2010年1月28日 23:59:52 +0000 (23:59 +0000)
committer Andrew Dunstan <andrew@dunslane.net>
2010年1月28日 23:59:52 +0000 (23:59 +0000)
In addition to everything built installed and tested by all, install and installcheck targets, these build HTML Docs,
build and test contrib, and test PLs and ECPG.

GNUmakefile.in patch | blob | blame | history
Makefile patch | blob | blame | history
doc/src/sgml/contrib.sgml patch | blob | blame | history
doc/src/sgml/installation.sgml patch | blob | blame | history

diff --git a/GNUmakefile.in b/GNUmakefile.in
index d934b19d9515e00955eb575a32766e1a5f9ce5a3..aa4af2afd2c20a123ed3e07cd493161c20ef4ff2 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -1,7 +1,7 @@
#
# PostgreSQL top level makefile
#
-# $PostgreSQL: pgsql/GNUmakefile.in,v 1.55 2009年11月03日 21:28:10 petere Exp $
+# $PostgreSQL: pgsql/GNUmakefile.in,v 1.56 2010年01月28日 23:59:52 adunstan Exp $
#
subdir =
@@ -14,6 +14,13 @@ all:
$(MAKE) -C config all
@echo "All of PostgreSQL successfully made. Ready to install."
+world:
+ $(MAKE) -C doc html
+ $(MAKE) -C src all
+ $(MAKE) -C config all
+ $(MAKE) -C contrib all
+ @echo "PostgreSQL, contrib and HTML documentation successfully made. Ready to install."
+
html man:
$(MAKE) -C doc $@
@@ -23,6 +30,13 @@ install:
$(MAKE) -C config $@
@echo "PostgreSQL installation complete."
+install-world:
+ $(MAKE) -C doc install
+ $(MAKE) -C src install
+ $(MAKE) -C config install
+ $(MAKE) -C contrib install
+ @echo "PostgreSQL and contrib installation complete."
+
installdirs uninstall coverage:
$(MAKE) -C doc $@
$(MAKE) -C src $@
@@ -60,6 +74,12 @@ check: all
check installcheck installcheck-parallel:
$(MAKE) -C src/test $@
+installcheck-world:
+ $(MAKE) -C src/test installcheck
+ $(MAKE) -C src/pl installcheck
+ $(MAKE) -C interfaces/ecpg installcheck
+ $(MAKE) -C contrib installcheck
+
GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
./config.status $@
diff --git a/Makefile b/Makefile
index bbf5de05a629b92afe537775ed778af01ffc808d..b5b2ea54c063bf49035b63248dbdff8dfc61651e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@
# GNUmakefile won't exist yet, so we catch that case as well.
-all check install installdirs installcheck installcheck-parallel uninstall clean distclean maintainer-clean dist distcheck:
+all check install installdirs installcheck installcheck-parallel uninstall clean distclean maintainer-clean dist distcheck world install-world installcheck-world:
@if [ ! -f GNUmakefile ] ; then \
echo "You need to run the 'configure' program first. See the file"; \
echo "'INSTALL' for installation instructions." ; \
diff --git a/doc/src/sgml/contrib.sgml b/doc/src/sgml/contrib.sgml
index 2895e6c170fcace2e6a4de00d4e6a73c961bf026..3ed2023b1b5374a1d2fdcb17d0c5c9865280b20f 100644 (file)
--- a/doc/src/sgml/contrib.sgml
+++ b/doc/src/sgml/contrib.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/contrib.sgml,v 1.15 2009年11月18日 21:57:56 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/contrib.sgml,v 1.16 2010年01月28日 23:59:52 adunstan Exp $ -->
<appendix id="contrib">
<title>Additional Supplied Modules</title>
@@ -16,7 +16,9 @@
<para>
When building from the source distribution, these modules are not built
- automatically. You can build and install all of them by running:
+ automatically, unless you build the "world" target
+ (see <xref linkend="build">).
+ You can build and install all of them by running:
<screen>
<userinput>gmake</userinput>
<userinput>gmake install</userinput>
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index 23d120b8a327690c3e7531d97652665c6e050135..003d172b01e17cb2126e3093de91541cfaef7d23 100644 (file)
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.339 2010年01月22日 22:50:03 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.340 2010年01月28日 23:59:52 adunstan Exp $ -->
<chapter id="installation">
<title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -1526,7 +1526,7 @@ su - postgres
</para>
</step>
- <step>
+ <step id="build">
<title>Build</title>
<para>
@@ -1539,6 +1539,18 @@ su - postgres
hardware. The last line displayed should be:
<screen>
All of PostgreSQL is successfully made. Ready to install.
+</screen>
+ </para>
+
+ <para>
+ If you want to build everything that can be built, including the HTML
+ documentation and the Additional Modules, type instead:
+<screen>
+<userinput>gmake world</userinput>
+</screen>
+ The last line displayed should be:
+<screen>
+PostgreSQL, contrib and HTML documentation successfully made. Ready to install.
</screen>
</para>
</step>
@@ -1594,6 +1606,13 @@ All of PostgreSQL is successfully made. Ready to install.
be granted.
</para>
+ <para>
+ If you built the world above, type instead:
+<screen>
+<userinput>gmake install-world</userinput>
+</screen>
+ </para>
+
<para>
You can use <literal>gmake install-strip</literal> instead of
<literal>gmake install</literal> to strip the executable files and
This is the main PostgreSQL git repository.
RSS Atom

AltStyle によって変換されたページ (->オリジナル) /