Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Greenplum
Opencv
提交
20ec29f2
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,发现更多精彩内容 >>
提交
20ec29f2
编写于
7月 14, 2011
作者:
A
Andrey Kamaev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Android samples are included into the Android package
上级
a70f354c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
47 addition
and
7 deletion
+47
-7
android/scripts/package.sh
android/scripts/package.sh
+38
-1
samples/android/2-native/jni/Android.mk
samples/android/2-native/jni/Android.mk
+4
-3
samples/android/4-mixed/jni/Android.mk
samples/android/4-mixed/jni/Android.mk
+4
-3
samples/android/includeOpenCV.mk
samples/android/includeOpenCV.mk
+1
-0
未找到文件。
android/scripts/package.sh
浏览文件 @
20ec29f2
...
...
@@ -10,6 +10,7 @@ cd package
PRG_DIR
=
`
pwd
`
mkdir
opencv
# neon-enabled build
cd
$PRG_DIR
mkdir
build-neon
...
...
@@ -23,6 +24,7 @@ rm -rf doc include src .classpath .project AndroidManifest.xml default.propertie
mv
libs/armeabi-v7a libs/armeabi-v7a-neon
mv
share/OpenCV/3rdparty/libs/armeabi-v7a share/OpenCV/3rdparty/libs/armeabi-v7a-neon
# armeabi-v7a build
cd
"
$PRG_DIR
"
mkdir
build
...
...
@@ -51,7 +53,42 @@ cp "$ANDROID_DIR/../README" opencv/
CV_VERSION
=
`
grep
-o
"[0-9]
\+\.
[0-9]
\+\.
[0-9]
\+
"
opencv/share/OpenCV/OpenCVConfig-version.cmake
`
mv
opencv opencv
$CV_VERSION
tar
cjpf opencv
$CV_VERSION
.tar.bz2 opencv
$CV_VERSION
||
exit
-1
#samples
cp
-r
"
$ANDROID_DIR
/../samples/android"
"
$PRG_DIR
/samples"
cd
"
$PRG_DIR
/samples"
#enable for loops over items with spaces in their name
IFS
=
"
"
for
dir
in
`
ls
-1
|
grep
-v
hello-android
`
do
if
[
-f
"
$dir
/default.properties"
]
then
HAS_REFERENCE
=
`
cat
"
$dir
/default.properties"
|
grep
-c
android.library.reference.1
`
if
[
$HAS_REFERENCE
=
1
]
then
echo
-n
>
"
$dir
/default.properties"
android update project
--name
"
$dir
"
--target
"android-8"
--library
"../../opencv
$CV_VERSION
"
--path
"
$dir
"
echo
'android update project --name "$dir" --target "android-8" --library "../opencv$CV_VERSION" --path "$dir"'
fi
fi
done
echo
"OPENCV_MK_PATH:=../../opencv
$CV_VERSION
/share/OpenCV/OpenCV.mk"
>
includeOpenCV.mk
cd
"
$PRG_DIR
/samples"
#remove ignored files/folders
svn status
--no-ignore
|
grep
^I |
cut
-c9-
| xargs
-d
\\
n
rm
-rf
#remove unversioned files/folders
svn status |
grep
^
\?
|
cut
-c9-
| xargs
-d
\\
n
rm
-rf
#remove unneded CMakeLists.txt
rm
CMakeLists.txt
# pack all files
cd
$PRG_DIR
tar
cjpf opencv
$CV_VERSION
.tar.bz2
--exclude-vcs
opencv
$CV_VERSION
samples
||
exit
-1
echo
echo
"Package opencv
$CV_VERSION
.tar.bz2 is successfully created"
samples/android/2-native/jni/Android.mk
浏览文件 @
20ec29f2
...
...
@@ -2,11 +2,12 @@ LOCAL_PATH := $(call my-dir)
include
$(CLEAR_VARS)
OPENCV_MK_BUILD_PATH
:=
../../../../android/build/OpenCV.mk
ifeq
("$(wildcard $(OPENCV_MK_BUILD_PATH))","")
include
../includeOpenCV.mk
ifeq
("$(wildcard $(OPENCV_MK_PATH))","")
#try to load OpenCV.mk from default install location
include
$(TOOLCHAIN_PREBUILT_ROOT)/user/share/OpenCV/OpenCV.mk
else
include
$(OPENCV_MK_
BUILD_
PATH)
include
$(OPENCV_MK_PATH)
endif
LOCAL_MODULE
:=
native_sample
...
...
samples/android/4-mixed/jni/Android.mk
浏览文件 @
20ec29f2
...
...
@@ -3,11 +3,12 @@ LOCAL_PATH := $(call my-dir)
include
$(CLEAR_VARS)
OPENCV_CAMERA_MODULES
:=
off
OPENCV_MK_BUILD_PATH
:=
../../../../android/build/OpenCV.mk
ifeq
("$(wildcard $(OPENCV_MK_BUILD_PATH))","")
include
../includeOpenCV.mk
ifeq
("$(wildcard $(OPENCV_MK_PATH))","")
#try to load OpenCV.mk from default install location
include
$(TOOLCHAIN_PREBUILT_ROOT)/user/share/OpenCV/OpenCV.mk
else
include
$(OPENCV_MK_
BUILD_
PATH)
include
$(OPENCV_MK_PATH)
endif
LOCAL_MODULE
:=
mixed_sample
...
...
samples/android/includeOpenCV.mk
0 → 100644
浏览文件 @
20ec29f2
OPENCV_MK_PATH
:=
../../../android/build/OpenCV.mk
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录