NotificationsYou must be signed in to change notification settings
Fork5
Star26

Commite88cd16

committed

Merge branch 'PGPRO9_5_ptrack_arman' into PGPRO9_5

2 parents5297b70 +bf99c52 commite88cd16Copy full SHA for e88cd16

File tree

53 files changed

+1905

-434

lines changed

contrib/pg_arman
- Makefile
- README.md
- backup.c
- catalog.c
- data.c
- dir.c
- doc
  - Makefile
  - pg_arman.md
- expected
- fetch.c
- parsexlog.c
- pg_arman.c
- pg_arman.h
- pgut
  - pgut.c
  - pgut.h
- restore.c
- show.c
- sql
- util.c
- validate.c
src
- backend
  - access
    - heap
      - Makefile
      - ptrack.c
    - transam
  - catalog
    - storage.c
  - storage
    - buffer
      - bufmgr.c
    - lmgr
      - lmgr.c
    - smgr
      - smgr.c
  - utils
    - init
      - postinit.c
    - misc
      - guc.c
- common
  - relpath.c
- include
  - access
    - ptrack.h
    - xlog_fn.h
  - catalog
    - pg_proc.h
  - common
    - relpath.h
  - miscadmin.h
  - storage
- pgpro-upgrade

Some content is hidden

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

53 files changed

+1905

-434

lines changed

`‎contrib/pg_arman/Makefile`

Lines changed: 13 additions & 44 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,26 +16,16 @@ OBJS = backup.o \`
`16`	`16`	`datapagemap.o\`
`17`	`17`	`parsexlog.o\`
`18`	`18`	`xlogreader.o\`
	`19`	`+streamutil.o\`
	`20`	`+receivelog.o\`
`19`	`21`	`pgut/pgut.o\`
`20`	`22`	`pgut/pgut-port.o`
`21`	`23`
`22`		`-DOCS = doc/pg_arman.txt`
`23`		`-`
`24`	`24`	`EXTRA_CLEAN = datapagemap.c datapagemap.h xlogreader.c`
`25`	`25`
`26`	`26`	`REGRESS = init option show delete backup restore`
`27`	`27`
`28`		`-# asciidoc and xmlto are present, so install the html documentation and man`
`29`		`-# pages as well. html is part of the vanilla documentation. Man pages need a`
`30`		`-# special handling at installation.`
`31`		`-ifneq ($(ASCIIDOC),)`
`32`		`-ifneq ($(XMLTO),)`
`33`		`-man_DOCS = doc/pg_arman.1`
`34`		`-DOCS += doc/pg_arman.html doc/README.html`
`35`		`-endif# XMLTO`
`36`		`-endif# ASCIIDOC`
`37`		`-`
`38`		`-all: docs datapagemap.h pg_arman`
	`28`	`+all: datapagemap.h receivelog.h streamutil.h pg_arman`
`39`	`29`	`ifdef$(USE_PGXS)`
`40`	`30`	`PG_CONFIG = pg_config`
`41`	`31`	`PGXS :=$(shell$(PG_CONFIG) --pgxs)`
`@@ -55,11 +45,9 @@ top_builddir=../..`
`55`	`45`	`include$(top_builddir)/src/Makefile.global`
`56`	`46`	`include$(top_srcdir)/contrib/contrib-global.mk`
`57`	`47`	`endif`
`58`		`-PG_CPPFLAGS = -I$(libpq_srcdir)`
	`48`	`+PG_CPPFLAGS = -I$(libpq_srcdir) ${PTHREAD_CFLAGS}`
`59`	`49`	`overrideCPPFLAGS := -DFRONTEND$(CPPFLAGS)$(PG_CPPFLAGS)`
`60`		`-PG_LIBS =$(libpq_pgport)`
`61`		`-`
`62`		`-`
	`50`	`+PG_LIBS =$(libpq_pgport) ${PTHREAD_CFLAGS}`
