diff options
author | Marcelo Lira <marcelo.lira@openbossa.org> | 2011-01-24 23:32:37 -0300 |
---|---|---|
committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:13:52 -0300 |
commit | e222dba7912df724e3ee6379b12f19e008c770b6 (patch) | |
tree | 24f0a951518a3fc5ed2e97c9f6f3db4f4e05242d /tests | |
parent | f112a17de646008ae8d930a97023c8864bca5c37 (diff) |
Test bindings project files modified to use key/value pair text files.
Reviewed by Hugo Parente <hugo.lima@openbossa.org>
Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/otherbinding/CMakeLists.txt | 6 | ||||
-rw-r--r-- | tests/otherbinding/other-binding.txt.in | 18 | ||||
-rw-r--r-- | tests/otherbinding/other-binding.xml.in | 23 | ||||
-rw-r--r-- | tests/samplebinding/CMakeLists.txt | 6 | ||||
-rw-r--r-- | tests/samplebinding/sample-binding.txt.in | 15 | ||||
-rw-r--r-- | tests/samplebinding/sample-binding.xml.in | 21 |
6 files changed, 39 insertions, 50 deletions
diff --git a/tests/otherbinding/CMakeLists.txt b/tests/otherbinding/CMakeLists.txt index e8b89eb5c..5a859679a 100644 --- a/tests/otherbinding/CMakeLists.txt +++ b/tests/otherbinding/CMakeLists.txt @@ -14,11 +14,11 @@ ${CMAKE_CURRENT_BINARY_DIR}/other/other_module_wrapper.cpp ) -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/other-binding.xml.in" - "${CMAKE_CURRENT_BINARY_DIR}/other-binding.xml" @ONLY) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/other-binding.txt.in" + "${CMAKE_CURRENT_BINARY_DIR}/other-binding.txt" @ONLY) add_custom_command(OUTPUT ${other_SRC} -COMMAND ${GENERATORRUNNER_BINARY} --project-file=${CMAKE_CURRENT_BINARY_DIR}/other-binding.xml +COMMAND ${GENERATORRUNNER_BINARY} --project-file=${CMAKE_CURRENT_BINARY_DIR}/other-binding.txt WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMENT "Running generator for 'other' test binding..." ) diff --git a/tests/otherbinding/other-binding.txt.in b/tests/otherbinding/other-binding.txt.in new file mode 100644 index 000000000..12ea06988 --- /dev/null +++ b/tests/otherbinding/other-binding.txt.in @@ -0,0 +1,18 @@ +[generator-project] + +generator-set = @generators_BINARY_DIR@/shiboken_generator@CMAKE_RELEASE_POSTFIX@@CMAKE_DEBUG_POSTFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@ + +header-file = @CMAKE_CURRENT_SOURCE_DIR@/global.h +typesystem-file = @other_TYPESYSTEM@ + +output-directory = @CMAKE_CURRENT_BINARY_DIR@ + +include-path = @libother_SOURCE_DIR@ +include-path = @libsample_SOURCE_DIR@ +include-path = @libsample_SOURCE_DIR@/.. + +typesystem-path = @CMAKE_CURRENT_SOURCE_DIR@ +typesystem-path = @sample_SOURCE_DIR@ + +enable-parent-ctor-heuristic + diff --git a/tests/otherbinding/other-binding.xml.in b/tests/otherbinding/other-binding.xml.in deleted file mode 100644 index 446049ac7..000000000 --- a/tests/otherbinding/other-binding.xml.in +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0"?> -<generator-project> - <generator-set generator="@generators_BINARY_DIR@/shiboken_generator@CMAKE_RELEASE_POSTFIX@@CMAKE_DEBUG_POSTFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@" /> - - <header-file location="@CMAKE_CURRENT_SOURCE_DIR@/global.h" /> - <typesystem-file location="@other_TYPESYSTEM@" /> - - <output-directory location="@CMAKE_CURRENT_BINARY_DIR@" /> - - <include-paths> - <path location="@libother_SOURCE_DIR@" /> - <path location="@libsample_SOURCE_DIR@" /> - <path location="@libsample_SOURCE_DIR@/.." /> - </include-paths> - <typesystem-paths> - <path location="@CMAKE_CURRENT_SOURCE_DIR@" /> - <path location="@sample_SOURCE_DIR@" /> - </typesystem-paths> - - <enable-parent-ctor-heuristic /> - -</generator-project> - diff --git a/tests/samplebinding/CMakeLists.txt b/tests/samplebinding/CMakeLists.txt index b0908d8c9..3421c0d5e 100644 --- a/tests/samplebinding/CMakeLists.txt +++ b/tests/samplebinding/CMakeLists.txt @@ -87,11 +87,11 @@ ${CMAKE_CURRENT_BINARY_DIR}/sample/voidholder_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/sample/valueandvirtual_wrapper.cpp ) -configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sample-binding.xml.in" - "${CMAKE_CURRENT_BINARY_DIR}/sample-binding.xml" @ONLY) +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/sample-binding.txt.in" + "${CMAKE_CURRENT_BINARY_DIR}/sample-binding.txt" @ONLY) add_custom_command(OUTPUT ${sample_SRC} -COMMAND ${GENERATORRUNNER_BINARY} --project-file=${CMAKE_CURRENT_BINARY_DIR}/sample-binding.xml +COMMAND ${GENERATORRUNNER_BINARY} --project-file=${CMAKE_CURRENT_BINARY_DIR}/sample-binding.txt WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMENT "Running generator for 'sample' test binding..." ) diff --git a/tests/samplebinding/sample-binding.txt.in b/tests/samplebinding/sample-binding.txt.in new file mode 100644 index 000000000..9a4895b6f --- /dev/null +++ b/tests/samplebinding/sample-binding.txt.in @@ -0,0 +1,15 @@ +[generator-project] + +generator-set = @generators_BINARY_DIR@/shiboken_generator@CMAKE_RELEASE_POSTFIX@@CMAKE_DEBUG_POSTFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@ + +header-file = @CMAKE_CURRENT_SOURCE_DIR@/global.h +typesystem-file = @sample_TYPESYSTEM@ + +output-directory = @CMAKE_CURRENT_BINARY_DIR@ + +include-path = @libsample_SOURCE_DIR@ + +typesystem-path = @CMAKE_CURRENT_SOURCE_DIR@ + +enable-parent-ctor-heuristic +use-isnull-as-nb_nonzero diff --git a/tests/samplebinding/sample-binding.xml.in b/tests/samplebinding/sample-binding.xml.in deleted file mode 100644 index 207821c99..000000000 --- a/tests/samplebinding/sample-binding.xml.in +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0"?> -<generator-project> - <generator-set generator="@generators_BINARY_DIR@/shiboken_generator@CMAKE_RELEASE_POSTFIX@@CMAKE_DEBUG_POSTFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@" /> - - <header-file location="@CMAKE_CURRENT_SOURCE_DIR@/global.h" /> - <typesystem-file location="@sample_TYPESYSTEM@" /> - - <output-directory location="@CMAKE_CURRENT_BINARY_DIR@" /> - - <include-paths> - <path location="@libsample_SOURCE_DIR@" /> - </include-paths> - <typesystem-paths> - <path location="@CMAKE_CURRENT_SOURCE_DIR@" /> - </typesystem-paths> - - <enable-parent-ctor-heuristic /> - <use-isnull-as-nb_nonzero /> - -</generator-project> - |