Modify build_qzxing.sh

KangLin · Jul 3, 2020 · 8e4e86d · 8e4e86d
1 parent 17ea4ab
commit 8e4e86d
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -122,6 +122,7 @@ jobs:
         - ANDROID_API=android-24
       before_script:
         - export RABBIT_NUMBER=0
+        - export RABBIT_CONFIG=Debug
         - rm -fr build
 
     - stage: stage2
@@ -139,6 +140,7 @@ jobs:
         - export DOWNLOAD_QT=TRUE
         - export QT_VERSION_DIR=5.13
         - export QT_VERSION=5.13.2
+        - export RABBIT_CONFIG=Debug
 
     ############################# unix #########################
     - stage: stage1

diff --git a/README.md b/README.md
@@ -13,8 +13,9 @@
 
   文件格式： $(平台)$(版本号)_$(架构)_$(QT 版本)_版本.zip
 
-    wget https://github.com/KangLin/RabbitThirdLibrary/releases/download/v0.3.1/windows_msvc15_x86_Qt5.12.8_v0.3.1.zip
-    mkdir third_windows
-    unzip windows_msvc15_x86_Qt5.12.8_v0.3.1.zip -O third_windows
-    cd third_windows
-    ./change_prefix.sh    #修改前缀为正确的目录
+
+      wget https://github.com/KangLin/RabbitThirdLibrary/releases/download/v0.3.1/windows_msvc15_x86_Qt5.12.8_v0.3.1.zip
+      mkdir third_windows
+      unzip windows_msvc15_x86_Qt5.12.8_v0.3.1.zip -O third_windows
+      cd third_windows
+      ./change_prefix.sh    #修改前缀为正确的目录
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,10 +1,10 @@
-version: 'v0.3.1.{build}'
+version: 'v.{build}'
 
 cache:
   - Package
 
 environment:
-  BUILD_VERSION: version: 'v0.3.1.{build}'
+  BUILD_VERSION: v0.3.1
   TimeOutMins: 2
   #ApiKey:
   #  secure: qex0da587ygmywf4315g
@@ -38,6 +38,14 @@ environment:
     RABBIT_CONFIG: Debug
     QT_ROOT: C:\Qt\5.13\msvc2017
 
+  - RABBIT_NUMBER: 2
+    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
+    BUILD_TARGERT: windows_msvc
+    TOOLCHAIN_VERSION: 15
+    BUILD_ARCH: x86
+    RABBIT_CONFIG: Debug
+    QT_ROOT: C:\Qt\5.12\msvc2017
+
   ##### msvc 2017 ########
   - RABBIT_NUMBER: 0
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017

diff --git a/build_script/build_qzxing.sh b/build_script/build_qzxing.sh
@@ -41,23 +41,23 @@ CUR_DIR=`pwd`
 
 #下载源码:
 if [ ! -d ${RABBIT_BUILD_SOURCE_CODE} ]; then
-    VERSION=29d7e2e6b2b6997db5d419c3c06ec1f01e6e40f6 
+    VERSION=master #29d7e2e6b2b6997db5d419c3c06ec1f01e6e40f6 
     if [ "TRUE" = "${RABBIT_USE_REPOSITORIES}" ]; then
-        echo "git clone -q https://github.com/ftylitak/qzxing.git ${RABBIT_BUILD_SOURCE_CODE}"
-        git clone -q https://github.com/ftylitak/qzxing.git ${RABBIT_BUILD_SOURCE_CODE}
-        #echo "git clone -q https://github.com/KangLin/qzxing.git ${RABBIT_BUILD_SOURCE_CODE}"
-        #git clone -q https://github.com/KangLin/qzxing.git ${RABBIT_BUILD_SOURCE_CODE}
+        #echo "git clone -q https://github.com/ftylitak/qzxing.git ${RABBIT_BUILD_SOURCE_CODE}"
+        #git clone -q https://github.com/ftylitak/qzxing.git ${RABBIT_BUILD_SOURCE_CODE}
+        echo "git clone -q https://github.com/KangLin/qzxing.git ${RABBIT_BUILD_SOURCE_CODE}"
+        git clone -q https://github.com/KangLin/qzxing.git ${RABBIT_BUILD_SOURCE_CODE}
         cd ${RABBIT_BUILD_SOURCE_CODE}
         if [ "$VERSION" != "master" ]; then
             git checkout -b ${VERSION} ${VERSION}
         fi
     else
         mkdir -p ${RABBIT_BUILD_SOURCE_CODE}
         cd ${RABBIT_BUILD_SOURCE_CODE}
