Nsis fixes

kvirc · Feb 17, 2024 · da53133 · da53133
1 parent 1552125
commit da53133
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
@@ -166,10 +166,18 @@ jobs:
           git_desc=$(git describe --always)
           echo "exe_name=KVIrc-$kvi_version-dev-$(date +%F)-git-$git_desc" >> "$GITHUB_ENV"
 
+
+      - name: Add StdUtils plugin to NSIS
+        run: |
+          (New-Object Net.WebClient).DownloadFile('https://github.com/lordmulder/stdutils/releases/download/1.14/StdUtils.2018-10-27.zip', 'c:\StdUtils.2018-10-27.zip')
+          7z e -o"C:\Program Files (x86)\NSIS\Plugins\x86-unicode" c:\StdUtils.2018-10-27.zip Plugins\Unicode\*.dll
+          7z e -o"C:\Program Files (x86)\NSIS\Include" c:\StdUtils.2018-10-27.zip Include\*.nsh
+
       - name: Create setup package
         run: |
           cd '${{github.workspace}}\build'
-          "c:\Program Files (x86)\NSIS\makensis.exe" KVIrc.nsi
+          c:\"Program Files (x86)"\NSIS\makensis.exe KVIrc.nsi
+          move KVIrc.exe ${{ env.exe_name }}.exe
 
       - name: Publish artifact
         uses: actions/upload-artifact@v3

diff --git a/cmake/KVIrc.nsi.cmake b/cmake/KVIrc.nsi.cmake
@@ -19,9 +19,11 @@ Name "@NICENAME@"
 !define PUBLISHER 'Szymon Stefanek and The KVIrc Development Team'
 
 ; Git release, e.g. KVIrc-4.3.2-dev-git-5465-ge352609.exe
-OutFile KVIrc-${KVIRC_BUILD_REVISION}.exe
+;OutFile KVIrc-${KVIRC_BUILD_REVISION}.exe
 ; Stable version, e.g. KVIrc-4.2.0-Equilibrium.exe
 ;OutFile KVIrc-${VERSION}-${RELEASE_NAME}.exe
+; Github CI
+OutFile KVIrc.exe
 
 Unicode true
 SetCompressor /SOLID lzma