CI

inyokaproject · Sep 10, 2024 · 3a15d93 · 3a15d93
1 parent 35f50d1
commit 3a15d93
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -38,32 +38,40 @@ jobs:
     
     - name: Compile
       run: |
-       mkdir release
-       cmake -S ${{github.workspace}} -B ${{github.workspace}}/release -DCMAKE_PREFIX_PATH=${{github.workspace}}/vcpkg_installed/x64-windows -DSPELLCHECKER_HUNSPELL=OFF -DSPELLCHECKER_NUSPELL=ON
-       cmake --build ${{github.workspace}}/release --config ${{env.BUILD_TYPE}}
+       mkdir build-cmake
+       cmake -S ${{github.workspace}} -B ${{github.workspace}}/build-cmake -DCMAKE_PREFIX_PATH=${{github.workspace}}/vcpkg_installed/x64-windows -DSPELLCHECKER_HUNSPELL=OFF -DSPELLCHECKER_NUSPELL=ON
+       cmake --build ${{github.workspace}}/build-cmake --config ${{env.BUILD_TYPE}}
     
     - name: Create Package
       shell: cmd
       run: |
        mkdir InyokaEdit\plugins
        mkdir InyokaEdit\community
-       copy release\..\InyokaEdit.exe InyokaEdit\InyokaEdit.exe
+       copy build-cmake\application\Release\InyokaEdit.exe InyokaEdit\InyokaEdit.exe
        windeployqt --release --no-translations --no-opengl-sw InyokaEdit\InyokaEdit.exe
        lconvert -o InyokaEdit\translations\qt_de.qm ${env:QT_ROOT_DIR}\translations\qtbase_de.qm ${env:QT_ROOT_DIR}\translations\qtwebengine_de.qm
        copy COPYING InyokaEdit\
        copy application\3rdparty\miniz\LICENSE InyokaEdit\Miniz_License.txt
        copy packaging\Windows\ICU_License.txt InyokaEdit\
        copy packaging\Windows\Nuspell_License.txt InyokaEdit\
-       xcopy /y /d vcpkg_installed\*.dll InyokaEdit\
+       xcopy /y /d vcpkg_installed\x64-windows\bin\*.dll InyokaEdit\
        xcopy /i /e /s packaging\Windows\dicts InyokaEdit\dicts\
-       copy release\..\plugins\*.dll InyokaEdit\plugins\
+       copy build-cmake\plugins\highlighter\Release\*.dll InyokaEdit\plugins\
+       copy build-cmake\plugins\hotkey\Release\*.dll InyokaEdit\plugins\
+       copy build-cmake\plugins\spellchecker-nuspell\Release\*.dll InyokaEdit\plugins\
+       copy build-cmake\plugins\uu_knowledgebox\Release\*.dll InyokaEdit\plugins\
+       copy build-cmake\plugins\uu_tabletemplate\Release\*.dll InyokaEdit\plugins\
        chcp 65001 && xcopy /i /e /s community\* InyokaEdit\community\
-       $buildnr = git rev-parse --short main
-       7z a "InyokaEdit-Windows_$($buildnr).zip" .\InyokaEdit\
+       git rev-parse --short main > buildnr.txt
+       set /p buildnr= < buildnr.txt
+       del buildnr.txt
+       set output_zip=InyokaEdit-Windows_%buildnr%.zip
+       set output_exe=InyokaEdit-Windows_%buildnr%.exe
+       7z a %output_zip% .\InyokaEdit\
        copy packaging\Windows\inyokaedit.nsi inyokaedit.nsi
        copy packaging\Windows\inyokaedit.ico inyokaedit.ico
        makensis inyokaedit.nsi
-       ren InyokaEdit_Installer.exe "InyokaEdit-Windows_$($buildnr).exe"
+       ren InyokaEdit_Installer.exe %output_exe%
        
     - uses: actions/upload-artifact@v4
       with:

diff --git a/cmake/FindHUNSPELL.cmake b/cmake/FindHUNSPELL.cmake
@@ -12,10 +12,12 @@ find_package(PkgConfig)
 pkg_check_modules(PKG_HUNSPELL QUIET hunspell)
 
 find_path(HUNSPELL_INCLUDE_DIRS
-          NAMES hunspell.hxx
+          NAMES hunspell/hunspell.hxx
           PATH_SUFFIXES hunspell
           HINTS ${PKG_HUNSPELL_INCLUDE_DIRS}
 )
+message(STATUS "hunspell/include => ${HUNSPELL_INCLUDE_DIRS}")
+
 find_library(HUNSPELL_LIBRARIES
              NAMES ${PKG_HUNSPELL_LIBRARIES} hunspell hunspell-1.7 hunspell-1.6 hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2 libhunspell
              HINTS ${PKG_HUNSPELL_LIBRARY_DIRS}

diff --git a/cmake/FindNUSPELL.cmake b/cmake/FindNUSPELL.cmake
@@ -9,14 +9,15 @@ find_package(PkgConfig)
 pkg_check_modules(PKG_NUSPELL QUIET nuspell)
 
 find_path(NUSPELL_INCLUDE_DIRS
-          NAMES dictionary.hxx
+          NAMES nuspell/dictionary.hxx
           PATH_SUFFIXES nuspell
           HINTS ${PKG_NUSPELL_INCLUDE_DIRS}
 )
 find_library(NUSPELL_LIBRARIES
              NAMES ${PKG_NUSPELL_LIBRARIES} nuspell nuspell-5.1 hunspell-5.0 libnuspell
              HINTS ${PKG_NUSPELL_LIBRARY_DIRS}
 )
+message(STATUS "nuspell/include => ${NUSPELL_INCLUDE_DIRS}")
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(NUSPELL

diff --git a/plugins/spellchecker-hunspell/CMakeLists.txt b/plugins/spellchecker-hunspell/CMakeLists.txt
@@ -49,6 +49,8 @@ target_link_libraries(spellchecker-hunspell
         ${HUNSPELL_LIBRARIES}
 )
 
+include_directories(${HUNSPELL_INCLUDE_DIRS})
+
 set(HEADERS
     hunspellcheckdialog.h
     spellchecker-hunspell.h

diff --git a/plugins/spellchecker-nuspell/CMakeLists.txt b/plugins/spellchecker-nuspell/CMakeLists.txt
@@ -49,6 +49,8 @@ target_link_libraries(spellchecker-nuspell
         ${NUSPELL_LIBRARIES}
 )
 
+include_directories(${NUSPELL_INCLUDE_DIRS})
+
 set(HEADERS
     nuspellcheckdialog.h
     spellchecker-nuspell.h