DBus Menu

Merge lp:~3v1n0/libdbusmenu/fix-gtkdoc-checks into lp:libdbusmenu

  1. fix-gtkdoc-checks
  2. Merge into trunk.16.10
Proposed by Marco Trevisan (Treviño)
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: 490
Merged at revision: 489
Proposed branch: lp:~3v1n0/libdbusmenu/fix-gtkdoc-checks
Merge into: lp:libdbusmenu
Diff against target: 546 lines (+161/-163)
2 files modified
INSTALL (+159/-161)
tests/Makefile.am (+2/-2)
To merge this branch: bzr merge lp:~3v1n0/libdbusmenu/fix-gtkdoc-checks
Reviewer Review Type Date Requested Status
DBus Menu Team Pending
Review via email: mp+355157@code.launchpad.net

Commit message

tests: don't use gtester for gtkdoc-check tests

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Bileto build went ok, self-approving then.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'INSTALL'
2--- INSTALL 2015-04-09 16:13:18 +0000
3+++ INSTALL 2018-09-17 16:33:39 +0000
4@@ -1,8 +1,8 @@
5 Installation Instructions
6 *************************
7
8-Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
9-Inc.
10+ Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software
11+Foundation, Inc.
12
13 Copying and distribution of this file, with or without modification,
14 are permitted in any medium without royalty provided the copyright
15@@ -12,97 +12,96 @@
16 Basic Installation
17 ==================
18
19- Briefly, the shell command `./configure && make && make install'
20+ Briefly, the shell command './configure && make && make install'
21 should configure, build, and install this package. The following
22-more-detailed instructions are generic; see the `README' file for
23+more-detailed instructions are generic; see the 'README' file for
24 instructions specific to this package. Some packages provide this
25-`INSTALL' file but do not implement all of the features documented
26+'INSTALL' file but do not implement all of the features documented
27 below. The lack of an optional feature in a given package is not
28 necessarily a bug. More recommendations for GNU packages can be found
29 in *note Makefile Conventions: (standards)Makefile Conventions.
30
31- The `configure' shell script attempts to guess correct values for
32+ The 'configure' shell script attempts to guess correct values for
33 various system-dependent variables used during compilation. It uses
34-those values to create a `Makefile' in each directory of the package.
35-It may also create one or more `.h' files containing system-dependent
36-definitions. Finally, it creates a shell script `config.status' that
37+those values to create a 'Makefile' in each directory of the package.
38+It may also create one or more '.h' files containing system-dependent
39+definitions. Finally, it creates a shell script 'config.status' that
40 you can run in the future to recreate the current configuration, and a
41-file `config.log' containing compiler output (useful mainly for
42-debugging `configure').
43+file 'config.log' containing compiler output (useful mainly for
44+debugging 'configure').
45
46- It can also use an optional file (typically called `config.cache'
47-and enabled with `--cache-file=config.cache' or simply `-C') that saves
48-the results of its tests to speed up reconfiguring. Caching is
49-disabled by default to prevent problems with accidental use of stale
50-cache files.
51+ It can also use an optional file (typically called 'config.cache' and
52+enabled with '--cache-file=config.cache' or simply '-C') that saves the
53+results of its tests to speed up reconfiguring. Caching is disabled by
54+default to prevent problems with accidental use of stale cache files.
55
56 If you need to do unusual things to compile the package, please try
57-to figure out how `configure' could check whether to do them, and mail
58-diffs or instructions to the address given in the `README' so they can
59+to figure out how 'configure' could check whether to do them, and mail
60+diffs or instructions to the address given in the 'README' so they can
61 be considered for the next release. If you are using the cache, and at
62-some point `config.cache' contains results you don't want to keep, you
63+some point 'config.cache' contains results you don't want to keep, you
64 may remove or edit it.
65
66- The file `configure.ac' (or `configure.in') is used to create
67-`configure' by a program called `autoconf'. You need `configure.ac' if
68-you want to change it or regenerate `configure' using a newer version
69-of `autoconf'.
70+ The file 'configure.ac' (or 'configure.in') is used to create
71+'configure' by a program called 'autoconf'. You need 'configure.ac' if
72+you want to change it or regenerate 'configure' using a newer version of
73+'autoconf'.
74
75 The simplest way to compile this package is:
76
77- 1. `cd' to the directory containing the package's source code and type
78- `./configure' to configure the package for your system.
79+ 1. 'cd' to the directory containing the package's source code and type
80+ './configure' to configure the package for your system.
81
82- Running `configure' might take a while. While running, it prints
83+ Running 'configure' might take a while. While running, it prints
84 some messages telling which features it is checking for.
85
86- 2. Type `make' to compile the package.
87+ 2. Type 'make' to compile the package.
88
89- 3. Optionally, type `make check' to run any self-tests that come with
90+ 3. Optionally, type 'make check' to run any self-tests that come with
91 the package, generally using the just-built uninstalled binaries.
92
93- 4. Type `make install' to install the programs and any data files and
94+ 4. Type 'make install' to install the programs and any data files and
95 documentation. When installing into a prefix owned by root, it is
96 recommended that the package be configured and built as a regular
97- user, and only the `make install' phase executed with root
98+ user, and only the 'make install' phase executed with root
99 privileges.
100
101- 5. Optionally, type `make installcheck' to repeat any self-tests, but
102+ 5. Optionally, type 'make installcheck' to repeat any self-tests, but
103 this time using the binaries in their final installed location.
104 This target does not install anything. Running this target as a
105- regular user, particularly if the prior `make install' required
106+ regular user, particularly if the prior 'make install' required
107 root privileges, verifies that the installation completed
108 correctly.
109
110 6. You can remove the program binaries and object files from the
111- source code directory by typing `make clean'. To also remove the
112- files that `configure' created (so you can compile the package for
113- a different kind of computer), type `make distclean'. There is
114- also a `make maintainer-clean' target, but that is intended mainly
115+ source code directory by typing 'make clean'. To also remove the
116+ files that 'configure' created (so you can compile the package for
117+ a different kind of computer), type 'make distclean'. There is
118+ also a 'make maintainer-clean' target, but that is intended mainly
119 for the package's developers. If you use it, you may have to get
120 all sorts of other programs in order to regenerate files that came
121 with the distribution.
122
123- 7. Often, you can also type `make uninstall' to remove the installed
124+ 7. Often, you can also type 'make uninstall' to remove the installed
125 files again. In practice, not all packages have tested that
126 uninstallation works correctly, even though it is required by the
127 GNU Coding Standards.
128
129- 8. Some packages, particularly those that use Automake, provide `make
130+ 8. Some packages, particularly those that use Automake, provide 'make
131 distcheck', which can by used by developers to test that all other
132- targets like `make install' and `make uninstall' work correctly.
133+ targets like 'make install' and 'make uninstall' work correctly.
134 This target is generally not run by end users.
135
136 Compilers and Options
137 =====================
138
139 Some systems require unusual options for compilation or linking that
140-the `configure' script does not know about. Run `./configure --help'
141+the 'configure' script does not know about. Run './configure --help'
142 for details on some of the pertinent environment variables.
143
144- You can give `configure' initial values for configuration parameters
145-by setting variables in the command line or in the environment. Here
146-is an example:
147+ You can give 'configure' initial values for configuration parameters
148+by setting variables in the command line or in the environment. Here is
149+an example:
150
151 ./configure CC=c99 CFLAGS=-g LIBS=-lposix
152
153@@ -113,21 +112,21 @@
154
155 You can compile the package for more than one kind of computer at the
156 same time, by placing the object files for each architecture in their
157-own directory. To do this, you can use GNU `make'. `cd' to the
158+own directory. To do this, you can use GNU 'make'. 'cd' to the
159 directory where you want the object files and executables to go and run
160-the `configure' script. `configure' automatically checks for the
161-source code in the directory that `configure' is in and in `..'. This
162-is known as a "VPATH" build.
163+the 'configure' script. 'configure' automatically checks for the source
164+code in the directory that 'configure' is in and in '..'. This is known
165+as a "VPATH" build.
166
167- With a non-GNU `make', it is safer to compile the package for one
168+ With a non-GNU 'make', it is safer to compile the package for one
169 architecture at a time in the source code directory. After you have
170-installed the package for one architecture, use `make distclean' before
171+installed the package for one architecture, use 'make distclean' before
172 reconfiguring for another architecture.
173
174 On MacOS X 10.5 and later systems, you can create libraries and
175 executables that work on multiple system types--known as "fat" or
176-"universal" binaries--by specifying multiple `-arch' options to the
177-compiler but only a single `-arch' option to the preprocessor. Like
178+"universal" binaries--by specifying multiple '-arch' options to the
179+compiler but only a single '-arch' option to the preprocessor. Like
180 this:
181
182 ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
183@@ -136,105 +135,104 @@
184
185 This is not guaranteed to produce working output in all cases, you
186 may have to build one architecture at a time and combine the results
187-using the `lipo' tool if you have problems.
188+using the 'lipo' tool if you have problems.
189
190 Installation Names
191 ==================
192
193- By default, `make install' installs the package's commands under
194-`/usr/local/bin', include files under `/usr/local/include', etc. You
195-can specify an installation prefix other than `/usr/local' by giving
196-`configure' the option `--prefix=PREFIX', where PREFIX must be an
197+ By default, 'make install' installs the package's commands under
198+'/usr/local/bin', include files under '/usr/local/include', etc. You
199+can specify an installation prefix other than '/usr/local' by giving
200+'configure' the option '--prefix=PREFIX', where PREFIX must be an
201 absolute file name.
202
203 You can specify separate installation prefixes for
204 architecture-specific files and architecture-independent files. If you
205-pass the option `--exec-prefix=PREFIX' to `configure', the package uses
206+pass the option '--exec-prefix=PREFIX' to 'configure', the package uses
207 PREFIX as the prefix for installing programs and libraries.
208 Documentation and other data files still use the regular prefix.
209
210 In addition, if you use an unusual directory layout you can give
211-options like `--bindir=DIR' to specify different values for particular
212-kinds of files. Run `configure --help' for a list of the directories
213-you can set and what kinds of files go in them. In general, the
214-default for these options is expressed in terms of `${prefix}', so that
215-specifying just `--prefix' will affect all of the other directory
216+options like '--bindir=DIR' to specify different values for particular
217+kinds of files. Run 'configure --help' for a list of the directories
218+you can set and what kinds of files go in them. In general, the default
219+for these options is expressed in terms of '${prefix}', so that
220+specifying just '--prefix' will affect all of the other directory
221 specifications that were not explicitly provided.
222
223 The most portable way to affect installation locations is to pass the
224-correct locations to `configure'; however, many packages provide one or
225+correct locations to 'configure'; however, many packages provide one or
226 both of the following shortcuts of passing variable assignments to the
227-`make install' command line to change installation locations without
228+'make install' command line to change installation locations without
229 having to reconfigure or recompile.
230
231 The first method involves providing an override variable for each
232-affected directory. For example, `make install
233+affected directory. For example, 'make install
234 prefix=/alternate/directory' will choose an alternate location for all
235 directory configuration variables that were expressed in terms of
236-`${prefix}'. Any directories that were specified during `configure',
237-but not in terms of `${prefix}', must each be overridden at install
238-time for the entire installation to be relocated. The approach of
239-makefile variable overrides for each directory variable is required by
240-the GNU Coding Standards, and ideally causes no recompilation.
241-However, some platforms have known limitations with the semantics of
242-shared libraries that end up requiring recompilation when using this
243-method, particularly noticeable in packages that use GNU Libtool.
244+'${prefix}'. Any directories that were specified during 'configure',
245+but not in terms of '${prefix}', must each be overridden at install time
246+for the entire installation to be relocated. The approach of makefile
247+variable overrides for each directory variable is required by the GNU
248+Coding Standards, and ideally causes no recompilation. However, some
249+platforms have known limitations with the semantics of shared libraries
250+that end up requiring recompilation when using this method, particularly
251+noticeable in packages that use GNU Libtool.
252
253- The second method involves providing the `DESTDIR' variable. For
254-example, `make install DESTDIR=/alternate/directory' will prepend
255-`/alternate/directory' before all installation names. The approach of
256-`DESTDIR' overrides is not required by the GNU Coding Standards, and
257+ The second method involves providing the 'DESTDIR' variable. For
258+example, 'make install DESTDIR=/alternate/directory' will prepend
259+'/alternate/directory' before all installation names. The approach of
260+'DESTDIR' overrides is not required by the GNU Coding Standards, and
261 does not work on platforms that have drive letters. On the other hand,
262 it does better at avoiding recompilation issues, and works well even
263-when some directory options were not specified in terms of `${prefix}'
264-at `configure' time.
265+when some directory options were not specified in terms of '${prefix}'
266+at 'configure' time.
267
268 Optional Features
269 =================
270
271 If the package supports it, you can cause programs to be installed
272-with an extra prefix or suffix on their names by giving `configure' the
273-option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
274+with an extra prefix or suffix on their names by giving 'configure' the
275+option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'.
276
277- Some packages pay attention to `--enable-FEATURE' options to
278-`configure', where FEATURE indicates an optional part of the package.
279-They may also pay attention to `--with-PACKAGE' options, where PACKAGE
280-is something like `gnu-as' or `x' (for the X Window System). The
281-`README' should mention any `--enable-' and `--with-' options that the
282+ Some packages pay attention to '--enable-FEATURE' options to
283+'configure', where FEATURE indicates an optional part of the package.
284+They may also pay attention to '--with-PACKAGE' options, where PACKAGE
285+is something like 'gnu-as' or 'x' (for the X Window System). The
286+'README' should mention any '--enable-' and '--with-' options that the
287 package recognizes.
288
289- For packages that use the X Window System, `configure' can usually
290+ For packages that use the X Window System, 'configure' can usually
291 find the X include and library files automatically, but if it doesn't,
292-you can use the `configure' options `--x-includes=DIR' and
293-`--x-libraries=DIR' to specify their locations.
294+you can use the 'configure' options '--x-includes=DIR' and
295+'--x-libraries=DIR' to specify their locations.
296
297 Some packages offer the ability to configure how verbose the
298-execution of `make' will be. For these packages, running `./configure
299+execution of 'make' will be. For these packages, running './configure
300 --enable-silent-rules' sets the default to minimal output, which can be
301-overridden with `make V=1'; while running `./configure
302+overridden with 'make V=1'; while running './configure
303 --disable-silent-rules' sets the default to verbose, which can be
304-overridden with `make V=0'.
305+overridden with 'make V=0'.
306
307 Particular systems
308 ==================
309
310- On HP-UX, the default C compiler is not ANSI C compatible. If GNU
311-CC is not installed, it is recommended to use the following options in
312+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU CC
313+is not installed, it is recommended to use the following options in
314 order to use an ANSI C compiler:
315
316 ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
317
318 and if that doesn't work, install pre-built binaries of GCC for HP-UX.
319
320- HP-UX `make' updates targets which have the same time stamps as
321-their prerequisites, which makes it generally unusable when shipped
322-generated files such as `configure' are involved. Use GNU `make'
323-instead.
324+ HP-UX 'make' updates targets which have the same time stamps as their
325+prerequisites, which makes it generally unusable when shipped generated
326+files such as 'configure' are involved. Use GNU 'make' instead.
327
328 On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
329-parse its `<wchar.h>' header file. The option `-nodtk' can be used as
330-a workaround. If GNU CC is not installed, it is therefore recommended
331-to try
332+parse its '<wchar.h>' header file. The option '-nodtk' can be used as a
333+workaround. If GNU CC is not installed, it is therefore recommended to
334+try
335
336 ./configure CC="cc"
337
338@@ -242,26 +240,26 @@
339
340 ./configure CC="cc -nodtk"
341
342- On Solaris, don't put `/usr/ucb' early in your `PATH'. This
343+ On Solaris, don't put '/usr/ucb' early in your 'PATH'. This
344 directory contains several dysfunctional programs; working variants of
345-these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
346-in your `PATH', put it _after_ `/usr/bin'.
347+these programs are available in '/usr/bin'. So, if you need '/usr/ucb'
348+in your 'PATH', put it _after_ '/usr/bin'.
349
350- On Haiku, software installed for all users goes in `/boot/common',
351-not `/usr/local'. It is recommended to use the following options:
352+ On Haiku, software installed for all users goes in '/boot/common',
353+not '/usr/local'. It is recommended to use the following options:
354
355 ./configure --prefix=/boot/common
356
357 Specifying the System Type
358 ==========================
359
360- There may be some features `configure' cannot figure out
361+ There may be some features 'configure' cannot figure out
362 automatically, but needs to determine by the type of machine the package
363 will run on. Usually, assuming the package is built to be run on the
364-_same_ architectures, `configure' can figure that out, but if it prints
365+_same_ architectures, 'configure' can figure that out, but if it prints
366 a message saying it cannot guess the machine type, give it the
367-`--build=TYPE' option. TYPE can either be a short name for the system
368-type, such as `sun4', or a canonical name which has the form:
369+'--build=TYPE' option. TYPE can either be a short name for the system
370+type, such as 'sun4', or a canonical name which has the form:
371
372 CPU-COMPANY-SYSTEM
373
374@@ -270,101 +268,101 @@
375 OS
376 KERNEL-OS
377
378- See the file `config.sub' for the possible values of each field. If
379-`config.sub' isn't included in this package, then this package doesn't
380+ See the file 'config.sub' for the possible values of each field. If
381+'config.sub' isn't included in this package, then this package doesn't
382 need to know the machine type.
383
384 If you are _building_ compiler tools for cross-compiling, you should
385-use the option `--target=TYPE' to select the type of system they will
386+use the option '--target=TYPE' to select the type of system they will
387 produce code for.
388
389 If you want to _use_ a cross compiler, that generates code for a
390 platform different from the build platform, you should specify the
391 "host" platform (i.e., that on which the generated programs will
392-eventually be run) with `--host=TYPE'.
393+eventually be run) with '--host=TYPE'.
394
395 Sharing Defaults
396 ================
397
398- If you want to set default values for `configure' scripts to share,
399-you can create a site shell script called `config.site' that gives
400-default values for variables like `CC', `cache_file', and `prefix'.
401-`configure' looks for `PREFIX/share/config.site' if it exists, then
402-`PREFIX/etc/config.site' if it exists. Or, you can set the
403-`CONFIG_SITE' environment variable to the location of the site script.
404-A warning: not all `configure' scripts look for a site script.
405+ If you want to set default values for 'configure' scripts to share,
406+you can create a site shell script called 'config.site' that gives
407+default values for variables like 'CC', 'cache_file', and 'prefix'.
408+'configure' looks for 'PREFIX/share/config.site' if it exists, then
409+'PREFIX/etc/config.site' if it exists. Or, you can set the
410+'CONFIG_SITE' environment variable to the location of the site script.
411+A warning: not all 'configure' scripts look for a site script.
412
413 Defining Variables
414 ==================
415
416 Variables not defined in a site shell script can be set in the
417-environment passed to `configure'. However, some packages may run
418+environment passed to 'configure'. However, some packages may run
419 configure again during the build, and the customized values of these
420 variables may be lost. In order to avoid this problem, you should set
421-them in the `configure' command line, using `VAR=value'. For example:
422+them in the 'configure' command line, using 'VAR=value'. For example:
423
424 ./configure CC=/usr/local2/bin/gcc
425
426-causes the specified `gcc' to be used as the C compiler (unless it is
427+causes the specified 'gcc' to be used as the C compiler (unless it is
428 overridden in the site shell script).
429
430-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
431-an Autoconf limitation. Until the limitation is lifted, you can use
432-this workaround:
433+Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an
434+Autoconf limitation. Until the limitation is lifted, you can use this
435+workaround:
436
437 CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
438
439-`configure' Invocation
440+'configure' Invocation
441 ======================
442
443- `configure' recognizes the following options to control how it
444+ 'configure' recognizes the following options to control how it
445 operates.
446
447-`--help'
448-`-h'
449- Print a summary of all of the options to `configure', and exit.
450+'--help'
451+'-h'
452+ Print a summary of all of the options to 'configure', and exit.
453
454-`--help=short'
455-`--help=recursive'
456+'--help=short'
457+'--help=recursive'
458 Print a summary of the options unique to this package's
459- `configure', and exit. The `short' variant lists options used
460- only in the top level, while the `recursive' variant lists options
461- also present in any nested packages.
462+ 'configure', and exit. The 'short' variant lists options used only
463+ in the top level, while the 'recursive' variant lists options also
464+ present in any nested packages.
465
466-`--version'
467-`-V'
468- Print the version of Autoconf used to generate the `configure'
469+'--version'
470+'-V'
471+ Print the version of Autoconf used to generate the 'configure'
472 script, and exit.
473
474-`--cache-file=FILE'
475+'--cache-file=FILE'
476 Enable the cache: use and save the results of the tests in FILE,
477- traditionally `config.cache'. FILE defaults to `/dev/null' to
478+ traditionally 'config.cache'. FILE defaults to '/dev/null' to
479 disable caching.
480
481-`--config-cache'
482-`-C'
483- Alias for `--cache-file=config.cache'.
484+'--config-cache'
485+'-C'
486+ Alias for '--cache-file=config.cache'.
487
488-`--quiet'
489-`--silent'
490-`-q'
491+'--quiet'
492+'--silent'
493+'-q'
494 Do not print messages saying which checks are being made. To
495- suppress all normal output, redirect it to `/dev/null' (any error
496+ suppress all normal output, redirect it to '/dev/null' (any error
497 messages will still be shown).
498
499-`--srcdir=DIR'
500+'--srcdir=DIR'
501 Look for the package's source code in directory DIR. Usually
502- `configure' can determine that directory automatically.
503-
504-`--prefix=DIR'
505- Use DIR as the installation prefix. *note Installation Names::
506- for more details, including other options available for fine-tuning
507- the installation locations.
508-
509-`--no-create'
510-`-n'
511+ 'configure' can determine that directory automatically.
512+
513+'--prefix=DIR'
514+ Use DIR as the installation prefix. *note Installation Names:: for
515+ more details, including other options available for fine-tuning the
516+ installation locations.
517+
518+'--no-create'
519+'-n'
520 Run the configure checks, but stop before creating any output
521 files.
522
523-`configure' also accepts some other, not widely useful, options. Run
524-`configure --help' for more details.
525+'configure' also accepts some other, not widely useful, options. Run
526+'configure --help' for more details.
527
528=== modified file 'tests/Makefile.am'
529--- tests/Makefile.am 2015-12-07 10:13:22 +0000
530+++ tests/Makefile.am 2018-09-17 16:33:39 +0000
531@@ -552,13 +552,13 @@
532 test_libdbusmenu_glib_gtkdoc:
533 @echo "#!/bin/bash" > $@
534 @echo cd $(abs_top_builddir)/docs/libdbusmenu-glib/reference >> $@
535- @echo gtester --verbose -k $(GTKDOC_CHECK_PATH) >> $@
536+ @echo $(GTKDOC_CHECK_PATH) >> $@
537 @chmod +x $@
538
539 test_libdbusmenu_gtk_gtkdoc:
540 @echo "#!/bin/bash" > $@
541 @echo cd $(abs_top_builddir)/docs/libdbusmenu-gtk/reference >> $@
542- @echo gtester --verbose -k $(GTKDOC_CHECK_PATH) >> $@
543+ @echo $(GTKDOC_CHECK_PATH) >> $@
544 @chmod +x $@
545
546 examplesdir = $(docdir)/examples/

Subscribers

People subscribed via source and target branches