1
=== modified file '.bzrignore'
2
--- .bzrignore	2014-09-15 08:52:36 +0000
3
+++ .bzrignore	2015-02-06 14:10:42 +0000
4
@@ -3149,5 +3149,5 @@
5
3149
./storage/innobase/xtrabackup/src/CMakeCache.txt
3149
./storage/innobase/xtrabackup/src/CMakeCache.txt
6
3150
./storage/innobase/xtrabackup/src/xtrabackup_version.h
3150
./storage/innobase/xtrabackup/src/xtrabackup_version.h
7
3151
./storage/innobase/xtrabackup/CMakeCache.txt
3151
./storage/innobase/xtrabackup/CMakeCache.txt
9
3152
./storage/innobase/xtrabackup/doc/build/
3152
./storage/innobase/xtrabackup/doc/source/build/
10
3153
./storage/innobase/xtrabackup/doc/source/percona-theme/
3153
./storage/innobase/xtrabackup/doc/source/percona-theme/
11
3154
3154
12
=== modified file 'cmake/build_configurations/xtrabackup_release.cmake'
13
--- cmake/build_configurations/xtrabackup_release.cmake	2014-09-14 04:53:30 +0000
14
+++ cmake/build_configurations/xtrabackup_release.cmake	2015-02-06 14:10:42 +0000
15
@@ -52,6 +52,8 @@
16
52
52
17
53
    # Enable fast mutexes on Linux
53
    # Enable fast mutexes on Linux
18
54
    OPTION(WITH_FAST_MUTEXES "" ON)
54
    OPTION(WITH_FAST_MUTEXES "" ON)
19
55
    # Enable building man pages on Linux by default
20
56
    OPTION(WITH_MAN_PAGES "" ON)
21
55
  ENDIF()
57
  ENDIF()
22
56
58
23
57
ENDIF()
59
ENDIF()
24
58
60
25
=== modified file 'storage/innobase/xtrabackup/.bzrignore'
26
--- storage/innobase/xtrabackup/.bzrignore	2014-03-04 07:58:39 +0000
27
+++ storage/innobase/xtrabackup/.bzrignore	2015-02-06 14:10:42 +0000
28
@@ -8,4 +8,4 @@
29
8
percona-theme*
8
percona-theme*
30
9
doc/source/percona-theme
9
doc/source/percona-theme
31
10
doc/source/percona-theme/
10
doc/source/percona-theme/
33
11
doc/build
11
doc/source/build
34
12
12
35
=== modified file 'storage/innobase/xtrabackup/CMakeLists.txt'
36
--- storage/innobase/xtrabackup/CMakeLists.txt	2014-05-19 12:26:12 +0000
37
+++ storage/innobase/xtrabackup/CMakeLists.txt	2015-02-06 14:10:42 +0000
38
@@ -25,3 +25,4 @@
39
25
25
40
26
ADD_SUBDIRECTORY(src)
26
ADD_SUBDIRECTORY(src)
41
27
ADD_SUBDIRECTORY(test)
27
ADD_SUBDIRECTORY(test)
42
28
ADD_SUBDIRECTORY(doc/source)
43
28
29
44
=== removed file 'storage/innobase/xtrabackup/doc/Makefile'
45
--- storage/innobase/xtrabackup/doc/Makefile	2014-03-26 07:39:36 +0000
46
+++ storage/innobase/xtrabackup/doc/Makefile	1970-01-01 00:00:00 +0000
47
@@ -1,143 +0,0 @@
48
1
# Makefile for Sphinx documentation
49
2
#
50
3
51
4
# You can set these variables from the command line.
52
5
SPHINXOPTS    =
53
6
SPHINXBUILD   = sphinx-build
54
7
PAPER         =
55
8
BUILDDIR      = build
56
9
57
10
# Internal variables.
58
11
PAPEROPT_a4     = -D latex_paper_size=a4
59
12
PAPEROPT_letter = -D latex_paper_size=letter
60
13
ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
61
14
62
15
.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest
63
16
64
17
help:
65
18
	@echo "Please use \`make <target>' where <target> is one of"
66
19
	@echo "  html       to make standalone HTML files"
67
20
	@echo "  dirhtml    to make HTML files named index.html in directories"
68
21
	@echo "  singlehtml to make a single large HTML file"
69
22
	@echo "  pickle     to make pickle files"
70
23
	@echo "  json       to make JSON files"
