Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
5c05b7bc
O
Opencv
项目概览
Greenplum
/
Opencv
11 个月 前同步成功
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
Opencv
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5c05b7bc
编写于
6月 06, 2019
作者:
A
Alexander Alekhin
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #14749 from alalek:fix_android_javadoc
上级
08019732
c6deba60
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
39 addition
and
8 deletion
+39
-8
modules/java/jar/CMakeLists.txt
modules/java/jar/CMakeLists.txt
+2
-0
modules/java/jar/build.xml.in
modules/java/jar/build.xml.in
+5
-3
platforms/android/build_sdk.py
platforms/android/build_sdk.py
+32
-5
未找到文件。
modules/java/jar/CMakeLists.txt
浏览文件 @
5c05b7bc
...
...
@@ -25,6 +25,8 @@ if(OPENCV_JAVA_TARGET_VERSION)
set
(
OPENCV_ANT_JAVAC_EXTRA_ATTRS
"
${
OPENCV_ANT_JAVAC_EXTRA_ATTRS
}
target=
\"
${
OPENCV_JAVA_TARGET_VERSION
}
\"
"
)
endif
()
set
(
OPENCV_JAVADOC_DESTINATION
"
${
OpenCV_BINARY_DIR
}
/doc/doxygen/html/javadoc"
CACHE STRING
""
)
configure_file
(
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/build.xml.in"
"
${
OPENCV_JAVA_DIR
}
/build.xml"
@ONLY
)
list
(
APPEND depends
"
${
OPENCV_JAVA_DIR
}
/build.xml"
)
...
...
modules/java/jar/build.xml.in
浏览文件 @
5c05b7bc
...
...
@@ -30,12 +30,13 @@
<target name="javadoc">
<copy file="@OpenCV_SOURCE_DIR@/doc/mymath.js"
todir="@O
penCV_BINARY_DIR@/doc/doxygen/html/javadoc
" />
todir="@O
PENCV_JAVADOC_DESTINATION@
" />
<!-- synchronize with platforms\android\build_sdk.py -->
<javadoc
packagenames="org.opencv.*"
sourcepath="java"
destdir="@O
penCV_BINARY_DIR@/doc/doxygen/html/javadoc
"
destdir="@O
PENCV_JAVADOC_DESTINATION@
"
Windowtitle="OpenCV @OPENCV_VERSION_PLAIN@ Java documentation"
Doctitle="OpenCV Java documentation (@OPENCV_VERSION@)"
bottom="Generated on ${timestamp} / OpenCV @OPENCV_VCSVERSION@"
...
...
@@ -48,7 +49,8 @@
<![CDATA[
<script>
var url = window.location.href;
url = url.substring(0, url.lastIndexOf('/', url.indexOf('.html'))) + '/../../../mymath.js';
var pos = url.lastIndexOf('/javadoc/');
url = pos >= 0 ? (url.substring(0, pos) + '/javadoc/mymath.js') : (window.location.origin + '/mymath.js');
var script = document.createElement('script');
script.src = '@OPENCV_MATHJAX_RELPATH@/MathJax.js?config=TeX-AMS-MML_HTMLorMML,' + url;
document.getElementsByTagName('head')[0].appendChild(script);
...
...
platforms/android/build_sdk.py
浏览文件 @
5c05b7bc
#!/usr/bin/env python
import
os
,
sys
,
subprocess
,
argparse
,
shutil
,
glob
,
re
import
os
,
sys
import
argparse
import
glob
import
re
import
shutil
import
subprocess
import
time
import
logging
as
log
import
xml.etree.ElementTree
as
ET
...
...
@@ -285,14 +292,34 @@ class Builder:
for
f
in
files
:
if
f
==
"android.jar"
or
f
==
"annotations.jar"
:
classpaths
.
append
(
os
.
path
.
join
(
dir
,
f
))
srcdir
=
os
.
path
.
join
(
self
.
resultdest
,
'sdk'
,
'java'
,
'src'
)
dstdir
=
self
.
docdest
# synchronize with modules/java/jar/build.xml.in
shutil
.
copy2
(
os
.
path
.
join
(
SCRIPT_DIR
,
'../../doc/mymath.js'
),
dstdir
)
cmd
=
[
"javadoc"
,
"-header"
,
"OpenCV %s"
%
self
.
opencv_version
,
'-windowtitle'
,
'OpenCV %s Java documentation'
%
self
.
opencv_version
,
'-doctitle'
,
'OpenCV Java documentation (%s)'
%
self
.
opencv_version
,
"-nodeprecated"
,
"-footer"
,
'<a href="http://docs.opencv.org">OpenCV %s Documentation</a>'
%
self
.
opencv_version
,
"-public"
,
'-sourcepath'
,
os
.
path
.
join
(
self
.
resultdest
,
'sdk'
,
'java'
,
'src'
),
"-d"
,
self
.
docdest
,
'-sourcepath'
,
srcdir
,
'-encoding'
,
'UTF-8'
,
'-charset'
,
'UTF-8'
,
'-docencoding'
,
'UTF-8'
,
'--allow-script-in-comments'
,
'-header'
,
'''
<script>
var url = window.location.href;
var pos = url.lastIndexOf('/javadoc/');
url = pos >= 0 ? (url.substring(0, pos) + '/javadoc/mymath.js') : (window.location.origin + '/mymath.js');
var script = document.createElement('script');
script.src = '%s/MathJax.js?config=TeX-AMS-MML_HTMLorMML,' + url;
document.getElementsByTagName('head')[0].appendChild(script);
</script>
'''
%
'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0'
,
'-bottom'
,
'Generated on %s / OpenCV %s'
%
(
time
.
strftime
(
"%Y-%m-%d %H:%M:%S"
),
self
.
opencv_version
),
"-d"
,
dstdir
,
"-classpath"
,
":"
.
join
(
classpaths
),
'-subpackages'
,
'org.opencv'
,
]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录