From b3f4a7f521566a0f72991e1031fa1c5b096c64f1 Mon Sep 17 00:00:00 2001 From: DongHun Kwak Date: Thu, 27 Oct 2016 14:16:02 +0900 Subject: [PATCH] Imported Upstream version 1.42.0 Change-Id: I9133173486792b3c41a8d55b213ef6d2c340941b Signed-off-by: DongHun Kwak --- INSTALL | 365 ------------ Makefile-cmph.am | 2 +- Makefile-girepository.am | 6 +- Makefile.in | 16 +- aclocal.m4 | 430 +++++++------- build-aux/config.guess | 164 +----- build-aux/config.sub | 25 +- build/gi-tests-msvc.mak | 9 +- config.h.win32 | 6 +- configure | 22 +- configure.ac | 4 +- depcomp | 630 --------------------- docs/reference/html/index.html | 2 +- docs/reference/version.xml | 2 +- gir/gio-2.0.c | 13 +- gir/glib-2.0.c | 69 ++- giscanner/ccompiler.py | 4 +- giscanner/codegen.py | 33 +- giscanner/maintransformer.py | 5 +- giscanner/scannermain.py | 37 +- giscanner/testcodegen.py | 18 +- gobject-introspection-1.0.pc | 4 +- gobject-introspection-no-export-1.0.pc | 4 +- tests/Makefile.am | 9 +- tests/Makefile.in | 9 +- tests/everything.c | 106 ++++ tests/offsets/Makefile.am | 6 +- tests/offsets/Makefile.in | 6 +- tests/offsets/offsets.c | 3 + tests/offsets/offsets.h | 2 + .../Regress.TestObj-pptrarray.page | 15 + .../Regress.TestObj-pptrarray.page | 18 + .../Regress.TestObj-pptrarray.page | 18 + .../Regress.TestObj.page | 2 +- tests/scanner/Regress-1.0-expected.gir | 5 + tests/scanner/regress.c | 12 + 36 files changed, 634 insertions(+), 1447 deletions(-) delete mode 100644 INSTALL delete mode 100755 depcomp create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-pptrarray.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-pptrarray.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-pptrarray.page diff --git a/INSTALL b/INSTALL deleted file mode 100644 index 7d1c323..0000000 --- a/INSTALL +++ /dev/null @@ -1,365 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. - - Copying and distribution of this file, with or without modification, -are permitted in any medium without royalty provided the copyright -notice and this notice are preserved. This file is offered as-is, -without warranty of any kind. - -Basic Installation -================== - - Briefly, the shell commands `./configure; make; make install' should -configure, build, and install this package. The following -more-detailed instructions are generic; see the `README' file for -instructions specific to this package. Some packages provide this -`INSTALL' file but do not implement all of the features documented -below. The lack of an optional feature in a given package is not -necessarily a bug. More recommendations for GNU packages can be found -in *note Makefile Conventions: (standards)Makefile Conventions. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - It can also use an optional file (typically called `config.cache' -and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is -disabled by default to prevent problems with accidental use of stale -cache files. - - If you need to do unusual things to compile the package, please try -to figure out how `configure' could check whether to do them, and mail -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -may remove or edit it. - - The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. - - The simplest way to compile this package is: - - 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. - - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package, generally using the just-built uninstalled binaries. - - 4. Type `make install' to install the programs and any data files and - documentation. When installing into a prefix owned by root, it is - recommended that the package be configured and built as a regular - user, and only the `make install' phase executed with root - privileges. - - 5. Optionally, type `make installcheck' to repeat any self-tests, but - this time using the binaries in their final installed location. - This target does not install anything. Running this target as a - regular user, particularly if the prior `make install' required - root privileges, verifies that the installation completed - correctly. - - 6. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - - 7. Often, you can also type `make uninstall' to remove the installed - files again. In practice, not all packages have tested that - uninstallation works correctly, even though it is required by the - GNU Coding Standards. - - 8. Some packages, particularly those that use Automake, provide `make - distcheck', which can by used by developers to test that all other - targets like `make install' and `make uninstall' work correctly. - This target is generally not run by end users. - -Compilers and Options -===================== - - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c99 CFLAGS=-g LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - - You can compile the package for more than one kind of computer at the -same time, by placing the object files for each architecture in their -own directory. To do this, you can use GNU `make'. `cd' to the -directory where you want the object files and executables to go and run -the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. This -is known as a "VPATH" build. - - With a non-GNU `make', it is safer to compile the package for one -architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before -reconfiguring for another architecture. - - On MacOS X 10.5 and later systems, you can create libraries and -executables that work on multiple system types--known as "fat" or -"universal" binaries--by specifying multiple `-arch' options to the -compiler but only a single `-arch' option to the preprocessor. Like -this: - - ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ - CPP="gcc -E" CXXCPP="g++ -E" - - This is not guaranteed to produce working output in all cases, you -may have to build one architecture at a time and combine the results -using the `lipo' tool if you have problems. - -Installation Names -================== - - By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX', where PREFIX must be an -absolute file name. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. In general, the -default for these options is expressed in terms of `${prefix}', so that -specifying just `--prefix' will affect all of the other directory -specifications that were not explicitly provided. - - The most portable way to affect installation locations is to pass the -correct locations to `configure'; however, many packages provide one or -both of the following shortcuts of passing variable assignments to the -`make install' command line to change installation locations without -having to reconfigure or recompile. - - The first method involves providing an override variable for each -affected directory. For example, `make install -prefix=/alternate/directory' will choose an alternate location for all -directory configuration variables that were expressed in terms of -`${prefix}'. Any directories that were specified during `configure', -but not in terms of `${prefix}', must each be overridden at install -time for the entire installation to be relocated. The approach of -makefile variable overrides for each directory variable is required by -the GNU Coding Standards, and ideally causes no recompilation. -However, some platforms have known limitations with the semantics of -shared libraries that end up requiring recompilation when using this -method, particularly noticeable in packages that use GNU Libtool. - - The second method involves providing the `DESTDIR' variable. For -example, `make install DESTDIR=/alternate/directory' will prepend -`/alternate/directory' before all installation names. The approach of -`DESTDIR' overrides is not required by the GNU Coding Standards, and -does not work on platforms that have drive letters. On the other hand, -it does better at avoiding recompilation issues, and works well even -when some directory options were not specified in terms of `${prefix}' -at `configure' time. - -Optional Features -================= - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - - Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - - Some packages offer the ability to configure how verbose the -execution of `make' will be. For these packages, running `./configure ---enable-silent-rules' sets the default to minimal output, which can be -overridden with `make V=1'; while running `./configure ---disable-silent-rules' sets the default to verbose, which can be -overridden with `make V=0'. - -Particular systems -================== - - On HP-UX, the default C compiler is not ANSI C compatible. If GNU -CC is not installed, it is recommended to use the following options in -order to use an ANSI C compiler: - - ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" - -and if that doesn't work, install pre-built binaries of GCC for HP-UX. - - On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot -parse its `' header file. The option `-nodtk' can be used as -a workaround. If GNU CC is not installed, it is therefore recommended -to try - - ./configure CC="cc" - -and if that doesn't work, try - - ./configure CC="cc -nodtk" - - On Solaris, don't put `/usr/ucb' early in your `PATH'. This -directory contains several dysfunctional programs; working variants of -these programs are available in `/usr/bin'. So, if you need `/usr/ucb' -in your `PATH', put it _after_ `/usr/bin'. - - On Haiku, software installed for all users goes in `/boot/common', -not `/usr/local'. It is recommended to use the following options: - - ./configure --prefix=/boot/common - -Specifying the System Type -========================== - - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS - KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - - Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./configure CC=/usr/local2/bin/gcc - -causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). - -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: - - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash - -`configure' Invocation -====================== - - `configure' recognizes the following options to control how it -operates. - -`--help' -`-h' - Print a summary of all of the options to `configure', and exit. - -`--help=short' -`--help=recursive' - Print a summary of the options unique to this package's - `configure', and exit. The `short' variant lists options used - only in the top level, while the `recursive' variant lists options - also present in any nested packages. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`--prefix=DIR' - Use DIR as the installation prefix. *note Installation Names:: - for more details, including other options available for fine-tuning - the installation locations. - -`--no-create' -`-n' - Run the configure checks, but stop before creating any output - files. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - diff --git a/Makefile-cmph.am b/Makefile-cmph.am index a2edcf6..5e2133a 100644 --- a/Makefile-cmph.am +++ b/Makefile-cmph.am @@ -1,6 +1,6 @@ EXTRA_LTLIBRARIES += libcmph.la -libcmph_la_CPPFLAGS = -Icmph $(GLIB_CFLAGS) +libcmph_la_CPPFLAGS = -Icmph $(GLIB_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) libcmph_la_LIBADD = -lm $(GLIB_LIBS) libcmph_la_SOURCES = \ diff --git a/Makefile-girepository.am b/Makefile-girepository.am index 8a857d6..44b508d 100644 --- a/Makefile-girepository.am +++ b/Makefile-girepository.am @@ -30,7 +30,11 @@ noinst_LTLIBRARIES += libgirepository-internals.la libgirepository-gthash.la libgirepository_gthash_la_SOURCES = \ girepository/gthash.c -libgirepository_gthash_la_CFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository +libgirepository_gthash_la_CFLAGS = \ + $(GIREPO_CFLAGS) \ + $(GI_HIDDEN_VISIBILITY_CFLAGS) \ + -I$(top_srcdir)/girepository + libgirepository_gthash_la_LIBADD = libcmph.la $(GIREPO_LIBS) libgirepository_internals_la_SOURCES = \ diff --git a/Makefile.in b/Makefile.in index 038b5c6..4104d42 100644 --- a/Makefile.in +++ b/Makefile.in @@ -153,10 +153,10 @@ DIST_COMMON = $(srcdir)/common.mk $(srcdir)/Makefile.introspection \ $(pkgpyexec_PYTHON) $(top_srcdir)/build-aux/py-compile \ $(dist_make_DATA) $(nobase_dist_template_DATA) \ $(girepo_HEADERS) $(top_srcdir)/build-aux/test-driver AUTHORS \ - COPYING ChangeLog INSTALL NEWS README TODO build-aux/compile \ - build-aux/config.guess build-aux/config.sub depcomp \ - build-aux/depcomp build-aux/install-sh build-aux/missing \ - build-aux/py-compile build-aux/ylwrap build-aux/ltmain.sh \ + COPYING ChangeLog NEWS README TODO build-aux/compile \ + build-aux/config.guess build-aux/config.sub build-aux/depcomp \ + build-aux/install-sh build-aux/missing build-aux/py-compile \ + build-aux/ylwrap build-aux/ltmain.sh \ $(top_srcdir)/build-aux/compile \ $(top_srcdir)/build-aux/config.guess \ $(top_srcdir)/build-aux/config.sub \ @@ -984,7 +984,7 @@ _gir_silent_scanner_opts_0 = --quiet _gir_silent_compiler = $(_gir_silent_compiler_$(V)) _gir_silent_compiler_ = $(_gir_silent_compiler_$(_gir_verbosity)) _gir_silent_compiler_0 = @echo " GICOMP $(1)"; -libcmph_la_CPPFLAGS = -Icmph $(GLIB_CFLAGS) +libcmph_la_CPPFLAGS = -Icmph $(GLIB_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) libcmph_la_LIBADD = -lm $(GLIB_LIBS) libcmph_la_SOURCES = \ girepository/cmph/bdz.c \ @@ -1079,7 +1079,11 @@ girepo_HEADERS = \ libgirepository_gthash_la_SOURCES = \ girepository/gthash.c -libgirepository_gthash_la_CFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository +libgirepository_gthash_la_CFLAGS = \ + $(GIREPO_CFLAGS) \ + $(GI_HIDDEN_VISIBILITY_CFLAGS) \ + -I$(top_srcdir)/girepository + libgirepository_gthash_la_LIBADD = libcmph.la $(GIREPO_LIBS) libgirepository_internals_la_SOURCES = \ girepository/girmodule.c \ diff --git a/aclocal.m4 b/aclocal.m4 index 399f7b8..385abe2 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -20,221 +20,6 @@ You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]dnl -])# PKG_PROG_PKG_CONFIG - -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) - -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes ], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG - -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED - - -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -pkg_failed=no -AC_MSG_CHECKING([for $1]) - -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) - -if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: - -$$1_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -_PKG_TEXT])[]dnl - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -_PKG_TEXT - -To get pkg-config, see .])[]dnl - ]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])# PKG_CHECK_MODULES - - -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# parameter. -AC_DEFUN([PKG_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([pkgconfigdir], - [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, - [with_pkgconfigdir=]pkg_default) -AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -]) dnl PKG_INSTALLDIR - - -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --with-noarch-pkgconfigdir parameter. -AC_DEFUN([PKG_NOARCH_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([noarch-pkgconfigdir], - [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, - [with_noarch_pkgconfigdir=]pkg_default) -AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -]) dnl PKG_NOARCH_INSTALLDIR - - -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------- -# Retrieves the value of the pkg-config variable for the given module. -AC_DEFUN([PKG_CHECK_VAR], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl - -_PKG_CONFIG([$1], [variable="][$3]["], [$2]) -AS_VAR_COPY([$1], [pkg_cv_][$1]) - -AS_VAR_IF([$1], [""], [$5], [$4])dnl -])# PKG_CHECK_VAR - # Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -1633,6 +1418,221 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see .])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES + + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR + m4_include([m4/gtk-doc.m4]) m4_include([m4/libtool.m4]) m4_include([m4/ltoptions.m4]) diff --git a/build-aux/config.guess b/build-aux/config.guess index 9afd676..1f5c50c 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2013-11-29' +timestamp='2014-03-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -149,7 +149,7 @@ Linux|GNU|GNU/*) LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` ;; esac @@ -826,7 +826,7 @@ EOF *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -969,10 +969,10 @@ EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} exit ;; - or32:Linux:*:*) + or32:Linux:*:* | or1k*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) @@ -1371,154 +1371,6 @@ EOF exit ;; esac -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - cat >&2 <." version="\ GNU config.sub ($timestamp) -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -283,8 +283,10 @@ case $basic_machine in | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipsr5900 | mipsr5900el \ @@ -296,8 +298,7 @@ case $basic_machine in | nds32 | nds32le | nds32be \ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or1k | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -402,8 +403,10 @@ case $basic_machine in | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipsr5900-* | mipsr5900el-* \ @@ -415,6 +418,7 @@ case $basic_machine in | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -824,6 +828,10 @@ case $basic_machine in basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -1369,14 +1377,14 @@ case $os in | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1594,9 +1602,6 @@ case $basic_machine in mips*-*) os=-elf ;; - or1k-*) - os=-elf - ;; or32-*) os=-coff ;; diff --git a/build/gi-tests-msvc.mak b/build/gi-tests-msvc.mak index 9a22d46..8d25c12 100644 --- a/build/gi-tests-msvc.mak +++ b/build/gi-tests-msvc.mak @@ -97,7 +97,7 @@ barapp.exe: @-if exist $@.manifest @mt /manifest $@.manifest /outputresource:$@;1 gitestoffsets.exe: gitestoffsets.c - $(CC) $(CFLAGS) /I..\girepository /I..\tests\offsets $*.c $(LDFLAGS) girepository-$(GI_APIVERSION).lib + $(CC) $(CFLAGS) /I..\girepository /I..\tests\offsets /I..\tests $*.c $(LDFLAGS) girepository-$(GI_APIVERSION).lib @-if exist $@.manifest @mt /manifest $@.manifest /outputresource:$@;1 @set GI_TYPELIB_PATH=. @-$@ offsets.compiled offsets.introspected @@ -124,7 +124,7 @@ Everything-$(GI_APIVERSION).gir: everything.dll Offsets-$(GI_APIVERSION).gir: offsets.dll $(PYTHON2) $(G_IR_SCANNER_CURRENT) --warn-all --warn-error --reparse-validate \ --namespace=Offsets --nsversion=$(GI_APIVERSION) \ - --no-libtool -I.. -I..\tests\offsets \ + --no-libtool -I.. -I..\tests\offsets -I..\tests \ --pkg=gobject-$(GLIB_APIVERSION) --add-include-path=. --include=GObject-$(GLIB_APIVERSION) \ --library=$* --output=$@ \ ..\tests\offsets\offsets.h ..\tests\offsets\offsets.c @@ -247,7 +247,10 @@ warn_tests_log.txt: # Rules for source code generation everything.c everything.h: $(PYTHON2) $(G_IR_SCANNER_CURRENT) -I.. \ - --generate-typelib-tests=Everything,everything.h,everything.c + --generate-typelib-tests=Everything,everything.h,everything.c \ + --function-decoration=_GI_TEST_EXTERN \ + --include-first-in-src=config.h \ + --include-last-in-header=gitestmacros.h gitestoffsets.c: Offsets-$(GI_APIVERSION).typelib $(PYTHON2) ..\tests\offsets\gen-gitestoffsets ..\tests\offsets\offsets.h > $@ diff --git a/config.h.win32 b/config.h.win32 index c433755..59291c2 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -96,7 +96,7 @@ #define PACKAGE_NAME "gobject-introspection" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "gojbect-introspection 1.41.91" +#define PACKAGE_STRING "gojbect-introspection 1.42.0" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gobject-introspection" @@ -105,7 +105,7 @@ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.41.91" +#define PACKAGE_VERSION "1.42.0" /* Define to the platform's shared library suffix */ #define SHLIB_SUFFIX ".dll" @@ -126,7 +126,7 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "1.41.91" +#define VERSION "1.42.0" /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a `char[]'. */ diff --git a/configure b/configure index cd761c7..2ce86d8 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gobject-introspection 1.41.91. +# Generated by GNU Autoconf 2.69 for gobject-introspection 1.42.0. # # Report bugs to . # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='gobject-introspection' PACKAGE_TARNAME='gobject-introspection' -PACKAGE_VERSION='1.41.91' -PACKAGE_STRING='gobject-introspection 1.41.91' +PACKAGE_VERSION='1.42.0' +PACKAGE_STRING='gobject-introspection 1.42.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=glib&component=introspection' PACKAGE_URL='' @@ -1430,7 +1430,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gobject-introspection 1.41.91 to adapt to many kinds of systems. +\`configure' configures gobject-introspection 1.42.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1501,7 +1501,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gobject-introspection 1.41.91:";; + short | recursive ) echo "Configuration of gobject-introspection 1.42.0:";; esac cat <<\_ACEOF @@ -1655,7 +1655,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gobject-introspection configure 1.41.91 +gobject-introspection configure 1.42.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2207,7 +2207,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gobject-introspection $as_me 1.41.91, which was +It was created by gobject-introspection $as_me 1.42.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3075,7 +3075,7 @@ fi # Define the identity of the package. PACKAGE='gobject-introspection' - VERSION='1.41.91' + VERSION='1.42.0' cat >>confdefs.h <<_ACEOF @@ -3348,7 +3348,7 @@ AM_BACKSLASH='\' # Used in docs/reference/version.xml -GI_VERSION=1.41.91 +GI_VERSION=1.42.0 # Check for Win32 @@ -15512,7 +15512,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gobject-introspection $as_me 1.41.91, which was +This file was extended by gobject-introspection $as_me 1.42.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15578,7 +15578,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gobject-introspection config.status 1.41.91 +gobject-introspection config.status 1.42.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 17924b1..1fd260a 100644 --- a/configure.ac +++ b/configure.ac @@ -3,8 +3,8 @@ dnl the gi version number m4_define(gi_major_version, 1) -m4_define(gi_minor_version, 41) -m4_define(gi_micro_version, 91) +m4_define(gi_minor_version, 42) +m4_define(gi_micro_version, 0) m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version) AC_PREREQ([2.63]) diff --git a/depcomp b/depcomp deleted file mode 100755 index df8eea7..0000000 --- a/depcomp +++ /dev/null @@ -1,630 +0,0 @@ -#! /bin/sh -# depcomp - compile a program generating dependencies as side-effects - -scriptversion=2009-04-28.21; # UTC - -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free -# Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# Originally written by Alexandre Oliva . - -case $1 in - '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) - cat <<\EOF -Usage: depcomp [--help] [--version] PROGRAM [ARGS] - -Run PROGRAMS ARGS to compile a file, generating dependencies -as side-effects. - -Environment variables: - depmode Dependency tracking mode. - source Source file read by `PROGRAMS ARGS'. - object Object file output by `PROGRAMS ARGS'. - DEPDIR directory where to store dependencies. - depfile Dependency file to output. - tmpdepfile Temporary file to use when outputing dependencies. - libtool Whether libtool is used (yes/no). - -Report bugs to . -EOF - exit $? - ;; - -v | --v*) - echo "depcomp $scriptversion" - exit $? - ;; -esac - -if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 -fi - -# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po. -depfile=${depfile-`echo "$object" | - sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`} -tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`} - -rm -f "$tmpdepfile" - -# Some modes work just like other modes, but use different flags. We -# parameterize here, but still list the modes in the big case below, -# to make depend.m4 easier to write. Note that we *cannot* use a case -# here, because this file can only contain one case statement. -if test "$depmode" = hp; then - # HP compiler uses -M and no extra arg. - gccflag=-M - depmode=gcc -fi - -if test "$depmode" = dashXmstdout; then - # This is just like dashmstdout with a different argument. - dashmflag=-xM - depmode=dashmstdout -fi - -cygpath_u="cygpath -u -f -" -if test "$depmode" = msvcmsys; then - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 - cygpath_u="sed s,\\\\\\\\,/,g" - depmode=msvisualcpp -fi - -case "$depmode" in -gcc3) -## gcc 3 implements dependency tracking that does exactly what -## we want. Yay! Note: for some reason libtool 1.4 doesn't like -## it if -MD -MP comes after the -MF stuff. Hmm. -## Unfortunately, FreeBSD c89 acceptance of flags depends upon -## the command line argument order; so add the flags where they -## appear in depend2.am. Note that the slowdown incurred here -## affects only configure: in makefiles, %FASTDEP% shortcuts this. - for arg - do - case $arg in - -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; - *) set fnord "$@" "$arg" ;; - esac - shift # fnord - shift # $arg - done - "$@" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - mv "$tmpdepfile" "$depfile" - ;; - -gcc) -## There are various ways to get dependency output from gcc. Here's -## why we pick this rather obscure method: -## - Don't want to use -MD because we'd like the dependencies to end -## up in a subdir. Having to rename by hand is ugly. -## (We might end up doing this anyway to support other compilers.) -## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like -## -MM, not -M (despite what the docs say). -## - Using -M directly means running the compiler twice (even worse -## than renaming). - if test -z "$gccflag"; then - gccflag=-MD, - fi - "$@" -Wp,"$gccflag$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - echo "$object : \\" > "$depfile" - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz -## The second -e expression handles DOS-style file names with drive letters. - sed -e 's/^[^:]*: / /' \ - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" -## This next piece of magic avoids the `deleted header file' problem. -## The problem is that when a header file which appears in a .P file -## is deleted, the dependency causes make to die (because there is -## typically no way to rebuild the header). We avoid this by adding -## dummy dependencies for each header file. Too bad gcc doesn't do -## this for us directly. - tr ' ' ' -' < "$tmpdepfile" | -## Some versions of gcc put a space before the `:'. On the theory -## that the space means something, we add a space to the output as -## well. -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -sgi) - if test "$libtool" = yes; then - "$@" "-Wp,-MDupdate,$tmpdepfile" - else - "$@" -MDupdate "$tmpdepfile" - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - - if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files - echo "$object : \\" > "$depfile" - - # Clip off the initial element (the dependent). Don't try to be - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; - # the IRIX cc adds comments like `#:fec' to the end of the - # dependency line. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ - tr ' -' ' ' >> "$depfile" - echo >> "$depfile" - - # The second pass generates a dummy entry for each header file. - tr ' ' ' -' < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -aix) - # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. In older versions, this file always lives in the - # current directory. Also, the AIX compiler puts `$object:' at the - # start of each line; $object doesn't have directory information. - # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - if test "$libtool" = yes; then - tmpdepfile1=$dir$base.u - tmpdepfile2=$base.u - tmpdepfile3=$dir.libs/$base.u - "$@" -Wc,-M - else - tmpdepfile1=$dir$base.u - tmpdepfile2=$dir$base.u - tmpdepfile3=$dir$base.u - "$@" -M - fi - stat=$? - - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - # Each line is of the form `foo.o: dependent.h'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile - # "include basename.Plo" scheme. - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -icc) - # Intel's C compiler understands `-MD -MF file'. However on - # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h - # which is wrong. We want: - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output - # foo.o: sub/foo.c sub/foo.h - # and will wrap long lines using \ : - # foo.o: sub/foo.c ... \ - # sub/foo.h ... \ - # ... - - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile" - exit $stat - fi - rm -f "$depfile" - # Each line is of the form `foo.o: dependent.h', - # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. - # Do two passes, one to just change these to - # `$object: dependent.h' and one to simply `dependent.h:'. - sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" - # Some versions of the HPUX 10.20 sed can't process this invocation - # correctly. Breaking it into two sed invocations is a workaround. - sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | - sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -hp2) - # The "hp" stanza above does not work with aCC (C++) and HP's ia64 - # compilers, which have integrated preprocessors. The correct option - # to use with these is +Maked; it writes dependencies to a file named - # 'foo.d', which lands next to the object file, wherever that - # happens to be. - # Much of this is similar to the tru64 case; see comments there. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - if test "$libtool" = yes; then - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir.libs/$base.d - "$@" -Wc,+Maked - else - tmpdepfile1=$dir$base.d - tmpdepfile2=$dir$base.d - "$@" +Maked - fi - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" - # Add `dependent.h:' lines. - sed -ne '2,${ - s/^ *// - s/ \\*$// - s/$/:/ - p - }' "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" "$tmpdepfile2" - ;; - -tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side - # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put - # dependencies in `foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` - - if test "$libtool" = yes; then - # With Tru64 cc, shared objects can also be used to make a - # static library. This mechanism is used in libtool 1.4 series to - # handle both shared and static libraries in a single compilation. - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. - # - # With libtool 1.5 this exception was removed, and libtool now - # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in $dir.libs/$base.o.d and - # in $dir$base.o.d. We have to check for both files, because - # one of the two compilations can be disabled. We should prefer - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is - # automatically cleaned when .libs/ is deleted, while ignoring - # the former would cause a distcleancheck panic. - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 - tmpdepfile2=$dir$base.o.d # libtool 1.5 - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 - "$@" -Wc,-MD - else - tmpdepfile1=$dir$base.o.d - tmpdepfile2=$dir$base.d - tmpdepfile3=$dir$base.d - tmpdepfile4=$dir$base.d - "$@" -MD - fi - - stat=$? - if test $stat -eq 0; then : - else - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - exit $stat - fi - - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" - do - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" - # That's a tab and a space in the []. - sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -#nosideeffect) - # This comment above is used by automake to tell side-effect - # dependency tracking mechanisms from slower ones. - -dashmstdout) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - test -z "$dashmflag" && dashmflag=-M - # Require at least two characters before searching for `:' - # in the target name. This is to cope with DOS-style filenames: - # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. - "$@" $dashmflag | - sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - tr ' ' ' -' < "$tmpdepfile" | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -dashXmstdout) - # This case only exists to satisfy depend.m4. It is never actually - # run, as this mode is specially recognized in the preamble. - exit 1 - ;; - -makedepend) - "$@" || exit $? - # Remove any Libtool call - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - # X makedepend - shift - cleared=no eat=no - for arg - do - case $cleared in - no) - set ""; shift - cleared=yes ;; - esac - if test $eat = yes; then - eat=no - continue - fi - case "$arg" in - -D*|-I*) - set fnord "$@" "$arg"; shift ;; - # Strip any option that makedepend may not understand. Remove - # the object too, otherwise makedepend will parse it as a source file. - -arch) - eat=yes ;; - -*|$object) - ;; - *) - set fnord "$@" "$arg"; shift ;; - esac - done - obj_suffix=`echo "$object" | sed 's/^.*\././'` - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" - sed '1,2d' "$tmpdepfile" | tr ' ' ' -' | \ -## Some versions of the HPUX 10.20 sed can't process this invocation -## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" "$tmpdepfile".bak - ;; - -cpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - - # Remove `-o $object'. - IFS=" " - for arg - do - case $arg in - -o) - shift - ;; - $object) - shift - ;; - *) - set fnord "$@" "$arg" - shift # fnord - shift # $arg - ;; - esac - done - - "$@" -E | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | - sed '$ s: \\$::' > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - cat < "$tmpdepfile" >> "$depfile" - sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvisualcpp) - # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout. - "$@" || exit $? - - # Remove the call to Libtool. - if test "$libtool" = yes; then - while test "X$1" != 'X--mode=compile'; do - shift - done - shift - fi - - IFS=" " - for arg - do - case "$arg" in - -o) - shift - ;; - $object) - shift - ;; - "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") - set fnord "$@" - shift - shift - ;; - *) - set fnord "$@" "$arg" - shift - shift - ;; - esac - done - "$@" -E 2>/dev/null | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" - echo " " >> "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -msvcmsys) - # This case exists only to let depend.m4 do its work. It works by - # looking at the text of this script. This case will never be run, - # since it is checked for above. - exit 1 - ;; - -none) - exec "$@" - ;; - -*) - echo "Unknown depmode $depmode" 1>&2 - exit 1 - ;; -esac - -exit 0 - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/docs/reference/html/index.html b/docs/reference/html/index.html index 08594bb..a5bc301 100644 --- a/docs/reference/html/index.html +++ b/docs/reference/html/index.html @@ -15,7 +15,7 @@