71
24
	@echo "  htmlhelp   to make HTML files and a HTML help project"
72
25
	@echo "  qthelp     to make HTML files and a qthelp project"
73
26
	@echo "  devhelp    to make HTML files and a Devhelp project"
74
27
	@echo "  epub       to make an epub"
75
28
	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
76
29
	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
77
30
	@echo "  text       to make text files"
78
31
	@echo "  man        to make manual pages"
79
32
	@echo "  changes    to make an overview of all changed/added/deprecated items"
80
33
	@echo "  linkcheck  to check all external links for integrity"
81
34
	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
82
35
83
36
clean:
84
37
	-rm -rf $(BUILDDIR)/*
85
38
86
39
html:
87
40
	@echo "Downloading percona-theme ..."
88
41
	@wget -O percona-theme.tar.gz http://percona.com/docs/theme/percona-xtrabackup/2.2
89
42
	@echo "Extracting theme."
90
43
	@tar -zxf percona-theme.tar.gz
91
44
	@rm -rf source/percona-theme
92
45
	@mv percona-theme source/percona-theme
93
46
	@rm percona-theme.tar.gz
94
47
	@echo "Building html doc"
95
48
	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
96
49
	@echo
97
50
	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
98
51
99
52
offhtml:
100
53
	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
101
54
	@echo
102
55
	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
103
56
104
57
dirhtml:
105
58
	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
106
59
	@echo
107
60
	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
108
61
109
62
singlehtml:
110
63
	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
111
64
	@echo
112
65
	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
113
66
114
67
pickle:
115
68
	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
116
69
	@echo
117
70
	@echo "Build finished; now you can process the pickle files."
118
71
119
72
json:
120
73
	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
121
74
	@echo
122
75
	@echo "Build finished; now you can process the JSON files."
123
76
124
77
htmlhelp:
125
78
	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
126
79
	@echo
127
80
	@echo "Build finished; now you can run HTML Help Workshop with the" \
128
81
	      ".hhp project file in $(BUILDDIR)/htmlhelp."
129
82
130
83
qthelp:
131
84
	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
132
85
	@echo
133
86
	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
134
87
	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
135
88
	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/PerconaXtraBackup.qhcp"
136
89
	@echo "To view the help file:"
137
90
	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/PerconaXtraBackup.qhc"
138
91
139
92
devhelp:
140
93
	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
141
94
	@echo
142
95
	@echo "Build finished."
143
96
	@echo "To view the help file:"
144
97
	@echo "# mkdir -p $$HOME/.local/share/devhelp/PerconaXtraBackup"
145
98
	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/PerconaXtraBackup"
146
99
	@echo "# devhelp"
147
100
148
101
epub:
149
102
	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
150
103
	@echo
151
104
	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
152
105
153
106
latex:
154
107
	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
155
108
	@echo
156
109
	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
157
110
	@echo "Run \`make' in that directory to run these through (pdf)latex" \
158
111
	      "(use \`make latexpdf' here to do that automatically)."
159
112
160
113
latexpdf:
161
114
	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
162
115
	@echo "Running LaTeX files through pdflatex..."
163
116
	make -C $(BUILDDIR)/latex all-pdf
164
117
	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
165
118
166
119
text:
167
120
	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
168
121
	@echo
169
122
	@echo "Build finished. The text files are in $(BUILDDIR)/text."
170
123
171
124
man:
172
125
	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
173
126
	@echo
174
127
	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
175
128
176
129
changes:
177
130
	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
178
131
	@echo
179
132
	@echo "The overview file is in $(BUILDDIR)/changes."
180
133
181
134
linkcheck:
182
135
	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
183
136
	@echo
184
137
	@echo "Link check complete; look for any errors in the above output " \
185
138
	      "or in $(BUILDDIR)/linkcheck/output.txt."
186
139
187
140
doctest:
188
141
	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
189
142
	@echo "Testing of doctests in the sources finished, look at the " \
190
143
	      "results in $(BUILDDIR)/doctest/output.txt."
191
144
0
192
=== removed file 'storage/innobase/xtrabackup/doc/make.bat'
193
--- storage/innobase/xtrabackup/doc/make.bat	2011-07-07 05:32:50 +0000
194
+++ storage/innobase/xtrabackup/doc/make.bat	1970-01-01 00:00:00 +0000
195
@@ -1,170 +0,0 @@
196
1
@ECHO OFF
197
2
198
3
REM Command file for Sphinx documentation
199
4
200
5
if "%SPHINXBUILD%" == "" (
201
6
	set SPHINXBUILD=sphinx-build
202
7
)
203
8
set BUILDDIR=build
204
9
set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% source
205
10
if NOT "%PAPER%" == "" (
206
11
	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
207
12
)
208
13
209
14
if "%1" == "" goto help
210
15
211
16
if "%1" == "help" (
212
17
	:help
213
18
	echo.Please use `make ^<target^>` where ^<target^> is one of
214
19
	echo.  html       to make standalone HTML files
215
20
	echo.  dirhtml    to make HTML files named index.html in directories
216
21
	echo.  singlehtml to make a single large HTML file
217
22
	echo.  pickle     to make pickle files
218
23
	echo.  json       to make JSON files
219
24
	echo.  htmlhelp   to make HTML files and a HTML help project
220
25
	echo.  qthelp     to make HTML files and a qthelp project
221
26
	echo.  devhelp    to make HTML files and a Devhelp project
222
27
	echo.  epub       to make an epub
223
28
	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
224
29
	echo.  text       to make text files
225
30
	echo.  man        to make manual pages
226
31
	echo.  changes    to make an overview over all changed/added/deprecated items
227
32
	echo.  linkcheck  to check all external links for integrity
228
33
	echo.  doctest    to run all doctests embedded in the documentation if enabled
229
34
	goto end
230
35
)
231
36
232
37
if "%1" == "clean" (
233
38
	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
234
39
	del /q /s %BUILDDIR%\*
235
40
	goto end
236
41
)
237
42
238
43
if "%1" == "html" (
239
44
	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
240
45
	if errorlevel 1 exit /b 1
241
46
	echo.
242
47
	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
243
48
	goto end
244
49
)
245
50
246
51
if "%1" == "dirhtml" (
247
52
	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
248
53
	if errorlevel 1 exit /b 1
249
54
	echo.
250
55
	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
251
56
	goto end
252
57
)
253
58
254
59
if "%1" == "singlehtml" (
255
60
	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
256
61
	if errorlevel 1 exit /b 1
257
62
	echo.
258
63
	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
259
64
	goto end
260
65
)
261
66
262
67
if "%1" == "pickle" (
263
68
	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
264
69
	if errorlevel 1 exit /b 1
265
70
	echo.
266
71
	echo.Build finished; now you can process the pickle files.
267
72
	goto end
268
73
)
269
74
270
75
if "%1" == "json" (
271
76
	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
272
77
	if errorlevel 1 exit /b 1
273
78
	echo.
274
79
	echo.Build finished; now you can process the JSON files.
275
80
	goto end
276
81
)
277
82
278
83
if "%1" == "htmlhelp" (
279
84
	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
280
85
	if errorlevel 1 exit /b 1
281
86
	echo.
282
87
	echo.Build finished; now you can run HTML Help Workshop with the ^
283
88
.hhp project file in %BUILDDIR%/htmlhelp.
284
89
	goto end
285
90
)
286
91
287
92
if "%1" == "qthelp" (
288
93
	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
289
94
	if errorlevel 1 exit /b 1
290
95
	echo.
291
96
	echo.Build finished; now you can run "qcollectiongenerator" with the ^
292
97
.qhcp project file in %BUILDDIR%/qthelp, like this:
293
98
	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\PerconaXtraBackup.qhcp
294
99
	echo.To view the help file:
295
100
	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\PerconaXtraBackup.ghc
296
101
	goto end
297
102
)
298
103
299
104
if "%1" == "devhelp" (
300
105
	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
301
106
	if errorlevel 1 exit /b 1
302
107
	echo.
303
108
	echo.Build finished.
304
109
	goto end
305
110
)
306
111
307
112
if "%1" == "epub" (
308
113
	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
309
114
	if errorlevel 1 exit /b 1
310
115
	echo.
311
116
	echo.Build finished. The epub file is in %BUILDDIR%/epub.
312
117
	goto end
313
118
)
314
119
315
120
if "%1" == "latex" (
316
121
	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
317
122
	if errorlevel 1 exit /b 1
318
123
	echo.
319
124
	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
320
125
	goto end
321
126
)
322
127
323
128
if "%1" == "text" (
324
129
	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
325
130
	if errorlevel 1 exit /b 1
326
131
	echo.
327
132
	echo.Build finished. The text files are in %BUILDDIR%/text.
328
133
	goto end
329
134
)
330
135
331
136
if "%1" == "man" (
332
137
	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
333
138
	if errorlevel 1 exit /b 1
334
139
	echo.
335
140
	echo.Build finished. The manual pages are in %BUILDDIR%/man.
336
141
	goto end
337
142
)
338
143
339
144
if "%1" == "changes" (
340
145
	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
341
146
	if errorlevel 1 exit /b 1
342
147
	echo.
343
148
	echo.The overview file is in %BUILDDIR%/changes.
344
149
	goto end
345
150
)
346
151
347
152
if "%1" == "linkcheck" (
348
153
	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
349
154
	if errorlevel 1 exit /b 1
350
155
	echo.
351
156
	echo.Link check complete; look for any errors in the above output ^
352
157
or in %BUILDDIR%/linkcheck/output.txt.
353
158
	goto end
354
159
)
355
160
356
161
if "%1" == "doctest" (
357
162
	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
358
163
	if errorlevel 1 exit /b 1
359
164
	echo.
360
165
	echo.Testing of doctests in the sources finished, look at the ^
361
166
results in %BUILDDIR%/doctest/output.txt.
362
167
	goto end
363
168
)
364
169
365
170
:end
366
171
0
367
=== added file 'storage/innobase/xtrabackup/doc/source/CMakeLists.txt'
368
--- storage/innobase/xtrabackup/doc/source/CMakeLists.txt	1970-01-01 00:00:00 +0000
369
+++ storage/innobase/xtrabackup/doc/source/CMakeLists.txt	2015-02-06 14:10:42 +0000
370
@@ -0,0 +1,80 @@
371
1
# Copyright (c) 2015 Percona LLC and/or its affiliates.
372
2
#
373
3
# This program is free software; you can redistribute it and/or modify
374
4
# it under the terms of the GNU General Public License as published by
375
5
# the Free Software Foundation; version 2 of the License.
376
6
377
7
# This program is distributed in the hope that it will be useful,
378
8
# but WITHOUT ANY WARRANTY; without even the implied warranty of
379
9
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
380
10
# GNU General Public License for more details.
381
11
382
12
# You should have received a copy of the GNU General Public License
383
13
# along with this program; if not, write to the Free Software
384
14
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
385
15
386
16
# generate man pages
387
17
IF(WITH_MAN_PAGES)
388
18
  ADD_CUSTOM_COMMAND(
389
19
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/build/man
390
20
    COMMAND sphinx-build -b man -d ${CMAKE_CURRENT_BINARY_DIR}/build/doctrees ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build/man
391
21
    VERBATIM
392
22
  )
393
23
394
24
  ADD_CUSTOM_TARGET(man ALL
395
25
    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/build/man
396
26
  )
397
27
398
28
  INSTALL(
399
29
    CODE "FILE( GLOB MAN1_FILES \"${CMAKE_CURRENT_BINARY_DIR}/build/man/*.1\" )"
400
30
    CODE "FILE( INSTALL \${MAN1_FILES} DESTINATION \"${INSTALL_MANDIR}/man1\" )"
401
31
  )
402
32
ENDIF()
403
33
404
34
# generate html documentation
405
35
IF(WITH_HTML_DOCS)
406
36
  ADD_CUSTOM_COMMAND(
407
37
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/build/html
408
38
    # Downloads percona-theme into source dir because of sphinx bug:
409
39
    # https://github.com/sphinx-doc/sphinx/issues/925
410
40
    COMMAND wget -O ${CMAKE_CURRENT_SOURCE_DIR}/percona-theme.tar.gz http://percona.com/docs/theme/percona-xtrabackup/2.2
411
41
    COMMAND tar -zxf ${CMAKE_CURRENT_SOURCE_DIR}/percona-theme.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR}
412
42
    COMMAND rm -f ${CMAKE_CURRENT_SOURCE_DIR}/percona-theme.tar.gz
413
43
    COMMAND sphinx-build -b html -d ${CMAKE_CURRENT_BINARY_DIR}/build/doctrees ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build/html
414
44
    COMMAND rm -rf ${CMAKE_CURRENT_SOURCE_DIR}/percona-theme
415
45
    VERBATIM
416
46
  )
417
47
418
48
  ADD_CUSTOM_TARGET(html ALL
419
49
    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/build/html
420
50
  )
421
51
ENDIF()
422
52
423
53
# generate latex or pdf documentation
424
54
IF(WITH_LATEX_DOCS OR WITH_PDF_DOCS)
425
55
  ADD_CUSTOM_COMMAND(
426
56
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/build/latex/PerconaXtraBackup-2.2.tex
427
57
    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/build/latex/Makefile
428
58
    COMMAND sphinx-build -b latex -d ${CMAKE_CURRENT_BINARY_DIR}/build/doctrees ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build/latex
429
59
    VERBATIM
430
60
  )
431
61
432
62
  ADD_CUSTOM_TARGET(latex ALL
433
63
    DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/build/latex/PerconaXtraBackup-2.2.tex
434
64
  )
435
65
436
66
  IF(WITH_PDF_DOCS)
437
67
    ADD_CUSTOM_COMMAND(
438
68
      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/build/latex/PerconaXtraBackup-2.2.pdf
439
69
      COMMAND make -C ${CMAKE_CURRENT_BINARY_DIR}/build/latex all-pdf
440
70
      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/build/latex/PerconaXtraBackup-2.2.tex
441
71
      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/build/latex/Makefile
442
72
      VERBATIM
443
73
    )
444
74
445
75
    ADD_CUSTOM_TARGET(latexpdf ALL
446
76
      DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/build/latex/PerconaXtraBackup-2.2.pdf
447
77
    )
448
78
  ENDIF()
449
79
450
80
ENDIF()
451
0
81
452
=== modified file 'storage/innobase/xtrabackup/utils/build-binary.sh'
453
--- storage/innobase/xtrabackup/utils/build-binary.sh	2014-03-28 10:35:52 +0000
454
+++ storage/innobase/xtrabackup/utils/build-binary.sh	2015-02-06 14:10:42 +0000
455
@@ -110,7 +110,7 @@
456
110
        # Install the files
110
        # Install the files
457
111
        mkdir -p "$INSTALLDIR"
111
        mkdir -p "$INSTALLDIR"
458
112
        cmake -DBUILD_CONFIG=xtrabackup_release -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" \
112
        cmake -DBUILD_CONFIG=xtrabackup_release -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" \
460
113
          -DINSTALL_MYSQLTESTDIR=percona-xtrabackup-${XB_VERSION_MAJOR}.${XB_VERSION_MINOR}-test . 
113
          -DINSTALL_MYSQLTESTDIR=percona-xtrabackup-${XB_VERSION_MAJOR}.${XB_VERSION_MINOR}-test -DINSTALL_MANDIR=${INSTALLDIR}/man .
461
114
        make $MAKE_JFLAG
114
        make $MAKE_JFLAG
462
115
        make install
115
        make install
463
116
116
464
117
117
465
=== modified file 'storage/innobase/xtrabackup/utils/debian/control'
466
--- storage/innobase/xtrabackup/utils/debian/control	2014-08-22 10:40:29 +0000
467
+++ storage/innobase/xtrabackup/utils/debian/control	2015-02-06 14:10:42 +0000
468
@@ -14,7 +14,9 @@
469
14
               libtool,
14
               libtool,
470
15
               libz-dev,
15
               libz-dev,
471
16
               libgcrypt-dev,
16
               libgcrypt-dev,
473
17
               lsb-release
17
               lsb-release,
474
18
               python-sphinx (>= 1.0.1),
475
19
               python-docutils (>= 0.6)
476
18
Standards-Version: 3.9.5
20
Standards-Version: 3.9.5
477
19
Homepage: http://www.percona.com/software/percona-xtrabackup
21
Homepage: http://www.percona.com/software/percona-xtrabackup
478
20
22
479
21
23
480
=== modified file 'storage/innobase/xtrabackup/utils/debian/percona-xtrabackup.install'
481
--- storage/innobase/xtrabackup/utils/debian/percona-xtrabackup.install	2014-06-10 11:24:27 +0000
482
+++ storage/innobase/xtrabackup/utils/debian/percona-xtrabackup.install	2015-02-06 14:10:42 +0000
483
@@ -1,1 +1,2 @@
484
1
/usr/bin
1
/usr/bin
485
2
/usr/share/man/man1
486
2
3
487
=== modified file 'storage/innobase/xtrabackup/utils/debian/rules'
488
--- storage/innobase/xtrabackup/utils/debian/rules	2014-07-22 12:46:09 +0000
489
+++ storage/innobase/xtrabackup/utils/debian/rules	2015-02-06 14:10:42 +0000
490
@@ -19,7 +19,7 @@
491
19
19
492
20
ifeq "$(DEB_DUMMY)" ""
20
ifeq "$(DEB_DUMMY)" ""
493
21
	cmake -DBUILD_CONFIG=xtrabackup_release -DCMAKE_INSTALL_PREFIX=/usr \
21
	cmake -DBUILD_CONFIG=xtrabackup_release -DCMAKE_INSTALL_PREFIX=/usr \
495
22
	  -DINSTALL_MYSQLTESTDIR=/usr/share/percona-xtrabackup-test .
22
	  -DINSTALL_MYSQLTESTDIR=/usr/share/percona-xtrabackup-test -DINSTALL_MANDIR=/usr/share/man .
496
23
else
23
else
497
24
	# Dummy binaries that avoid compilation
24
	# Dummy binaries that avoid compilation
498
25
	echo 'main() { return 300; }' | gcc -x c - -o xtrabackup
25
	echo 'main() { return 300; }' | gcc -x c - -o xtrabackup
499
26
26
500
=== modified file 'storage/innobase/xtrabackup/utils/percona-xtrabackup.spec'
501
--- storage/innobase/xtrabackup/utils/percona-xtrabackup.spec	2015-01-12 09:58:23 +0000
502
+++ storage/innobase/xtrabackup/utils/percona-xtrabackup.spec	2015-02-06 14:10:42 +0000
503
@@ -17,6 +17,11 @@
504
17
Source:         percona-xtrabackup-%{version}%{xb_version_extra}.tar.gz
17
Source:         percona-xtrabackup-%{version}%{xb_version_extra}.tar.gz
505
18
18
506
19
BuildRequires:  cmake, libaio-devel, libgcrypt-devel, ncurses-devel, readline-devel, zlib-devel
19
BuildRequires:  cmake, libaio-devel, libgcrypt-devel, ncurses-devel, readline-devel, zlib-devel
507
20
%if 0%{?rhel} > 6
508
21
BuildRequires:  python-sphinx >= 1.0.1, python-docutils >= 0.6
509
22
%else
510
23
BuildRequires:  python-sphinx10 >= 1.0.1, python-docutils >= 0.6
511
24
%endif
512
20
Requires:       perl(DBD::mysql), rsync
25
Requires:       perl(DBD::mysql), rsync
513
21
BuildRoot:      %{_tmppath}/%{name}-%{version}-root
26
BuildRoot:      %{_tmppath}/%{name}-%{version}-root
514
22
27
515
@@ -54,7 +59,7 @@
516
54
export CXXFLAGS="$CXXFLAGS -DXTRABACKUP_VERSION=\\\"%{xtrabackup_version}\\\" -DXTRABACKUP_REVISION=\\\"%{xtrabackup_revision}\\\""
59
export CXXFLAGS="$CXXFLAGS -DXTRABACKUP_VERSION=\\\"%{xtrabackup_version}\\\" -DXTRABACKUP_REVISION=\\\"%{xtrabackup_revision}\\\""
517
55
#
60
#
518
56
cmake -DBUILD_CONFIG=xtrabackup_release -DCMAKE_INSTALL_PREFIX=%{_prefix} \
61
cmake -DBUILD_CONFIG=xtrabackup_release -DCMAKE_INSTALL_PREFIX=%{_prefix} \
520
57
  -DINSTALL_MYSQLTESTDIR=%{_datadir}/percona-xtrabackup-test .
62
  -DINSTALL_MYSQLTESTDIR=%{_datadir}/percona-xtrabackup-test -DINSTALL_MANDIR=%{_mandir} .
521
58
#
63
#
522
59
make %{?_smp_mflags}
64
make %{?_smp_mflags}
523
60
#
65
#
524
@@ -74,6 +79,7 @@
525
74
%{_bindir}/xbstream
79
%{_bindir}/xbstream
526
75
%{_bindir}/xbcrypt
80
%{_bindir}/xbcrypt
527
76
%doc COPYING
81
%doc COPYING
528
82
%doc %{_mandir}/man1/*.1.gz
529
77
83
530
78
%files -n percona-xtrabackup-test
84
%files -n percona-xtrabackup-test
531
79
%defattr(-,root,root,-)
85
%defattr(-,root,root,-)
Reviewer	Review Type	Date Requested	Status
Alexey Kopytov (community)		2015-01-22	Approve on 2015-02-06
Review via email: mp+247329@code.launchpad.net