Modify GITHUB_TOKEN

.travis.yml

@@ -77,7 +77,7 @@ install:
 before_script:
 
 script: 
-  - ./build_script/ci/build.sh ${TRAVIS_BUILD_DIR} #> /dev/null
+  - ./build_script/ci/build_linux.sh ${TRAVIS_BUILD_DIR} #> /dev/null
 
 after_script:
 
@@ -86,15 +86,15 @@ notifications:
   on_success: never  # [always|never|change]
   on_failure: always
 
-deploy:
-  provider: releases
-  api_key: 
-    secure: "${GITHUB_TOKEN}"
-  file_glob: true
-  file: 
-    - ${BUILD_TARGERT}*.tar.gz
-  skip_cleanup: true
-  on:
-   #condition: $TRAVIS_OS_NAME = android
-   # repo: KangLin/RabbitThirdLibrary
-    tags: true
+#deploy:
+#  provider: releases
+#  api_key: 
+#    secure: ${GITHUB_TOKEN}
+#  file_glob: true
+#  file: 
+#    - ${BUILD_TARGERT}*.tar.gz
+#  skip_cleanup: true
+#  on:
+#   #condition: $TRAVIS_OS_NAME = android
+#   # repo: KangLin/RabbitThirdLibrary
+#    tags: true

appveyor.yml

@@ -15,47 +15,7 @@ environment:
   #  secure: ejAYGgB+3sBispRxUSr0xw==
 
   matrix:
-  ##### android ########
-  - RABBIT_NUMBER: 0
-    BUILD_TARGERT: android
-    TOOLCHAIN_VERSION: 4.9
-    BUILD_ARCH: arm
-    ANDROID_API: android-24
-    ANDROID_ARM_NEON: ON
-
-  - RABBIT_NUMBER: 1
-    BUILD_TARGERT: android
-    TOOLCHAIN_VERSION: 4.9
-    BUILD_ARCH: arm
-    ANDROID_API: android-24
-    ANDROID_ARM_NEON: ON
 
-  - RABBIT_NUMBER: 0
-    BUILD_TARGERT: android
-    TOOLCHAIN_VERSION: 4.9
-    BUILD_ARCH: arm64
-    ANDROID_API: android-24
-    ANDROID_ARM_NEON: ON
-
-  - RABBIT_NUMBER: 1
-    BUILD_TARGERT: android
-    TOOLCHAIN_VERSION: 4.9
-    BUILD_ARCH: arm64
-    ANDROID_API: android-24
-    ANDROID_ARM_NEON: ON
-
-  - RABBIT_NUMBER: 0
-    BUILD_TARGERT: android
-    TOOLCHAIN_VERSION: 4.9
-    BUILD_ARCH: x86
-    ANDROID_API: android-24
-
-  - RABBIT_NUMBER: 1
-    BUILD_TARGERT: android
-    TOOLCHAIN_VERSION: 4.9
-    BUILD_ARCH: x86
-    ANDROID_API: android-24
-
   ##### msvc 2017 ########
   - RABBIT_NUMBER: 0
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
@@ -133,6 +93,47 @@ environment:
 
 #QT_ROOT: C:\Qt\5.12\mingw73_64
 
+  ##### android ########
+  - RABBIT_NUMBER: 0
+    BUILD_TARGERT: android
+    TOOLCHAIN_VERSION: 4.9
+    BUILD_ARCH: arm
+    ANDROID_API: android-24
+    ANDROID_ARM_NEON: ON
+
+  - RABBIT_NUMBER: 1
+    BUILD_TARGERT: android
+    TOOLCHAIN_VERSION: 4.9
+    BUILD_ARCH: arm
+    ANDROID_API: android-24
+    ANDROID_ARM_NEON: ON
+
+  - RABBIT_NUMBER: 0
+    BUILD_TARGERT: android
+    TOOLCHAIN_VERSION: 4.9
+    BUILD_ARCH: arm64
+    ANDROID_API: android-24
+    ANDROID_ARM_NEON: ON
+
+  - RABBIT_NUMBER: 1
+    BUILD_TARGERT: android
+    TOOLCHAIN_VERSION: 4.9
+    BUILD_ARCH: arm64
+    ANDROID_API: android-24
+    ANDROID_ARM_NEON: ON
+
+  - RABBIT_NUMBER: 0
+    BUILD_TARGERT: android
+    TOOLCHAIN_VERSION: 4.9
+    BUILD_ARCH: x86
+    ANDROID_API: android-24
+
+  - RABBIT_NUMBER: 1
+    BUILD_TARGERT: android
+    TOOLCHAIN_VERSION: 4.9
+    BUILD_ARCH: x86
+    ANDROID_API: android-24
+
 matrix:
   fast_finish: false
 