`63`	`51`
`64`	`52`	`envtest:`
`65`	`53`	`: top_srcdir=$(top_srcdir)`
`@@ -74,33 +62,14 @@ datapagemap.c: % : $(top_srcdir)/src/bin/pg_rewind/%`
`74`	`62`	`rm -f$@&&$(LN_S)$<.`
`75`	`63`	`datapagemap.h:% :$(top_srcdir)/src/bin/pg_rewind/%`
`76`	`64`	`rm -f&&$(LN_S)$<.`
`77`		`-`
`78`		`-# Part related to documentation`
`79`		`-# Compile documentation as well is ASCIIDOC and XMLTO are defined`
`80`		`-ifneq ($(ASCIIDOC),)`
`81`		`-ifneq ($(XMLTO),)`
`82`		`-docs:`
`83`		`-$(MAKE) -C doc/`
`84`		`-`
`85`		`-# Special handling for man pages, they need to be in a dedicated folder`
`86`		`-install: install-man`
`87`		`-`
`88`		`-install-man:`
`89`		`-$(MKDIR_P)'$(DESTDIR)$(mandir)/man1/'`
`90`		`-$(INSTALL_DATA)$(man_DOCS)'$(DESTDIR)$(mandir)/man1/'`
`91`		`-else`
`92`		`-docs:`
`93`		`-@echo"No docs to build"`
`94`		`-endif# XMLTO`
`95`		`-else`
`96`		`-docs:`
`97`		`-@echo"No docs to build"`
`98`		`-endif# ASCIIDOC`
`99`		`-`
`100`		`-# Clean up documentation as well`
`101`		`-clean: clean-docs`
`102`		`-clean-docs:`
`103`		`-$(MAKE) -C doc/ clean`
	`65`	`+receivelog.c:% :$(top_srcdir)/src/bin/pg_basebackup/%`
	`66`	`+rm -f&&$(LN_S)$<.`
	`67`	`+receivelog.h:% :$(top_srcdir)/src/bin/pg_basebackup/%`
	`68`	`+rm -f&&$(LN_S)$<.`
	`69`	`+streamutil.c:% :$(top_srcdir)/src/bin/pg_basebackup/%`
	`70`	`+rm -f&&$(LN_S)$<.`
	`71`	`+streamutil.h:% :$(top_srcdir)/src/bin/pg_basebackup/%`
	`72`	`+rm -f&&$(LN_S)$<.`
`104`	`73`
`105`	`74`	`# Disable make check`
`106`	`75`	`check:`

`‎contrib/pg_arman/READMErenamed to‎contrib/pg_arman/README.md`

Lines changed: 1 addition & 19 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,25 +38,7 @@ pg_arman has been tested on Linux and Unix-based platforms.`
`38`	`38`	`Documentation`
`39`	`39`	`-------------`
`40`	`40`
`41`		`-All the documentation is maintained in doc/ as text file, that is then`
`42`		`-fetched by asciidoc to generate automatically man pages and html`
`43`		`-documentation.`
`44`		`-`
`45`		`-In order to generate the documentation, the variables XMLTO and ASCIIDOC`
`46`		`-need to be set to proper values indicating where are located the binaries`
`47`		`-of respectively xmlto and asciidoc. An example of build is as follows:`
`48`		`-`
`49`		`- make top_srcdir=<path to PostgreSQL source tree> \`
`50`		`- ASCIIDOC=asciidoc XMLTO=xmlto`
`51`		`-`
`52`		`-They could as well be set as environment variables for development`
`53`		`-purposes.`
`54`		`-`
`55`		`-On OSX, it is necessary to set XML_CATALOG_FILES to point to the correct`
`56`		`-xml catalogs. In the case of an environment with Homebrew after having`
`57`		`-install xmlto and asciidoc:`
`58`		`-`
`59`		`- export XML_CATALOG_FILES="/usr/local/etc/xml/catalog"`
	`41`	`+All the documentation you can find[here](doc/pg_arman.md).`
`60`	`42`
`61`	`43`	`Regression tests`
`62`	`44`	`----------------`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commite88cd16

File tree

53 files changed

Some content is hidden

53 files changed

`‎contrib/pg_arman/Makefile`

`‎contrib/pg_arman/READMErenamed to‎contrib/pg_arman/README.md`

0 commit comments