Skip to content

Commit

Permalink
release: update V0.5.6
Browse files Browse the repository at this point in the history
Signed-off-by: xiaoming <[email protected]>
  • Loading branch information
QQxiaoming committed Nov 7, 2023
1 parent 051fede commit e9a5237
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 16 deletions.
3 changes: 3 additions & 0 deletions YUVviewer.pro
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ unix:{
include(partform_unix.pri)
}

# 定义版本号路径
YUVVIEWER_VERSION="$$cat(./version.txt)"

###############################################################################
# 定义需要的Qt组件
QT += core gui
Expand Down
9 changes: 4 additions & 5 deletions build_deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@
QT_DIR=/opt/Qt6.2.0/6.2.0/gcc_64
# 定义opencv目录
OPENCV_DIR=/home/xiaoming/Desktop/opencv

# 定义版本号
YUVVIEWER_MAJARVERSION="0"
YUVVIEWER_SUBVERSION="5"
YUVVIEWER_REVISION="5"
###############################################################################


###############################################################################
# 定义版本号
YUVVIEWER_MAJARVERSION=$(< ./version.txt cut -d '.' -f 1)
YUVVIEWER_SUBVERSION=$(< ./version.txt cut -d '.' -f 2)
YUVVIEWER_REVISION=$(< ./version.txt cut -d '.' -f 3)
export PATH=$QT_DIR/bin:$PATH
export LD_LIBRARY_PATH=$OPENCV_DIR/lib:$QT_DIR/lib:$LD_LIBRARY_PATH
export QT_PLUGIN_PATH=$QT_DIR/plugins
Expand Down
9 changes: 4 additions & 5 deletions build_dmg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,14 @@
QT_DIR=/opt/Qt6.2.0/6.2.0/gcc_64
# 定义opencv目录
OPENCV_DIR=/home/xiaoming/Desktop/opencv

# 定义版本号
YUVVIEWER_MAJARVERSION="0"
YUVVIEWER_SUBVERSION="5"
YUVVIEWER_REVISION="5"
###############################################################################


###############################################################################
# 定义版本号
YUVVIEWER_MAJARVERSION=$(< ./version.txt cut -d '.' -f 1)
YUVVIEWER_SUBVERSION=$(< ./version.txt cut -d '.' -f 2)
YUVVIEWER_REVISION=$(< ./version.txt cut -d '.' -f 3)
export PATH=$QT_DIR/bin:$PATH
export LD_LIBRARY_PATH=$OPENCV_DIR/lib:$QT_DIR/lib:$LD_LIBRARY_PATH
export QT_PLUGIN_PATH=$QT_DIR/plugins
Expand Down
5 changes: 3 additions & 2 deletions build_setup.bat
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
@echo off

:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

:: 定义Qt目录
set "QT_DIR=C:/Qt/Qt6.2.0/6.2.0/mingw81_32/bin"
set "QT_TOOLS_DIR=C:/Qt/Qt6.2.0/Tools/mingw810_32/bin"
:: 定义Inno Setup目录
set "INNO_SETUP_DIR=C:/Program Files (x86)/Inno Setup 6"
:: 定义opencv目录
set "OPENCV_DIR=D:/Qt/opencv4.2.0/x64/mingw/bin"
:: 定义版本号
set "YUVVIEWER_VERSION=0.5.5"
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::


:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: 定义版本号
set /p YUVVIEWER_VERSION=<version.txt
:: 设置环境变量
set "PATH=%QT_DIR%;%QT_TOOLS_DIR%;%INNO_SETUP_DIR%;%PATH%"
:: 编译
Expand Down
2 changes: 0 additions & 2 deletions partform_unix.pri
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
###############################################################################
# 定义opencv lib路径
OPENCV_DIR=/home/xiaoming/Desktop/opencv
# 定义版本号路径
YUVVIEWER_VERSION=0.5.5
###############################################################################
2 changes: 0 additions & 2 deletions partform_win32.pri
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
###############################################################################
# 定义opencv lib路径
OPENCV_DIR=D:\Qt\opencv4.2.0
# 定义版本号路径
YUVVIEWER_VERSION=0.5.5
###############################################################################
1 change: 1 addition & 0 deletions version.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.5.6

0 comments on commit e9a5237

Please sign in to comment.