Skip to content

Commit d58cc9e

Browse files
KangLinKangLin
committed
CI: add third library
1 parent c840a8a commit d58cc9e

14 files changed

Lines changed: 498 additions & 448 deletions

‎.travis.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ addons:
3838
env:
3939
global:
4040
- SOURCE_DIR=$TRAVIS_BUILD_DIR
41-
- RABBITIM_USE_REPOSITORIES="TRUE"
41+
- RABBIT_BUILD_THIRDLIBRARY="TRUE"
4242
- QMAKE=qmake
4343

4444
matrix:
@@ -56,17 +56,17 @@ env:
5656
# BUILD_ARCH qt 大于等于 5.14.0 可选（arm64-v8a armeabi-v7a x86_64 x86）组合
5757
#- BUILD_TARGERT="android" BUILD_ARCH="armeabi-v7a x86" ANDROID_ARM_NEON=ON QT_VERSION_DIR=5.14 QT_VERSION=5.14.0 ANDROID_API=android-24 DOWNLOAD_QT=TRUE GENERATORS="Unix Makefiles"
5858

59-
- BUILD_TARGERT="android" BUILD_ARCH="armeabi-v7a" ANDROID_ARM_NEON=ON QT_VERSION_DIR=5.13 QT_VERSION=5.13.2 ANDROID_API=android-24 DOWNLOAD_QT=TRUE GENERATORS="Unix Makefiles"
60-
- BUILD_TARGERT="android" BUILD_ARCH="armeabi-v7a" ANDROID_ARM_NEON=ON QT_VERSION_DIR=5.12 QT_VERSION=5.12.6 ANDROID_API=android-24 DOWNLOAD_QT=TRUE GENERATORS="Unix Makefiles"
61-
- BUILD_TARGERT="android" BUILD_ARCH="x86" QT_VERSION_DIR=5.12 QT_VERSION=5.12.6 ANDROID_API=android-24 DOWNLOAD_QT=TRUE GENERATORS="Unix Makefiles"
59+
- BUILD_TARGERT="android" BUILD_ARCH="armeabi-v7a" ANDROID_ARM_NEON=ON QT_VERSION_DIR=5.13 QT_VERSION=5.13.2 ANDROID_API=android-24 DOWNLOAD_QT=TRUE GENERATORS="Unix Makefiles" DOWNLOAD_THIRDLIBS_URL=https://github.com/KangLin/RabbitThirdLibrary/releases/download/v0.2.0/android_arm.tar.gz
60+
- BUILD_TARGERT="android" BUILD_ARCH="armeabi-v7a" ANDROID_ARM_NEON=ON QT_VERSION_DIR=5.12 QT_VERSION=5.12.6 ANDROID_API=android-24 DOWNLOAD_QT=TRUE GENERATORS="Unix Makefiles" DOWNLOAD_THIRDLIBS_URL=https://github.com/KangLin/RabbitThirdLibrary/releases/download/v0.2.0/android_arm.tar.gz
61+
- BUILD_TARGERT="android" BUILD_ARCH="x86" QT_VERSION_DIR=5.12 QT_VERSION=5.12.6 ANDROID_API=android-24 DOWNLOAD_QT=TRUE GENERATORS="Unix Makefiles" DOWNLOAD_THIRDLIBS_URL=https://github.com/KangLin/RabbitThirdLibrary/releases/download/v0.2.0/android_x86.tar.gz
6262

6363
before_install:
6464
- echo "TRAVIS_OS_NAME=${TRAVIS_OS_NAME}"
6565
- sudo apt-get install -y -qq xvfb xpra
6666
- sudo Xvfb :99 -ac &
6767
- export DISPLAY=:99.0
6868
- mkdir ${SOURCE_DIR}/Tools
69-
- export VERSION="v0.0.2"
69+
- export VERSION="v0.0.3"
7070

7171
install:
7272
- cd ${SOURCE_DIR}

‎App/android/AndroidManifest.xml‎