-        echo "wget -q -c -nv -O qzxing.zip https://github.com/ftylitak/qzxing/archive/${VERSION}.zip"
-        wget -q -c -nv -O qzxing.zip https://github.com/ftylitak/qzxing/archive/${VERSION}.zip
-        #echo "wget -q -c -nv -O qzxing.zip https://github.com/KangLin/qzxing/archive/${VERSION}.zip"
-        #wget -q -c -nv -O qzxing.zip https://github.com/KangLin/qzxing/archive/${VERSION}.zip
+        #echo "wget -q -c -nv -O qzxing.zip https://github.com/ftylitak/qzxing/archive/${VERSION}.zip"
+        #wget -q -c -nv -O qzxing.zip https://github.com/ftylitak/qzxing/archive/${VERSION}.zip
+        echo "wget -q -c -nv -O qzxing.zip https://github.com/KangLin/qzxing/archive/${VERSION}.zip"
+        wget -q -c -nv -O qzxing.zip https://github.com/KangLin/qzxing/archive/${VERSION}.zip
         unzip -q qzxing.zip
         mv qzxing-${VERSION} ..
         rm -fr *

diff --git a/build_script/ci/build_linux.sh b/build_script/ci/build_linux.sh
@@ -141,12 +141,15 @@ do
     bash ./build_$v.sh ${BUILD_TARGERT} > /dev/null
 done
 
+if [ -z "$RABBIT_CONFIG" ]; then
+    RABBIT_CONFIG=Release
+fi
 echo "RABBIT_LIBRARYS size:${#RABBIT_LIBRARYS[@]}"
 if [ ${#RABBIT_LIBRARYS[@]} -eq `expr $RABBIT_NUMBER + 1` ]; then
     if [ "$TRAVIS_TAG" != "" ]; then
         TAR_NAME=${BUILD_TARGERT}_${BUILD_ARCH}_${RABBIT_CONFIG}
         if [ -n "$QT_VERSION" ]; then
-            TAR_NAME=${TAR_NAME}_Qt${QT_VERSION}
+            TAR_NAME=${TAR_NAME}_qt${QT_VERSION}
         fi
         if [ -n "${TRAVIS_TAG}" ]; then
             TAR_NAME=${TAR_NAME}_${TRAVIS_TAG}

diff --git a/tag.sh b/tag.sh
@@ -24,7 +24,7 @@ fi
 
 APPVERYOR_VERSION="version: '${VERSION}.{build}'"
 sed -i "s/^version: '.*{build}'/${APPVERYOR_VERSION}/g" ${SOURCE_DIR}/appveyor.yml
-sed -i "s/BUILD_VERSION: v[0-9]\+\.[0-9]\+\.[0-9]\+/BUILD_VERSION: ${APPVERYOR_VERSION}/g" ${SOURCE_DIR}/appveyor.yml
+sed -i "s/BUILD_VERSION: v[0-9]\+\.[0-9]\+\.[0-9]\+/BUILD_VERSION: ${VERSION}/g" ${SOURCE_DIR}/appveyor.yml
 sed -i "s/v[0-9]\+\.[0-9]\+\.[0-9]\+/${VERSION}/g" ${SOURCE_DIR}/README*.md
 
 #git tag -a v${VERSION} -m "Release v${VERSION}"