Commit Graph

2819 Commits

Author SHA1 Message Date
Sam Thursfield ac56f8d8fb Don't show tracebacks for MesonException in helper scripts
I hit an issue when building gtk-doc documentation. The issue is
my fault, but the error output from Meson makes it look like an
internal error:

    [0/1] 'Running external command libtracker-sparql-doc.'
    Building documentation for libtracker-sparql
    Traceback (most recent call last):
      File "/home/sam/meson/meson.py", line 26, in <module>
        sys.exit(main())
      File "/home/sam/meson/meson.py", line 23, in main
        return mesonmain.run(launcher, sys.argv[1:])
      File "/home/sam/meson/mesonbuild/mesonmain.py", line 249, in run
        sys.exit(run_script_command(args[1:]))
      File "/home/sam/meson/mesonbuild/mesonmain.py", line 239, in run_script_command
        return cmdfunc(cmdargs)
      File "/home/sam/meson/mesonbuild/scripts/gtkdochelper.py", line 183, in run
        options.ignore_headers.split('@@') if options.ignore_headers else [])
      File "/home/sam/meson/mesonbuild/scripts/gtkdochelper.py", line 133, in build_gtkdoc
        gtkdoc_run_check(mkhtml_cmd, os.path.join(abs_out, 'html'))
      File "/home/sam/meson/mesonbuild/scripts/gtkdochelper.py", line 55, in gtkdoc_run_check
        raise MesonException('\n'.join(err_msg))
    mesonbuild.mesonlib.MesonException: 'gtkdoc-mkhtml' failed with status 6
    warning: failed to load external entity "../overview.sgml"
    ../libtracker-sparql-docs.sgml:20: element include: XInclude error :
    could not load ../overview.sgml, and no fallback was found
    warning: failed to load external entity "../examples.sgml"
    ../libtracker-sparql-docs.sgml:41: element include: XInclude error :
    could not load ../examples.sgml, and no fallback was found

    FAILED: libtracker-sparql-doc

After this patch, the output is much clearer:

    [0/1] 'Running external command libtracker-sparql-doc.'
    Building documentation for libtracker-sparql

    Error in gtkdoc helper script:
    'gtkdoc-mkhtml' failed with status 6
    warning: failed to load external entity "../overview.sgml"
    ../libtracker-sparql-docs.sgml:20: element include: XInclude error :
    could not load ../overview.sgml, and no fallback was found
    warning: failed to load external entity "../examples.sgml"
    ../libtracker-sparql-docs.sgml:41: element include: XInclude error :
    could not load ../examples.sgml, and no fallback was found

Note the actual errors from xsltproc are swallowed by gtkdoc-mkhtml
1.25.1, they're only displayed in the example above because I made a
patch: <https://bugzilla.gnome.org/show_bug.cgi?id=774812>
2016-11-26 12:11:59 -05:00
Jussi Pakkanen da45e1925f Merge pull request #1093 from centricular/pypi-status-readme
Add pypi status to README
2016-11-26 12:08:51 -05:00
Jussi Pakkanen d6f848bd3d Merge pull request #1059 from thiblahute/master
Allow specifying push URL in .wrap and fix broken subproject directories handling
2016-11-26 11:24:45 -05:00
Jussi Pakkanen 7e1b674704 Add both native and cross compiler options to option list. 2016-11-26 11:24:20 -05:00
Nirbheek Chauhan 65a44f52aa README.md: Add a warning about zipapp adding tests 2016-11-23 21:28:56 +05:30
Nirbheek Chauhan fcbee35104 Add pypi status to README 2016-11-23 16:47:01 +05:30
Jussi Pakkanen bfd190279c Detect Qt5 properly on more platforms. 2016-11-23 05:11:02 -05:00
Thibault Saunier 0ebf033f31 wrap: Allow specifying push URL in wrap files using git 2016-11-22 14:24:36 -03:00
Thibault Saunier 28cd23ab6e wrap: Make sure that the cloned git repo is properly cloned 2016-11-22 14:24:36 -03:00
Patrick Griffis 587a0bb3d1 gnome: Update required version for glib-compile-resources depfile fixes
Note that this version is not yet released
2016-11-20 23:01:26 +01:00
Jussi Pakkanen c9a46fcc93 Can set compiler arguments in Java. 2016-11-20 16:57:58 -05:00
Jussi Pakkanen 0250b2cce6 Can give many alternative names to find_program to simplify searching. 2016-11-20 16:54:19 -05:00
Jussi Pakkanen 82bb24b264 Made has_function survive optimization flags. Closes #1053. 2016-11-20 16:53:58 -05:00
Jussi Pakkanen 8f41154827 Can specify headers to install with Files. 2016-11-20 16:52:45 -05:00
Jussi Pakkanen aa9668a2fc Merge pull request #730 from mesonbuild/newtest
New testing tool
2016-11-20 16:07:32 -05:00
Jussi Pakkanen df4af2d122 Renamed test to plug hole in numbering. 2016-11-20 00:50:25 +02:00
Jussi Pakkanen 5b00c9b9c0 Dead code removal. 2016-11-19 19:34:49 +01:00
Jussi Pakkanen a01919976e Always specify installed data with a File object. Closes #858. 2016-11-18 17:37:35 -05:00
Elliott Sales de Andrade 996f4d89f3 Disallow some keyword arguments to gnome.mkenums.
The install argument is allowed for CustomTargets, but we use
install_header as the setting now. Also, setting a generic template when
specifying the more specific source or header template shouldn't be
allowed.
2016-11-18 15:30:56 -05:00
Jussi Pakkanen 1ebc5c1ea0 Can run special tests with the new tool. 2016-11-18 22:10:22 +02:00
Jussi Pakkanen c7ddce163f All testing is now in mesontest.py, which simplifies a lot of stuff. 2016-11-18 22:10:22 +02:00
Jussi Pakkanen 39df22bf53 Made Meson test into a class rather than abusing global variables and as preparation for moving it elsewhere. 2016-11-18 22:08:07 +02:00
Jussi Pakkanen e24229eae7 Can run benchmarks. 2016-11-18 22:04:29 +02:00
Jussi Pakkanen 077741097a Run all tests if none are specified. 2016-11-18 22:04:29 +02:00
Jussi Pakkanen def68cbc50 Use the same code for tests and benchmarks. 2016-11-18 22:04:29 +02:00
Jussi Pakkanen 0d619df2f3 Removed subsuite targets. 2016-11-18 22:04:29 +02:00
Jussi Pakkanen 951262d759 Removed Valgrind from core. 2016-11-18 22:04:29 +02:00
Jussi Pakkanen a5a4c85eca Can run tests under gdb. 2016-11-18 22:04:29 +02:00
Jussi Pakkanen 3f3c9c5329 Add option to run under gdb. 2016-11-18 22:04:29 +02:00
Jussi Pakkanen ee90ce74e8 New test runner. 2016-11-18 22:04:29 +02:00
Jussi Pakkanen 621219ccb0 Removed duplicate log message for command running. Closes #1056. 2016-11-17 00:20:36 +02:00
Elliott Sales de Andrade d45db903ac Rename test cases to remove duplicate numbers. 2016-11-14 13:50:31 -05:00
Jussi Pakkanen 070c6a72b2 Bump version for new development. 2016-11-14 20:49:06 +02:00
Jussi Pakkanen 4e3073f90a Updated version number for release. 2016-11-14 20:19:43 +02:00
Elliott Sales de Andrade 330aebc186 Fix message to be checked in Qt5 unit test. 2016-11-14 11:45:23 -05:00
Nirbheek Chauhan b438455ec1 Hotfix for cross-compilation from Windows to Linux
We currently pass cross-compiler options to the native compiler too and
when cross-compiling from Windows to Linux, `options` will contain
Linux-specific options which doesn't include `c_winlibs`.