Lines changed: 98 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,98 +1,98 @@
1-
<?xml version='1.0' encoding='utf-8'?>
2-
<manifest package="org.KangLinStudio.FaceRecognizer" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.0.3" android:versionCode="0" android:installLocation="auto">
3-
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="24"/>
4-
5-
<supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
6-
7-
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/app_name" android:icon="@drawable/icon">
8-
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="@string/app_name" android:screenOrientation="unspecified" android:launchMode="singleTop">
9-
<intent-filter>
10-
<action android:name="android.intent.action.MAIN"/>
11-
<category android:name="android.intent.category.LAUNCHER"/>
12-
</intent-filter>
13-
14-
<!-- Application arguments -->
15-
<!-- meta-data android:name="android.app.arguments" android:value="arg1 arg2 arg3"/ -->
16-
<!-- Application arguments -->
17-
18-
<meta-data android:name="android.app.lib_name" android:value="FaceRecognizerApp"/>
19-
<meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
20-
<meta-data android:name="android.app.repository" android:value="default"/>
21-
<meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
22-
<meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
23-
<!-- Deploy Qt libs as part of package -->
24-
<meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
25-
<meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
26-
<meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
27-
<!-- Run with local libs -->
28-
<meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
29-
<meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
30-
<meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/>
31-
<meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
32-
<meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
33-
<!-- Used to specify custom system library path to run with local system libs -->
34-
<meta-data android:name="android.app.system_libs_prefix" android:value="/system/lib/"/>
35-
<!-- Messages maps -->
36-
<meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
37-
<meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
38-
<meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
39-
<meta-data android:value="@string/unsupported_android_version" android:name="android.app.unsupported_android_version"/>
40-
<!-- Messages maps -->
41-
42-
<!-- Splash screen -->
43-
<!-- Orientation-specific (portrait/landscape) data is checked first. If not available for current orientation,
44-
then android.app.splash_screen_drawable. For best results, use together with splash_screen_sticky and
45-
use hideSplashScreen() with a fade-out animation from Qt Android Extras to hide the splash screen when you
46-
are done populating your window with content. -->
47-
<!-- meta-data android:name="android.app.splash_screen_drawable_portrait" android:resource="@drawable/logo_portrait" / -->
48-
<!-- meta-data android:name="android.app.splash_screen_drawable_landscape" android:resource="@drawable/logo_landscape" / -->
49-
<!-- meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/ -->
50-
<!-- meta-data android:name="android.app.splash_screen_sticky" android:value="true"/ -->
51-
<!-- Splash screen -->
52-
53-
<!-- Background running -->
54-
<!-- Warning: changing this value to true may cause unexpected crashes if the
55-
application still try to draw after
56-
"applicationStateChanged(Qt::ApplicationSuspended)"
57-
signal is sent! -->
58-
<meta-data android:name="android.app.background_running" android:value="false"/>
59-
<!-- Background running -->
60-
61-
<!-- auto screen scale factor -->
62-
<meta-data android:name="android.app.auto_screen_scale_factor" android:value="false"/>
63-
<!-- auto screen scale factor -->
64-
65-
<!-- extract android style -->
66-
<!-- available android:values :
67-
* default - In most cases this will be the same as "full", but it can also be something else if needed, e.g., for compatibility reasons
68-
* full - useful QWidget & Quick Controls 1 apps
69-
* minimal - useful for Quick Controls 2 apps, it is much faster than "full"
70-
* none - useful for apps that don't use any of the above Qt modules
71-
-->
72-
<meta-data android:name="android.app.extract_android_style" android:value="default"/>
73-
<!-- extract android style -->
74-
</activity>
75-
76-
<!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
77-
78-
</application>
79-
80-
<!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
81-
Remove the comment if you do not require these default features. -->
82-
<!-- %%INSERT_FEATURES -->
83-
84-
<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
85-
Remove the comment if you do not require these default permissions. -->
86-
<uses-permission android:name="android.permission.INTERNET"/>
87-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
88-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
89-
<uses-permission android:name="android.permission.WAKE_LOCK"/>
90-
<uses-permission android:name="android.permission.VIBRATE"/>
91-
<uses-permission android:name="android.permission.CAMERA"/>
92-
<uses-permission android:name="android.permission.DEVICE_POWER"/>
93-
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
94-
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
95-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
96-
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
97-
98-
</manifest>
1+
<?xml version='1.0' encoding='utf-8'?>
2+
<manifest package="org.KangLinStudio.FaceRecognizer" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="0.0.3" android:versionCode="0" android:installLocation="auto">
3+
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="24"/>
4+
5+
<supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
6+
7+
<application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="@string/app_name" android:icon="@drawable/icon">
8+
<activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="@string/app_name" android:screenOrientation="unspecified" android:launchMode="singleTop">
9+
<intent-filter>
10+
<action android:name="android.intent.action.MAIN"/>
11+
<category android:name="android.intent.category.LAUNCHER"/>
12+
</intent-filter>
13+
14+
<!-- Application arguments -->
15+
<!-- meta-data android:name="android.app.arguments" android:value="arg1 arg2 arg3"/ -->
16+
<!-- Application arguments -->
17+
18+
<meta-data android:name="android.app.lib_name" android:value="FaceRecognizerApp"/>
19+
<meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
20+
<meta-data android:name="android.app.repository" android:value="default"/>
21+
<meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
22+
<meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
23+
<!-- Deploy Qt libs as part of package -->
24+
<meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
25+
<meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
26+
<meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
27+
<!-- Run with local libs -->
28+
<meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
29+
<meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
30+
<meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/>
31+
<meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
32+
<meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
33+
<!-- Used to specify custom system library path to run with local system libs -->
34+
<meta-data android:name="android.app.system_libs_prefix" android:value="/system/lib/"/>
35+
<!-- Messages maps -->
36+
<meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
37+
<meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
38+
<meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
39+
<meta-data android:value="@string/unsupported_android_version" android:name="android.app.unsupported_android_version"/>
40+
<!-- Messages maps -->
41+
42+
<!-- Splash screen -->
43+
<!-- Orientation-specific (portrait/landscape) data is checked first. If not available for current orientation,
44+
then android.app.splash_screen_drawable. For best results, use together with splash_screen_sticky and
45+
use hideSplashScreen() with a fade-out animation from Qt Android Extras to hide the splash screen when you
46+
are done populating your window with content. -->
47+
<!-- meta-data android:name="android.app.splash_screen_drawable_portrait" android:resource="@drawable/logo_portrait" / -->
48+
<!-- meta-data android:name="android.app.splash_screen_drawable_landscape" android:resource="@drawable/logo_landscape" / -->
49+
<!-- meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/ -->
50+
<!-- meta-data android:name="android.app.splash_screen_sticky" android:value="true"/ -->
51+
<!-- Splash screen -->
52+
53+
<!-- Background running -->
54+
<!-- Warning: changing this value to true may cause unexpected crashes if the
55+
application still try to draw after
56+
"applicationStateChanged(Qt::ApplicationSuspended)"
57+
signal is sent! -->
58+
<meta-data android:name="android.app.background_running" android:value="false"/>
59+
<!-- Background running -->
60+
61+
<!-- auto screen scale factor -->
62+
<meta-data android:name="android.app.auto_screen_scale_factor" android:value="false"/>
63+
<!-- auto screen scale factor -->
64+
65+
<!-- extract android style -->
66+
<!-- available android:values :
67+
* default - In most cases this will be the same as "full", but it can also be something else if needed, e.g., for compatibility reasons
68+
* full - useful QWidget & Quick Controls 1 apps
69+
* minimal - useful for Quick Controls 2 apps, it is much faster than "full"
70+
* none - useful for apps that don't use any of the above Qt modules
71+
-->
72+
<meta-data android:name="android.app.extract_android_style" android:value="default"/>
73+
<!-- extract android style -->
74+
</activity>
75+
76+
<!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
77+
78+
</application>
79+
80+
<!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
81+
Remove the comment if you do not require these default features. -->
82+
<!-- %%INSERT_FEATURES -->
83+
84+
<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
85+
Remove the comment if you do not require these default permissions. -->
86+
<uses-permission android:name="android.permission.INTERNET"/>
87+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
88+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
89+
<uses-permission android:name="android.permission.WAKE_LOCK"/>
90+
<uses-permission android:name="android.permission.VIBRATE"/>
91+
<uses-permission android:name="android.permission.CAMERA"/>
92+
<uses-permission android:name="android.permission.DEVICE_POWER"/>
93+
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
94+
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
95+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
96+
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE"/>
97+
98+
</manifest>

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ CONFIGURE_FILE(
2121
ADD_CUSTOM_TARGET(uninstall
2222
"${CMAKE_COMMAND}" -P "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake")
2323

24-
SET(BUILD_VERSION "v0.0.2")
24+
SET(BUILD_VERSION "v0.0.3")
2525
# Find Git Version Patch
2626
IF(EXISTS "${CMAKE_SOURCE_DIR}/.git")
2727
if(NOT GIT)

‎ChangeLog.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
+ Add register from video
66
+ Add recognizer from video
77
+ Use default qt in ubuntu to ci
8-
8+
+ Automatically generate binary distributions under CI
9+
910
- v0.0.2
1011
+ Register and recognizer face from video file
1112
+ Add format convert

‎ChangeLog_zh_CN.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
+ 增加从图像识别
66
+ 增加从视频识别
77
+ Ubuntu 下使用系统自带 qt 自动化编译
8-
8+
+ CI 下自动生成二进制分发包
9+
910
- v0.0.2
1011
+ 从视频文件中注册与识别人脸
1112
+ 增加视频格式转换

‎Install/Install.nsi‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
; HM NIS Edit Wizard helper defines
44
!define PRODUCT_NAME "FaceRecognizer"
55
!define PRODUCT_APP_NAME "FaceRecognizerApp"
6-
!define PRODUCT_VERSION "v0.0.2"
6+
!define PRODUCT_VERSION "v0.0.3"
77
!define PRODUCT_PUBLISHER "KangLin studio"
88
!define PRODUCT_WEB_SITE "https://github.com/KangLin/${PRODUCT_NAME}"
99
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}.exe"
@@ -65,8 +65,8 @@ LangString LANG_DIRECTORY_PERMISSION ${LANG_SIMPCHINESE} "无目录访问权限"
6565

