Merge lp://qastaging/~tplavcic/percona-xtrabackup/bug1156209-2.3 into lp://qastaging/percona-xtrabackup/2.3
Proposed by
Tomislav Plavcic
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Alexey Kopytov | ||||
| Approved revision: | no longer in the source branch. | ||||
| Merged at revision: | 5066 | ||||
| Proposed branch: | lp://qastaging/~tplavcic/percona-xtrabackup/bug1156209-2.3 | ||||
| Merge into: | lp://qastaging/percona-xtrabackup/2.3 | ||||
| Diff against target: |
546 lines (+100/-321) 12 files modified
.bzrignore (+1/-1) cmake/build_configurations/xtrabackup_release.cmake (+2/-0) storage/innobase/xtrabackup/.bzrignore (+1/-1) storage/innobase/xtrabackup/CMakeLists.txt (+1/-0) storage/innobase/xtrabackup/doc/Makefile (+0/-143) storage/innobase/xtrabackup/doc/make.bat (+0/-170) storage/innobase/xtrabackup/doc/source/CMakeLists.txt (+80/-0) storage/innobase/xtrabackup/utils/build-binary.sh (+1/-1) storage/innobase/xtrabackup/utils/debian/control (+4/-2) storage/innobase/xtrabackup/utils/debian/percona-xtrabackup-23.install (+1/-0) storage/innobase/xtrabackup/utils/debian/rules (+1/-1) storage/innobase/xtrabackup/utils/percona-xtrabackup.spec (+8/-2) |
||||
| To merge this branch: | bzr merge lp://qastaging/~tplavcic/percona-xtrabackup/bug1156209-2.3 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Alexey Kopytov (community) | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2015-01-16.
Description of the change
Man pages were added before but they were not build and added into packages/tarball.
Changes were made to our build nodes to support sphinx-build and also made changes in cmake and packages to generate man pages on build and include them into packages.
Removed: Makefile and make.bat from utils/doc directory.
Added -DWITH_MAN_PAGES option which is turned on by default.
Added -DWITH_HTML_DOCS, -DWITH_LATEX_DOCS, -DWITH_PDF_DOCS options which are turned off by default.
To post a comment you must log in.
Revision history for this message
| Tomislav Plavcic (tplavcic) wrote | # |
Revision history for this message
| Tomislav Plavcic (tplavcic) wrote | # |
Revision history for this message
| Tomislav Plavcic (tplavcic) wrote | # |
Revision history for this message
| Alexey Kopytov (akopytov) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Test packages are available here:
http://
http://
nevermind the yellow build for 2.3 for centos5-32 it was some connection problem and it was successful when restarted.