update V0.4.3

QQxiaoming · Aug 26, 2021 · 743a381 · 743a381
1 parent 465aa87
commit 743a381
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -27,7 +27,10 @@ jobs:
 
       - name: Setup OpenCV
         uses: Dovyski/setup-opencv-action@v1
-
+        with:
+          opencv-version: 4.0.0
+          opencv-extra-modules: false
+
       - name: Install prerequisites
         run: |
           sudo apt update
@@ -53,7 +56,7 @@ jobs:
       - name: Run tests
         run: |
           if ls ./dpkg | grep ".deb" ; then echo "Pass"; else echo "Failed" && exit 1; fi; 
-          timeout --foreground -s SIGKILL 20s ./build_release/out/YUVviewer --version > >(tee run.log) || {
+          timeout --foreground -s SIGKILL 20s ./dpkg/YUVviewer_Linux_*/opt/YUVviewer/YUVviewer --version > >(tee run.log) || {
             if cat run.log | grep "YUVviewer" ; then echo "Pass" && exit 0; else echo "Failed" && exit 1; fi; 
           }
 
@@ -68,6 +71,9 @@ jobs:
 
       - name: Setup OpenCV
         uses: Dovyski/setup-opencv-action@v1
+        with:
+          opencv-version: 4.0.0
+          opencv-extra-modules: false
 
       - name: Install prerequisites
         run: |
@@ -94,7 +100,7 @@ jobs:
       - name: Run tests
         run: |
           if ls ./dpkg | grep ".deb" ; then echo "Pass"; else echo "Failed" && exit 1; fi; 
-          timeout --foreground -s SIGKILL 20s ./build_release/out/YUVviewer --version > >(tee run.log) || {
+          timeout --foreground -s SIGKILL 20s ./dpkg/YUVviewer_Linux_*/opt/YUVviewer/YUVviewer --version > >(tee run.log) || {
             if cat run.log | grep "YUVviewer" ; then echo "Pass" && exit 0; else echo "Failed" && exit 1; fi; 
           }
       
@@ -114,7 +120,7 @@ jobs:
           Choco-Install -PackageName innosetup --force
           Choco-Install -PackageName cmake --force
           git clone https://github.com/opencv/opencv.git --branch 4.0.0 --depth 1
-          cmake -G "MinGW Makefiles" -S opencv -B opencv/build -D CMAKE_INSTALL_PREFIX=C:/opencv4.0.0 -D ENABLE_PRECOMPILED_HEADERS=OFF -D WITH_MSMF=OFF
+          cmake -G "MinGW Makefiles" -S opencv -B opencv/build -D CMAKE_INSTALL_PREFIX=C:/opencv4.0.0 -D ENABLE_PRECOMPILED_HEADERS=OFF -D WITH_MSMF=OFF -D BUILD_PERF_TESTS=OFF -D BUILD_TESTS=OFF -D BUILD_WITH_DEBUG_INFO=OFF -D BUILD_DOCS=OFF -D CMAKE_BUILD_TYPE=RELEASE
           cd ./opencv/build
           mingw32-make
           mingw32-make install

diff --git a/build_deb.sh b/build_deb.sh
@@ -9,7 +9,7 @@ OPENCV_DIR=/home/xiaoming/Desktop/opencv
 # 定义版本号
 YVYVIEWER_MAJARVERSION="0"
 YVYVIEWER_SUBVERSION="4"
-YVYVIEWER_REVISION="2"
+YVYVIEWER_REVISION="3"
 ###############################################################################
 
 

diff --git a/build_setup.bat b/build_setup.bat
@@ -9,7 +9,7 @@ set "INNO_SETUP_DIR=C:/Program Files (x86)/Inno Setup 6"
 :: 定义opencv目录
 set "OPENCV_DIR=D:/Qt/opencv4.2.0/x64/mingw/bin"
 :: 定义版本号
-set "YVYVIEWER_VERSION=0.4.2"
+set "YVYVIEWER_VERSION=0.4.3"
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 
 

diff --git a/partform_unix.pri b/partform_unix.pri
@@ -2,5 +2,5 @@
 # 定义opencv lib路径
 OPENCV_DIR=/home/xiaoming/Desktop/opencv
 # 定义版本号路径
-YVYVIEWER_VERSION=0.4.2
+YVYVIEWER_VERSION=0.4.3
 ###############################################################################
diff --git a/partform_win32.pri b/partform_win32.pri
@@ -2,5 +2,5 @@
 # 定义opencv lib路径
 OPENCV_DIR=D:\Qt\opencv4.2.0
 # 定义版本号路径
-YVYVIEWER_VERSION=0.4.2
+YVYVIEWER_VERSION=0.4.3
 ###############################################################################
diff --git a/src/YUVviewer.py b/src/YUVviewer.py
@@ -11,7 +11,7 @@
 from configFile import ConfigFile
 from ImgViewer import ImgViewer
 
-VERSION = 'V0.4.2'
+VERSION = 'V0.4.3'
 GIT_TAG = 'error:not found!'
 with open('git_tag.inc') as fp:
     GIT_TAG = fp.read()