- This document is for GObject Introspection version 1.41.91 + This document is for GObject Introspection version 1.42.0 . The latest version of this documentation can be found on-line at http://developer.gnome.org/gi/unstable/. diff --git a/docs/reference/version.xml b/docs/reference/version.xml index d3dcb16..a50908c 100644 --- a/docs/reference/version.xml +++ b/docs/reference/version.xml @@ -1 +1 @@ -1.41.91 +1.42.0 diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index ba8a8ee..35f04f8 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -243,11 +243,6 @@ * decide to perform certain actions, including direct local handling * (which may be useful for options like --version). * - * If the options have been "handled" then a non-negative value should - * be returned. In this case, the return value is the exit status: 0 - * for success and a positive value for failure. -1 means to continue - * normal processing. - * * In the event that the application is marked * %G_APPLICATION_HANDLES_COMMAND_LINE the "normal processing" will * send the @option dictionary to the primary instance where it can be @@ -278,6 +273,10 @@ * capabilities than what is provided here, but this should not * normally be required. * + * Returns: an exit code. If you have handled your options and want + * to exit the process, return a non-negative option, 0 for success, + * and a positive value for failure. To continue, return -1 to let + * the default option processing continue. * Since: 2.40 */ @@ -5337,7 +5336,7 @@ * implements methods for getting information that all files should * contain, and allows for manipulation of extended attributes. * - * See [GFileAttribute][gio-GFileAttribute for more information on how + * See [GFileAttribute][gio-GFileAttribute] for more information on how * GIO handles file attributes. * * To obtain a #GFileInfo for a #GFile, use g_file_query_info() (or its @@ -18687,6 +18686,8 @@ * An application implements an interface if that interface is listed in * the Implements= line of the desktop file of the application. * + * Returns: (element-type GDesktopAppInfo) (transfer full): a list of #GDesktopAppInfo + * objects. * Since: 2.42 */ diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index de9db6b..d1c3b59 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -4997,9 +4997,11 @@ * An example using a #GPtrArray: * |[ * GPtrArray *array; - * gchar *string1 = "one", *string2 = "two", *string3 = "three"; + * gchar *string1 = "one"; + * gchar *string2 = "two"; + * gchar *string3 = "three"; * - * gparray = g_ptr_array_new (); + * array = g_ptr_array_new (); * g_ptr_array_add (array, (gpointer) string1); * g_ptr_array_add (array, (gpointer) string2); * g_ptr_array_add (array, (gpointer) string3); @@ -6002,10 +6004,11 @@ * in the gio library, for those.) * * For space-efficiency, the #GVariant serialisation format does not - * automatically include the variant's type or endianness, which must - * either be implied from context (such as knowledge that a particular - * file format always contains a little-endian %G_VARIANT_TYPE_VARIANT) - * or supplied out-of-band (for instance, a type and/or endianness + * automatically include the variant's length, type or endianness, + * which must either be implied from context (such as knowledge that a + * particular file format always contains a little-endian + * %G_VARIANT_TYPE_VARIANT which occupies the whole length of the file) + * or supplied out-of-band (for instance, a length, type and/or endianness * indicator could be placed at the beginning of a file, network message * or network stream). * @@ -6038,7 +6041,8 @@ * * This is the memory that is used for storing GVariant data in * serialised form. This is what would be sent over the network or - * what would end up on disk. + * what would end up on disk, not counting any indicator of the + * endianness, or of the length or type of the top-level variant. * * The amount of memory required to store a boolean is 1 byte. 16, * 32 and 64 bit integers and double precision floating point numbers @@ -18732,7 +18736,18 @@ * * Finds a #GSource given a pair of context and ID. * - * Returns: (transfer none): the #GSource if found, otherwise, %NULL + * It is a programmer error to attempt to lookup a non-existent source. + * + * More specifically: source IDs can be reissued after a source has been + * destroyed and therefore it is never valid to use this function with a + * source ID which may have already been removed. An example is when + * scheduling an idle to run in another thread with g_idle_add(): the + * idle may already have run and been removed by the time this function + * is called on its (now invalid) source ID. This source ID may have + * been reissued, leading to the operation being performed against the + * wrong source. + * + * Returns: (transfer none): the #GSource */ @@ -25849,9 +25864,8 @@ * g_source_get_name: * @source: a #GSource * - * Gets a name for the source, used in debugging and profiling. - * The name may be #NULL if it has never been set with - * g_source_set_name(). + * Gets a name for the source, used in debugging and profiling. The + * name may be #NULL if it has never been set with g_source_set_name(). * * Returns: the name of the source * Since: 2.26 @@ -26058,6 +26072,15 @@ * * It is a programmer error to attempt to remove a non-existent source. * + * More specifically: source IDs can be reissued after a source has been + * destroyed and therefore it is never valid to use this function with a + * source ID which may have already been removed. An example is when + * scheduling an idle to run in another thread with g_idle_add(): the + * idle may already have run and been removed by the time this function + * is called on its (now invalid) source ID. This source ID may have + * been reissued, leading to the operation being performed against the + * wrong source. + * * Returns: For historical reasons, this function always returns %TRUE */ @@ -26211,6 +26234,11 @@ * one could change the name in the "check" function of a #GSourceFuncs * to include details like the event type in the source name. * + * Use caution if changing the name while another thread may be + * accessing it with g_source_get_name(); that function does not copy + * the value, and changing the value will free it while the other thread + * may be attempting to use it. + * * Since: 2.26 */ @@ -26225,6 +26253,18 @@ * This is a convenience utility to set source names from the return * value of g_idle_add(), g_timeout_add(), etc. * + * It is a programmer error to attempt to set the name of a non-existent + * source. + * + * More specifically: source IDs can be reissued after a source has been + * destroyed and therefore it is never valid to use this function with a + * source ID which may have already been removed. An example is when + * scheduling an idle to run in another thread with g_idle_add(): the + * idle may already have run and been removed by the time this function + * is called on its (now invalid) source ID. This source ID may have + * been reissued, leading to the operation being performed against the + * wrong source. + * * Since: 2.26 */ @@ -29316,11 +29356,16 @@ * until it is destroyed by g_thread_pool_free(). If @exclusive is * %FALSE, threads are created when needed and shared between all * non-exclusive thread pools. This implies that @max_threads may - * not be -1 for exclusive thread pools. + * not be -1 for exclusive thread pools. Besides, exclusive thread + * pools are not affected by g_thread_pool_set_max_idle_time() + * since their threads are never considered idle and returned to the + * global pool. * * @error can be %NULL to ignore errors, or non-%NULL to report * errors. An error can only occur when @exclusive is set to %TRUE * and not all @max_threads threads could be created. + * See #GThreadError for possible errors that may occurr. + * Note, even in case of error a valid #GThreadPool is returned. * * Returns: the new #GThreadPool */ diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py index 63110a2..1c66aac 100644 --- a/giscanner/ccompiler.py +++ b/giscanner/ccompiler.py @@ -135,9 +135,9 @@ class CCompiler(object): # When we are not using Visual C++ (i.e. we are using GCC)... else: is_msvc = False - libtool = get_libtool_command(options) + libtool = utils.get_libtool_command(options) if libtool: - args.append(which(os.environ.get('SHELL', 'sh.exe'))) + args.append(utils.which(os.environ.get('SHELL', 'sh.exe'))) args.extend(libtool) args.append('--mode=execute') # FIXME: it could have prefix (i686-w64-mingw32-dlltool.exe) diff --git a/giscanner/codegen.py b/giscanner/codegen.py index e9ed941..e0eb182 100644 --- a/giscanner/codegen.py +++ b/giscanner/codegen.py @@ -26,9 +26,21 @@ from . import ast class CCodeGenerator(object): - def __init__(self, namespace, out_h_filename, out_c_filename): + def __init__(self, namespace, + out_h_filename, + out_c_filename, + function_decoration=[], + include_first_header=[], + include_last_header=[], + include_first_src=[], + include_last_src=[]): self.out_h_filename = out_h_filename self.out_c_filename = out_c_filename + self.function_decoration = function_decoration + self.include_first_header = include_first_header + self.include_last_header = include_last_header + self.include_first_src = include_first_src + self.include_last_src = include_last_src self._function_bodies = {} self.namespace = namespace @@ -50,6 +62,10 @@ class CCodeGenerator(object): return param.type.ctype + suffix def _write_prelude(self, out, func): + if self.function_decoration: + out.write(""" +%s""" % " ".join(self.function_decoration)) + out.write(""" %s %s (""" % (self._typecontainer_to_ctype(func.retval), func.symbol)) @@ -105,16 +121,31 @@ class CCodeGenerator(object): warning = '/* GENERATED BY testcodegen.py; DO NOT EDIT */\n\n' self.out_h.write(warning) nsupper = self.namespace.name.upper() + + for header in self.include_first_header: + self.out_h.write("""#include "%s"\n""" % header) + self.out_h.write(""" #ifndef __%s_H__ #define __%s_H__ #include + """ % (nsupper, nsupper)) + for header in self.include_last_header: + self.out_h.write("""#include "%s"\n""" % header) + self.out_c.write(warning) + + for header in self.include_first_src: + self.out_c.write("""#include "%s"\n""" % header) + self.out_c.write("""#include "%s"\n\n""" % (self.out_h_filename, )) + for header in self.include_last_src: + self.out_c.write("""#include "%s"\n""" % header) + def _codegen_end(self): self.out_h.write("""#endif\n""") diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py index 19e3f24..4326374 100644 --- a/giscanner/maintransformer.py +++ b/giscanner/maintransformer.py @@ -287,7 +287,10 @@ class MainTransformer(object): return base if isinstance(base, ast.List) and len(rest) == 1: return ast.List(base.name, *rest) - if isinstance(base, ast.Map) and len(rest) == 2: + elif isinstance(base, ast.Array) and len(rest) == 1: + base.element_type = rest[0] + return base + elif isinstance(base, ast.Map) and len(rest) == 2: return ast.Map(*rest) message.warn( "Too many parameters in type specification %r" % (type_str, )) diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py index c3706f2..bca4a88 100755 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py @@ -217,6 +217,21 @@ match the namespace prefix.""") parser.add_option("", "--typelib-xml", action="store_true", dest="typelib_xml", help=optparse.SUPPRESS_HELP) + parser.add_option("", "--function-decoration", + action="append", dest="function_decoration", default=[], + help="Macro to decorate functions in generated code") + parser.add_option("", "--include-first-in-header", + action="append", dest="include_first_header", default=[], + help="Header to include first in generated header") + parser.add_option("", "--include-last-in-header", + action="append", dest="include_last_header", default=[], + help="Header to include after the other headers in generated header") + parser.add_option("", "--include-first-in-src", + action="append", dest="include_first_src", default=[], + help="Header to include first in generated sources") + parser.add_option("", "--include-last-in-src", + action="append", dest="include_last_src", default=[], + help="Header to include after the other headers in generated sources") return parser @@ -233,11 +248,22 @@ def passthrough_gir(path, f): f.write(writer.get_xml()) -def test_codegen(optstring): +def test_codegen(optstring, + function_decoration, + include_first_header, + include_last_header, + include_first_src, + include_last_src): (namespace, out_h_filename, out_c_filename) = optstring.split(',') if namespace == 'Everything': from .testcodegen import EverythingCodeGenerator - gen = EverythingCodeGenerator(out_h_filename, out_c_filename) + gen = EverythingCodeGenerator(out_h_filename, + out_c_filename, + function_decoration, + include_first_header, + include_last_header, + include_first_src, + include_last_src) gen.write() else: _error("Invaild namespace %r" % (namespace, )) @@ -450,7 +476,12 @@ def scanner_main(args): if options.passthrough_gir: passthrough_gir(options.passthrough_gir, sys.stdout) if options.test_codegen: - return test_codegen(options.test_codegen) + return test_codegen(options.test_codegen, + options.function_decoration, + options.include_first_header, + options.include_last_header, + options.include_first_src, + options.include_last_src) if hasattr(options, 'filelist') and not options.filelist: if len(args) <= 1: diff --git a/giscanner/testcodegen.py b/giscanner/testcodegen.py index 1ed247c..32139e3 100644 --- a/giscanner/testcodegen.py +++ b/giscanner/testcodegen.py @@ -46,9 +46,23 @@ def uscore_from_type(typeval): class EverythingCodeGenerator(object): - def __init__(self, out_h_filename, out_c_filename): + def __init__(self, + out_h_filename, + out_c_filename, + function_decoration, + include_first_header, + include_last_header, + include_first_src, + include_last_src): self.namespace = ast.Namespace('Everything', '1.0') - self.gen = CCodeGenerator(self.namespace, out_h_filename, out_c_filename) + self.gen = CCodeGenerator(self.namespace, + out_h_filename, + out_c_filename, + function_decoration, + include_first_header, + include_last_header, + include_first_src, + include_last_src) def write(self): func = ast.Function('nullfunc', diff --git a/gobject-introspection-1.0.pc b/gobject-introspection-1.0.pc index ff10b4e..75c6429 100644 --- a/gobject-introspection-1.0.pc +++ b/gobject-introspection-1.0.pc @@ -1,4 +1,4 @@ -prefix=/opt/gnome +prefix=/home/mclasen/gnome exec_prefix=${prefix} libdir=${exec_prefix}/lib bindir=${exec_prefix}/bin @@ -21,4 +21,4 @@ Libs.private: Name: gobject-introspection Description: GObject Introspection -Version: 1.41.91 +Version: 1.42.0 diff --git a/gobject-introspection-no-export-1.0.pc b/gobject-introspection-no-export-1.0.pc index 25809d1..a59d02c 100644 --- a/gobject-introspection-no-export-1.0.pc +++ b/gobject-introspection-no-export-1.0.pc @@ -1,4 +1,4 @@ -prefix=/opt/gnome +prefix=/home/mclasen/gnome exec_prefix=${prefix} libdir=${exec_prefix}/lib bindir=${exec_prefix}/bin @@ -20,4 +20,4 @@ Libs.private: Name: gobject-introspection Description: GObject Introspection -Version: 1.41.91 +Version: 1.42.0 diff --git a/tests/Makefile.am b/tests/Makefile.am index adeba76..bdd0fa7 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -6,7 +6,7 @@ EXTRA_DIST= BUILT_SOURCES= CLEANFILES= -AM_CFLAGS = $(GOBJECT_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) +AM_CFLAGS = $(GOBJECT_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) -I$(srcdir) LIBADD = $(GOBJECT_LIBS) testsdir = $(datadir)/gobject-introspection-1.0/tests @@ -39,7 +39,11 @@ CLEANFILES += \ GIMarshallingTests-1.0.typelib everything-stamp.h: Makefile - $(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) --generate-typelib-tests=Everything,everything.h,everything.c + $(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) \ + --generate-typelib-tests=Everything,everything.h,everything.c \ + --function-decoration=_GI_TEST_EXTERN \ + --include-first-in-src=config.h \ + --include-last-in-header=gitestmacros.h touch $@ everything.c: everything-stamp.h @@ -54,6 +58,7 @@ Everything-1.0.gir: libeverything-1.0.la Makefile --libtool="$(LIBTOOL)" \ --add-include-path=$(top_builddir) --include=Gio-2.0 \ --library=libeverything-1.0.la --output=$@ \ + -I$(srcdir) \ everything.h everything.c GIMarshallingTests-1.0.gir: libgimarshallingtests-1.0.la Makefile diff --git a/tests/Makefile.in b/tests/Makefile.in index ecec7a2..49bcf3b 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -647,7 +647,7 @@ BUILT_SOURCES = everything.c everything.h CLEANFILES = $(BUILT_SOURCES) $(EXTRA_LTLIBRARIES) everything-stamp.h \ Everything-1.0.gir Everything-1.0.typelib \ GIMarshallingTests-1.0.gir GIMarshallingTests-1.0.typelib -AM_CFLAGS = $(GOBJECT_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) +AM_CFLAGS = $(GOBJECT_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) -I$(srcdir) LIBADD = $(GOBJECT_LIBS) testsdir = $(datadir)/gobject-introspection-1.0/tests tests_DATA = \ @@ -1222,7 +1222,11 @@ uninstall-am: uninstall-testsDATA everything-stamp.h: Makefile - $(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) --generate-typelib-tests=Everything,everything.h,everything.c + $(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) \ + --generate-typelib-tests=Everything,everything.h,everything.c \ + --function-decoration=_GI_TEST_EXTERN \ + --include-first-in-src=config.h \ + --include-last-in-header=gitestmacros.h touch $@ everything.c: everything-stamp.h @@ -1237,6 +1241,7 @@ Everything-1.0.gir: libeverything-1.0.la Makefile --libtool="$(LIBTOOL)" \ --add-include-path=$(top_builddir) --include=Gio-2.0 \ --library=libeverything-1.0.la --output=$@ \ + -I$(srcdir) \ everything.h everything.c GIMarshallingTests-1.0.gir: libgimarshallingtests-1.0.la Makefile diff --git a/tests/everything.c b/tests/everything.c index f60d963..e460469 100644 --- a/tests/everything.c +++ b/tests/everything.c @@ -1,5 +1,6 @@ /* GENERATED BY testcodegen.py; DO NOT EDIT */ +#include "config.h" #include "everything.h" /** @@ -9,6 +10,7 @@ * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_nullfunc (void) { @@ -22,6 +24,7 @@ everything_nullfunc (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gboolean everything_const_return_gboolean (void) { @@ -35,6 +38,7 @@ everything_const_return_gboolean (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gint8 everything_const_return_gint8 (void) { @@ -48,6 +52,7 @@ everything_const_return_gint8 (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN guint8 everything_const_return_guint8 (void) { @@ -61,6 +66,7 @@ everything_const_return_guint8 (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gint16 everything_const_return_gint16 (void) { @@ -74,6 +80,7 @@ everything_const_return_gint16 (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN guint16 everything_const_return_guint16 (void) { @@ -87,6 +94,7 @@ everything_const_return_guint16 (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gint32 everything_const_return_gint32 (void) { @@ -100,6 +108,7 @@ everything_const_return_gint32 (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN guint32 everything_const_return_guint32 (void) { @@ -113,6 +122,7 @@ everything_const_return_guint32 (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gint64 everything_const_return_gint64 (void) { @@ -126,6 +136,7 @@ everything_const_return_gint64 (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN guint64 everything_const_return_guint64 (void) { @@ -139,6 +150,7 @@ everything_const_return_guint64 (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gchar everything_const_return_gchar (void) { @@ -152,6 +164,7 @@ everything_const_return_gchar (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gshort everything_const_return_gshort (void) { @@ -165,6 +178,7 @@ everything_const_return_gshort (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gushort everything_const_return_gushort (void) { @@ -178,6 +192,7 @@ everything_const_return_gushort (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gint everything_const_return_gint (void) { @@ -191,6 +206,7 @@ everything_const_return_gint (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN guint everything_const_return_guint (void) { @@ -204,6 +220,7 @@ everything_const_return_guint (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN glong everything_const_return_glong (void) { @@ -217,6 +234,7 @@ everything_const_return_glong (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gulong everything_const_return_gulong (void) { @@ -230,6 +248,7 @@ everything_const_return_gulong (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gsize everything_const_return_gsize (void) { @@ -243,6 +262,7 @@ everything_const_return_gsize (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gssize everything_const_return_gssize (void) { @@ -256,6 +276,7 @@ everything_const_return_gssize (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gintptr everything_const_return_gintptr (void) { @@ -269,6 +290,7 @@ everything_const_return_gintptr (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN guintptr everything_const_return_guintptr (void) { @@ -282,6 +304,7 @@ everything_const_return_guintptr (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gfloat everything_const_return_gfloat (void) { @@ -295,6 +318,7 @@ everything_const_return_gfloat (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gdouble everything_const_return_gdouble (void) { @@ -308,6 +332,7 @@ everything_const_return_gdouble (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gunichar everything_const_return_gunichar (void) { @@ -321,6 +346,7 @@ everything_const_return_gunichar (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN GType everything_const_return_GType (void) { @@ -334,6 +360,7 @@ everything_const_return_GType (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN const gchar* everything_const_return_utf8 (void) { @@ -347,6 +374,7 @@ everything_const_return_utf8 (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN const gchar* everything_const_return_filename (void) { @@ -361,6 +389,7 @@ everything_const_return_filename (void) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_oneparam_gboolean (gboolean arg0) { @@ -375,6 +404,7 @@ everything_oneparam_gboolean (gboolean arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_oneparam_gint8 (gint8 arg0) { @@ -389,6 +419,7 @@ everything_oneparam_gint8 (gint8 arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_oneparam_guint8 (guint8 arg0) { @@ -403,6 +434,7 @@ everything_oneparam_guint8 (guint8 arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_oneparam_gint16 (gint16 arg0) { @@ -417,6 +449,7 @@ everything_oneparam_gint16 (gint16 arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_oneparam_guint16 (guint16 arg0) { @@ -431,6 +464,7 @@ everything_oneparam_guint16 (guint16 arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_oneparam_gint32 (gint32 arg0) { @@ -445,6 +479,7 @@ everything_oneparam_gint32 (gint32 arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_oneparam_guint32 (guint32 arg0) { @@ -459,6 +494,7 @@ everything_oneparam_guint32 (guint32 arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_oneparam_gint64 (gint64 arg0) { @@ -473,6 +509,7 @@ everything_oneparam_gint64 (gint64 arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_oneparam_guint64 (guint64 arg0) { @@ -487,6 +524,7 @@ everything_oneparam_guint64 (guint64 arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_oneparam_gchar (gchar arg0) { @@ -501,6 +539,7 @@ everything_oneparam_gchar (gchar arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_oneparam_gshort (gshort arg0) { @@ -515,6 +554,7 @@ everything_oneparam_gshort (gshort arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_oneparam_gushort (gushort arg0) { @@ -529,6 +569,7 @@ everything_oneparam_gushort (gushort arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_oneparam_gint (gint arg0) { @@ -543,6 +584,7 @@ everything_oneparam_gint (gint arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_oneparam_guint (guint arg0) { @@ -557,6 +599,7 @@ everything_oneparam_guint (guint arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_oneparam_glong (glong arg0) { @@ -571,6 +614,7 @@ everything_oneparam_glong (glong arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_oneparam_gulong (gulong arg0) { @@ -585,6 +629,7 @@ everything_oneparam_gulong (gulong arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_oneparam_gsize (gsize arg0) { @@ -599,6 +644,7 @@ everything_oneparam_gsize (gsize arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_oneparam_gssize (gssize arg0) { @@ -613,6 +659,7 @@ everything_oneparam_gssize (gssize arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_oneparam_gintptr (gintptr arg0) { @@ -627,6 +674,7 @@ everything_oneparam_gintptr (gintptr arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_oneparam_guintptr (guintptr arg0) { @@ -641,6 +689,7 @@ everything_oneparam_guintptr (guintptr arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_oneparam_gfloat (gfloat arg0) { @@ -655,6 +704,7 @@ everything_oneparam_gfloat (gfloat arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_oneparam_gdouble (gdouble arg0) { @@ -669,6 +719,7 @@ everything_oneparam_gdouble (gdouble arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_oneparam_gunichar (gunichar arg0) { @@ -683,6 +734,7 @@ everything_oneparam_gunichar (gunichar arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_oneparam_GType (GType arg0) { @@ -697,6 +749,7 @@ everything_oneparam_GType (GType arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_oneparam_utf8 (const gchar* arg0) { @@ -711,6 +764,7 @@ everything_oneparam_utf8 (const gchar* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_oneparam_filename (const gchar* arg0) { @@ -725,6 +779,7 @@ everything_oneparam_filename (const gchar* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_one_outparam_gboolean (gboolean* arg0) { @@ -740,6 +795,7 @@ everything_one_outparam_gboolean (gboolean* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_one_outparam_gint8 (gint8* arg0) { @@ -755,6 +811,7 @@ everything_one_outparam_gint8 (gint8* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_one_outparam_guint8 (guint8* arg0) { @@ -770,6 +827,7 @@ everything_one_outparam_guint8 (guint8* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_one_outparam_gint16 (gint16* arg0) { @@ -785,6 +843,7 @@ everything_one_outparam_gint16 (gint16* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_one_outparam_guint16 (guint16* arg0) { @@ -800,6 +859,7 @@ everything_one_outparam_guint16 (guint16* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_one_outparam_gint32 (gint32* arg0) { @@ -815,6 +875,7 @@ everything_one_outparam_gint32 (gint32* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_one_outparam_guint32 (guint32* arg0) { @@ -830,6 +891,7 @@ everything_one_outparam_guint32 (guint32* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_one_outparam_gint64 (gint64* arg0) { @@ -845,6 +907,7 @@ everything_one_outparam_gint64 (gint64* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_one_outparam_guint64 (guint64* arg0) { @@ -860,6 +923,7 @@ everything_one_outparam_guint64 (guint64* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_one_outparam_gchar (gchar* arg0) { @@ -875,6 +939,7 @@ everything_one_outparam_gchar (gchar* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_one_outparam_gshort (gshort* arg0) { @@ -890,6 +955,7 @@ everything_one_outparam_gshort (gshort* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_one_outparam_gushort (gushort* arg0) { @@ -905,6 +971,7 @@ everything_one_outparam_gushort (gushort* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_one_outparam_gint (gint* arg0) { @@ -920,6 +987,7 @@ everything_one_outparam_gint (gint* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_one_outparam_guint (guint* arg0) { @@ -935,6 +1003,7 @@ everything_one_outparam_guint (guint* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_one_outparam_glong (glong* arg0) { @@ -950,6 +1019,7 @@ everything_one_outparam_glong (glong* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_one_outparam_gulong (gulong* arg0) { @@ -965,6 +1035,7 @@ everything_one_outparam_gulong (gulong* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_one_outparam_gsize (gsize* arg0) { @@ -980,6 +1051,7 @@ everything_one_outparam_gsize (gsize* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_one_outparam_gssize (gssize* arg0) { @@ -995,6 +1067,7 @@ everything_one_outparam_gssize (gssize* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_one_outparam_gintptr (gintptr* arg0) { @@ -1010,6 +1083,7 @@ everything_one_outparam_gintptr (gintptr* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_one_outparam_guintptr (guintptr* arg0) { @@ -1025,6 +1099,7 @@ everything_one_outparam_guintptr (guintptr* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_one_outparam_gfloat (gfloat* arg0) { @@ -1040,6 +1115,7 @@ everything_one_outparam_gfloat (gfloat* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_one_outparam_gdouble (gdouble* arg0) { @@ -1055,6 +1131,7 @@ everything_one_outparam_gdouble (gdouble* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_one_outparam_gunichar (gunichar* arg0) { @@ -1070,6 +1147,7 @@ everything_one_outparam_gunichar (gunichar* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_one_outparam_GType (GType* arg0) { @@ -1085,6 +1163,7 @@ everything_one_outparam_GType (GType* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_one_outparam_utf8 (const gchar** arg0) { @@ -1100,6 +1179,7 @@ everything_one_outparam_utf8 (const gchar** arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN void everything_one_outparam_filename (const gchar** arg0) { @@ -1115,6 +1195,7 @@ everything_one_outparam_filename (const gchar** arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gboolean everything_passthrough_one_gboolean (gboolean arg0) { @@ -1129,6 +1210,7 @@ everything_passthrough_one_gboolean (gboolean arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gint8 everything_passthrough_one_gint8 (gint8 arg0) { @@ -1143,6 +1225,7 @@ everything_passthrough_one_gint8 (gint8 arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN guint8 everything_passthrough_one_guint8 (guint8 arg0) { @@ -1157,6 +1240,7 @@ everything_passthrough_one_guint8 (guint8 arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gint16 everything_passthrough_one_gint16 (gint16 arg0) { @@ -1171,6 +1255,7 @@ everything_passthrough_one_gint16 (gint16 arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN guint16 everything_passthrough_one_guint16 (guint16 arg0) { @@ -1185,6 +1270,7 @@ everything_passthrough_one_guint16 (guint16 arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gint32 everything_passthrough_one_gint32 (gint32 arg0) { @@ -1199,6 +1285,7 @@ everything_passthrough_one_gint32 (gint32 arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN guint32 everything_passthrough_one_guint32 (guint32 arg0) { @@ -1213,6 +1300,7 @@ everything_passthrough_one_guint32 (guint32 arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gint64 everything_passthrough_one_gint64 (gint64 arg0) { @@ -1227,6 +1315,7 @@ everything_passthrough_one_gint64 (gint64 arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN guint64 everything_passthrough_one_guint64 (guint64 arg0) { @@ -1241,6 +1330,7 @@ everything_passthrough_one_guint64 (guint64 arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gchar everything_passthrough_one_gchar (gchar arg0) { @@ -1255,6 +1345,7 @@ everything_passthrough_one_gchar (gchar arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gshort everything_passthrough_one_gshort (gshort arg0) { @@ -1269,6 +1360,7 @@ everything_passthrough_one_gshort (gshort arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gushort everything_passthrough_one_gushort (gushort arg0) { @@ -1283,6 +1375,7 @@ everything_passthrough_one_gushort (gushort arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gint everything_passthrough_one_gint (gint arg0) { @@ -1297,6 +1390,7 @@ everything_passthrough_one_gint (gint arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN guint everything_passthrough_one_guint (guint arg0) { @@ -1311,6 +1405,7 @@ everything_passthrough_one_guint (guint arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN glong everything_passthrough_one_glong (glong arg0) { @@ -1325,6 +1420,7 @@ everything_passthrough_one_glong (glong arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gulong everything_passthrough_one_gulong (gulong arg0) { @@ -1339,6 +1435,7 @@ everything_passthrough_one_gulong (gulong arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gsize everything_passthrough_one_gsize (gsize arg0) { @@ -1353,6 +1450,7 @@ everything_passthrough_one_gsize (gsize arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gssize everything_passthrough_one_gssize (gssize arg0) { @@ -1367,6 +1465,7 @@ everything_passthrough_one_gssize (gssize arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gintptr everything_passthrough_one_gintptr (gintptr arg0) { @@ -1381,6 +1480,7 @@ everything_passthrough_one_gintptr (gintptr arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN guintptr everything_passthrough_one_guintptr (guintptr arg0) { @@ -1395,6 +1495,7 @@ everything_passthrough_one_guintptr (guintptr arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gfloat everything_passthrough_one_gfloat (gfloat arg0) { @@ -1409,6 +1510,7 @@ everything_passthrough_one_gfloat (gfloat arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gdouble everything_passthrough_one_gdouble (gdouble arg0) { @@ -1423,6 +1525,7 @@ everything_passthrough_one_gdouble (gdouble arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN gunichar everything_passthrough_one_gunichar (gunichar arg0) { @@ -1437,6 +1540,7 @@ everything_passthrough_one_gunichar (gunichar arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN GType everything_passthrough_one_GType (GType arg0) { @@ -1451,6 +1555,7 @@ everything_passthrough_one_GType (GType arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN const gchar* everything_passthrough_one_utf8 (const gchar* arg0) { @@ -1465,6 +1570,7 @@ everything_passthrough_one_utf8 (const gchar* arg0) * * Returns: (transfer none) */ +_GI_TEST_EXTERN const gchar* everything_passthrough_one_filename (const gchar* arg0) { diff --git a/tests/offsets/Makefile.am b/tests/offsets/Makefile.am index 9608ad0..65d8773 100644 --- a/tests/offsets/Makefile.am +++ b/tests/offsets/Makefile.am @@ -16,7 +16,7 @@ EXTRA_LTLIBRARIES += liboffsets.la liboffsets_la_SOURCES = \ offsets.h \ offsets.c -liboffsets_la_CPPFLAGS = $(GIREPO_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) +liboffsets_la_CPPFLAGS = $(GIREPO_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) -I$(top_srcdir)/tests # dummy rpath to get built dynamically (huh?) liboffsets_la_LDFLAGS = -avoid-version -rpath $(libdir) @@ -25,7 +25,7 @@ Offsets_1_0_gir_INCLUDES = GObject-2.0 Offsets_1_0_gir_LIBS = liboffsets.la Offsets_1_0_gir_PACKAGES = gobject-2.0 Offsets_1_0_gir_FILES = $(srcdir)/offsets.h $(srcdir)/offsets.c -Offsets_1_0_gir_SCANNERFLAGS = --warn-all --warn-error +Offsets_1_0_gir_SCANNERFLAGS = --warn-all --warn-error -I$(top_srcdir)/tests INTROSPECTION_GIRS += Offsets-1.0.gir CLEANFILES += Offsets-1.0.gir Offsets-1.0.typelib liboffsets.la @@ -35,7 +35,7 @@ CLEANFILES += Offsets-1.0.gir Offsets-1.0.typelib liboffsets.la EXTRA_PROGRAMS += gitestoffsets nodist_gitestoffsets_SOURCES = gitestoffsets.c -gitestoffsets_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository +gitestoffsets_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository -I$(top_srcdir)/tests gitestoffsets_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS) gitestoffsets.c: gen-gitestoffsets offsets.h Offsets-1.0.typelib diff --git a/tests/offsets/Makefile.in b/tests/offsets/Makefile.in index 7c2919c..c25a019 100644 --- a/tests/offsets/Makefile.in +++ b/tests/offsets/Makefile.in @@ -691,16 +691,16 @@ liboffsets_la_SOURCES = \ offsets.h \ offsets.c -liboffsets_la_CPPFLAGS = $(GIREPO_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) +liboffsets_la_CPPFLAGS = $(GIREPO_CFLAGS) $(GI_HIDDEN_VISIBILITY_CFLAGS) -I$(top_srcdir)/tests # dummy rpath to get built dynamically (huh?) liboffsets_la_LDFLAGS = -avoid-version -rpath $(libdir) Offsets_1_0_gir_INCLUDES = GObject-2.0 Offsets_1_0_gir_LIBS = liboffsets.la Offsets_1_0_gir_PACKAGES = gobject-2.0 Offsets_1_0_gir_FILES = $(srcdir)/offsets.h $(srcdir)/offsets.c -Offsets_1_0_gir_SCANNERFLAGS = --warn-all --warn-error +Offsets_1_0_gir_SCANNERFLAGS = --warn-all --warn-error -I$(top_srcdir)/tests nodist_gitestoffsets_SOURCES = gitestoffsets.c -gitestoffsets_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository +gitestoffsets_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository -I$(top_srcdir)/tests gitestoffsets_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS) LOG_COMPILER = env GI_TYPELIB_PATH=:$(top_builddir) ./gitestoffsets$(EXEEXT) offsets.compiled offsets.introspected && \ diff -u offsets.compiled offsets.introspected && echo diff --git a/tests/offsets/offsets.c b/tests/offsets/offsets.c index bd009e8..d8a280e 100644 --- a/tests/offsets/offsets.c +++ b/tests/offsets/offsets.c @@ -1,5 +1,8 @@ +#include "config.h" + #include +_GI_TEST_EXTERN void offsets_dummy(void); /* To avoid an empty compilation unit */ diff --git a/tests/offsets/offsets.h b/tests/offsets/offsets.h index 7bdc1ad..b57b1bf 100644 --- a/tests/offsets/offsets.h +++ b/tests/offsets/offsets.h @@ -5,6 +5,8 @@ #include #include +#include "gitestmacros.h" + /* Test we get the alignment right for various basic types; we put * a char in front of of each field to make it more likely that we'll * stress out the alignment code. diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-pptrarray.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-pptrarray.page new file mode 100644 index 0000000..36a32b0 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-pptrarray.page @@ -0,0 +1,15 @@ + + + + + pptrarray + + Regress.TestObj:pptrarray + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-pptrarray.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-pptrarray.page new file mode 100644 index 0000000..2c7cff0 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-pptrarray.page @@ -0,0 +1,18 @@ + + + + + pptrarray + + Regress.TestObj.pptrarray + +TestObj.pptrarray: Array(String) (Read / Write) + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-pptrarray.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-pptrarray.page new file mode 100644 index 0000000..f30deac --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-pptrarray.page @@ -0,0 +1,18 @@ + + + + + pptrarray + + Regress.TestObj:pptrarray + +"pptrarray" [unicode] : Read / Write + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page index 56033fd..4f05703 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page @@ -12,7 +12,7 @@ from gi.repository import Regress -test_obj = Regress.TestObj(bare=value, boxed=value, double=value, float=value, gtype=value, hash_table=value, hash_table_old=value, int=value, list=value, list_old=value, string=value) +test_obj = Regress.TestObj(bare=value, boxed=value, double=value, float=value, gtype=value, hash_table=value, hash_table_old=value, int=value, list=value, list_old=value, pptrarray=value, string=value) diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index a907b30..98f7ec9 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -3458,6 +3458,11 @@ raise an error. + + + + + diff --git a/tests/scanner/regress.c b/tests/scanner/regress.c index 48d9e93..3d3cfdd 100644 --- a/tests/scanner/regress.c +++ b/tests/scanner/regress.c @@ -2021,6 +2021,7 @@ enum PROP_TEST_OBJ_BOXED, PROP_TEST_OBJ_HASH_TABLE, PROP_TEST_OBJ_LIST, + PROP_TEST_OBJ_PPTRARRAY, PROP_TEST_OBJ_HASH_TABLE_OLD, PROP_TEST_OBJ_LIST_OLD, PROP_TEST_OBJ_INT, @@ -2490,6 +2491,17 @@ regress_test_obj_class_init (RegressTestObjClass *klass) pspec); /** + * RegressTestObj:pptrarray: (type GLib.PtrArray(utf8)) (transfer none) + */ + pspec = g_param_spec_pointer ("pptrarray", + "PtrArray property as a pointer", + "Test annotating with GLib.PtrArray", + G_PARAM_READWRITE); + g_object_class_install_property (gobject_class, + PROP_TEST_OBJ_PPTRARRAY, + pspec); + + /** * RegressTestObj:hash-table-old: (type GLib.HashTable) (transfer container) */ pspec = g_param_spec_boxed ("hash-table-old", -- 2.7.4