diff options
author | Daniel Elstner <danielk@openismus.com> | 2009-08-06 21:13:44 +0200 |
---|---|---|
committer | Daniel Elstner <danielk@openismus.com> | 2009-08-06 21:36:24 +0200 |
commit | dfbb69c0eb2d6a5b97c8c9d99829fc32c20c4b42 (patch) | |
tree | 58eaa41e37b7219019200e0dbdcc2674df557095 /tests | |
parent | 6ce88c9b0a02eefee9ee352d3b8751ab755cb7e1 (diff) | |
download | sigc++-dfbb69c0eb2d6a5b97c8c9d99829fc32c20c4b42.tar.gz |
Transition to new mm-common build infrastructure
* autogen.sh: Replace with a minimal script that simply executes
mm-common-prepare, autoreconf and configure.
* configure.ac: Get rid of an enormous amount of old cruft. Use
macros from the new mm-common module to set up Doxygen for building
the documentation. Add option to enable more compiler warnings.
* sigc++-2.0-uninstalled.pc.in: New pkg-config data file to allow
linking to an uninstalled libsigc++.
* sigc++-2.0.pc.in: Modernize. Provide the location of the
installed reference documentation and the Doxygen tag file.
* sigc++config.h.in: Modernize and update for new build
infrastructure.
* Makefile.am, */Makefile.am: Modernize and adapt to the new C++
binding build infrastructure in the mm-common module.
* sigc++/filelist.am: New Automake include file. Defines lists
of C++ and M4 source files.
* docs/Makefile.am: Rewrite using doc-reference.am from the
mm-common module.
* docs/doc-manual.am: New Automake include file for building the
libsigc++ Docbook manual.
* docs/images/Makefile.am: Remove file.
* docs/manual/Makefile.am: ditto,
* docs/reference/Makefile.am: ditto.
* docs/Makefile_web.am_fragment: Remove for now, to be taken care
of later.
* docs/reference/Doxyfile.in: Modernize and adapt to new build
infrastructure.
* docs/reference/beautify_docs.pl: Remove and use the more recent
scripts/doc-postprocess.pl instead.
* libsigc++-2.0.spec.in: Remove, to be resurrected only if someone
complains.
* scripts/Makefile.am: Remove file. Distribute the files from the
toplevel Makefile.am instead.
* scripts/cxx_std.m4: Add missing third argument to AC_DEFINE().
* scripts/doc-install.pl: New file, copied from mm-common.
* scripts/doc-postprocess.pl: ditto,
* scripts/tagfile-to-devhelp2.xsl: ditto.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/.cvsignore | 22 | ||||
-rw-r--r-- | tests/.gitignore | 23 | ||||
-rw-r--r-- | tests/Makefile.am | 136 |
3 files changed, 96 insertions, 85 deletions
diff --git a/tests/.cvsignore b/tests/.cvsignore deleted file mode 100644 index 6436acb..0000000 --- a/tests/.cvsignore +++ /dev/null @@ -1,22 +0,0 @@ -Makefile Makefile.in -.libs .deps -test_trackable -test_deduce_result_type -test_functor_trait -test_mem_fun -test_ptr_fun -test_slot -test_signal -test_accumulated -test_disconnect -test_disconnect_during_emit -test_bind -test_bind_return -test_retype_return -test_hide -test_retype -test_compose -test_exception_catch -test_lambda -test_size -test_compatibility diff --git a/tests/.gitignore b/tests/.gitignore new file mode 100644 index 0000000..eee46a4 --- /dev/null +++ b/tests/.gitignore @@ -0,0 +1,23 @@ +/test_accum_iter +/test_bind +/test_bind_ref +/test_bind_return +/test_compose +/test_copy_invalid_slot +/test_custom +/test_deduce_result_type +/test_disconnect +/test_disconnect_during_emit +/test_exception_catch +/test_functor_trait +/test_hide +/test_limit_reference +/test_mem_fun +/test_ptr_fun +/test_retype +/test_retype_return +/test_signal +/test_size +/test_slot +/test_slot_disconnect +/test_trackable diff --git a/tests/Makefile.am b/tests/Makefile.am index 52e54e3..9ae85c5 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,70 +1,80 @@ -INCLUDES = -I$(top_srcdir) -I$(top_builddir) +## Copyright (c) 2009 Openismus GmbH <http://www.openismus.com/> +## +## This file is part of libsigc++. +## +## libsigc++ is free software: you can redistribute it and/or modify it +## under the terms of the GNU Lesser General Public License as published +## by the Free Software Foundation, either version 2.1 of the License, +## or (at your option) any later version. +## +## libsigc++ 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 Lesser General Public License for more details. +## +## You should have received a copy of the GNU Lesser General Public License +## along with this library. If not, see <http://www.gnu.org/licenses/>. -LDADD = $(top_builddir)/sigc++/libsigc-2.0.la +AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) +AM_CXXFLAGS = $(SIGC_WXXFLAGS) +LDADD = $(top_builddir)/sigc++/libsigc-$(SIGCXX_API_VERSION).la -# don't bother with automake defs -DEFS = +check_PROGRAMS = \ + test_accum_iter \ + test_bind \ + test_bind_ref \ + test_bind_return \ + test_compose \ + test_copy_invalid_slot \ + test_custom \ + test_deduce_result_type \ + test_disconnect \ + test_disconnect_during_emit \ + test_exception_catch \ + test_functor_trait \ + test_hide \ + test_limit_reference \ + test_mem_fun \ + test_ptr_fun \ + test_retype \ + test_retype_return \ + test_signal \ + test_size \ + test_slot \ + test_slot_disconnect \ + test_trackable -# this means make check will run these programs. -noinst_PROGRAMS= \ - test_trackable \ - test_deduce_result_type \ - test_mem_fun \ - test_ptr_fun \ - test_slot \ - test_signal \ - test_disconnect \ - test_disconnect_during_emit \ - test_bind_return \ - test_retype_return \ - test_hide \ - test_retype \ - test_compose \ - test_exception_catch \ - test_size \ - test_bind \ - test_bind_ref \ - test_functor_trait \ - test_limit_reference \ - test_copy_invalid_slot \ - test_slot_disconnect \ - test_custom \ - test_accum_iter +TESTS = $(check_PROGRAMS) -#Disabled: -# test_lambda - The Tru64 compiler can't build this when not using -std strict_ansi -model ansi, so let's not worry about it. +test_accum_iter_SOURCES = test_accum_iter.cc +test_bind_SOURCES = test_bind.cc +test_bind_ref_SOURCES = test_bind_ref.cc +test_bind_return_SOURCES = test_bind_return.cc +test_compose_SOURCES = test_compose.cc +test_copy_invalid_slot_SOURCES = test_copy_invalid_slot.cc +test_custom_SOURCES = test_custom.cc +test_deduce_result_type_SOURCES = test_deduce_result_type.cc +test_disconnect_SOURCES = test_disconnect.cc +test_disconnect_during_emit_SOURCES = test_disconnect_during_emit.cc +test_exception_catch_SOURCES = test_exception_catch.cc +test_functor_trait_SOURCES = test_functor_trait.cc +test_hide_SOURCES = test_hide.cc +test_limit_reference_SOURCES = test_limit_reference.cc +test_mem_fun_SOURCES = test_mem_fun.cc +test_ptr_fun_SOURCES = test_ptr_fun.cc +test_retype_SOURCES = test_retype.cc +test_retype_return_SOURCES = test_retype_return.cc +test_signal_SOURCES = test_signal.cc +test_size_SOURCES = test_size.cc +test_slot_SOURCES = test_slot.cc +test_slot_disconnect_SOURCES = test_slot_disconnect.cc +test_trackable_SOURCES = test_trackable.cc -# test_accumulated - The AIX xlC compiler can't build this. It says +# Disabled: test_lambda - The Tru64 compiler can't build this when not using +# -std strict_ansi -model ansi, so let's not worry about it. +# Disabled: test_accumulated - The AIX xlC compiler can't build this. It says # xlC_r -I. -I. -I.. -I.. -I.. -AA -c -o test_accumulated.o test_accumulated.cc -# "../sigc++/signal.h", line 534.39: 1540-1110 (S) The referenced type "sigc::internal::signal_emit1" contains a circular reference back to "" +# "../sigc++/signal.h", line 534.39: 1540-1110 (S) The referenced type +# "sigc::internal::signal_emit1" contains a circular reference back to "" -TESTS = $(noinst_PROGRAMS) - - -# we can have as many programs built here as we need. -test_trackable_SOURCES = test_trackable.cc -test_deduce_result_type_SOURCES = test_deduce_result_type.cc -test_functor_trait_SOURCES = test_functor_trait.cc -test_mem_fun_SOURCES = test_mem_fun.cc -test_ptr_fun_SOURCES = test_ptr_fun.cc -test_slot_SOURCES = test_slot.cc -test_signal_SOURCES = test_signal.cc -# test_accumulated_SOURCES = test_accumulated.cc -test_disconnect_SOURCES = test_disconnect.cc -test_disconnect_during_emit_SOURCES = test_disconnect_during_emit.cc -test_bind_SOURCES = test_bind.cc -test_bind_ref_SOURCES = test_bind_ref.cc -test_bind_return_SOURCES = test_bind_return.cc -test_retype_return_SOURCES = test_retype_return.cc -test_hide_SOURCES = test_hide.cc -test_retype_SOURCES = test_retype.cc -test_compose_SOURCES = test_compose.cc -test_exception_catch_SOURCES = test_exception_catch.cc -# test_lambda_SOURCES = test_lambda.cc - -test_size_SOURCES = test_size.cc -test_limit_reference_SOURCES = test_limit_reference.cc -test_copy_invalid_slot_SOURCES = test_copy_invalid_slot.cc -test_slot_disconnect_SOURCES = test_slot_disconnect.cc -test_custom_SOURCES = test_custom.cc -test_accum_iter_SOURCES = test_accum_iter.cc +dist_noinst_DATA = test_accumulated.cc test_lambda.cc |