Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Harfbuzz
提交
a9b650d3
T
Third Party Harfbuzz
项目概览
OpenHarmony
/
Third Party Harfbuzz
大约 1 年 前同步成功
通知
0
Star
18
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Harfbuzz
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
a9b650d3
编写于
2月 12, 2018
作者:
E
Ebrahim Byagowi
提交者:
GitHub
2月 12, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Apply check-defs.sh to -icu and -subset, toward mingw fix (#780)
上级
2efc8965
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
35 addition
and
18 deletion
+35
-18
CMakeLists.txt
CMakeLists.txt
+8
-3
src/Makefile.am
src/Makefile.am
+16
-5
src/check-defs.sh
src/check-defs.sh
+5
-7
src/gen-def.py
src/gen-def.py
+6
-3
未找到文件。
CMakeLists.txt
浏览文件 @
a9b650d3
...
...
@@ -836,8 +836,11 @@ if (UNIX OR MINGW)
add_test
(
NAME check-symbols.sh COMMAND
${
PROJECT_SOURCE_DIR
}
/src/check-symbols.sh
)
add_test
(
NAME check-defs.sh COMMAND
${
PROJECT_SOURCE_DIR
}
/src/check-defs.sh
)
set_tests_properties
(
check-static-inits.sh check-libstdc++.sh check-symbols.sh check-defs.sh
PROPERTIES ENVIRONMENT
"libs=.;srcdir=
${
PROJECT_SOURCE_DIR
}
/src"
)
set_tests_properties
(
check-static-inits.sh check-libstdc++.sh check-symbols.sh check-defs.sh
PROPERTIES
ENVIRONMENT
"libs=.;srcdir=
${
PROJECT_SOURCE_DIR
}
/src"
SKIP_RETURN_CODE 77
)
endif
()
add_test
(
NAME check-c-linkage-decls.sh COMMAND ./check-c-linkage-decls.sh
)
...
...
@@ -846,7 +849,9 @@ if (UNIX OR MINGW)
add_test
(
NAME check-includes.sh COMMAND ./check-includes.sh
)
set_tests_properties
(
check-c-linkage-decls.sh check-header-guards.sh check-externs.sh check-includes.sh
PROPERTIES WORKING_DIRECTORY
${
PROJECT_SOURCE_DIR
}
/src
)
PROPERTIES
WORKING_DIRECTORY
${
PROJECT_SOURCE_DIR
}
/src
SKIP_RETURN_CODE 77
)
endif
()
# Needs to come last so that variables defined above are passed to
...
...
src/Makefile.am
浏览文件 @
a9b650d3
...
...
@@ -122,6 +122,10 @@ HBLIBS += $(HBNONPCLIBS)
if
OS_WIN32
export_symbols
=
-export-symbols
harfbuzz.def
harfbuzz_def_dependency
=
harfbuzz.def
export_symbols_icu
=
-export-symbols
harfbuzz-icu.def
harfbuzz_icu_def_dependency
=
harfbuzz-icu.def
export_symbols_subset
=
-export-symbols
harfbuzz-subset.def
harfbuzz_subset_def_dependency
=
harfbuzz-subset.def
libharfbuzz_la_LINK
=
$(CXXLINK)
$(libharfbuzz_la_LDFLAGS)
else
if
WITHSTDCPP
...
...
@@ -136,9 +140,10 @@ endif
endif
endif
base_link_flags
=
$(AM_LDFLAGS)
-lm
-version-info
$(HB_LIBTOOL_VERSION_INFO)
-no-undefined
libharfbuzz_la_SOURCES
=
$(HBSOURCES)
$(HBHEADERS)
$(HBNODISTHEADERS)
libharfbuzz_la_CPPFLAGS
=
$(HBCFLAGS)
libharfbuzz_la_LDFLAGS
=
$(
AM_LDFLAGS)
-lm
-version-info
$(HB_LIBTOOL_VERSION_INFO)
$(export_symbols)
-no-undefined
libharfbuzz_la_LDFLAGS
=
$(
base_link_flags)
$(export_symbols)
libharfbuzz_la_LIBADD
=
$(HBLIBS)
EXTRA_libharfbuzz_la_DEPENDENCIES
=
$(harfbuzz_def_dependency)
pkginclude_HEADERS
=
$(HBHEADERS)
...
...
@@ -151,8 +156,9 @@ lib_LTLIBRARIES += libharfbuzz-subset.la
libharfbuzz_subset_la_LINK
=
$(libharfbuzz_la_LINK)
libharfbuzz_subset_la_SOURCES
=
$(HB_SUBSET_sources)
libharfbuzz_subset_la_CPPFLAGS
=
$(libharfbuzz_la_CPPFLAGS)
libharfbuzz_subset_la_LDFLAGS
=
$(
libharfbuzz_la_LDFLAGS
)
libharfbuzz_subset_la_LDFLAGS
=
$(
base_link_flags)
$(export_symbols_subset
)
libharfbuzz_subset_la_LIBADD
=
libharfbuzz.la
EXTRA_libharfbuzz_subset_la_DEPENDENCIES
=
$(harfbuzz_subset_def_dependency)
pkginclude_HEADERS
+=
$(HB_SUBSET_headers)
pkgconfig_DATA
+=
harfbuzz-subset.pc
EXTRA_DIST
+=
harfbuzz-subset.pc.in
...
...
@@ -188,8 +194,9 @@ lib_LTLIBRARIES += libharfbuzz-icu.la
libharfbuzz_icu_la_LINK
=
$(libharfbuzz_la_LINK)
libharfbuzz_icu_la_SOURCES
=
$(HB_ICU_sources)
libharfbuzz_icu_la_CPPFLAGS
=
$(libharfbuzz_la_CPPFLAGS)
$(ICU_CFLAGS)
libharfbuzz_icu_la_LDFLAGS
=
$(
libharfbuzz_la_LDFLAGS
)
libharfbuzz_icu_la_LDFLAGS
=
$(
base_link_flags)
$(export_symbols_icu
)
libharfbuzz_icu_la_LIBADD
=
$(ICU_LIBS)
libharfbuzz.la
EXTRA_libharfbuzz_icu_la_DEPENDENCIES
=
$(harfbuzz_icu_def_dependency)
pkginclude_HEADERS
+=
$(HB_ICU_headers)
pkgconfig_DATA
+=
harfbuzz-icu.pc
endif
...
...
@@ -245,9 +252,13 @@ EXTRA_DIST += \
CLEANFILES
+=
$(pkgconfig_DATA)
CLEANFILES
+=
harfbuzz.def
CLEANFILES
+=
harfbuzz.def
harfbuzz-icu.def harfbuzz-subset.def
harfbuzz.def
:
$(HBHEADERS) $(HBNODISTHEADERS)
$(AM_V_GEN)
headers
=
"
$^
"
$(srcdir)
/gen-def.py
$@
harfbuzz-icu.def
:
$(HB_ICU_headers)
$(AM_V_GEN)
headers
=
"
$^
"
$(srcdir)
/gen-def.py
$@
harfbuzz-subset.def
:
$(HB_SUBSET_headers)
$(AM_V_GEN)
headers
=
"
$^
"
$(srcdir)
/gen-def.py
$@
GENERATORS
=
\
...
...
@@ -319,7 +330,7 @@ test_buffer_serialize_SOURCES = test-buffer-serialize.cc
test_buffer_serialize_CPPFLAGS
=
$(HBCFLAGS)
test_buffer_serialize_LDADD
=
libharfbuzz.la
$(HBLIBS)
check
:
harfbuzz.def
#
For check-defs.sh
check
:
harfbuzz.def
harfbuzz-icu.def harfbuzz-subset.def
#
For check-defs.sh
dist_check_SCRIPTS
=
\
check-c-linkage-decls.sh
\
...
...
src/check-defs.sh
浏览文件 @
a9b650d3
...
...
@@ -14,14 +14,12 @@ else
exit
77
fi
defs
=
"harfbuzz.def"
if
!
test
-f
"
$defs
"
;
then
echo
"check-defs.sh: '
$defs
' not found; skipping test"
exit
77
fi
tested
=
false
for
def
in
$defs
;
do
for
def
in
harfbuzz.def harfbuzz-icu.def harfbuzz-subset.def
;
do
if
!
test
-f
"
$def
"
;
then
echo
"check-defs.sh: '
$def
' not found; skipping test"
exit
77
fi
lib
=
`
echo
"
$def
"
|
sed
's/[.]def$//;s@.*/@@'
`
for
suffix
in
so dylib
;
do
so
=
$libs
/lib
${
lib
}
.
$suffix
...
...
src/gen-def.py
浏览文件 @
a9b650d3
...
...
@@ -9,8 +9,11 @@ for h in os.environ["headers"].split (' '):
if
h
.
endswith
(
".h"
):
with
io
.
open
(
h
,
encoding
=
'utf8'
)
as
f
:
headers_content
.
append
(
f
.
read
())
result
=
(
"EXPORTS
\n
"
+
"
\n
"
.
join
(
sorted
(
re
.
findall
(
r
"^hb_\w+(?= \()"
,
"
\n
"
.
join
(
headers_content
),
re
.
M
)))
+
"
\n
LIBRARY libharfbuzz-0.dll"
)
result
=
"""EXPORTS
%s
LIBRARY lib%s-0.dll"""
%
(
"
\n
"
.
join
(
sorted
(
re
.
findall
(
r
"^hb_\w+(?= \()"
,
"
\n
"
.
join
(
headers_content
),
re
.
M
))),
sys
.
argv
[
1
].
replace
(
'.def'
,
''
)
)
with
open
(
sys
.
argv
[
1
],
"w"
)
as
f
:
f
.
write
(
result
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录