bu5hm4n pushed a commit to branch feature/meson. http://git.enlightenment.org/core/efl.git/commit/?id=f0e60b0210e4263b3557bf6aa0091cae5a3d084e
commit f0e60b0210e4263b3557bf6aa0091cae5a3d084e Author: Marcel Hollerbach <[email protected]> Date: Wed Dec 27 15:45:24 2017 +0000 meson: add eet --- meson.build | 1 + src/bin/eet/meson.build | 10 ++++++++++ src/examples/eet/meson.build | 13 +++++++++++++ src/examples/meson.build | 1 + src/lib/eet/meson.build | 39 +++++++++++++++++++++++++++++++++++++++ src/tests/eet/meson.build | 27 +++++++++++++++++++++++++++ src/tests/meson.build | 1 + 7 files changed, 92 insertions(+) diff --git a/meson.build b/meson.build index d9c719d95f..f6e6215aec 100644 --- a/meson.build +++ b/meson.build @@ -85,6 +85,7 @@ subprojects = [ ['eo' , false, true, false, true, []], ['efl' , false, true, false, false, []], ['emile' , false, true, false, false, ['lz4', 'rg_etc']], +['eet' , false, true, true, false, []] ] diff --git a/src/bin/eet/meson.build b/src/bin/eet/meson.build new file mode 100644 index 0000000000..e5f9ddf071 --- /dev/null +++ b/src/bin/eet/meson.build @@ -0,0 +1,10 @@ +executable('eet', + 'eet_main.c', + dependencies: [eet], + install : true +) + +install_data(['diffeet','vieet'], + install_mode: 'rwxr--r--', + install_dir : dir_bin +) diff --git a/src/examples/eet/meson.build b/src/examples/eet/meson.build new file mode 100644 index 0000000000..98a1120a44 --- /dev/null +++ b/src/examples/eet/meson.build @@ -0,0 +1,13 @@ +examples = [ + 'eet-basic', + 'eet-file', + 'eet-data-simple', + 'eet-data-nested', + 'eet-data-file_descriptor_01', + 'eet-data-file_descriptor_02', + 'eet-data-cipher_decipher' +] + +foreach example : examples + executable(example, example + '.c', dependencies: eet) +endforeach diff --git a/src/examples/meson.build b/src/examples/meson.build index 36219b40a2..b322542d45 100644 --- a/src/examples/meson.build +++ b/src/examples/meson.build @@ -1,2 +1,3 @@ subdir('eina') subdir('emile') +subdir('eet') \ No newline at end of file diff --git a/src/lib/eet/meson.build b/src/lib/eet/meson.build new file mode 100644 index 0000000000..db17870de7 --- /dev/null +++ b/src/lib/eet/meson.build @@ -0,0 +1,39 @@ +eet_deps = [] + +eet_header_src = [ + 'Eet.h' +] + +eet_src = [ + 'Eet_private.h', + 'eet_alloc.c', + 'eet_cipher.c', + 'eet_connection.c', + 'eet_data.c', + 'eet_dictionary.c', + 'eet_image.c', + 'eet_lib.c', + 'eet_node.c', + 'eet_utils.c', +] + +eet_deps += cc.find_library('jpeg') +eet_deps += rg_etc + +eet_lib = library('eet', + eet_src, pub_eo_file_target, + dependencies: [eet_deps, eina, emile, m], + include_directories : config_dir, + install: true, +) + +eet = declare_dependency( + include_directories: [include_directories('.')], + link_with: eet_lib, + sources : pub_eo_file_target, + dependencies: [eina, eo, emile, efl], +) + +install_headers(eet_header_src, + install_dir : dir_package_include, +) \ No newline at end of file diff --git a/src/tests/eet/meson.build b/src/tests/eet/meson.build new file mode 100644 index 0000000000..6a6dafad34 --- /dev/null +++ b/src/tests/eet/meson.build @@ -0,0 +1,27 @@ +eet_suite_src = [ + 'eet_test_cache.c', + 'eet_test_cipher.c', + 'eet_test_common.c', + 'eet_test_connection.c', + 'eet_test_data.c', + 'eet_test_file.c', + 'eet_test_identity.c', + 'eet_test_image.c', + 'eet_test_init.c', + 'eet_suite.c', + 'eet_test_common.h', + 'eet_suite.h' +] + +eet_suite = executable('eet_suite', + eet_suite_src, + dependencies: [eet, check], + c_args : [ + '-DTESTS_WD="`pwd`"', + '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"', + '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"'] +) + +test('eet-suite', eet_suite, + is_parallel: true, +) diff --git a/src/tests/meson.build b/src/tests/meson.build index 121f6b8688..4d8fb60cd1 100644 --- a/src/tests/meson.build +++ b/src/tests/meson.build @@ -5,3 +5,4 @@ subdir('eo') #disabled for now we need ecore first #subdir('efl') subdir('emile') +subdir('eet') \ No newline at end of file --