@@ -166,7 +167,6 @@ build_script:
   - C:\msys64\usr\bin\bash.exe %APPVEYOR_BUILD_FOLDER%\build_script\ci\build_windows.sh
 
 artifacts:
-  #- path: $(BUILD_TARGERT)
   - path: $(BUILD_TARGERT)$(TOOLCHAIN_VERSION)_$(BUILD_ARCH)_$(APPVEYOR_REPO_TAG_NAME)
   - path: $(BUILD_TARGERT)$(TOOLCHAIN_VERSION)_$(BUILD_ARCH)_$(ANDROID_API)_$(APPVEYOR_REPO_TAG_NAME)_in_windows
 
@@ -180,7 +180,7 @@ deploy:
     #token : https://github.com/settings/tokens
     #password encrypt: https://ci.appveyor.com/tools/encrypt
     auth_token:
-      secure: I/iPgcw0IPuy66OiIjBSK33ZTrLDAlnnmfEpNo8q2DT6X3z1XJvYECnXGvef0C9y
+      secure: NPGYJzqYbViyGy0og49nCXxnj98vKqjxsgAd45rMhB9L1Vp1hCYp+Ku4C9qhe+vC
     #artifact: RabbitThirdLibrary_$(BUILD_TARGERT)$(TOOLCHAIN_VERSION)_$(BUILD_ARCH)_$(QT_VERSION)_$(BUILD_VERSION)
     #draft: true
     #prerelease: true

build_script/build_libfacedetection.sh

@@ -38,16 +38,16 @@ CUR_DIR=`pwd`
 if [ ! -d ${RABBIT_BUILD_SOURCE_CODE} ]; then
     VERSION=master
     if [ "TRUE" = "${RABBIT_USE_REPOSITORIES}" ]; then
-        echo "git clone -q https://github.com/ShiqiYu/libfacedetection.git ${RABBIT_BUILD_SOURCE_CODE}"
-        git clone -q https://github.com/ShiqiYu/libfacedetection.git ${RABBIT_BUILD_SOURCE_CODE}
+        echo "git clone -q https://github.com/KangLin/libfacedetection.git ${RABBIT_BUILD_SOURCE_CODE}"
+        git clone -q https://github.com/KangLin/libfacedetection.git ${RABBIT_BUILD_SOURCE_CODE}
         if [ "$VERSION" != "master" ]; then
             git checkout -b v$VERSION v$VERSION
         fi
     else
-        echo "wget -q -c https://github.com/ShiqiYu/libfacedetection/archive/${VERSION}.zip"
+        echo "wget -q -c https://github.com/KangLin/libfacedetection/archive/${VERSION}.zip"
         mkdir -p ${RABBIT_BUILD_SOURCE_CODE}
         cd ${RABBIT_BUILD_SOURCE_CODE}
-        wget -q -c https://github.com/ShiqiYu/libfacedetection/archive/${VERSION}.zip
+        wget -q -c https://github.com/KangLin/libfacedetection/archive/${VERSION}.zip
         unzip -q ${VERSION}.zip
         mv libfacedetection-${VERSION} ..
         rm -fr *

build_script/build_openssl.sh

@@ -37,7 +37,7 @@ CUR_DIR=`pwd`
 
 #下载源码:
 if [ ! -d ${RABBIT_BUILD_SOURCE_CODE} ]; then
-    OPENSLL_BRANCH=OpenSSL_1_1_1d
+    OPENSLL_BRANCH=OpenSSL_1_1_1f
     if [ "TRUE" = "${RABBIT_USE_REPOSITORIES}" ]; then
         echo "git clone -q --branch=${OPENSLL_BRANCH} https://github.com/openssl/openssl ${RABBIT_BUILD_SOURCE_CODE}"
         git clone -q -b ${OPENSLL_BRANCH} https://github.com/openssl/openssl ${RABBIT_BUILD_SOURCE_CODE}
@@ -96,7 +96,7 @@ fi
 if [ "$RABBIT_BUILD_STATIC" != "static" ]; then
     MODE=shared
 else
-    MODE="no-shared no-pic"
+    MODE="no-shared no-pic no-threads -static"
 fi
 
 echo "configure ..."
@@ -174,7 +174,13 @@ case ${BUILD_TARGERT} in
 esac
 
 echo "make install"
-${MAKE}
+${MAKE} V=1
 ${MAKE} install
 
+if [ "${BUILD_ARCH}" = "android" ]; then
+    cd ${RABBIT_BUILD_PREFIX}/lib/
+    mv libssl.so.1.1 libssl.so
+    mv libcrypto.so.1.1 libcrypto.so
+fi
+
 cd $CUR_DIR