From b22842eadeaada70fd0bb78fa9af6931e2eb0ef4 Mon Sep 17 00:00:00 2001 From: mat007 Date: Thu, 14 Jun 2012 21:18:55 +0000 Subject: [PATCH] Changed project layout to boost layout git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@459 860be788-9bd5-4423-9f1e-828f051e677b --- Jamfile.v2 | 28 ++++++ Jamroot.jam | 9 ++ README.txt | 3 - build/build.properties | 2 - build/vc100/turtle.vcxproj.filters | 95 ------------------- build/vc100/turtle_bench.vcxproj.filters | 38 -------- libs/turtle/build/build.properties | 4 + {build => libs/turtle/build}/build.xml | 16 ++-- {build => libs/turtle/build}/vc100/turtle.sln | 0 .../turtle/build}/vc100/turtle.vcxproj | 56 +++++------ .../turtle/build/vc100/turtle.vcxproj.filters | 95 +++++++++++++++++++ .../turtle/build}/vc100/turtle.vcxproj.user | 0 .../turtle/build}/vc100/turtle_bench.vcxproj | 26 ++--- .../build/vc100/turtle_bench.vcxproj.filters | 38 ++++++++ .../build}/vc100/turtle_bench.vcxproj.user | 0 .../turtle/build}/vc100/turtle_test.vcxproj | 36 +++---- .../build}/vc100/turtle_test.vcxproj.filters | 28 +++--- .../build}/vc100/turtle_test.vcxproj.user | 0 .../turtle/build}/vc80/bench_test.vcproj | 25 ++--- .../turtle/build}/vc80/errors_test.vcproj | 30 +++--- {build => libs/turtle/build}/vc80/turtle.sln | 0 .../turtle/build}/vc80/turtle.vcproj | 56 +++++------ .../turtle/build}/vc80/turtle_test.vcproj | 32 +++---- libs/turtle/test/Jamfile.jam | 26 +++++ .../turtle/test/bench_0_class.cpp | 0 .../turtle/test/bench_0_class_10_max_args.cpp | 0 .../turtle/test/bench_0_class_20_max_args.cpp | 0 .../turtle/test/bench_0_class_30_max_args.cpp | 0 ...classes_30_methods_30_args_30_max_args.cpp | 0 .../bench_30_classes_30_methods_9_args.cpp | 0 ..._classes_30_methods_9_args_10_max_args.cpp | 0 ..._classes_30_methods_9_args_20_max_args.cpp | 0 ..._classes_30_methods_9_args_30_max_args.cpp | 0 .../test/fail_ambiguous_mock_method.cpp | 0 ...fail_constraint_functor_not_compatible.cpp | 0 .../fail_constraint_value_not_comparable.cpp | 0 ...ue_of_wrong_type_in_builtin_constraint.cpp | 0 ...il_mismatch_type_in_returns_int_action.cpp | 0 ...mismatch_type_in_returns_string_action.cpp | 0 ...l_mismatch_type_in_returns_void_action.cpp | 0 ...sting_base_class_method_in_mock_method.cpp | 0 ...of_arguments_greater_than_max_constant.cpp | 0 ...il_template_argument_without_tpl_macro.cpp | 0 ...fail_too_many_arguments_in_mock_method.cpp | 0 ...fail_wrong_number_of_arguments_in_with.cpp | 0 .../turtle/test}/mock_error.hpp | 0 .../turtle/test/test_args.cpp | 0 .../turtle/test/test_constraints.cpp | 0 .../turtle/test/test_error.cpp | 0 .../turtle/test/test_function.cpp | 0 .../turtle/test/test_integration.cpp | 0 .../turtle/test/test_invocation.cpp | 0 .../turtle/test/test_is_functor.cpp | 0 .../turtle/test/test_log.cpp | 0 .../turtle/test/test_max_args.cpp | 0 .../turtle/test/test_mock.cpp | 0 .../turtle/test/test_object.cpp | 0 .../turtle/test/test_sequence.cpp | 0 .../turtle/test/test_type_name.cpp | 0 src/tests/bench_test/Jamfile.v2 | 5 - src/tests/bench_test/Jamroot | 0 {src/libraries/turtle => turtle}/action.hpp | 0 {src/libraries/turtle => turtle}/args.hpp | 0 .../turtle => turtle}/boost_test_error.hpp | 0 {src/libraries/turtle => turtle}/check.hpp | 0 {src/libraries/turtle => turtle}/child.hpp | 0 {src/libraries/turtle => turtle}/cleanup.hpp | 0 {src/libraries/turtle => turtle}/config.hpp | 0 .../turtle => turtle}/constraint.hpp | 0 .../turtle => turtle}/constraints.hpp | 0 {src/libraries/turtle => turtle}/context.hpp | 0 .../turtle => turtle}/default_error.hpp | 0 {src/libraries/turtle => turtle}/error.hpp | 0 .../turtle => turtle}/expectation.hpp | 0 {src/libraries/turtle => turtle}/function.hpp | 0 {src/libraries/turtle => turtle}/group.hpp | 0 .../turtle => turtle}/invocation.hpp | 0 .../turtle => turtle}/is_functor.hpp | 0 {src/libraries/turtle => turtle}/lambda.hpp | 0 {src/libraries/turtle => turtle}/log.hpp | 0 {src/libraries/turtle => turtle}/mock.hpp | 0 {src/libraries/turtle => turtle}/object.hpp | 0 .../libraries/turtle => turtle}/operators.hpp | 0 {src/libraries/turtle => turtle}/parent.hpp | 0 {src/libraries/turtle => turtle}/root.hpp | 0 {src/libraries/turtle => turtle}/sequence.hpp | 0 .../libraries/turtle => turtle}/type_name.hpp | 0 .../turtle => turtle}/verifiable.hpp | 0 .../turtle => turtle}/yes_no_type.hpp | 0 89 files changed, 353 insertions(+), 295 deletions(-) create mode 100644 Jamfile.v2 create mode 100644 Jamroot.jam delete mode 100644 README.txt delete mode 100644 build/build.properties delete mode 100644 build/vc100/turtle.vcxproj.filters delete mode 100644 build/vc100/turtle_bench.vcxproj.filters create mode 100644 libs/turtle/build/build.properties rename {build => libs/turtle/build}/build.xml (87%) rename {build => libs/turtle/build}/vc100/turtle.sln (100%) rename {build => libs/turtle/build}/vc100/turtle.vcxproj (81%) create mode 100644 libs/turtle/build/vc100/turtle.vcxproj.filters rename {build => libs/turtle/build}/vc100/turtle.vcxproj.user (100%) rename {build => libs/turtle/build}/vc100/turtle_bench.vcxproj (86%) create mode 100644 libs/turtle/build/vc100/turtle_bench.vcxproj.filters rename {build => libs/turtle/build}/vc100/turtle_bench.vcxproj.user (100%) rename {build => libs/turtle/build}/vc100/turtle_test.vcxproj (86%) rename {build => libs/turtle/build}/vc100/turtle_test.vcxproj.filters (52%) rename {build => libs/turtle/build}/vc100/turtle_test.vcxproj.user (100%) rename {build => libs/turtle/build}/vc80/bench_test.vcproj (77%) rename {build => libs/turtle/build}/vc80/errors_test.vcproj (77%) rename {build => libs/turtle/build}/vc80/turtle.sln (100%) rename {build => libs/turtle/build}/vc80/turtle.vcproj (69%) rename {build => libs/turtle/build}/vc80/turtle_test.vcproj (78%) create mode 100644 libs/turtle/test/Jamfile.jam rename src/tests/bench_test/turtle_bench_0_class.cpp => libs/turtle/test/bench_0_class.cpp (100%) rename src/tests/bench_test/turtle_bench_0_class_10_max_args.cpp => libs/turtle/test/bench_0_class_10_max_args.cpp (100%) rename src/tests/bench_test/turtle_bench_0_class_20_max_args.cpp => libs/turtle/test/bench_0_class_20_max_args.cpp (100%) rename src/tests/bench_test/turtle_bench_0_class_30_max_args.cpp => libs/turtle/test/bench_0_class_30_max_args.cpp (100%) rename src/tests/bench_test/turtle_bench_30_classes_30_methods_30_args_30_max_args.cpp => libs/turtle/test/bench_30_classes_30_methods_30_args_30_max_args.cpp (100%) rename src/tests/bench_test/turtle_bench_30_classes_30_methods_9_args.cpp => libs/turtle/test/bench_30_classes_30_methods_9_args.cpp (100%) rename src/tests/bench_test/turtle_bench_30_classes_30_methods_9_args_10_max_args.cpp => libs/turtle/test/bench_30_classes_30_methods_9_args_10_max_args.cpp (100%) rename src/tests/bench_test/turtle_bench_30_classes_30_methods_9_args_20_max_args.cpp => libs/turtle/test/bench_30_classes_30_methods_9_args_20_max_args.cpp (100%) rename src/tests/bench_test/turtle_bench_30_classes_30_methods_9_args_30_max_args.cpp => libs/turtle/test/bench_30_classes_30_methods_9_args_30_max_args.cpp (100%) rename src/tests/errors_test/ambiguous_mock_method.cpp => libs/turtle/test/fail_ambiguous_mock_method.cpp (100%) rename src/tests/errors_test/constraint_functor_not_compatible.cpp => libs/turtle/test/fail_constraint_functor_not_compatible.cpp (100%) rename src/tests/errors_test/constraint_value_not_comparable.cpp => libs/turtle/test/fail_constraint_value_not_comparable.cpp (100%) rename src/tests/errors_test/constraint_value_of_wrong_type_in_builtin_constraint.cpp => libs/turtle/test/fail_constraint_value_of_wrong_type_in_builtin_constraint.cpp (100%) rename src/tests/errors_test/mismatch_type_in_returns_int_action.cpp => libs/turtle/test/fail_mismatch_type_in_returns_int_action.cpp (100%) rename src/tests/errors_test/mismatch_type_in_returns_string_action.cpp => libs/turtle/test/fail_mismatch_type_in_returns_string_action.cpp (100%) rename src/tests/errors_test/mismatch_type_in_returns_void_action.cpp => libs/turtle/test/fail_mismatch_type_in_returns_void_action.cpp (100%) rename src/tests/errors_test/non_existing_base_class_method_in_mock_method.cpp => libs/turtle/test/fail_non_existing_base_class_method_in_mock_method.cpp (100%) rename src/tests/errors_test/number_of_arguments_greater_than_max_constant.cpp => libs/turtle/test/fail_number_of_arguments_greater_than_max_constant.cpp (100%) rename src/tests/errors_test/template_argument_without_tpl_macro.cpp => libs/turtle/test/fail_template_argument_without_tpl_macro.cpp (100%) rename src/tests/errors_test/too_many_arguments_in_mock_method.cpp => libs/turtle/test/fail_too_many_arguments_in_mock_method.cpp (100%) rename src/tests/errors_test/wrong_number_of_arguments_in_with.cpp => libs/turtle/test/fail_wrong_number_of_arguments_in_with.cpp (100%) rename {src/tests/turtle_test => libs/turtle/test}/mock_error.hpp (100%) rename src/tests/turtle_test/args_test.cpp => libs/turtle/test/test_args.cpp (100%) rename src/tests/turtle_test/constraints_test.cpp => libs/turtle/test/test_constraints.cpp (100%) rename src/tests/turtle_test/error_test.cpp => libs/turtle/test/test_error.cpp (100%) rename src/tests/turtle_test/function_test.cpp => libs/turtle/test/test_function.cpp (100%) rename src/tests/turtle_test/integration_test.cpp => libs/turtle/test/test_integration.cpp (100%) rename src/tests/turtle_test/invocation_test.cpp => libs/turtle/test/test_invocation.cpp (100%) rename src/tests/turtle_test/is_functor_test.cpp => libs/turtle/test/test_is_functor.cpp (100%) rename src/tests/turtle_test/log_test.cpp => libs/turtle/test/test_log.cpp (100%) rename src/tests/turtle_test/max_args_test.cpp => libs/turtle/test/test_max_args.cpp (100%) rename src/tests/turtle_test/mock_test.cpp => libs/turtle/test/test_mock.cpp (100%) rename src/tests/turtle_test/object_test.cpp => libs/turtle/test/test_object.cpp (100%) rename src/tests/turtle_test/sequence_test.cpp => libs/turtle/test/test_sequence.cpp (100%) rename src/tests/turtle_test/type_name_test.cpp => libs/turtle/test/test_type_name.cpp (100%) delete mode 100644 src/tests/bench_test/Jamfile.v2 delete mode 100644 src/tests/bench_test/Jamroot rename {src/libraries/turtle => turtle}/action.hpp (100%) rename {src/libraries/turtle => turtle}/args.hpp (100%) rename {src/libraries/turtle => turtle}/boost_test_error.hpp (100%) rename {src/libraries/turtle => turtle}/check.hpp (100%) rename {src/libraries/turtle => turtle}/child.hpp (100%) rename {src/libraries/turtle => turtle}/cleanup.hpp (100%) rename {src/libraries/turtle => turtle}/config.hpp (100%) rename {src/libraries/turtle => turtle}/constraint.hpp (100%) rename {src/libraries/turtle => turtle}/constraints.hpp (100%) rename {src/libraries/turtle => turtle}/context.hpp (100%) rename {src/libraries/turtle => turtle}/default_error.hpp (100%) rename {src/libraries/turtle => turtle}/error.hpp (100%) rename {src/libraries/turtle => turtle}/expectation.hpp (100%) rename {src/libraries/turtle => turtle}/function.hpp (100%) rename {src/libraries/turtle => turtle}/group.hpp (100%) rename {src/libraries/turtle => turtle}/invocation.hpp (100%) rename {src/libraries/turtle => turtle}/is_functor.hpp (100%) rename {src/libraries/turtle => turtle}/lambda.hpp (100%) rename {src/libraries/turtle => turtle}/log.hpp (100%) rename {src/libraries/turtle => turtle}/mock.hpp (100%) rename {src/libraries/turtle => turtle}/object.hpp (100%) rename {src/libraries/turtle => turtle}/operators.hpp (100%) rename {src/libraries/turtle => turtle}/parent.hpp (100%) rename {src/libraries/turtle => turtle}/root.hpp (100%) rename {src/libraries/turtle => turtle}/sequence.hpp (100%) rename {src/libraries/turtle => turtle}/type_name.hpp (100%) rename {src/libraries/turtle => turtle}/verifiable.hpp (100%) rename {src/libraries/turtle => turtle}/yes_no_type.hpp (100%) diff --git a/Jamfile.v2 b/Jamfile.v2 new file mode 100644 index 0000000..a373100 --- /dev/null +++ b/Jamfile.v2 @@ -0,0 +1,28 @@ +# Copyright Rene Rivera 2007. +# +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +# Usage: +# +# bjam [options | properties | targets] +# +# Options: +# +# --boost= The directory of a Boost source tree. +# Default; BOOST env var (if found) +# Default; ../boost (if found) +# +# --boost-build= +# The directory for the Boost.Build v2 files. +# Default; BOOST_BUILD_PATH env var (if found) +# Default; BOOST_BUILD env var (if found) +# Default; /tools/build/v2 (if found) + +#~ If we have the Boost sources we can use the project... + +if [ GLOB $(BOOST) : [ modules.peek project : JAMFILE ] ] +{ + use-project /boost : $(BOOST) ; +} diff --git a/Jamroot.jam b/Jamroot.jam new file mode 100644 index 0000000..00a9dd1 --- /dev/null +++ b/Jamroot.jam @@ -0,0 +1,9 @@ + +import modules ; + +local boost = [ modules.peek : BOOST ] ; + +project turtle : requirements $(boost) . ; + +# This seems to prevent some Boost.Build errors that otherwise occur :-( +use-project /boost : $(boost) ; diff --git a/README.txt b/README.txt deleted file mode 100644 index 59595ed..0000000 --- a/README.txt +++ /dev/null @@ -1,3 +0,0 @@ -Turtle is an open-source C++ mock object library with a focus on usability and simplicity. - -For more information see http://turtle.sf.net diff --git a/build/build.properties b/build/build.properties deleted file mode 100644 index c44646e..0000000 --- a/build/build.properties +++ /dev/null @@ -1,2 +0,0 @@ -extensions = svn,headers,check -platform = vc80 diff --git a/build/vc100/turtle.vcxproj.filters b/build/vc100/turtle.vcxproj.filters deleted file mode 100644 index 095c263..0000000 --- a/build/vc100/turtle.vcxproj.filters +++ /dev/null @@ -1,95 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/build/vc100/turtle_bench.vcxproj.filters b/build/vc100/turtle_bench.vcxproj.filters deleted file mode 100644 index 6c6f6e2..0000000 --- a/build/vc100/turtle_bench.vcxproj.filters +++ /dev/null @@ -1,38 +0,0 @@ - - - - - {0ddf67a0-6350-4b1a-ad9f-0648d3985709} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx;h;hpp;hxx;hm;inl;inc;xsd - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/libs/turtle/build/build.properties b/libs/turtle/build/build.properties new file mode 100644 index 0000000..1323264 --- /dev/null +++ b/libs/turtle/build/build.properties @@ -0,0 +1,4 @@ +extensions = svn,headers,check +platform = vc80 +tests.dir = ${root.dir} +libraries.dir = ${root.dir}/../.. diff --git a/build/build.xml b/libs/turtle/build/build.xml similarity index 87% rename from build/build.xml rename to libs/turtle/build/build.xml index ea113dc..a946b29 100644 --- a/build/build.xml +++ b/libs/turtle/build/build.xml @@ -12,12 +12,13 @@ - + + @@ -68,9 +69,10 @@ + - + @@ -85,7 +87,7 @@ ${file} - + @@ -99,11 +101,9 @@ - - - - - + + + diff --git a/build/vc100/turtle.sln b/libs/turtle/build/vc100/turtle.sln similarity index 100% rename from build/vc100/turtle.sln rename to libs/turtle/build/vc100/turtle.sln diff --git a/build/vc100/turtle.vcxproj b/libs/turtle/build/vc100/turtle.vcxproj similarity index 81% rename from build/vc100/turtle.vcxproj rename to libs/turtle/build/vc100/turtle.vcxproj index 36335b9..af9800c 100644 --- a/build/vc100/turtle.vcxproj +++ b/libs/turtle/build/vc100/turtle.vcxproj @@ -19,34 +19,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + {831F2DEE-1E35-4533-A3B2-12C01BA8DA1D} diff --git a/libs/turtle/build/vc100/turtle.vcxproj.filters b/libs/turtle/build/vc100/turtle.vcxproj.filters new file mode 100644 index 0000000..bae2c05 --- /dev/null +++ b/libs/turtle/build/vc100/turtle.vcxproj.filters @@ -0,0 +1,95 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/build/vc100/turtle.vcxproj.user b/libs/turtle/build/vc100/turtle.vcxproj.user similarity index 100% rename from build/vc100/turtle.vcxproj.user rename to libs/turtle/build/vc100/turtle.vcxproj.user diff --git a/build/vc100/turtle_bench.vcxproj b/libs/turtle/build/vc100/turtle_bench.vcxproj similarity index 86% rename from build/vc100/turtle_bench.vcxproj rename to libs/turtle/build/vc100/turtle_bench.vcxproj index 4a68807..cade182 100644 --- a/build/vc100/turtle_bench.vcxproj +++ b/libs/turtle/build/vc100/turtle_bench.vcxproj @@ -19,15 +19,15 @@ - - - - - - - - - + + + + + + + + + {2D607783-30B9-46DE-81E2-28513B31D5D2} @@ -79,7 +79,7 @@ Disabled - ../../src/libraries;%(AdditionalIncludeDirectories) + ../../../..; ../../include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -106,7 +106,7 @@ Disabled - ../../src/libraries;%(AdditionalIncludeDirectories) + ../../../..; ../../include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -133,7 +133,7 @@ MaxSpeed - ../../src/libraries;%(AdditionalIncludeDirectories) + ../../../..; ../../include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Default MultiThreadedDLL @@ -161,7 +161,7 @@ MaxSpeed - ../../src/libraries;%(AdditionalIncludeDirectories) + ../../../..; ../../include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Default MultiThreadedDLL diff --git a/libs/turtle/build/vc100/turtle_bench.vcxproj.filters b/libs/turtle/build/vc100/turtle_bench.vcxproj.filters new file mode 100644 index 0000000..8fc23e0 --- /dev/null +++ b/libs/turtle/build/vc100/turtle_bench.vcxproj.filters @@ -0,0 +1,38 @@ + + + + + {0ddf67a0-6350-4b1a-ad9f-0648d3985709} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx;h;hpp;hxx;hm;inl;inc;xsd + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/build/vc100/turtle_bench.vcxproj.user b/libs/turtle/build/vc100/turtle_bench.vcxproj.user similarity index 100% rename from build/vc100/turtle_bench.vcxproj.user rename to libs/turtle/build/vc100/turtle_bench.vcxproj.user diff --git a/build/vc100/turtle_test.vcxproj b/libs/turtle/build/vc100/turtle_test.vcxproj similarity index 86% rename from build/vc100/turtle_test.vcxproj rename to libs/turtle/build/vc100/turtle_test.vcxproj index 3315134..f4433c0 100644 --- a/build/vc100/turtle_test.vcxproj +++ b/libs/turtle/build/vc100/turtle_test.vcxproj @@ -19,22 +19,22 @@ - + - - - - - - - - - - - - - + + + + + + + + + + + + + {74810A2A-33D8-47D6-9A50-71261F1683F5} @@ -84,7 +84,7 @@ /Zm172 %(AdditionalOptions) Disabled - ../../src/libraries; ../../include;%(AdditionalIncludeDirectories) + ../../../..; ../../include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -117,7 +117,7 @@ /Zm172 %(AdditionalOptions) Disabled - ../../src/libraries; ../../include;%(AdditionalIncludeDirectories) + ../../../..; ../../include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL @@ -150,7 +150,7 @@ /Zm162 %(AdditionalOptions) MaxSpeed - ../../src/libraries; ../../include;%(AdditionalIncludeDirectories) + ../../../..; ../../include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Default MultiThreadedDLL @@ -183,7 +183,7 @@ /Zm162 %(AdditionalOptions) MaxSpeed - ../../src/libraries; ../../include;%(AdditionalIncludeDirectories) + ../../../..; ../../include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) Default MultiThreadedDLL diff --git a/build/vc100/turtle_test.vcxproj.filters b/libs/turtle/build/vc100/turtle_test.vcxproj.filters similarity index 52% rename from build/vc100/turtle_test.vcxproj.filters rename to libs/turtle/build/vc100/turtle_test.vcxproj.filters index 7ebabd1..bafd93d 100644 --- a/build/vc100/turtle_test.vcxproj.filters +++ b/libs/turtle/build/vc100/turtle_test.vcxproj.filters @@ -7,48 +7,48 @@ - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files - + Source Files diff --git a/build/vc100/turtle_test.vcxproj.user b/libs/turtle/build/vc100/turtle_test.vcxproj.user similarity index 100% rename from build/vc100/turtle_test.vcxproj.user rename to libs/turtle/build/vc100/turtle_test.vcxproj.user diff --git a/build/vc80/bench_test.vcproj b/libs/turtle/build/vc80/bench_test.vcproj similarity index 77% rename from build/vc80/bench_test.vcproj rename to libs/turtle/build/vc80/bench_test.vcproj index 9cbd1b1..b34fd3d 100644 --- a/build/vc80/bench_test.vcproj +++ b/libs/turtle/build/vc80/bench_test.vcproj @@ -1,9 +1,10 @@ diff --git a/build/vc80/errors_test.vcproj b/libs/turtle/build/vc80/errors_test.vcproj similarity index 77% rename from build/vc80/errors_test.vcproj rename to libs/turtle/build/vc80/errors_test.vcproj index 4d8a3d6..48166cf 100644 --- a/build/vc80/errors_test.vcproj +++ b/libs/turtle/build/vc80/errors_test.vcproj @@ -1,7 +1,7 @@ diff --git a/build/vc80/turtle.sln b/libs/turtle/build/vc80/turtle.sln similarity index 100% rename from build/vc80/turtle.sln rename to libs/turtle/build/vc80/turtle.sln diff --git a/build/vc80/turtle.vcproj b/libs/turtle/build/vc80/turtle.vcproj similarity index 69% rename from build/vc80/turtle.vcproj rename to libs/turtle/build/vc80/turtle.vcproj index 75d4635..b52b29b 100644 --- a/build/vc80/turtle.vcproj +++ b/libs/turtle/build/vc80/turtle.vcproj @@ -153,115 +153,115 @@ UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" > diff --git a/build/vc80/turtle_test.vcproj b/libs/turtle/build/vc80/turtle_test.vcproj similarity index 78% rename from build/vc80/turtle_test.vcproj rename to libs/turtle/build/vc80/turtle_test.vcproj index 05d294f..1ec21fc 100644 --- a/build/vc80/turtle_test.vcproj +++ b/libs/turtle/build/vc80/turtle_test.vcproj @@ -39,7 +39,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/Zm172" Optimization="0" - AdditionalIncludeDirectories="../../src/libraries, ../../include" + AdditionalIncludeDirectories="../../../..; ../../include" PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE" BasicRuntimeChecks="3" RuntimeLibrary="3" @@ -123,7 +123,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/Zm162" Optimization="2" - AdditionalIncludeDirectories="../../src/libraries, ../../include" + AdditionalIncludeDirectories="../../../..; ../../include" PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE" BasicRuntimeChecks="0" RuntimeLibrary="2" @@ -191,59 +191,59 @@ Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx;h;hpp;hxx;hm;inl;inc;xsd" > diff --git a/libs/turtle/test/Jamfile.jam b/libs/turtle/test/Jamfile.jam new file mode 100644 index 0000000..f43f8c4 --- /dev/null +++ b/libs/turtle/test/Jamfile.jam @@ -0,0 +1,26 @@ +# Turtle mock library +# +# Copyright Mathieu Champlon 2012 +# +# Distributed under the Boost Software License version 1.0. (See +# accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +import testing ; + +run [ glob test_*.cpp ] /boost//unit_test_framework ; + +compile-fail fail_ambiguous_mock_method.cpp ; +compile-fail fail_constraint_functor_not_compatible.cpp ; +compile-fail fail_constraint_value_not_comparable.cpp ; +compile-fail fail_constraint_value_of_wrong_type_in_builtin_constraint.cpp ; +compile-fail fail_mismatch_type_in_returns_int_action.cpp ; +compile-fail fail_mismatch_type_in_returns_string_action.cpp ; +compile-fail fail_mismatch_type_in_returns_void_action.cpp ; +compile-fail fail_non_existing_base_class_method_in_mock_method.cpp ; +compile-fail fail_number_of_arguments_greater_than_max_constant.cpp ; +compile-fail fail_template_argument_without_tpl_macro.cpp ; +compile-fail fail_too_many_arguments_in_mock_method.cpp ; +compile-fail fail_wrong_number_of_arguments_in_with.cpp ; + +# How to time bench_*.cpp compilation ? diff --git a/src/tests/bench_test/turtle_bench_0_class.cpp b/libs/turtle/test/bench_0_class.cpp similarity index 100% rename from src/tests/bench_test/turtle_bench_0_class.cpp rename to libs/turtle/test/bench_0_class.cpp diff --git a/src/tests/bench_test/turtle_bench_0_class_10_max_args.cpp b/libs/turtle/test/bench_0_class_10_max_args.cpp similarity index 100% rename from src/tests/bench_test/turtle_bench_0_class_10_max_args.cpp rename to libs/turtle/test/bench_0_class_10_max_args.cpp diff --git a/src/tests/bench_test/turtle_bench_0_class_20_max_args.cpp b/libs/turtle/test/bench_0_class_20_max_args.cpp similarity index 100% rename from src/tests/bench_test/turtle_bench_0_class_20_max_args.cpp rename to libs/turtle/test/bench_0_class_20_max_args.cpp diff --git a/src/tests/bench_test/turtle_bench_0_class_30_max_args.cpp b/libs/turtle/test/bench_0_class_30_max_args.cpp similarity index 100% rename from src/tests/bench_test/turtle_bench_0_class_30_max_args.cpp rename to libs/turtle/test/bench_0_class_30_max_args.cpp diff --git a/src/tests/bench_test/turtle_bench_30_classes_30_methods_30_args_30_max_args.cpp b/libs/turtle/test/bench_30_classes_30_methods_30_args_30_max_args.cpp similarity index 100% rename from src/tests/bench_test/turtle_bench_30_classes_30_methods_30_args_30_max_args.cpp rename to libs/turtle/test/bench_30_classes_30_methods_30_args_30_max_args.cpp diff --git a/src/tests/bench_test/turtle_bench_30_classes_30_methods_9_args.cpp b/libs/turtle/test/bench_30_classes_30_methods_9_args.cpp similarity index 100% rename from src/tests/bench_test/turtle_bench_30_classes_30_methods_9_args.cpp rename to libs/turtle/test/bench_30_classes_30_methods_9_args.cpp diff --git a/src/tests/bench_test/turtle_bench_30_classes_30_methods_9_args_10_max_args.cpp b/libs/turtle/test/bench_30_classes_30_methods_9_args_10_max_args.cpp similarity index 100% rename from src/tests/bench_test/turtle_bench_30_classes_30_methods_9_args_10_max_args.cpp rename to libs/turtle/test/bench_30_classes_30_methods_9_args_10_max_args.cpp diff --git a/src/tests/bench_test/turtle_bench_30_classes_30_methods_9_args_20_max_args.cpp b/libs/turtle/test/bench_30_classes_30_methods_9_args_20_max_args.cpp similarity index 100% rename from src/tests/bench_test/turtle_bench_30_classes_30_methods_9_args_20_max_args.cpp rename to libs/turtle/test/bench_30_classes_30_methods_9_args_20_max_args.cpp diff --git a/src/tests/bench_test/turtle_bench_30_classes_30_methods_9_args_30_max_args.cpp b/libs/turtle/test/bench_30_classes_30_methods_9_args_30_max_args.cpp similarity index 100% rename from src/tests/bench_test/turtle_bench_30_classes_30_methods_9_args_30_max_args.cpp rename to libs/turtle/test/bench_30_classes_30_methods_9_args_30_max_args.cpp diff --git a/src/tests/errors_test/ambiguous_mock_method.cpp b/libs/turtle/test/fail_ambiguous_mock_method.cpp similarity index 100% rename from src/tests/errors_test/ambiguous_mock_method.cpp rename to libs/turtle/test/fail_ambiguous_mock_method.cpp diff --git a/src/tests/errors_test/constraint_functor_not_compatible.cpp b/libs/turtle/test/fail_constraint_functor_not_compatible.cpp similarity index 100% rename from src/tests/errors_test/constraint_functor_not_compatible.cpp rename to libs/turtle/test/fail_constraint_functor_not_compatible.cpp diff --git a/src/tests/errors_test/constraint_value_not_comparable.cpp b/libs/turtle/test/fail_constraint_value_not_comparable.cpp similarity index 100% rename from src/tests/errors_test/constraint_value_not_comparable.cpp rename to libs/turtle/test/fail_constraint_value_not_comparable.cpp diff --git a/src/tests/errors_test/constraint_value_of_wrong_type_in_builtin_constraint.cpp b/libs/turtle/test/fail_constraint_value_of_wrong_type_in_builtin_constraint.cpp similarity index 100% rename from src/tests/errors_test/constraint_value_of_wrong_type_in_builtin_constraint.cpp rename to libs/turtle/test/fail_constraint_value_of_wrong_type_in_builtin_constraint.cpp diff --git a/src/tests/errors_test/mismatch_type_in_returns_int_action.cpp b/libs/turtle/test/fail_mismatch_type_in_returns_int_action.cpp similarity index 100% rename from src/tests/errors_test/mismatch_type_in_returns_int_action.cpp rename to libs/turtle/test/fail_mismatch_type_in_returns_int_action.cpp diff --git a/src/tests/errors_test/mismatch_type_in_returns_string_action.cpp b/libs/turtle/test/fail_mismatch_type_in_returns_string_action.cpp similarity index 100% rename from src/tests/errors_test/mismatch_type_in_returns_string_action.cpp rename to libs/turtle/test/fail_mismatch_type_in_returns_string_action.cpp diff --git a/src/tests/errors_test/mismatch_type_in_returns_void_action.cpp b/libs/turtle/test/fail_mismatch_type_in_returns_void_action.cpp similarity index 100% rename from src/tests/errors_test/mismatch_type_in_returns_void_action.cpp rename to libs/turtle/test/fail_mismatch_type_in_returns_void_action.cpp diff --git a/src/tests/errors_test/non_existing_base_class_method_in_mock_method.cpp b/libs/turtle/test/fail_non_existing_base_class_method_in_mock_method.cpp similarity index 100% rename from src/tests/errors_test/non_existing_base_class_method_in_mock_method.cpp rename to libs/turtle/test/fail_non_existing_base_class_method_in_mock_method.cpp diff --git a/src/tests/errors_test/number_of_arguments_greater_than_max_constant.cpp b/libs/turtle/test/fail_number_of_arguments_greater_than_max_constant.cpp similarity index 100% rename from src/tests/errors_test/number_of_arguments_greater_than_max_constant.cpp rename to libs/turtle/test/fail_number_of_arguments_greater_than_max_constant.cpp diff --git a/src/tests/errors_test/template_argument_without_tpl_macro.cpp b/libs/turtle/test/fail_template_argument_without_tpl_macro.cpp similarity index 100% rename from src/tests/errors_test/template_argument_without_tpl_macro.cpp rename to libs/turtle/test/fail_template_argument_without_tpl_macro.cpp diff --git a/src/tests/errors_test/too_many_arguments_in_mock_method.cpp b/libs/turtle/test/fail_too_many_arguments_in_mock_method.cpp similarity index 100% rename from src/tests/errors_test/too_many_arguments_in_mock_method.cpp rename to libs/turtle/test/fail_too_many_arguments_in_mock_method.cpp diff --git a/src/tests/errors_test/wrong_number_of_arguments_in_with.cpp b/libs/turtle/test/fail_wrong_number_of_arguments_in_with.cpp similarity index 100% rename from src/tests/errors_test/wrong_number_of_arguments_in_with.cpp rename to libs/turtle/test/fail_wrong_number_of_arguments_in_with.cpp diff --git a/src/tests/turtle_test/mock_error.hpp b/libs/turtle/test/mock_error.hpp similarity index 100% rename from src/tests/turtle_test/mock_error.hpp rename to libs/turtle/test/mock_error.hpp diff --git a/src/tests/turtle_test/args_test.cpp b/libs/turtle/test/test_args.cpp similarity index 100% rename from src/tests/turtle_test/args_test.cpp rename to libs/turtle/test/test_args.cpp diff --git a/src/tests/turtle_test/constraints_test.cpp b/libs/turtle/test/test_constraints.cpp similarity index 100% rename from src/tests/turtle_test/constraints_test.cpp rename to libs/turtle/test/test_constraints.cpp diff --git a/src/tests/turtle_test/error_test.cpp b/libs/turtle/test/test_error.cpp similarity index 100% rename from src/tests/turtle_test/error_test.cpp rename to libs/turtle/test/test_error.cpp diff --git a/src/tests/turtle_test/function_test.cpp b/libs/turtle/test/test_function.cpp similarity index 100% rename from src/tests/turtle_test/function_test.cpp rename to libs/turtle/test/test_function.cpp diff --git a/src/tests/turtle_test/integration_test.cpp b/libs/turtle/test/test_integration.cpp similarity index 100% rename from src/tests/turtle_test/integration_test.cpp rename to libs/turtle/test/test_integration.cpp diff --git a/src/tests/turtle_test/invocation_test.cpp b/libs/turtle/test/test_invocation.cpp similarity index 100% rename from src/tests/turtle_test/invocation_test.cpp rename to libs/turtle/test/test_invocation.cpp diff --git a/src/tests/turtle_test/is_functor_test.cpp b/libs/turtle/test/test_is_functor.cpp similarity index 100% rename from src/tests/turtle_test/is_functor_test.cpp rename to libs/turtle/test/test_is_functor.cpp diff --git a/src/tests/turtle_test/log_test.cpp b/libs/turtle/test/test_log.cpp similarity index 100% rename from src/tests/turtle_test/log_test.cpp rename to libs/turtle/test/test_log.cpp diff --git a/src/tests/turtle_test/max_args_test.cpp b/libs/turtle/test/test_max_args.cpp similarity index 100% rename from src/tests/turtle_test/max_args_test.cpp rename to libs/turtle/test/test_max_args.cpp diff --git a/src/tests/turtle_test/mock_test.cpp b/libs/turtle/test/test_mock.cpp similarity index 100% rename from src/tests/turtle_test/mock_test.cpp rename to libs/turtle/test/test_mock.cpp diff --git a/src/tests/turtle_test/object_test.cpp b/libs/turtle/test/test_object.cpp similarity index 100% rename from src/tests/turtle_test/object_test.cpp rename to libs/turtle/test/test_object.cpp diff --git a/src/tests/turtle_test/sequence_test.cpp b/libs/turtle/test/test_sequence.cpp similarity index 100% rename from src/tests/turtle_test/sequence_test.cpp rename to libs/turtle/test/test_sequence.cpp diff --git a/src/tests/turtle_test/type_name_test.cpp b/libs/turtle/test/test_type_name.cpp similarity index 100% rename from src/tests/turtle_test/type_name_test.cpp rename to libs/turtle/test/test_type_name.cpp diff --git a/src/tests/bench_test/Jamfile.v2 b/src/tests/bench_test/Jamfile.v2 deleted file mode 100644 index d66196d..0000000 --- a/src/tests/bench_test/Jamfile.v2 +++ /dev/null @@ -1,5 +0,0 @@ -import template-profile ; -template-profile turtle_bench : turtle_bench.cpp - : ../../libraries - : d:\\dev\\include - ; \ No newline at end of file diff --git a/src/tests/bench_test/Jamroot b/src/tests/bench_test/Jamroot deleted file mode 100644 index e69de29..0000000 diff --git a/src/libraries/turtle/action.hpp b/turtle/action.hpp similarity index 100% rename from src/libraries/turtle/action.hpp rename to turtle/action.hpp diff --git a/src/libraries/turtle/args.hpp b/turtle/args.hpp similarity index 100% rename from src/libraries/turtle/args.hpp rename to turtle/args.hpp diff --git a/src/libraries/turtle/boost_test_error.hpp b/turtle/boost_test_error.hpp similarity index 100% rename from src/libraries/turtle/boost_test_error.hpp rename to turtle/boost_test_error.hpp diff --git a/src/libraries/turtle/check.hpp b/turtle/check.hpp similarity index 100% rename from src/libraries/turtle/check.hpp rename to turtle/check.hpp diff --git a/src/libraries/turtle/child.hpp b/turtle/child.hpp similarity index 100% rename from src/libraries/turtle/child.hpp rename to turtle/child.hpp diff --git a/src/libraries/turtle/cleanup.hpp b/turtle/cleanup.hpp similarity index 100% rename from src/libraries/turtle/cleanup.hpp rename to turtle/cleanup.hpp diff --git a/src/libraries/turtle/config.hpp b/turtle/config.hpp similarity index 100% rename from src/libraries/turtle/config.hpp rename to turtle/config.hpp diff --git a/src/libraries/turtle/constraint.hpp b/turtle/constraint.hpp similarity index 100% rename from src/libraries/turtle/constraint.hpp rename to turtle/constraint.hpp diff --git a/src/libraries/turtle/constraints.hpp b/turtle/constraints.hpp similarity index 100% rename from src/libraries/turtle/constraints.hpp rename to turtle/constraints.hpp diff --git a/src/libraries/turtle/context.hpp b/turtle/context.hpp similarity index 100% rename from src/libraries/turtle/context.hpp rename to turtle/context.hpp diff --git a/src/libraries/turtle/default_error.hpp b/turtle/default_error.hpp similarity index 100% rename from src/libraries/turtle/default_error.hpp rename to turtle/default_error.hpp diff --git a/src/libraries/turtle/error.hpp b/turtle/error.hpp similarity index 100% rename from src/libraries/turtle/error.hpp rename to turtle/error.hpp diff --git a/src/libraries/turtle/expectation.hpp b/turtle/expectation.hpp similarity index 100% rename from src/libraries/turtle/expectation.hpp rename to turtle/expectation.hpp diff --git a/src/libraries/turtle/function.hpp b/turtle/function.hpp similarity index 100% rename from src/libraries/turtle/function.hpp rename to turtle/function.hpp diff --git a/src/libraries/turtle/group.hpp b/turtle/group.hpp similarity index 100% rename from src/libraries/turtle/group.hpp rename to turtle/group.hpp diff --git a/src/libraries/turtle/invocation.hpp b/turtle/invocation.hpp similarity index 100% rename from src/libraries/turtle/invocation.hpp rename to turtle/invocation.hpp diff --git a/src/libraries/turtle/is_functor.hpp b/turtle/is_functor.hpp similarity index 100% rename from src/libraries/turtle/is_functor.hpp rename to turtle/is_functor.hpp diff --git a/src/libraries/turtle/lambda.hpp b/turtle/lambda.hpp similarity index 100% rename from src/libraries/turtle/lambda.hpp rename to turtle/lambda.hpp diff --git a/src/libraries/turtle/log.hpp b/turtle/log.hpp similarity index 100% rename from src/libraries/turtle/log.hpp rename to turtle/log.hpp diff --git a/src/libraries/turtle/mock.hpp b/turtle/mock.hpp similarity index 100% rename from src/libraries/turtle/mock.hpp rename to turtle/mock.hpp diff --git a/src/libraries/turtle/object.hpp b/turtle/object.hpp similarity index 100% rename from src/libraries/turtle/object.hpp rename to turtle/object.hpp diff --git a/src/libraries/turtle/operators.hpp b/turtle/operators.hpp similarity index 100% rename from src/libraries/turtle/operators.hpp rename to turtle/operators.hpp diff --git a/src/libraries/turtle/parent.hpp b/turtle/parent.hpp similarity index 100% rename from src/libraries/turtle/parent.hpp rename to turtle/parent.hpp diff --git a/src/libraries/turtle/root.hpp b/turtle/root.hpp similarity index 100% rename from src/libraries/turtle/root.hpp rename to turtle/root.hpp diff --git a/src/libraries/turtle/sequence.hpp b/turtle/sequence.hpp similarity index 100% rename from src/libraries/turtle/sequence.hpp rename to turtle/sequence.hpp diff --git a/src/libraries/turtle/type_name.hpp b/turtle/type_name.hpp similarity index 100% rename from src/libraries/turtle/type_name.hpp rename to turtle/type_name.hpp diff --git a/src/libraries/turtle/verifiable.hpp b/turtle/verifiable.hpp similarity index 100% rename from src/libraries/turtle/verifiable.hpp rename to turtle/verifiable.hpp diff --git a/src/libraries/turtle/yes_no_type.hpp b/turtle/yes_no_type.hpp similarity index 100% rename from src/libraries/turtle/yes_no_type.hpp rename to turtle/yes_no_type.hpp