mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-22 06:36:29 +01:00
upgrade to glibmm 2.16
git-svn-id: svn://localhost/ardour2/branches/3.0@5303 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
parent
5b97b13766
commit
e916ac2821
211 changed files with 26478 additions and 4168 deletions
|
|
@ -291,14 +291,17 @@ sub append_parameter_docs($$)
|
|||
|
||||
foreach my $param (@param_names)
|
||||
{
|
||||
my $desc = $$param_descriptions->{$param};
|
||||
|
||||
$param =~ s/([a-zA-Z0-9]*(_[a-zA-Z0-9]+)*)_?/$1/g;
|
||||
DocsParser::convert_docs_to_cpp($obj_function, \$desc);
|
||||
if(length($desc) > 0)
|
||||
if ($param ne "error" ) #We wrap GErrors as exceptions, so ignore these.
|
||||
{
|
||||
$desc .= '.' unless($desc =~ /(?:^|\.)$/);
|
||||
$$text .= "\n\@param ${param} \u${desc}";
|
||||
my $desc = $$param_descriptions->{$param};
|
||||
|
||||
$param =~ s/([a-zA-Z0-9]*(_[a-zA-Z0-9]+)*)_?/$1/g;
|
||||
DocsParser::convert_docs_to_cpp($obj_function, \$desc);
|
||||
if(length($desc) > 0)
|
||||
{
|
||||
$desc .= '.' unless($desc =~ /(?:^|\.)$/);
|
||||
$$text .= "\n\@param ${param} \u${desc}";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -350,7 +353,11 @@ sub convert_tags_to_doxygen($)
|
|||
|
||||
# Some argument names are suffixed by "_" -- strip this.
|
||||
# gtk-doc uses @thearg, but doxygen uses @a thearg.
|
||||
s" ?\@([a-zA-Z0-9]*(_[a-zA-Z0-9]+)*)_?\b" \@a $1 "g;
|
||||
s" ?\@([a-zA-Z0-9]*(_[a-zA-Z0-9]+)*)_?\b" \@a $1"g;
|
||||
|
||||
# Don't convert doxygen's @throws and @param, so these can be used in the
|
||||
# docs_override.xml:
|
||||
s" \@a (throws|param)" \@$1"g;
|
||||
s"^Note ?\d?: "\@note "mg;
|
||||
|
||||
s"</?programlisting>""g;
|
||||
|
|
@ -410,6 +417,7 @@ sub substitute_identifiers($$)
|
|||
# Undo wrong substitutions.
|
||||
s/\bHas::/HAS_/g;
|
||||
s/\bNo::/NO_/g;
|
||||
s/\bG:://g; #Rename G::Something to Something. Doesn't seem to work. murrayc.
|
||||
|
||||
# Replace C function names with C++ counterparts.
|
||||
s/\b([a-z]+_[a-z][a-z\d_]+) ?\(\)/&DocsParser::substitute_function($doc_func, $1)/eg;
|
||||
|
|
|
|||
|
|
@ -5,6 +5,6 @@ EXTRA_DIST = Makefile_list_of_sources.am_fragment $(files_tools_pm)
|
|||
|
||||
# Install the .pm, files:
|
||||
|
||||
tools_pm_includedir = $(libdir)/glibmm-2.4/proc/pm
|
||||
tools_pm_includedir = $(GMMPROC_DIR)/pm
|
||||
tools_pm_include_HEADERS = $(files_tools_pm)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
# Makefile.in generated by automake 1.10 from Makefile.am.
|
||||
# Makefile.in generated by automake 1.10.1 from Makefile.am.
|
||||
# @configure_input@
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
|
||||
# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
|
||||
# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
|
|
@ -37,7 +37,14 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
|
|||
$(top_srcdir)/tools/pm/Makefile_list_of_sources.am_fragment
|
||||
subdir = tools/pm
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/configure.in
|
||||
am__aclocal_m4_deps = $(top_srcdir)/scripts/c_std.m4 \
|
||||
$(top_srcdir)/scripts/cxx.m4 $(top_srcdir)/scripts/cxx_std.m4 \
|
||||
$(top_srcdir)/scripts/dk-feature.m4 \
|
||||
$(top_srcdir)/scripts/docgen.m4 \
|
||||
$(top_srcdir)/scripts/glibmm_check_perl.m4 \
|
||||
$(top_srcdir)/scripts/macros.m4 \
|
||||
$(top_srcdir)/scripts/reduced.m4 $(top_srcdir)/scripts/sun.m4 \
|
||||
$(top_srcdir)/configure.in
|
||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
$(ACLOCAL_M4)
|
||||
mkinstalldirs = $(install_sh) -d
|
||||
|
|
@ -79,8 +86,10 @@ CXXFLAGS = @CXXFLAGS@
|
|||
CYGPATH_W = @CYGPATH_W@
|
||||
DEFS = @DEFS@
|
||||
DEPDIR = @DEPDIR@
|
||||
DISABLE_DEPRECATED_API_CFLAGS = @DISABLE_DEPRECATED_API_CFLAGS@
|
||||
DISABLE_DEPRECATED_CFLAGS = @DISABLE_DEPRECATED_CFLAGS@
|
||||
DLLTOOL = @DLLTOOL@
|
||||
DSYMUTIL = @DSYMUTIL@
|
||||
ECHO = @ECHO@
|
||||
ECHO_C = @ECHO_C@
|
||||
ECHO_N = @ECHO_N@
|
||||
|
|
@ -102,6 +111,8 @@ GMMPROC_DIR = @GMMPROC_DIR@
|
|||
GREP = @GREP@
|
||||
GTHREAD_CFLAGS = @GTHREAD_CFLAGS@
|
||||
GTHREAD_LIBS = @GTHREAD_LIBS@
|
||||
GTKMMPROC_MERGECDOCS = @GTKMMPROC_MERGECDOCS@
|
||||
GTKMM_DOXYGEN_INPUT = @GTKMM_DOXYGEN_INPUT@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
|
|
@ -114,9 +125,11 @@ LIBS = @LIBS@
|
|||
LIBTOOL = @LIBTOOL@
|
||||
LN_S = @LN_S@
|
||||
LTLIBOBJS = @LTLIBOBJS@
|
||||
M4 = @M4@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
MKDIR_P = @MKDIR_P@
|
||||
NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
PACKAGE = @PACKAGE@
|
||||
|
|
@ -126,6 +139,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
|
|||
PACKAGE_TARNAME = @PACKAGE_TARNAME@
|
||||
PACKAGE_VERSION = @PACKAGE_VERSION@
|
||||
PATH_SEPARATOR = @PATH_SEPARATOR@
|
||||
PERL_PATH = @PERL_PATH@
|
||||
PKG_CONFIG = @PKG_CONFIG@
|
||||
RANLIB = @RANLIB@
|
||||
SED = @SED@
|
||||
|
|
@ -182,13 +196,14 @@ sharedstatedir = @sharedstatedir@
|
|||
srcdir = @srcdir@
|
||||
sysconfdir = @sysconfdir@
|
||||
target_alias = @target_alias@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
files_tools_pm = DocsParser.pm GtkDefs.pm Enum.pm Function.pm FunctionBase.pm Object.pm Output.pm Property.pm Util.pm WrapParser.pm
|
||||
EXTRA_DIST = Makefile_list_of_sources.am_fragment $(files_tools_pm)
|
||||
|
||||
# Install the .pm, files:
|
||||
tools_pm_includedir = $(libdir)/glibmm-2.4/proc/pm
|
||||
tools_pm_includedir = $(GMMPROC_DIR)/pm
|
||||
tools_pm_include_HEADERS = $(files_tools_pm)
|
||||
all: all-am
|
||||
|
||||
|
|
@ -251,8 +266,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
|
|||
unique=`for i in $$list; do \
|
||||
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
||||
done | \
|
||||
$(AWK) ' { files[$$0] = 1; } \
|
||||
END { for (i in files) print i; }'`; \
|
||||
$(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
|
||||
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
||||
mkid -fID $$unique
|
||||
tags: TAGS
|
||||
|
||||
|
|
@ -264,8 +279,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
|||
unique=`for i in $$list; do \
|
||||
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
||||
done | \
|
||||
$(AWK) ' { files[$$0] = 1; } \
|
||||
END { for (i in files) print i; }'`; \
|
||||
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
||||
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
||||
if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
|
||||
test -n "$$unique" || unique=$$empty_fix; \
|
||||
$(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
|
||||
|
|
@ -275,13 +290,12 @@ ctags: CTAGS
|
|||
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|
||||
$(TAGS_FILES) $(LISP)
|
||||
tags=; \
|
||||
here=`pwd`; \
|
||||
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
|
||||
unique=`for i in $$list; do \
|
||||
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
|
||||
done | \
|
||||
$(AWK) ' { files[$$0] = 1; } \
|
||||
END { for (i in files) print i; }'`; \
|
||||
$(AWK) '{ files[$$0] = 1; nonempty = 1; } \
|
||||
END { if (nonempty) { for (i in files) print i; }; }'`; \
|
||||
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|
||||
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
|
||||
$$tags $$unique
|
||||
|
|
|
|||
|
|
@ -598,6 +598,12 @@ sub output_wrap_property($$$$$$)
|
|||
{
|
||||
# construct-only functions can be read, but not written.
|
||||
$proxy_suffix = "_ReadOnly";
|
||||
|
||||
if($objProperty->get_readable() ne 1)
|
||||
{
|
||||
$self->output_wrap_failed($name, "attempt to wrap write-only and construct-only property.");
|
||||
return;
|
||||
}
|
||||
}
|
||||
elsif($objProperty->get_readable() ne 1)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue