forked from enlightenment/efl
Compare commits
4 Commits
f0a966a65f
...
97845c1ee3
Author | SHA1 | Date |
---|---|---|
Vincent Torri | 97845c1ee3 | |
Vincent Torri | 7e839be3ab | |
Ross Vandegrift | 12124b770b | |
Ross Vandegrift | 35e486dbb5 |
|
@ -388,3 +388,9 @@ option('docs',
|
||||||
value: false,
|
value: false,
|
||||||
description: 'Enable building C of documentation (Requires doxygen)'
|
description: 'Enable building C of documentation (Requires doxygen)'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
option('embedded-libunibreak',
|
||||||
|
type : 'boolean',
|
||||||
|
value : true,
|
||||||
|
description : 'Use the embedded in-tree libunibreak instead of the system libunibreak.'
|
||||||
|
)
|
||||||
|
|
|
@ -68,7 +68,7 @@ do
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
echo "Failed compiling eet file."
|
echo "Failed compiling eet file."
|
||||||
echo "Press 'Return' to reopen the editor, or ^C to abort."
|
echo "Press 'Return' to reopen the editor, or ^C to abort."
|
||||||
read
|
read _dummy
|
||||||
else
|
else
|
||||||
DONE=1
|
DONE=1
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -1,32 +1,35 @@
|
||||||
|
if (get_option('embedded-libunibreak'))
|
||||||
|
libunibreak_src = [
|
||||||
|
'unibreakbase.h',
|
||||||
|
'unibreakdef.h',
|
||||||
|
'linebreak.h',
|
||||||
|
'linebreakdef.h',
|
||||||
|
'wordbreakdef.h',
|
||||||
|
'wordbreak.h',
|
||||||
|
'unibreakbase.c',
|
||||||
|
'unibreakdef.c',
|
||||||
|
'linebreak.c',
|
||||||
|
'linebreakdata.c',
|
||||||
|
'linebreakdef.c',
|
||||||
|
'wordbreak.c',
|
||||||
|
'graphemebreak.c',
|
||||||
|
'graphemebreak.h',
|
||||||
|
'graphemebreakdef.h',
|
||||||
|
'emojidef.h',
|
||||||
|
'emojidef.c',
|
||||||
|
]
|
||||||
|
|
||||||
libunibreak_src = [
|
libunibreak_lib = static_library('libunibreak',
|
||||||
'unibreakbase.h',
|
libunibreak_src,
|
||||||
'unibreakdef.h',
|
include_directories : config_dir,
|
||||||
'linebreak.h',
|
install: false,
|
||||||
'linebreakdef.h',
|
)
|
||||||
'wordbreakdef.h',
|
|
||||||
'wordbreak.h',
|
|
||||||
'unibreakbase.c',
|
|
||||||
'unibreakdef.c',
|
|
||||||
'linebreak.c',
|
|
||||||
'linebreakdata.c',
|
|
||||||
'linebreakdef.c',
|
|
||||||
'wordbreak.c',
|
|
||||||
'graphemebreak.c',
|
|
||||||
'graphemebreak.h',
|
|
||||||
'graphemebreakdef.h',
|
|
||||||
'emojidef.h',
|
|
||||||
'emojidef.c',
|
|
||||||
]
|
|
||||||
|
|
||||||
libunibreak_lib = static_library('libunibreak',
|
libunibreak = declare_dependency(
|
||||||
libunibreak_src,
|
include_directories: [include_directories('.')],
|
||||||
include_directories : config_dir,
|
link_with: libunibreak_lib,
|
||||||
install: false,
|
dependencies: [eina],
|
||||||
)
|
)
|
||||||
|
else
|
||||||
libunibreak = declare_dependency(
|
libunibreak = dependency('libunibreak', version : '>=4.2')
|
||||||
include_directories: [include_directories('.')],
|
endif
|
||||||
link_with: libunibreak_lib,
|
|
||||||
dependencies: [eina],
|
|
||||||
)
|
|
||||||
|
|
|
@ -551,8 +551,9 @@ static const struct {
|
||||||
{ "C:\\home\\mydir\\..\\myfile", "C:/home/myfile" },
|
{ "C:\\home\\mydir\\..\\myfile", "C:/home/myfile" },
|
||||||
{ "C:/home/mydir/../myfile", "C:/home/myfile" },
|
{ "C:/home/mydir/../myfile", "C:/home/myfile" },
|
||||||
{ "\\home\\mydir\\..\\myfile", "/home/myfile" },
|
{ "\\home\\mydir\\..\\myfile", "/home/myfile" },
|
||||||
#endif
|
#else
|
||||||
{ "/home/mydir/../myfile", "/home/myfile" }
|
{ "/home/mydir/../myfile", "/home/myfile" }
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
EFL_START_TEST(eina_test_file_path)
|
EFL_START_TEST(eina_test_file_path)
|
||||||
|
|
|
@ -93,6 +93,11 @@ EFL_START_TEST(eina_value_test_simple)
|
||||||
fail_unless(l == 0xb33f);
|
fail_unless(l == 0xb33f);
|
||||||
eina_value_flush(value);
|
eina_value_flush(value);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* On Windows, long is always a 4 bytes type, so this check
|
||||||
|
* will never work on Windows.
|
||||||
|
*/
|
||||||
|
#ifndef _WIN32
|
||||||
fail_unless(eina_value_setup(value, EINA_VALUE_TYPE_INT64));
|
fail_unless(eina_value_setup(value, EINA_VALUE_TYPE_INT64));
|
||||||
fail_unless(eina_value_set(value, 0x0011223344556677));
|
fail_unless(eina_value_set(value, 0x0011223344556677));
|
||||||
fail_unless(eina_value_get(value, &i64));
|
fail_unless(eina_value_get(value, &i64));
|
||||||
|
@ -103,6 +108,7 @@ EFL_START_TEST(eina_value_test_simple)
|
||||||
fail_unless(l == (long)0x0011223344556677);
|
fail_unless(l == (long)0x0011223344556677);
|
||||||
fail_unless(i64 == 0x0011223344556677);
|
fail_unless(i64 == 0x0011223344556677);
|
||||||
eina_value_flush(value);
|
eina_value_flush(value);
|
||||||
|
#endif
|
||||||
|
|
||||||
/* unsigned: */
|
/* unsigned: */
|
||||||
|
|
||||||
|
@ -150,6 +156,11 @@ EFL_START_TEST(eina_value_test_simple)
|
||||||
fail_unless(ul == 3000000001UL);
|
fail_unless(ul == 3000000001UL);
|
||||||
eina_value_flush(value);
|
eina_value_flush(value);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* On Windows, long is always a 4 bytes type, so this check
|
||||||
|
* will never work on Windows.
|
||||||
|
*/
|
||||||
|
#ifndef _WIN32
|
||||||
fail_unless(eina_value_setup(value, EINA_VALUE_TYPE_UINT64));
|
fail_unless(eina_value_setup(value, EINA_VALUE_TYPE_UINT64));
|
||||||
fail_unless(eina_value_set(value, 0x1122334455667788));
|
fail_unless(eina_value_set(value, 0x1122334455667788));
|
||||||
fail_unless(eina_value_get(value, &u64));
|
fail_unless(eina_value_get(value, &u64));
|
||||||
|
@ -160,6 +171,7 @@ EFL_START_TEST(eina_value_test_simple)
|
||||||
fail_unless(ul == (unsigned long)0x1122334455667788);
|
fail_unless(ul == (unsigned long)0x1122334455667788);
|
||||||
fail_unless(u64 == 0x1122334455667788);
|
fail_unless(u64 == 0x1122334455667788);
|
||||||
eina_value_flush(value);
|
eina_value_flush(value);
|
||||||
|
#endif
|
||||||
|
|
||||||
/* floating point */
|
/* floating point */
|
||||||
fail_unless(eina_value_setup(value, EINA_VALUE_TYPE_FLOAT));
|
fail_unless(eina_value_setup(value, EINA_VALUE_TYPE_FLOAT));
|
||||||
|
|
Loading…
Reference in New Issue