ci:update script

Signed-off-by: xiaoming <[email protected]>
QQxiaoming · Feb 11, 2023 · ac09a16 · ac09a16
1 parent 1f8786f
commit ac09a16
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -42,7 +42,7 @@ jobs:
           git fetch --tags --force
           git describe --always --long --dirty --abbrev=10 --tags | awk '{print "\""$0"\""}' > git_tag.inc
           sed -i'.original' -e 's/git_tag.inc/git_tag.ci.inc/g' TTFviewer.pro
-          sed -i'.original' -e 's/QT_DIR=\/opt\/Qt6.2.0\/6.2.0\/gcc_64/QT_DIR=$(cd "$(dirname "$0")";pwd)\/..\/Qt\/6.2.0\/gcc_64/g' build_dmg.sh
+          sed -i'.original' -e 's/QT_DIR=\/opt\/Qt6.2.0\/6.2.0\/gcc_64/QT_DIR=$(cd "$(dirname "$0")";pwd)\/..\/Qt\/6.2.0\/macos/g' build_dmg.sh
           sed -i'.original' -e 's/\/home\/qqm\/Desktop\/ttfviewer\/depend\/freetype/\/usr\/local\/ttfviewer/g' partform_unix.pri
           cd depend
           sudo ./build.sh

diff --git a/build_deb.sh b/build_deb.sh
@@ -7,7 +7,7 @@ QT_DIR=/opt/Qt6.2.0/6.2.0/gcc_64
 # 定义版本号
 TTFVIEWER_MAJARVERSION="0"
 TTFVIEWER_SUBVERSION="2"
-TTFVIEWER_REVISION="2"
+TTFVIEWER_REVISION="3"
 ###############################################################################
 
 

diff --git a/build_dmg.sh b/build_dmg.sh
@@ -7,7 +7,7 @@ QT_DIR=/opt/Qt6.2.0/6.2.0/gcc_64
 # 定义版本号
 TTFVIEWER_MAJARVERSION="0"
 TTFVIEWER_SUBVERSION="2"
-TTFVIEWER_REVISION="2"
+TTFVIEWER_REVISION="3"
 ###############################################################################
 
 
@@ -20,14 +20,14 @@ export QML2_IMPORT_PATH=$QT_DIR/qml
 TTFVIEWER_VERSION="V"$TTFVIEWER_MAJARVERSION$TTFVIEWER_SUBVERSION$TTFVIEWER_REVISION
 # 编译
 rm -rf .qmake.stash Makefile
-qmake -makefile
+$QT_DIR/bin/qmake -makefile
 make
 cp -R ./test ./build_release/out/TTFviewer.app/contents/resources/test
 cp ./tools/create-dmg/build-dmg.sh ./build_release/out/build-dmg.sh
 cp ./tools/create-dmg/installer_background.png ./build_release/out/installer_background.png
 cd ./build_release/out
 # 打包
-macdeployqt TTFviewer.app
+$QT_DIR/bin/macdeployqt TTFviewer.app
 otool -L ./TTFviewer.app/Contents/MacOS/TTFviewer
 ./build-dmg.sh TTFviewer
 echo build success!

diff --git a/build_setup.bat b/build_setup.bat
@@ -7,7 +7,7 @@ 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"
 :: 定义版本号
-set "TTFVIEWER_VERSION=0.2.2"
+set "TTFVIEWER_VERSION=0.2.3"
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 
 

diff --git a/partform_unix.pri b/partform_unix.pri
@@ -2,5 +2,5 @@
 # 定义freetype2 lib路径
 FREETPE2_DIR=/home/qqm/Desktop/ttfviewer/depend/freetype
 # 定义版本号路径
-TTFVIEWER_VERSION=0.2.2
+TTFVIEWER_VERSION=0.2.3
 ###############################################################################
diff --git a/partform_win32.pri b/partform_win32.pri
@@ -2,5 +2,5 @@
 # 定义freetype2 lib路径
 FREETPE2_DIR=D:\ttfviewer\depend\freetype
 # 定义版本号路径
-TTFVIEWER_VERSION=0.2.2
+TTFVIEWER_VERSION=0.2.3
 ###############################################################################