The proper fix is to allow cross-info files to specify compiler options
and to maintain both cross and native compiler options in coredata, but
that will have to be done after the 0.36.0 release.

Also fixes a typo in MinGW cpp_winlibs option setting.

Closes #1029
2016-11-14 11:44:51 -05:00
Igor Gnatenko 900438882c trivial: remove executable bits on gnome framework
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
2016-11-14 11:44:21 -05:00
Jussi Pakkanen c23c822196 Only add src_include_dir if it has been defined. 2016-11-14 11:43:37 -05:00
Jussi Pakkanen 8b05990c13 Disable gresource dependency generation as it breaks Ninja. 2016-11-14 11:43:24 -05:00
Jussi Pakkanen 382917ee8f More robust link check. 2016-11-14 11:42:58 -05:00
Elliott Sales de Andrade 155f163341 Use portable path separator in wrappers.
The semicolon only separates paths on Windows, but the wrapper is
sometimes used on other platforms.
2016-11-13 12:39:03 -05:00
Jussi Pakkanen 08c82fd17c Merge pull request #1042 from centricular/fix-qt4-testcase-qtwidgets
qt: Fix qmake detection on Linux and Windows
2016-11-13 12:38:17 -05:00
Jussi Pakkanen dd8af1b56e Added new files to manifest. 2016-11-13 11:01:06 -05:00
Jussi Pakkanen 918b8d098d GTest and GMock changed their entire project layout on 1.8.0. Again. Fix it. 2016-11-13 11:00:04 -05:00
Nirbheek Chauhan 0f92b7d97c tests/4 qt: Test that invalid modules are not found 2016-11-13 16:50:09 +05:30
Nirbheek Chauhan 954038b7c1 tests/4 qt: Don't search for QtWidgets with Qt4
Doesn't exist on qt4, and causes the test case to not run at all.
2016-11-13 16:50:09 +05:30
Nirbheek Chauhan 69aafd141e qt: Fix qmake detection on Linux and Windows
qmake for both Qt4 and Qt5 detection was assuming that it was only used
on Windows, which is incorrect. It can also be used on Linux for
cross-compilation or in general when pkg-config is not available.

It was also not failing properly for both Qt5 and Qt4 when no libraries
were found, and was assuming that the .dll was always available.

Qt4 detection with qmake was also completely broken.

Also prevents unwanted injection of partially-found qt dependencies in
targets by unsetting self.cargs and self.largs
2016-11-13 16:50:09 +05:30
Guillaume Poirier-Morency b2a39dd06e vala: Generate GIR into the build directory (fix #185)
Add a Vala test generating GIR and typelib files.
2016-11-12 18:03:24 -05:00
Jussi Pakkanen 59a414283c Merge pull request #1022 from centricular/fix-girtarget-deps-includes
gnome.generate_gir: Add gir deps and includes recursively
2016-11-12 18:01:28 -05:00
Jussi Pakkanen e1ecb95d1d Merged generate_gir fix. 2016-11-13 00:43:06 +02:00