Modify install and ci

KangLin · Oct 14, 2021 · e5c4eb4 · e5c4eb4
1 parent c4f10d3
commit e5c4eb4
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 2 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -151,7 +151,7 @@ jobs:
         move /Y ${{env.INSTALL_DIR}}/bin\*.dll install\bin
         move /Y ${{env.INSTALL_DIR}}/lib\*.dll install\bin
         makensis ${{github.workspace}}/build/Install.nsi
-        ${{github.workspace}}/build/install/bin/RabbitImApp.exe -f "${{github.workspace}}/build/update_windows.xml" --pf RabbitIm-Setup-v0.0.8.exe -m "v0.0.8"
+        ${{github.workspace}}/build/install/bin/RabbitImApp.exe -f "${{github.workspace}}/build/update_windows.xml" --pf RabbitIm-Setup-v0.1.0.exe -m "v0.1.0"
       if: ${{ matrix.BUILD_TYPE == 'Release' }}
 
     - name: update 

diff --git a/.github/workflows/cmake_mingw.yml b/.github/workflows/cmake_mingw.yml
@@ -59,6 +59,7 @@ jobs:
         C:\msys64\usr\bin\pacman -S --noconfirm mingw-w64-x86_64-libpng
         C:\msys64\usr\bin\pacman -S --noconfirm mingw-w64-x86_64-i686-nasm
         C:\msys64\usr\bin\pacman -S --noconfirm mingw-w64-x86_64-openh264 
+        C:\msys64\usr\bin\pacman -S --noconfirm mingw-w64-x86_64-opencv
         C:\msys64\usr\bin\pacman -S --noconfirm git base-devel
 
     - name: make_directory
@@ -106,7 +107,7 @@ jobs:
         PATH: C:\msys64\mingw64\bin;C:\msys64\usr\bin
       run: |
         git clone "https://github.com/KangLin/qzxing.git"
-        cd qxmpp
+        cd qzxing
         cmake -E make_directory build
         cd build
         cmake .. -G"MinGW Makefiles" -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_DIR}}

diff --git a/Install/Install.nsi b/Install/Install.nsi
@@ -93,6 +93,22 @@ VSRedistInstalled:
   Delete "$INSTDIR\bin\vcredist_x86.exe"
 FunctionEnd
 
+Function _InstallVC
+   Push $R0
+   ClearErrors
+   ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{FF66E9F6-83E7-3A3E-AF14-8DE9A809A6A4}" "Version"
+
+   ; check regist
+   IfErrors 0 VSRedistInstalled
+   Exec "$INSTDIR\bin\vc_redist.x86.exe /q /norestart"
+   StrCpy $R0 "-1"
+
+VSRedistInstalled:
+  ;MessageBox MB_OK  "vc_redist.x86.exe is installed"
+  Exch $R0
+  Delete "$INSTDIR\bin\vc_redist.x86.exe "
+FunctionEnd
+
 Function InstallVC64
     Push $R0
     ClearErrors
@@ -109,11 +125,31 @@ Function InstallVC64
     Delete "$INSTDIR\bin\vcredist_x64.exe"
 FunctionEnd
 
+Function _InstallVC64
+    Push $R0
+    ClearErrors
+    ReadRegDword $R0 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\{FF66E9F6-83E7-3A3E-AF14-8DE9A809A6A4}" "Version"
+
+    ; check regist
+    IfErrors 0 VSRedistInstalled
+    Exec "$INSTDIR\bin\vc_redist.x64.exe /q /norestart"
+    StrCpy $R0 "-1"
+
+    VSRedistInstalled:
+    ;MessageBox MB_OK  "Vcredist_x64.exe is installed"
+    Exch $R0
+    Delete "$INSTDIR\bin\vc_redist.x64.exe"
+FunctionEnd
+
 Function InstallRuntime
     IfFileExists "$INSTDIR\bin\vcredist_x64.exe" 0 +2
     call InstallVC64
+    IfFileExists "$INSTDIR\bin\vc_redist.x64.exe" 0 +2
+    call _InstallVC64
     IfFileExists "$INSTDIR\bin\vcredist_x86.exe" 0 +2
     call InstallVC
+    IfFileExists "$INSTDIR\bin\vc_redist.x86.exe" 0 +2
+    call _InstallVC
 FunctionEnd
 
 Function DirectoryPermissionErrorBox