diff --git a/.github/workflows/buildGit.yml b/.github/workflows/buildGit.yml new file mode 100644 index 00000000..8ce8c408 --- /dev/null +++ b/.github/workflows/buildGit.yml @@ -0,0 +1,210 @@ +name: buildGit + +on: + push: + branches: + - main + tags-ignore: + - '*' + +env: + QT5_VERSION: "5.15.2" + MINGW5_VERSION: "win32_mingw81" + MINGW5_PATH: "mingw81_32" + QT6_VERSION: "6.6.2" + MINGW6_VERSION: "win64_mingw" + MINGW6_PATH: "mingw_64" + BUILD_TYPE: Release + +jobs: + buildGitEvent: + runs-on: windows-latest + steps: + - + uses: actions/checkout@v4 + with: + path: SiriKali + - + name: Install mingw + uses: msys2/setup-msys2@v2 + with: + install: mingw-w64-i686-gcc + msystem: mingw32 + location: ${{github.workspace}} + - + name: update env for Qt5 + run: echo "${{github.workspace}}/msys64/mingw32/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + - + name: Check GCC version and path for Qt5 + run: | + Write-Output (Get-Command c++.exe).Path + c++.exe --version + - + name: Install Qt5 + uses: jurplel/install-qt-action@v3 + with: + version: ${{ env.QT5_VERSION }} + arch: ${{ env.MINGW5_VERSION }} + dir: "${{github.workspace}}/qt5" + install-deps: "true" + host: 'windows' + target: 'desktop' + - + name: Set Build time + run: | + + $now = (Get-Date) + + $then = (Get-Date -Year 2024 -Month 5 -Day 3 -Hour 0 -Minute 0) + + echo "CURRENT_TIME=$($now.ToString())" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + + $All = (New-TimeSpan -start $then -end $now) + + $Days=$All.Days.ToString() + $Hours=$All.Hours.ToString() + $Minutes=$All.Minutes.ToString() + + if($Hours.Length -eq 1){ $Hours = "0" + $Hours } + if($Minutes.Length -eq 1){ $Minutes = "0" + $Minutes } + + $Version=$Days+$Hours+$Minutes + + $Version=$Version.TrimStart("0") + + echo "GIT_VERSION_NUMBER=$Version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + - + name: Configure CMake for Qt5 + env: + CMAKE_PREFIX_PATH: "${{github.workspace}}/qt5/Qt/${{ env.QT5_VERSION }}" + msystem: MINGW32 + run: cmake -DOUTPUT_BASE_NAME=SiriKaliQt5 -DBUILD_WITH_QT6=false -DLIBRARIES_LOCATION=${{github.workspace}}\SiriKali.git\ -DOUTPUT_PATH=${{github.workspace}}\ -DSOURCE_PATH=${{github.workspace}}\SiriKali\ -DCMAKE_VERBOSE_MAKEFILE=FALSE -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -G "CodeBlocks - MinGW Makefiles" -S ${{github.workspace}}/SiriKali/ -B ${{github.workspace}}/SiriKali/build5 + - + name: Print installer script for Qt5 + run : get-content ${{github.workspace}}\SiriKali\build5\sirikali_windows_installer_Qt5.iss + - + name: Update version.h for Qt5 + run: | + $content = [System.IO.File]::ReadAllText("${{github.workspace}}\SiriKali\build5\version.h").Replace("git_tag",${{ env.GIT_VERSION_NUMBER }}) + [System.IO.File]::WriteAllText("${{github.workspace}}\SiriKali\build5\version.h",$content ) + - + name: Build Project for Qt5 + run: cmake --build ${{github.workspace}}/SiriKali/build5 + - + name: Prepare release date + run: | + $data = [System.IO.File]::ReadAllText("${{github.workspace}}\SiriKali\build5\version.h") + + $versionInfoLines = $data.Split([Environment]::NewLine, [System.StringSplitOptions]::RemoveEmptyEntries) + + $versionInfoFirstLine = $versionInfoLines[1] + + $versionInfo = $versionInfoFirstLine.Split(" ",[System.StringSplitOptions]::RemoveEmptyEntries)[2] + + echo "BUILD_VERSION=$versionInfo" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + - + name: Create SiriKali.git.exe.zip + run: | + New-Item -ItemType Directory -Path ${{github.workspace}}\SiriKali.git + New-Item -ItemType Directory -Path ${{github.workspace}}\SiriKali.git/local + + Copy-Item -Path ${{github.workspace}}\SiriKali\translations -Destination ${{github.workspace}}\SiriKali.git -Recurse + Copy-Item -Path ${{github.workspace}}\SiriKali\build5\sirikali.exe -Destination ${{github.workspace}}\SiriKali.git + + Set-Location ${{github.workspace}}\SiriKali.git + + ${{github.workspace}}/qt5/Qt/${{ env.QT5_VERSION }}/${{ env.MINGW5_PATH }}/bin/windeployqt.exe ${{github.workspace}}\SiriKali.git\sirikali.exe + + $bb = ${{ env.BUILD_VERSION }} + $bb = $bb.Trim() + + echo "$bb" | Out-File -FilePath ${{github.workspace}}\SiriKali.git\version_info.txt -Encoding utf8 -Append + + Compress-Archive -Path ${{github.workspace}}\SiriKali.git -DestinationPath ${{github.workspace}}\SiriKaliQt5.git.exe.zip + + Remove-Item -Path ${{github.workspace}}\SiriKali.git\local + + Remove-Item -Path ${{github.workspace}}\SiriKali.git\version_info.txt + - + name: Make installer for Qt5 + uses: Minionguyjpro/Inno-Setup-Action@v1.2.2 + with: + path: SiriKali/build5/sirikali_windows_installer_Qt5.iss + - + name: Install Qt6 + uses: jurplel/install-qt-action@v3 + with: + version: ${{ env.QT6_VERSION }} + arch: ${{ env.MINGW6_VERSION }} + dir: "${{github.workspace}}/qt6" + install-deps: "true" + host: 'windows' + target: 'desktop' + tools: 'tools_mingw1310' + - + name: update env for Qt6 + run: echo "${{github.workspace}}/qt6/Qt/Tools/mingw1310_64/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + - + name: Check GCC version and path for Qt6 + run: | + Write-Output (Get-Command c++.exe).Path + c++.exe --version + - + name: Configure CMake for Qt6 + env: + CMAKE_PREFIX_PATH: "${{github.workspace}}/qt6/Qt/${{ env.QT6_VERSION }}" + msystem: MINGW32 + run: cmake -DOUTPUT_BASE_NAME=SiriKaliQt6 -DLIBRARIES_LOCATION=${{github.workspace}}\SiriKaliQt6.git\ -DOUTPUT_PATH=${{github.workspace}}\ -DSOURCE_PATH=${{github.workspace}}\SiriKali\ -DBUILD_WITH_QT6=true -DCMAKE_VERBOSE_MAKEFILE=FALSE -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -G "CodeBlocks - MinGW Makefiles" -S ${{github.workspace}}/SiriKali/ -B ${{github.workspace}}/SiriKali/build6 + - + name: Print installer script for Qt6 + run : get-content ${{github.workspace}}\SiriKali\build6\sirikali_windows_installer_Qt6.iss + - + name: Update version.h for Qt6 + run: | + $content = [System.IO.File]::ReadAllText("${{github.workspace}}\SiriKali\build6\version.h").Replace("git_tag",${{ env.GIT_VERSION_NUMBER }}) + [System.IO.File]::WriteAllText("${{github.workspace}}\SiriKali\build6\version.h",$content ) + - + name: Build Project for Qt6 + run: cmake --build ${{github.workspace}}/SiriKali/build6 + - + name: Create SiriKaliQt6.git.exe.zip + run: | + New-Item -ItemType Directory -Path ${{github.workspace}}\SiriKaliQt6.git + New-Item -ItemType Directory -Path ${{github.workspace}}\SiriKaliQt6.git/local + + Copy-Item -Path ${{github.workspace}}\SiriKali\translations -Destination ${{github.workspace}}\SiriKaliQt6.git -Recurse + Copy-Item -Path ${{github.workspace}}\SiriKali\build6\sirikali.exe -Destination ${{github.workspace}}\SiriKaliQt6.git + + Set-Location ${{github.workspace}}\SiriKaliQt6.git + + ${{github.workspace}}/qt6/Qt/${{ env.QT6_VERSION }}/${{ env.MINGW6_PATH }}/bin/windeployqt6.exe ${{github.workspace}}\SiriKaliQt6.git\sirikali.exe + + $bb = ${{ env.BUILD_VERSION }} + $bb = $bb.Trim() + + echo "$bb" | Out-File -FilePath ${{github.workspace}}\SiriKaliQt6.git\version_info.txt -Encoding utf8 -Append + + Compress-Archive -Path ${{github.workspace}}\SiriKaliQt6.git -DestinationPath ${{github.workspace}}\SiriKaliQt6.git.exe.zip + + Remove-Item -Path ${{github.workspace}}\SiriKaliQt6.git\local + + Remove-Item -Path ${{github.workspace}}\SiriKaliQt6.git\version_info.txt + - + name: Make installer for Qt6 + uses: Minionguyjpro/Inno-Setup-Action@v1.2.2 + with: + path: SiriKali/build6/sirikali_windows_installer_Qt6.iss + - + name: Rename installers + run: | + Rename-Item -Path ${{github.workspace}}\SiriKaliQt5.exe -NewName ${{github.workspace}}\SiriKaliQt5.git.setup.exe + Rename-Item -Path ${{github.workspace}}\SiriKaliQt6.exe -NewName ${{github.workspace}}\SiriKaliQt6.git.setup.exe + - + name: Post Releases + uses: ncipollo/release-action@v1 + with: + artifacts: ${{github.workspace}}\SiriKaliQt5.git.setup.exe,${{github.workspace}}\SiriKaliQt6.git.setup.exe,${{github.workspace}}\SiriKaliQt6.git.exe.zip,${{github.workspace}}\SiriKaliQt5.git.exe.zip + tag: "1.5.2" + commit: "main" + allowUpdates: true + body: "Build date and time: ${{ env.CURRENT_TIME }}\nBuild version: ${{ env.BUILD_VERSION }}" diff --git a/.github/workflows/buildRelease.yml b/.github/workflows/buildRelease.yml new file mode 100644 index 00000000..bd6d3cce --- /dev/null +++ b/.github/workflows/buildRelease.yml @@ -0,0 +1,217 @@ +name: buildRelease + +on: + push: + tags: + - '*' + +env: + QT5_VERSION: "5.15.2" + MINGW5_VERSION: "win32_mingw81" + MINGW5_PATH: "mingw81_32" + QT6_VERSION: "6.6.2" + MINGW6_VERSION: "win64_mingw" + MINGW6_PATH: "mingw_64" + BUILD_TYPE: Release + +jobs: + buildReleaseEvent: + runs-on: windows-latest + steps: + - + uses: actions/checkout@v4 + with: + path: SiriKali + - + name: Install mingw + uses: msys2/setup-msys2@v2 + with: + install: mingw-w64-i686-gcc + msystem: mingw32 + location: ${{github.workspace}} + - + name: update env for Qt5 + run: echo "${{github.workspace}}/msys64/mingw32/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + - + name: Check GCC version and path for Qt5 + run: | + Write-Output (Get-Command c++.exe).Path + c++.exe --version + - + name: Install Qt5 + uses: jurplel/install-qt-action@v3 + with: + version: ${{ env.QT5_VERSION }} + arch: ${{ env.MINGW5_VERSION }} + dir: "${{github.workspace}}/qt5" + install-deps: "true" + host: 'windows' + target: 'desktop' + - + name: Set Build time + run: | + + $now = (Get-Date) + + $then = (Get-Date -Year 2024 -Month 5 -Day 3 -Hour 0 -Minute 0) + + echo "CURRENT_TIME=$($now.ToString())" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + + $All = (New-TimeSpan -start $then -end $now) + + $Days=$All.Days.ToString() + $Hours=$All.Hours.ToString() + $Minutes=$All.Minutes.ToString() + + if($Hours.Length -eq 1){ $Hours = "0" + $Hours } + if($Minutes.Length -eq 1){ $Minutes = "0" + $Minutes } + + $Version=$Days+$Hours+$Minutes + + $Version=$Version.TrimStart("0") + + echo "GIT_VERSION_NUMBER=$Version" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + - + name: Configure CMake for Qt5 + env: + CMAKE_PREFIX_PATH: "${{github.workspace}}/qt5/Qt/${{ env.QT5_VERSION }}" + msystem: MINGW32 + run: cmake -DOUTPUT_BASE_NAME=SiriKaliQt5 -DBUILD_WITH_QT6=false -DLIBRARIES_LOCATION=${{github.workspace}}\SiriKali.git\ -DOUTPUT_PATH=${{github.workspace}}\ -DSOURCE_PATH=${{github.workspace}}\SiriKali\ -DCMAKE_VERBOSE_MAKEFILE=FALSE -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -G "CodeBlocks - MinGW Makefiles" -S ${{github.workspace}}/SiriKali/ -B ${{github.workspace}}/SiriKali/build5 + - + name: Print installer script for Qt5 + run : get-content ${{github.workspace}}\SiriKali\build5\sirikali_windows_installer_Qt5.iss + - + name: Update version.h for Qt5 + run: | + $content = [System.IO.File]::ReadAllText("${{github.workspace}}\SiriKali\build5\version.h").Replace("git_tag",${{ env.GIT_VERSION_NUMBER }}) + [System.IO.File]::WriteAllText("${{github.workspace}}\SiriKali\build5\version.h",$content ) + - + name: Build Project for Qt5 + run: cmake --build ${{github.workspace}}/SiriKali/build5 + - + name: Prepare release date + run: | + $data = [System.IO.File]::ReadAllText("${{github.workspace}}\SiriKali\build5\version.h") + + $versionInfoLines = $data.Split([Environment]::NewLine, [System.StringSplitOptions]::RemoveEmptyEntries) + + $versionInfoFirstLine = $versionInfoLines[1] + + $versionInfo = $versionInfoFirstLine.Split(" ",[System.StringSplitOptions]::RemoveEmptyEntries)[2] + + $VERSION = $versionInfo + + $VERSION = $VERSION.Replace('"',"") + + echo "RELEASEVERSION=$VERSION" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + + echo "BUILD_VERSION=$versionInfo" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append + - + name: Create SiriKali.git.exe.zip + run: | + New-Item -ItemType Directory -Path ${{github.workspace}}\SiriKali.git + New-Item -ItemType Directory -Path ${{github.workspace}}\SiriKali.git/local + + Copy-Item -Path ${{github.workspace}}\SiriKali\translations -Destination ${{github.workspace}}\SiriKali.git -Recurse + Copy-Item -Path ${{github.workspace}}\SiriKali\build5\sirikali.exe -Destination ${{github.workspace}}\SiriKali.git + + Set-Location ${{github.workspace}}\SiriKali.git + + ${{github.workspace}}/qt5/Qt/${{ env.QT5_VERSION }}/${{ env.MINGW5_PATH }}/bin/windeployqt.exe ${{github.workspace}}\SiriKali.git\sirikali.exe + + $bb = ${{ env.BUILD_VERSION }} + $bb = $bb.Trim() + + echo "$bb" | Out-File -FilePath ${{github.workspace}}\SiriKali.git\version_info.txt -Encoding utf8 -Append + + Compress-Archive -Path ${{github.workspace}}\SiriKali.git -DestinationPath ${{github.workspace}}\SiriKaliQt5-${{ env.RELEASEVERSION }}.exe.zip + + Remove-Item -Path ${{github.workspace}}\SiriKali.git\local + + Remove-Item -Path ${{github.workspace}}\SiriKali.git\version_info.txt + - + name: Make installer for Qt5 + uses: Minionguyjpro/Inno-Setup-Action@v1.2.2 + with: + path: SiriKali/build5/sirikali_windows_installer_Qt5.iss + - + name: Install Qt6 + uses: jurplel/install-qt-action@v3 + with: + version: ${{ env.QT6_VERSION }} + arch: ${{ env.MINGW6_VERSION }} + dir: "${{github.workspace}}/qt6" + install-deps: "true" + host: 'windows' + target: 'desktop' + tools: 'tools_mingw1310' + - + name: update env for Qt6 + run: echo "${{github.workspace}}/qt6/Qt/Tools/mingw1310_64/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append + - + name: Check GCC version and path for Qt6 + run: | + Write-Output (Get-Command c++.exe).Path + c++.exe --version + - + name: Configure CMake for Qt6 + env: + CMAKE_PREFIX_PATH: "${{github.workspace}}/qt6/Qt/${{ env.QT6_VERSION }}" + msystem: MINGW32 + run: cmake -DOUTPUT_BASE_NAME=SiriKaliQt6 -DLIBRARIES_LOCATION=${{github.workspace}}\SiriKaliQt6.git\ -DOUTPUT_PATH=${{github.workspace}}\ -DSOURCE_PATH=${{github.workspace}}\SiriKali\ -DBUILD_WITH_QT6=true -DCMAKE_VERBOSE_MAKEFILE=FALSE -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -G "CodeBlocks - MinGW Makefiles" -S ${{github.workspace}}/SiriKali/ -B ${{github.workspace}}/SiriKali/build6 + - + name: Print installer script for Qt6 + run : get-content ${{github.workspace}}\SiriKali\build6\sirikali_windows_installer_Qt6.iss + - + name: Update version.h for Qt6 + run: | + $content = [System.IO.File]::ReadAllText("${{github.workspace}}\SiriKali\build6\version.h").Replace("git_tag",${{ env.GIT_VERSION_NUMBER }}) + [System.IO.File]::WriteAllText("${{github.workspace}}\SiriKali\build6\version.h",$content ) + - + name: Build Project for Qt6 + run: cmake --build ${{github.workspace}}/SiriKali/build6 + - + name: Create SiriKaliQt6.git.exe.zip + run: | + New-Item -ItemType Directory -Path ${{github.workspace}}\SiriKaliQt6.git + New-Item -ItemType Directory -Path ${{github.workspace}}\SiriKaliQt6.git/local + + Copy-Item -Path ${{github.workspace}}\SiriKali\translations -Destination ${{github.workspace}}\SiriKaliQt6.git -Recurse + Copy-Item -Path ${{github.workspace}}\SiriKali\build6\sirikali.exe -Destination ${{github.workspace}}\SiriKaliQt6.git + + Set-Location ${{github.workspace}}\SiriKaliQt6.git + + ${{github.workspace}}/qt6/Qt/${{ env.QT6_VERSION }}/${{ env.MINGW6_PATH }}/bin/windeployqt6.exe ${{github.workspace}}\SiriKaliQt6.git\sirikali.exe + + $bb = ${{ env.BUILD_VERSION }} + $bb = $bb.Trim() + + echo "$bb" | Out-File -FilePath ${{github.workspace}}\SiriKaliQt6.git\version_info.txt -Encoding utf8 -Append + + Compress-Archive -Path ${{github.workspace}}\SiriKaliQt6.git -DestinationPath ${{github.workspace}}\SiriKaliQt6-${{ env.RELEASEVERSION }}.exe.zip + + Remove-Item -Path ${{github.workspace}}\SiriKaliQt6.git\local + + Remove-Item -Path ${{github.workspace}}\SiriKaliQt6.git\version_info.txt + - + name: Make installer for Qt6 + uses: Minionguyjpro/Inno-Setup-Action@v1.2.2 + with: + path: SiriKali/build6/sirikali_windows_installer_Qt6.iss + - + name: Rename installers + run: | + Rename-Item -Path ${{github.workspace}}\SiriKaliQt5.exe -NewName ${{github.workspace}}\SiriKaliQt5-${{ env.RELEASEVERSION }}.setup.exe + Rename-Item -Path ${{github.workspace}}\SiriKaliQt6.exe -NewName ${{github.workspace}}\SiriKaliQt6-${{ env.RELEASEVERSION }}.setup.exe + - + name: Post Releases + uses: ncipollo/release-action@v1 + with: + artifacts: ${{github.workspace}}\SiriKaliQt5-${{ env.RELEASEVERSION }}.setup.exe,${{github.workspace}}\SiriKaliQt6-${{ env.RELEASEVERSION }}.setup.exe,${{github.workspace}}\SiriKaliQt6-${{ env.RELEASEVERSION }}.exe.zip,${{github.workspace}}\SiriKaliQt5-${{ env.RELEASEVERSION }}.exe.zip + tag: "1.5.2" + commit: "main" + allowUpdates: true + omitBody: true + omitBodyDuringUpdate: true + omitNameDuringUpdate: true + omitPrereleaseDuringUpdate: true diff --git a/CMakeLists.txt b/CMakeLists.txt index 600c7d7e..23da920a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,10 +8,16 @@ set_property( GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS ON ) project( sirikali ) -set( PGR_VERSION "1.5.1" ) -set( COPYRIGHT_YEARS "2016-2023" ) +set( PGR_VERSION "1.6.0" ) +set( COPYRIGHT_YEARS "2016-2024" ) set( CMAKE_CXX_STANDARD 14 ) +set(CMAKE_INCLUDE_CURRENT_DIR ON) +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +option(BUILD_WITH_QT6 "Build with Qt 6" OFF) MESSAGE( STATUS "Setting C++ version to C++14" ) if(${CMAKE_VERSION} VERSION_LESS "3.1.0") @@ -77,7 +83,7 @@ else() endif() if( APPLE ) - file( WRITE ${PROJECT_BINARY_DIR}/locale_path.h "\n#define TRANSLATION_PATH \"${CMAKE_INSTALL_PREFIX}/sirikali.app/Contents/Resources/\"\n") + file( WRITE ${PROJECT_BINARY_DIR}/locale_path.h "\n#define TRANSLATION_PATH \"${CMAKE_INSTALL_PREFIX}/sirikali.app/Contents/Resources/\"\n") else() file( WRITE ${PROJECT_BINARY_DIR}/locale_path.h "\n#define TRANSLATION_PATH \"${CMAKE_INSTALL_FULL_DATADIR}/sirikali/translations/\"\n") endif() @@ -88,58 +94,72 @@ if( NOT DEFINED INTERNAL_LXQT_WALLET ) set( INTERNAL_LXQT_WALLET "false" ) endif() -if( DEFINED QT5 AND NOT QT5 ) - message( FATAL_ERROR "Qt4 Build is no longer supported" ) -endif() - if(NOT DEFINED NONETWORKSUPPORT) - set( NONETWORKSUPPORT "true" ) + set( NONETWORKSUPPORT "true" ) endif() -set( QT5 "true" ) - if( WIN32 ) - set( INTERNAL_LXQT_WALLET "true" ) + set( INTERNAL_LXQT_WALLET "true" ) else() - find_file( GCRYPT_INCLUDE_FILE gcrypt.h ) - find_path( GCRYPT_INCLUDE_PATH gcrypt.h ) - - add_definitions( -I${GCRYPT_INCLUDE_PATH} ) + find_file( GCRYPT_INCLUDE_FILE gcrypt.h ) + find_path( GCRYPT_INCLUDE_PATH gcrypt.h ) - find_library( GCRYPT_LIBRARY gcrypt ) + add_definitions( -I${GCRYPT_INCLUDE_PATH} ) - if( NOT GCRYPT_INCLUDE_FILE ) - MESSAGE( FATAL_ERROR "could not find gcrypt header file" ) - else() - MESSAGE( STATUS "found gcrypt header file at: ${GCRYPT_INCLUDE_FILE}" ) - endif() + find_library( GCRYPT_LIBRARY gcrypt ) - if( NOT GCRYPT_LIBRARY ) - MESSAGE( FATAL_ERROR "could not find gcrypt library" ) - else() - get_filename_component( GCRYPT_LIBRARY_PATH ${GCRYPT_LIBRARY} DIRECTORY ) + if( NOT GCRYPT_INCLUDE_FILE ) + MESSAGE( FATAL_ERROR "could not find gcrypt header file" ) + else() + MESSAGE( STATUS "found gcrypt header file at: ${GCRYPT_INCLUDE_FILE}" ) + endif() - MESSAGE( STATUS "found gcrypt library at: ${GCRYPT_LIBRARY}" ) - MESSAGE( STATUS "adding library search path of: ${GCRYPT_LIBRARY_PATH}" ) + if( NOT GCRYPT_LIBRARY ) + MESSAGE( FATAL_ERROR "could not find gcrypt library" ) + else() + get_filename_component( GCRYPT_LIBRARY_PATH ${GCRYPT_LIBRARY} DIRECTORY ) - endif() + MESSAGE( STATUS "found gcrypt library at: ${GCRYPT_LIBRARY}" ) + MESSAGE( STATUS "adding library search path of: ${GCRYPT_LIBRARY_PATH}" ) + endif() endif() -if( UNIX AND NOT APPLE ) +if(BUILD_WITH_QT6) + + if( UNIX AND NOT APPLE ) - find_package( Qt5 COMPONENTS Core Widgets Network DBus REQUIRED ) + find_package( Qt6 COMPONENTS Core Widgets Network DBus REQUIRED ) - message( STATUS "Found Qt5Widgets, version ${Qt5Widgets_VERSION}" ) - message( STATUS "Found Qt5Core, version ${Qt5Core_VERSION}" ) - message( STATUS "Found Qt5Network, version ${Qt5Network_VERSION}" ) - message( STATUS "Found Qt5DBus, version ${Qt5DBus_VERSION}" ) + message( STATUS "Found Qt6Widgets, version ${Qt6Widgets_VERSION}" ) + message( STATUS "Found Qt6Core, version ${Qt6Core_VERSION}" ) + message( STATUS "Found Qt6Network, version ${Qt6Network_VERSION}" ) + message( STATUS "Found Qt6DBus, version ${Qt6DBus_VERSION}" ) + else() + find_package( Qt6 COMPONENTS Core Widgets Network REQUIRED ) + + message( STATUS "Found Qt6Widgets, version ${Qt6Widgets_VERSION}" ) + message( STATUS "Found Qt6Core, version ${Qt6Core_VERSION}" ) + message( STATUS "Found Qt6Network, version ${Qt6Network_VERSION}" ) + endif() + SET (QTVERSION "${Qt6Core_VERSION}" ) else() - find_package( Qt5 COMPONENTS Core Widgets Network REQUIRED ) + if( UNIX AND NOT APPLE ) - message( STATUS "Found Qt5Widgets, version ${Qt5Widgets_VERSION}" ) - message( STATUS "Found Qt5Core, version ${Qt5Core_VERSION}" ) - message( STATUS "Found Qt5Network, version ${Qt5Network_VERSION}" ) + find_package( Qt5 COMPONENTS Core Widgets Network DBus REQUIRED ) + + message( STATUS "Found Qt5Widgets, version ${Qt5Widgets_VERSION}" ) + message( STATUS "Found Qt5Core, version ${Qt5Core_VERSION}" ) + message( STATUS "Found Qt5Network, version ${Qt5Network_VERSION}" ) + message( STATUS "Found Qt5DBus, version ${Qt5DBus_VERSION}" ) + else() + find_package( Qt5 COMPONENTS Core Widgets Network REQUIRED ) + + message( STATUS "Found Qt5Widgets, version ${Qt5Widgets_VERSION}" ) + message( STATUS "Found Qt5Core, version ${Qt5Core_VERSION}" ) + message( STATUS "Found Qt5Network, version ${Qt5Network_VERSION}" ) + endif() + SET (QTVERSION "${Qt5Core_VERSION}" ) endif() #pkg_check_modules( MCHUNGU_TASK mhogomchungu_task ) @@ -151,7 +171,7 @@ file( WRITE ${PROJECT_BINARY_DIR}/version.h " \n #ifndef SIRIKALI_VERSION #define SIRIKALI_VERSION -#define VERSION_STRING \"Version : ${PGR_VERSION} (Compiled with Qt ${Qt5Core_VERSION})\\nCopyright: ${COPYRIGHT_YEARS} Francis Banyikwa,mhogomchungu@gmail.com\\nLicense : GPLv2+\" +#define VERSION_STRING \"Version : ${PGR_VERSION} (Compiled with Qt ${QTVERSION})\\nCopyright: ${COPYRIGHT_YEARS} Francis Banyikwa,mhogomchungu@gmail.com\\nLicense : GPLv2+\" #endif \n" ) @@ -159,14 +179,14 @@ file(WRITE ${PROJECT_BINARY_DIR}/network_support.h "\n#define HAS_NETWORK_SUPPO if( MCHUNGU_TASK_FOUND ) - message( STATUS "---------------------------------------------------------------------------" ) + message( STATUS "---------------------------------------------------------------------------" ) message( STATUS "mhogomchungu_task library will be provided by an external library" ) message( STATUS "---------------------------------------------------------------------------" ) include_directories( "${MCHUNGU_TASK_INCLUDEDIR}" ) link_directories( "${MCHUNGU_TASK_LIBDIR}" ) else() - message( STATUS "---------------------------------------------------------------------------" ) + message( STATUS "---------------------------------------------------------------------------" ) message( STATUS "mhogomchungu_task library will be provided by an internal library" ) message( STATUS "---------------------------------------------------------------------------" ) include_directories( src/3rdParty/tasks ) @@ -175,7 +195,7 @@ endif() if( INTERNAL_LXQT_WALLET ) - message( STATUS "---------------------------------------------------------------------------" ) + message( STATUS "---------------------------------------------------------------------------" ) message( STATUS "lxqt wallet support will be provided by an internal library" ) message( STATUS "---------------------------------------------------------------------------" ) @@ -183,11 +203,11 @@ if( INTERNAL_LXQT_WALLET ) include_directories( ${PROJECT_SOURCE_DIR}/src/3rdParty/lxqt_wallet/frontend ) include_directories( ${PROJECT_BINARY_DIR}/src/3rdParty/lxqt_wallet/frontend ) else() - pkg_check_modules( LXQT_WALLET lxqt-wallet ) + pkg_check_modules( LXQT_WALLET lxqt-wallet ) if( NOT LXQT_WALLET_FOUND ) - message( STATUS "ERROR: could not find lxqt_wallet package" ) + message( STATUS "ERROR: could not find lxqt_wallet package" ) message( STATUS "---------------------------------------------------------------------------" ) message( STATUS "lxqt wallet support will be provided by an internal library" ) message( STATUS "---------------------------------------------------------------------------" ) @@ -197,16 +217,16 @@ else() ADD_SUBDIRECTORY( src/3rdParty/lxqt_wallet ) else() - if( LXQT_WALLET_VERSION VERSION_GREATER "3.1.0" ) + if( LXQT_WALLET_VERSION VERSION_GREATER "3.1.0" ) - include_directories( ${LXQT_WALLET_INCLUDEDIR} ) + include_directories( ${LXQT_WALLET_INCLUDEDIR} ) link_directories( ${LXQT_WALLET_LIBDIR} ) message( STATUS "---------------------------------------------------------------------------" ) message( STATUS "lxqt wallet support will be provided by an external library" ) message( STATUS "---------------------------------------------------------------------------" ) else() - message( STATUS "---------------------------------------------------------------------------" ) + message( STATUS "---------------------------------------------------------------------------" ) message( FATAL_ERROR "---------------------------------------------------------------------------\nInstalled version of lxqt_wallet is too old(<3.2.0)\nPlease install a more receant version from: https://github.com/lxqt/lxqt_wallet\n---------------------------------------------------------------------------" ) @@ -266,7 +286,7 @@ set( MOC_FILES src/engines/fscryptcreateoptions.h ) -set( SRC src/dialogok.cpp +set( SRC src/dialogok.cpp src/main.cpp src/systemsignalhandler.cpp src/crypto.cpp @@ -339,9 +359,15 @@ include_directories( ${Qt5Network_INCLUDE_DIRS} ) add_definitions( ${Qt5Widgets_DEFINITIONS} ) -QT5_WRAP_UI( UI ${UI_FILES} ) -QT5_WRAP_CPP( MOC ${MOC_FILES} ) -QT5_ADD_RESOURCES( TRAY_RC_SRCS src/icon.qrc ) +if(BUILD_WITH_QT6) + QT6_WRAP_UI( UI ${UI_FILES} ) + QT6_WRAP_CPP( MOC ${MOC_FILES} ) + QT6_ADD_RESOURCES( TRAY_RC_SRCS src/icon.qrc ) +else() + QT5_WRAP_UI( UI ${UI_FILES} ) + QT5_WRAP_CPP( MOC ${MOC_FILES} ) + QT5_ADD_RESOURCES( TRAY_RC_SRCS src/icon.qrc ) +endif() INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ) INCLUDE_DIRECTORIES( ${GCRYPT_INCLUDE_PATH} ) @@ -362,30 +388,51 @@ endif() link_directories( ${GCRYPT_LIBRARY_PATH} ) -if( WIN32 ) - TARGET_LINK_LIBRARIES( sirikali ${Qt5Widgets_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIBRARIES} mhogomchungu_task lxqt-wallet ) -endif() +if(BUILD_WITH_QT6) + if( WIN32 ) + TARGET_LINK_LIBRARIES( sirikali ${Qt6Widgets_LIBRARIES} ${Qt6Core_LIBRARIES} ${Qt6Widgets_LIBRARIES} ${Qt6Network_LIBRARIES} mhogomchungu_task lxqt-wallet ) + endif() -if( APPLE ) - TARGET_LINK_LIBRARIES( sirikali ${Qt5Widgets_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIBRARIES} ${library_pwquality} ${GCRYPT_LIBRARY} mhogomchungu_task lxqt-wallet -L${GCRYPT_LIBRARY_PATH}) + if( APPLE ) + TARGET_LINK_LIBRARIES( sirikali ${Qt6Widgets_LIBRARIES} ${Qt6Core_LIBRARIES} ${Qt6Widgets_LIBRARIES} ${Qt6Network_LIBRARIES} ${library_pwquality} ${GCRYPT_LIBRARY} mhogomchungu_task lxqt-wallet -L${GCRYPT_LIBRARY_PATH}) + endif() + + if( UNIX AND NOT APPLE ) + TARGET_LINK_LIBRARIES( sirikali ${Qt6DBus_LIBRARIES} ${Qt6Widgets_LIBRARIES} ${Qt6Core_LIBRARIES} ${Qt6Widgets_LIBRARIES} ${Qt6Network_LIBRARIES} ${library_pwquality} ${GCRYPT_LIBRARY} mhogomchungu_task lxqt-wallet -L${GCRYPT_LIBRARY_PATH} -Wl,-znow) + endif() +else() + if( WIN32 ) + TARGET_LINK_LIBRARIES( sirikali ${Qt5Widgets_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIBRARIES} mhogomchungu_task lxqt-wallet ) + endif() + + if( APPLE ) + TARGET_LINK_LIBRARIES( sirikali ${Qt5Widgets_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIBRARIES} ${library_pwquality} ${GCRYPT_LIBRARY} mhogomchungu_task lxqt-wallet -L${GCRYPT_LIBRARY_PATH}) + endif() + + if( UNIX AND NOT APPLE ) + TARGET_LINK_LIBRARIES( sirikali ${Qt5DBus_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIBRARIES} ${library_pwquality} ${GCRYPT_LIBRARY} mhogomchungu_task lxqt-wallet -L${GCRYPT_LIBRARY_PATH} -Wl,-znow) + endif() endif() -if( UNIX AND NOT APPLE ) - TARGET_LINK_LIBRARIES( sirikali ${Qt5DBus_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIBRARIES} ${library_pwquality} ${GCRYPT_LIBRARY} mhogomchungu_task lxqt-wallet -L${GCRYPT_LIBRARY_PATH} -Wl,-znow) +if(BUILD_WITH_QT6) + message( STATUS "---------------------------------------------------------------------------" ) + message( STATUS "Building GUI components using Qt6" ) + message( STATUS "---------------------------------------------------------------------------\n\n" ) +else() + message( STATUS "---------------------------------------------------------------------------" ) + message( STATUS "Building GUI components using Qt5" ) + message( STATUS "---------------------------------------------------------------------------\n\n" ) endif() -message( STATUS "---------------------------------------------------------------------------" ) -message( STATUS "Building GUI components using Qt5" ) -message( STATUS "---------------------------------------------------------------------------\n\n" ) if( WIN32 ) - ADD_SUBDIRECTORY( src/sirikali_cppcryptfs ) + ADD_SUBDIRECTORY( src/sirikali_cppcryptfs ) endif() if( WIN32 ) - set_target_properties( sirikali PROPERTIES COMPILE_FLAGS "-Wextra -Wall -s -pedantic" ) + set_target_properties( sirikali PROPERTIES COMPILE_FLAGS "-Wextra -Wall -s -pedantic" ) else() - set_target_properties( sirikali PROPERTIES COMPILE_FLAGS "-Wextra -Wall -s -fPIC -pedantic" ) + set_target_properties( sirikali PROPERTIES COMPILE_FLAGS "-Wextra -Wall -s -fPIC -pedantic" ) endif() file( WRITE ${PROJECT_BINARY_DIR}/siriPolkit.h "\n#define siriPolkitPath \"${CMAKE_INSTALL_PREFIX}/bin/sirikali.pkexec\"" ) @@ -522,23 +569,110 @@ endif() endif() -if( WIN32 ) +set( OutputBaseFilename "SiriKali-${PGR_VERSION}.setup" ) - find_path( libstdc_PATH libstdc++-6.dll ) +if(OUTPUT_BASE_NAME) + set( OutputBaseFilename ${OUTPUT_BASE_NAME}) +endif() - find_path( gcc_PATH gcc.exe ) +if( WIN32 ) - find_path( windeployqt_PATH windeployqt.exe PATHS "${CMAKE_PREFIX_PATH}/bin" ) +if( BUILD_WITH_QT6 ) -file( WRITE ${PROJECT_BINARY_DIR}/sirikali_windows_installer_commands.txt +file( WRITE ${PROJECT_BINARY_DIR}/sirikali_windows_installer_Qt6.iss " -set PATH=${gcc_PATH};${libstdc_PATH};%PATH%\r\n -${windeployqt_PATH}/windeployqt --release sirikali.exe\r\n -") +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! +#define MyAppName \"SiriKali\" +#define MyAppVersion \"${PGR_VERSION}\" +#define MyAppPublisher \"Francis Banyikwa\" +#define MyAppURL \"https://mhogomchungu.github.io/sirikali\" +#define MyAppExeName \"sirikali.exe\" +#define MyLibrariesLocation \"${LIBRARIES_LOCATION}\" +#define MyEXELocation \"${PROJECT_BINARY_DIR}\\sirikali.exe\" +#define MyEXELocation1 \"${PROJECT_BINARY_DIR}\\src\\sirikali_cppcryptfs\\sirikali_cppcryptfs.exe\" +#define MyOutPutPath \"${OUTPUT_PATH}\" +#define MySourcesPath \"${SOURCE_PATH}\" +[Setup] +AppId={{677BCC48-2AC2-4CBC-B826-A94324C26988} +AppName={#MyAppName} +AppVersion={#MyAppVersion} +;AppVerName={#MyAppName} {#MyAppVersion} +AppPublisher={#MyAppPublisher} +AppPublisherURL={#MyAppURL} +AppSupportURL={#MyAppURL} +AppUpdatesURL={#MyAppURL} +DefaultDirName={pf}\\{#MyAppName} +LicenseFile={#MySourcesPath}\\LICENSE.txt +OutputDir={#MyOutPutPath} +SetupIconFile={#MySourcesPath}\\icons\\256x256\\sirikali.ico +Compression=lzma +SolidCompression=yes +DisableProgramGroupPage=yes +OutputBaseFilename=${OutputBaseFilename} + +[Tasks] +Name: \"desktopicon\"; Description: \"{cm:CreateDesktopIcon}\"; GroupDescription: \"{cm:AdditionalIcons}\"; Flags: unchecked +Name: \"quicklaunchicon\"; Description: \"{cm:CreateQuickLaunchIcon}\"; GroupDescription: \"{cm:AdditionalIcons}\"; Flags: unchecked; OnlyBelowVersion: 0,6.1 + +[Files] +Source: {#MyEXELocation}; DestDir: {app}; Flags: ignoreversion +Source: {#MyEXELocation1}; DestDir: {app}; Flags: ignoreversion +Source: {#MyLibrariesLocation}\\*.dll; DestDir: {app} ; Flags: ignoreversion +Source: {#MySourcesPath}\\LICENSE.txt; DestDir: {app}; Flags: ignoreversion +Source: {#MyLibrariesLocation}\\iconengines\\* ; DestDir: {app}\\iconengines; Flags: ignoreversion +Source: {#MyLibrariesLocation}\\imageformats\\*; DestDir: {app}\\imageformats; Flags: ignoreversion +Source: {#MyLibrariesLocation}\\styles\\*; DestDir: {app}\\styles; Flags: ignoreversion +Source: {#MyLibrariesLocation}\\platforms\\*; DestDir: {app}\\platforms; Flags: ignoreversion +Source: {#MyLibrariesLocation}\\generic\\*; DestDir: {app}\\generic; Flags: ignoreversion +Source: {#MyLibrariesLocation}\\tls\\*; DestDir: {app}\\tls; Flags: ignoreversion +Source: {#MyLibrariesLocation}\\networkinformation\\*; DestDir: {app}\\networkinformation; Flags: ignoreversion + +Source: {#MyLibrariesLocation}\\translations\\*; DestDir: {app}\\translations; Flags: ignoreversion +Source: {#MySourcesPath}\\translations\\*.qm; DestDir: {app}\\translations; Flags: ignoreversion +Source: {#MySourcesPath}\\icons\\256x256\\sirikali.ico; DestDir: {app}\\icons; Flags: ignoreversion + +; NOTE: Don't use \"Flags: ignoreversion\" on any shared system files + +[Icons] +Name: \"{commonprograms}\\{#MyAppName}\"; Filename: \"{app}\\{#MyAppExeName}\"; IconFilename: \"{app}\\icons\\sirikali.ico\"; WorkingDir: \"{app}\" +;Name: \"{commonprograms}\\Uninstall {#MyAppName}\"; Filename: \"{uninstallexe}\"; IconFilename: \"{app}\\icons\\sirikali.ico\"; WorkingDir: \"{app}\" + +Name: \"{commondesktop}\\{#MyAppName}\"; Filename: \"{app}\\{#MyAppExeName}\"; IconFilename: \"{app}\\icons\\sirikali.ico\"; WorkingDir: \"{app}\"; Tasks: desktopicon +Name: \"{userappdata}\\Microsoft\\Internet Explorer\\Quick Launch\\{#MyAppName}\"; Filename: \"{app}\\{#MyAppExeName}\"; IconFilename: \"{app}\\icons\\sirikali.ico\"; WorkingDir: \"{app}\"; Tasks: quicklaunchicon + +[Run] +Filename: \"{app}\\{#MyAppExeName}\"; Description: \"{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}\"; Flags: nowait postinstall skipifsilent + +[Languages] +Name: \"english\"; MessagesFile: \"compiler:Default.isl\" +Name: \"brazilianportuguese\"; MessagesFile: \"compiler:Languages\\BrazilianPortuguese.isl\" +Name: \"catalan\"; MessagesFile: \"compiler:Languages\\Catalan.isl\" +Name: \"corsican\"; MessagesFile: \"compiler:Languages\\Corsican.isl\" +Name: \"czech\"; MessagesFile: \"compiler:Languages\\Czech.isl\" +Name: \"danish\"; MessagesFile: \"compiler:Languages\\Danish.isl\" +Name: \"dutch\"; MessagesFile: \"compiler:Languages\\Dutch.isl\" +Name: \"finnish\"; MessagesFile: \"compiler:Languages\\Finnish.isl\" +Name: \"french\"; MessagesFile: \"compiler:Languages\\French.isl\" +Name: \"german\"; MessagesFile: \"compiler:Languages\\German.isl\" +Name: \"hebrew\"; MessagesFile: \"compiler:Languages\\Hebrew.isl\" +Name: \"italian\"; MessagesFile: \"compiler:Languages\\Italian.isl\" +Name: \"japanese\"; MessagesFile: \"compiler:Languages\\Japanese.isl\" +Name: \"norwegian\"; MessagesFile: \"compiler:Languages\\Norwegian.isl\" +Name: \"polish\"; MessagesFile: \"compiler:Languages\\Polish.isl\" +Name: \"portuguese\"; MessagesFile: \"compiler:Languages\\Portuguese.isl\" +Name: \"russian\"; MessagesFile: \"compiler:Languages\\Russian.isl\" +Name: \"slovenian\"; MessagesFile: \"compiler:Languages\\Slovenian.isl\" +Name: \"spanish\"; MessagesFile: \"compiler:Languages\\Spanish.isl\" +Name: \"turkish\"; MessagesFile: \"compiler:Languages\\Turkish.isl\" +Name: \"ukrainian\"; MessagesFile: \"compiler:Languages\\Ukrainian.isl\" +") -file( WRITE ${PROJECT_BINARY_DIR}/sirikali_windows_installer.iss +else() + +file( WRITE ${PROJECT_BINARY_DIR}/sirikali_windows_installer_Qt5.iss " ; Script generated by the Inno Setup Script Wizard. ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! @@ -548,12 +682,11 @@ file( WRITE ${PROJECT_BINARY_DIR}/sirikali_windows_installer.iss #define MyAppPublisher \"Francis Banyikwa\" #define MyAppURL \"https://mhogomchungu.github.io/sirikali\" #define MyAppExeName \"sirikali.exe\" -#define MyLibrariesLocation \"C:\\projects\\SiriKali.libraries.Qt-${Qt5Core_VERSION}\\\" +#define MyLibrariesLocation \"${LIBRARIES_LOCATION}\" #define MyEXELocation \"${PROJECT_BINARY_DIR}\\sirikali.exe\" #define MyEXELocation1 \"${PROJECT_BINARY_DIR}\\src\\sirikali_cppcryptfs\\sirikali_cppcryptfs.exe\" -#define MyOutPutPath \"C:\\projects\\SiriKali.installer\\Qt-${Qt5Core_VERSION}\" -#define MyGcryptLibraryPath \"C:\\projects\\sirikali\\libs\\lib\\\" -#define MySourcesPath \"C:\\projects\\sirikali\\\" +#define MyOutPutPath \"${OUTPUT_PATH}\" +#define MySourcesPath \"${SOURCE_PATH}\" [Setup] AppId={{677BCC48-2AC2-4CBC-B826-A94324C26988} @@ -571,7 +704,7 @@ SetupIconFile={#MySourcesPath}\\icons\\256x256\\sirikali.ico Compression=lzma SolidCompression=yes DisableProgramGroupPage=yes -OutputBaseFilename=SiriKali-${PGR_VERSION}.setup +OutputBaseFilename=${OutputBaseFilename} [Tasks] Name: \"desktopicon\"; Description: \"{cm:CreateDesktopIcon}\"; GroupDescription: \"{cm:AdditionalIcons}\"; Flags: unchecked @@ -579,27 +712,16 @@ Name: \"quicklaunchicon\"; Description: \"{cm:CreateQuickLaunchIcon}\"; GroupDes [Files] Source: {#MyEXELocation}; DestDir: {app}; Flags: ignoreversion - Source: {#MyEXELocation1}; DestDir: {app}; Flags: ignoreversion - Source: {#MyLibrariesLocation}\\*.dll; DestDir: {app} ; Flags: ignoreversion - Source: {#MySourcesPath}\\LICENSE.txt; DestDir: {app}; Flags: ignoreversion - Source: {#MyLibrariesLocation}\\bearer\\* ; DestDir: {app}\\bearer; Flags: ignoreversion - Source: {#MyLibrariesLocation}\\iconengines\\* ; DestDir: {app}\\iconengines; Flags: ignoreversion - Source: {#MyLibrariesLocation}\\imageformats\\*; DestDir: {app}\\imageformats; Flags: ignoreversion - Source: {#MyLibrariesLocation}\\styles\\*; DestDir: {app}\\styles; Flags: ignoreversion - Source: {#MyLibrariesLocation}\\platforms\\*; DestDir: {app}\\platforms; Flags: ignoreversion - Source: {#MyLibrariesLocation}\\translations\\*; DestDir: {app}\\translations; Flags: ignoreversion - Source: {#MySourcesPath}\\translations\\*.qm; DestDir: {app}\\translations; Flags: ignoreversion - Source: {#MySourcesPath}\\icons\\256x256\\sirikali.ico; DestDir: {app}\\icons; Flags: ignoreversion ; NOTE: Don't use \"Flags: ignoreversion\" on any shared system files @@ -639,3 +761,5 @@ Name: \"ukrainian\"; MessagesFile: \"compiler:Languages\\Ukrainian.isl\" ") endif() + +endif() diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..f288702d --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/build_windows.ps1 b/build_windows.ps1 new file mode 100644 index 00000000..838fc121 --- /dev/null +++ b/build_windows.ps1 @@ -0,0 +1,119 @@ + + +$QT_PATH="C:\Qt\5.15.2\mingw81_32" + +$QT_PATH_BIN="$QT_PATH\bin" + +$GCC_PATH="C:\Qt\Tools\mingw810_32\bin" +$NINJA_PATH="C:\Qt\Tools\Ninja" +$CMAKE_PATH="C:\Qt\Tools\CMake_64\bin" +$GIT_PATH="C:\Program Files (x86)\Git\bin" +$INNO_PATH="C:\Program Files (x86)\Inno Setup 6" +$SEVEN_ZIP_PATH="C:\projects\7-Zip" + +$SRC_LOCATION=$PSScriptRoot + +$BUILD_PATH="$SRC_LOCATION/BUILD" + +$env:Path = "$GCC_PATH;$SEVEN_ZIP_PATH;$QT_PATH_BIN;$NINJA_PATH;$CMAKE_PATH;$INNO_PATH;$GIT_PATH" + $env:Path + +Set-Location -Path $SRC_LOCATION + +if(Test-Path -Path $BUILD_PATH/SiriKali) +{ + Remove-Item -Path $BUILD_PATH/SiriKali -Recurse +} + +New-Item -ItemType Directory -Path $BUILD_PATH/SiriKali + +cmake.exe -DCMAKE_VERBOSE_MAKEFILE=FALSE -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_PREFIX_PATH="$QT_PATH" -DLIBRARIES_LOCATION="$BUILD_PATH" -DOUTPUT_PATH="$BUILD_PATH" -DSOURCE_PATH="$SRC_LOCATION" -G "CodeBlocks - MinGW Makefiles" -S "$SRC_LOCATION" -B "$BUILD_PATH/SiriKali" + +if($?) +{ +} +else +{ + Read-Host "Press Enter To Exit" + exit +} + +$data = [System.IO.File]::ReadAllText("$BUILD_PATH/SiriKali/version.h") + +$versionInfoLines = $data.Split([Environment]::NewLine, [System.StringSplitOptions]::RemoveEmptyEntries) + +$versionInfoFirstLine = $versionInfoLines[0] + +$versionInfo = $versionInfoFirstLine.Split(" ",[System.StringSplitOptions]::RemoveEmptyEntries)[2] + +$VERSION = $versionInfo.Replace(".git_tag","") + +$VERSION = $VERSION.Replace('"',"") + +cmake.exe -DCMAKE_VERBOSE_MAKEFILE=FALSE -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_PREFIX_PATH="$QT_PATH" -DLIBRARIES_LOCATION="$BUILD_PATH/SiriKali-$VERSION" -DOUTPUT_PATH="$BUILD_PATH" -DSOURCE_PATH="$SRC_LOCATION" -G "CodeBlocks - MinGW Makefiles" -S "$SRC_LOCATION" -B "$BUILD_PATH/SiriKali" + +if($?) +{ +} +else +{ + Read-Host "Press Enter To Exit" + exit +} + +if(Test-Path -Path $BUILD_PATH/SiriKali-$VERSION) +{ + Remove-Item -Path $BUILD_PATH/SiriKali-$VERSION -Recurse +} + +cmake --build $BUILD_PATH/SiriKali + +if($?) +{ +} +else +{ + Read-Host "Press Enter To Exit" + exit +} + +New-Item -ItemType Directory -Path $BUILD_PATH/SiriKali-$VERSION + +Copy-Item -Path $SRC_LOCATION/translations -Destination $BUILD_PATH/SiriKali-$VERSION -Recurse +Copy-Item -Path $BUILD_PATH/SiriKali/media-downloader.exe -Destination $BUILD_PATH/SiriKali-$VERSION + +windeployqt.exe $BUILD_PATH/SiriKali-$VERSION/media-downloader.exe --libdir $BUILD_PATH/SiriKali-$VERSION --plugindir $BUILD_PATH/SiriKali-$VERSION + +if($?) +{ +} +else +{ + Read-Host "Press Enter To Exit" + exit +} + +iscc $BUILD_PATH\SiriKali\sirikali_windows_installer_Qt5.iss + +if($?) +{ +} +else +{ + Read-Host "Press Enter To Exit" + exit +} + +Write-Output "$VERSION" | Out-File -FilePath $BUILD_PATH/SiriKali-$VERSION/version_info.txt -Encoding utf8 -Append + +New-Item -ItemType Directory -Path $BUILD_PATH/SiriKali-$VERSION/local + +7z.exe a $BUILD_PATH/SiriKali-$VERSION.zip $BUILD_PATH/SiriKali-$VERSION + +if($?) +{ + Read-Host "SUCCESS!! Press Enter To Exit" +} +else +{ + Read-Host "Press Enter To Exit" +} diff --git a/changelog b/changelog index db7102da..629e3c2b 100644 --- a/changelog +++ b/changelog @@ -277,3 +277,8 @@ version 1.4.2(December 18,2019) version 1.5.1(July 10, 2023) [NON WINDOWS] -- Folders specified in PATH variable will be checked when looking for executables. + + version 1.6.0(May 09, 2024) + [ALL] +-- Add support for building with Qt6 by passing option "-DBUILD_WITH_QT6=true" to cmake. +-- Add support for securefs version >= 1.0.0. diff --git a/rpm/sirikali.spec b/rpm/sirikali.spec index 5c56a886..1866edb0 100644 --- a/rpm/sirikali.spec +++ b/rpm/sirikali.spec @@ -17,7 +17,7 @@ # along with this program. If not, see . Name: SiriKali -Version: 1.5.1 +Version: 1.6.0 Release: 0 Summary: SiriKali is a Qt/C++ GUI front end to fscrypt,encfs,cryfs,gocryptfs,ecryptfs and securefs. License: GPL-2.0+ diff --git a/src/3rdParty/lxqt_wallet/frontend/CMakeLists.txt b/src/3rdParty/lxqt_wallet/frontend/CMakeLists.txt index bcf72386..27515e3e 100644 --- a/src/3rdParty/lxqt_wallet/frontend/CMakeLists.txt +++ b/src/3rdParty/lxqt_wallet/frontend/CMakeLists.txt @@ -20,12 +20,21 @@ endif() set(CMAKE_INCLUDE_CURRENT_DIR ON) -include_directories(${Qt5Widgets_INCLUDE_DIRS}) -include_directories(${Qt5Core_INCLUDE_DIRS}}) -include_directories(${Qt5DBus_INCLUDE_DIRS}}) +if(BUILD_WITH_QT6) + include_directories(${Qt6Widgets_INCLUDE_DIRS}) + include_directories(${Qt6Core_INCLUDE_DIRS}) + include_directories(${Qt6DBus_INCLUDE_DIRS}) -add_definitions(${Qt5Widgets_DEFINITIONS}) -add_definitions(${Qt5Core_DEFINITIONS}) + add_definitions(${Qt6Widgets_DEFINITIONS}) + add_definitions(${Qt6Core_DEFINITIONS}) +else() + include_directories(${Qt5Widgets_INCLUDE_DIRS}) + include_directories(${Qt5Core_INCLUDE_DIRS}}) + include_directories(${Qt5DBus_INCLUDE_DIRS}}) + + add_definitions(${Qt5Widgets_DEFINITIONS}) + add_definitions(${Qt5Core_DEFINITIONS}) +endif() if(NOSECRETSUPPORT) SET(SECRET_SUPPORT "false") @@ -43,9 +52,9 @@ else() endif() if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 10.0.0 ) - set( CMAKE_CXX_STANDARD 20 ) + set( CMAKE_CXX_STANDARD 14 ) elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 10.0.0) - set( CMAKE_CXX_STANDARD 20 ) + set( CMAKE_CXX_STANDARD 14 ) else() set( CMAKE_CXX_STANDARD 14 ) if(${CMAKE_VERSION} VERSION_LESS "3.1.0") @@ -54,8 +63,12 @@ else() endif() endif() -set( CMAKE_CXX_STANDARD_REQUIRED ON ) -set( CMAKE_CXX_EXTENSIONS OFF) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CXX_EXTENSIONS OFF) +set(CMAKE_INCLUDE_CURRENT_DIR ON) +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) if(NOKDESUPPORT) SET(KWALLET_SUPPORT "false") @@ -97,34 +110,36 @@ set(COMMON_UI_FILES changepassworddialog.ui password_dialog.ui) set(COMMON_MOC_FILES task.h changepassworddialog.h password_dialog.h) set(COMMON_SRC_FILES changepassworddialog.cpp password_dialog.cpp lxqt_windows_dpapi.cpp lxqt_internal_wallet.cpp lxqt_wallet.cpp lxqt_osx_keychain.cpp) -Qt5_WRAP_UI(UI ${COMMON_UI_FILES}) -Qt5_WRAP_CPP(MOC ${COMMON_MOC_FILES}) - if(KWALLET_SUPPORT) - Qt5_WRAP_CPP(MOC_KWALLET lxqt_kwallet.h) + set(MOC_KWALLET lxqt_kwallet.h) set(KWALLET_COMMON lxqt_kwallet.cpp) if(SECRET_SUPPORT) - add_library(lxqt-wallet STATIC ${KWALLET_COMMON} lxqt_libsecret.cpp ${UI} ${COMMON_SRC_FILES} ${MOC} ${MOC_KWALLET}) + add_library(lxqt-wallet STATIC ${KWALLET_COMMON} lxqt_libsecret.cpp ${COMMON_UI_FILES} ${COMMON_SRC_FILES} ${COMMON_MOC_FILES} ${MOC_KWALLET}) target_link_libraries(lxqt-wallet secretlib) else() - add_library(lxqt-wallet STATIC ${KWALLET_COMMON} ${UI} ${COMMON_SRC_FILES} ${MOC} ${MOC_KWALLET}) + add_library(lxqt-wallet STATIC ${KWALLET_COMMON} ${COMMON_UI_FILES} ${COMMON_SRC_FILES} ${COMMON_MOC_FILES} ${MOC_KWALLET}) endif() target_link_libraries(lxqt-wallet KF5::Wallet) else() - Qt5_WRAP_CPP(MOC_KWALLET_DBUS lxqt_kwallet-dbus.h) + set(MOC_KWALLET_DBUS lxqt_kwallet-dbus.h) set(KWALLET_DBUS lxqt_kwallet-dbus.cpp) if(SECRET_SUPPORT) - add_library(lxqt-wallet STATIC lxqt_libsecret.cpp ${KWALLET_DBUS} ${UI} ${COMMON_SRC_FILES} ${MOC} ${MOC_KWALLET_DBUS}) + add_library(lxqt-wallet STATIC lxqt_libsecret.cpp ${KWALLET_DBUS} ${COMMON_UI_FILES} ${COMMON_SRC_FILES} ${COMMON_MOC_FILES} ${MOC_KWALLET_DBUS}) target_link_libraries(lxqt-wallet secretlib) else() - add_library(lxqt-wallet STATIC ${UI} ${COMMON_SRC_FILES} ${KWALLET_DBUS} ${MOC} ${MOC_KWALLET_DBUS}) + add_library(lxqt-wallet STATIC ${COMMON_UI_FILES} ${COMMON_SRC_FILES} ${KWALLET_DBUS} ${COMMON_MOC_FILES} ${MOC_KWALLET_DBUS}) endif() endif() target_link_libraries(lxqt-wallet lxqtwallet-backend) -target_link_libraries(lxqt-wallet ${Qt5Widgets_LIBRARIES}) -target_link_libraries(lxqt-wallet ${Qt5Core_LIBRARIES}) +if(BUILD_WITH_QT6) + target_link_libraries(lxqt-wallet ${Qt6Widgets_LIBRARIES}) + target_link_libraries(lxqt-wallet ${Qt6Core_LIBRARIES}) +else() + target_link_libraries(lxqt-wallet ${Qt5Widgets_LIBRARIES}) + target_link_libraries(lxqt-wallet ${Qt5Core_LIBRARIES}) +endif() if(WIN32) target_link_libraries(lxqt-wallet -lcrypt32 -lbcrypt) diff --git a/src/3rdParty/lxqt_wallet/frontend/lxqt_windows_dpapi.cpp b/src/3rdParty/lxqt_wallet/frontend/lxqt_windows_dpapi.cpp index 0a1257f0..58939d0d 100644 --- a/src/3rdParty/lxqt_wallet/frontend/lxqt_windows_dpapi.cpp +++ b/src/3rdParty/lxqt_wallet/frontend/lxqt_windows_dpapi.cpp @@ -7,6 +7,7 @@ static const int TEST_VALUE = -1; #include +#include std::unique_ptr< QSettings > lxqt_qsettings() ; diff --git a/src/3rdParty/tasks/CMakeLists.txt b/src/3rdParty/tasks/CMakeLists.txt index 9417f9e1..c4806e47 100644 --- a/src/3rdParty/tasks/CMakeLists.txt +++ b/src/3rdParty/tasks/CMakeLists.txt @@ -15,14 +15,23 @@ set( CMAKE_CXX_STANDARD 14 ) set( CMAKE_CXX_STANDARD_REQUIRED ON ) set( CMAKE_CXX_EXTENSIONS OFF) +set(CMAKE_INCLUDE_CURRENT_DIR ON) +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) INCLUDE( GNUInstallDirs ) INCLUDE( CMakeDependentOption ) -QT5_WRAP_CPP( MOC_LIBRARY task.hpp ) +set( MOC_LIBRARY task.hpp ) + +if(BUILD_WITH_QT6) + include_directories( ${Qt6Core_INCLUDE_DIRS} ) +else() + include_directories( ${Qt5Core_INCLUDE_DIRS} ) +endif() -include_directories( ${Qt5Core_INCLUDE_DIRS} ) if( MCHUNGU_TASK_INSTALL ) add_library( mhogomchungu_task SHARED ${MOC_LIBRARY} ) @@ -31,7 +40,11 @@ else() add_library( mhogomchungu_task STATIC ${MOC_LIBRARY} ) endif() -target_link_libraries( mhogomchungu_task ${Qt5Core_LIBRARIES} ) +if(BUILD_WITH_QT6) + target_link_libraries( mhogomchungu_task ${Qt6Core_LIBRARIES} ) +else() + target_link_libraries( mhogomchungu_task ${Qt5Core_LIBRARIES} ) +endif() if( WIN32 ) set_target_properties( mhogomchungu_task PROPERTIES COMPILE_FLAGS "-Wextra -Wall -s -pedantic " ) @@ -40,7 +53,7 @@ else() endif() if( MCHUNGU_TASK_DEBUG ) - QT5_WRAP_CPP( MOC_EXE example.h ) + set( MOC_EXE example.h ) add_executable( example example.cpp main.cpp ${MOC_EXE} ) target_link_libraries( example mhogomchungu_task ) endif() diff --git a/src/3rdParty/tasks/task.hpp b/src/3rdParty/tasks/task.hpp index 500727df..93a769d3 100644 --- a/src/3rdParty/tasks/task.hpp +++ b/src/3rdParty/tasks/task.hpp @@ -193,7 +193,7 @@ namespace Task { } std::pair< std::function< void() >,std::function< void() > > value ; - }; + }; template< typename E, typename F, Task::detail::not_copyable = 0, @@ -1285,12 +1285,19 @@ namespace Task m_function( std::move( function ) ) { this->setProcessEnvironment( env ) ; + + #ifndef Q_OS_WIN + #if QT_VERSION >= QT_VERSION_CHECK( 6,0,0 ) + this->setChildProcessModifier( m_function ) ; + #endif + #endif } - protected: - void setupChildProcess() + #if QT_VERSION < QT_VERSION_CHECK( 6,0,0 ) + void setupChildProcess() override { m_function() ; } + #endif private: std::function< void() > m_function ; diff --git a/src/json_parser.hpp b/src/json_parser.hpp index 118fdd32..a179764f 100644 --- a/src/json_parser.hpp +++ b/src/json_parser.hpp @@ -183,7 +183,7 @@ class SirikaliJson } void operator=( int value ) { - m_json.insert( m_key,QString( value ) ) ; + m_json.insert( m_key,value ) ; } void operator=( const QStringList& value ) { diff --git a/src/sirikali.appdata.xml b/src/sirikali.appdata.xml index 58ce6edd..a6c3ce4d 100644 --- a/src/sirikali.appdata.xml +++ b/src/sirikali.appdata.xml @@ -34,6 +34,7 @@ + diff --git a/src/sirikali_cppcryptfs/CMakeLists.txt b/src/sirikali_cppcryptfs/CMakeLists.txt index 035f1857..be338764 100644 --- a/src/sirikali_cppcryptfs/CMakeLists.txt +++ b/src/sirikali_cppcryptfs/CMakeLists.txt @@ -10,11 +10,20 @@ set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_INCLUDE_CURRENT_DIR ON) +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +if(BUILD_WITH_QT6) + find_package( Qt6 COMPONENTS Core REQUIRED ) + add_executable(sirikali_cppcryptfs main.cpp ) + target_link_libraries(sirikali_cppcryptfs Qt6::Core) +else() + find_package( Qt5 COMPONENTS Core REQUIRED ) + add_executable(sirikali_cppcryptfs main.cpp ) + target_link_libraries(sirikali_cppcryptfs Qt5::Core) +endif() + -find_package(QT NAMES Qt5 COMPONENTS Core REQUIRED) -find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED) -add_executable(sirikali_cppcryptfs - main.cpp -) -target_link_libraries(sirikali_cppcryptfs Qt${QT_VERSION_MAJOR}::Core) diff --git a/src/sirikali_cppcryptfs/main.cpp b/src/sirikali_cppcryptfs/main.cpp index 1ef1ca2f..c7c127ac 100644 --- a/src/sirikali_cppcryptfs/main.cpp +++ b/src/sirikali_cppcryptfs/main.cpp @@ -26,6 +26,8 @@ #include +#include + class counter { public: diff --git a/src/siripolkit/CMakeLists.txt b/src/siripolkit/CMakeLists.txt index 2808ddce..e99c8b81 100644 --- a/src/siripolkit/CMakeLists.txt +++ b/src/siripolkit/CMakeLists.txt @@ -16,13 +16,21 @@ endif() set( CMAKE_CXX_STANDARD_REQUIRED ON ) set( CMAKE_CXX_EXTENSIONS OFF) +set(CMAKE_INCLUDE_CURRENT_DIR ON) +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) set( sirikali.pkexecSRC main.cpp zulupolkit.cpp ) -find_package( Qt5 COMPONENTS Core Network REQUIRED ) +if(BUILD_WITH_QT6) + find_package( Qt6 COMPONENTS Core Network REQUIRED ) +else() + find_package( Qt5 COMPONENTS Core Network REQUIRED ) +endif() INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ) @@ -33,10 +41,10 @@ add_executable( sirikali.pkexec ${sirikali.pkexecMOC} ${sirikali.pkexecSRC} ) set_target_properties( sirikali.pkexec PROPERTIES COMPILE_FLAGS "-Wextra -Wall -s -fPIC -pedantic" ) -if( QT5 ) - target_link_libraries( sirikali.pkexec ${Qt5Core_LIBRARIES} ${Qt5Network_LIBRARIES} mhogomchungu_task -Wl,-znow ) +if(BUILD_WITH_QT6) + target_link_libraries( sirikali.pkexec ${Qt6Core_LIBRARIES} ${Qt6Network_LIBRARIES} mhogomchungu_task -Wl,-znow ) else() - target_link_libraries( sirikali.pkexec ${QT_LIBRARIES} ${QT_NETWORK} mhogomchungu_task -Wl,-znow ) + target_link_libraries( sirikali.pkexec ${Qt5Core_LIBRARIES} ${Qt5Network_LIBRARIES} mhogomchungu_task -Wl,-znow ) endif() install( TARGETS sirikali.pkexec RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) diff --git a/src/win.cpp b/src/win.cpp index a4c5857e..4e57e7e1 100644 --- a/src/win.cpp +++ b/src/win.cpp @@ -98,7 +98,7 @@ static QByteArray _reg_get_value( HKEY hkey,const char * key ) auto e = reinterpret_cast< BYTE * >( buffer.data() ) ; auto m = static_cast< DWORD >( buffer.size() ) ; - if( RegQueryValueEx( hkey,key,nullptr,&dwType,e,&m ) == ERROR_SUCCESS ){ + if( RegQueryValueExA( hkey,key,nullptr,&dwType,e,&m ) == ERROR_SUCCESS ){ return { buffer.data(),static_cast< int >( m ) } ; } @@ -116,19 +116,19 @@ static QString _readRegistry( const char * subKey,const char * key ) static auto _msg( DWORD err ) { - TCHAR * s = nullptr ; + char * s = nullptr ; DWORD flags = FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS | FORMAT_MESSAGE_ALLOCATE_BUFFER ; - auto m = FormatMessage( flags, + auto m = FormatMessageA( flags, nullptr, err, MAKELANGID( LANG_NEUTRAL,SUBLANG_DEFAULT ), - reinterpret_cast< TCHAR * >( &s ), + reinterpret_cast< char * >( &s ), 0, nullptr ) ; - return std::make_pair( m > 0,utility2::unique_ptr( s,[]( TCHAR * e ){ LocalFree( e ) ; } ) ) ; + return std::make_pair( m > 0,utility2::unique_ptr( s,[]( char * e ){ LocalFree( e ) ; } ) ) ; } QString lastError() @@ -157,11 +157,11 @@ static QString _errorMsg( DWORD err,const QString& path ) std::pair< bool,QString > driveHasSupportedFileSystem( const QString& path ) { - auto a = path.mid( 0,1 ).toLatin1()[ 0 ] ; + auto aa = path.mid( 0,1 ).toUtf8() ; - std::array< TCHAR,4 >rpath = { a,':','\\','\0' } ; + std::array< char,4 >rpath = { aa[ 0 ],':','\\','\0' } ; - std::array< TCHAR,MAX_PATH + 1 > fsname ; + std::array< char,MAX_PATH + 1 > fsname ; std::fill( fsname.begin(),fsname.end(),'\0' ) ;