6666
; MUI end ------
6767

68-
Name "$(LANG_PRODUCT_NAME)-${PRODUCT_VERSION}"
69-
Caption "$(LANG_PRODUCT_NAME)-${PRODUCT_VERSION}"
68+
Name "$(LANG_PRODUCT_NAME) ${PRODUCT_VERSION}"
69+
Caption "$(LANG_PRODUCT_NAME) ${PRODUCT_VERSION}"
7070
OutFile "${PRODUCT_NAME}-Setup-${PRODUCT_VERSION}.exe"
7171
InstallDir "$LOCALAPPDATA\${PRODUCT_NAME}"
7272
;InstallDirRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_DIR_REGKEY}" ""
@@ -83,7 +83,7 @@ Function InstallVC
8383

8484
; check regist
8585
IfErrors 0 VSRedistInstalled
86-
Exec "$INSTDIR\bin\vcredist_x86.exe /q"
86+
Exec "$INSTDIR\bin\vcredist_x86.exe /q /norestart"
8787
StrCpy $R0 "-1"
8888

8989
VSRedistInstalled:
@@ -99,7 +99,7 @@ Function InstallVC64
9999

100100
; check regist
101101
IfErrors 0 VSRedistInstalled
102-
Exec "$INSTDIR\bin\vcredist_x64.exe /q"
102+
Exec "$INSTDIR\bin\vcredist_x64.exe /q /norestart"
103103
StrCpy $R0 "-1"
104104

105105
VSRedistInstalled:

0 commit comments

Comments
 (0)