Skip to content

Minor grammar corrections #378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Mar 16, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions windows/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ This is used to build packages for Windows systems.

# Instructions:

* Open `Huggle.nsi` and update the version of Huggle to current one
* Run powershell script `release.ps1`
* You can pick generator using `-cmake_generator`
* Open `Huggle.nsi` and update the version of Huggle to the current one
* Run the PowerShell script `release.ps1`
* You can pick a generator using `-cmake_generator`

By default, this script will try to use Visual Studio to compile Huggle. You may want to pass the parameter `-mingw true`.

We use MingW for the 32bit version of Huggle release builds because it has fewer dependencies than Visual Studio and works on more versions of Windows with no need to install any redistributable files from Microsoft.
We use MinGW for the 32-bit version of Huggle release builds because it has fewer dependencies than Visual Studio and works on more versions of Windows with no need to install any redistributable files from Microsoft.
48 changes: 24 additions & 24 deletions windows/release.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# the following conditions are met:

# 1. Redistributions of source code must retain
# the above copyright notice, this list
# the above copyright notice, this list
# of conditions and the following disclaimer.

# 2. Redistributions in binary form must reproduce the above copyright
Expand Down Expand Up @@ -202,29 +202,29 @@ cp .\build\huggle_core\Release\huggle_core.dll release
cp .\build\huggle_l10n\Release\huggle_l10n.dll release
cp ..\src\scripts\*.js release\extensions
# get the qt
cp ..\src\huggle_res\Resources\huggle.ico huggle.ico
cp ..\src\huggle_res\Resources\huggle.ico release
# missing Qt dll, bug in winqtdeploy :/
$path = Join-Path $qt_path 'bin'
$fileQt5 = 'Qt5Multimedia.dll'
$fileQt6 = 'Qt6Multimedia.dll'
if (Test-Path (Join-Path $path $fileQt5))
{
Copy-Item (Join-Path $path $fileQt5) 'release'
}
elseif (Test-Path (Join-Path $path $fileQt6))
{
Copy-Item (Join-Path $path $fileQt6) 'release'
}
else
{
Write-Error 'Neither Qt5Multimedia.dll nor Qt6Multimedia.dll was found.'
}
# Older SSL, used by Qt 5.10 and older
#cp $openssl_path\libssl32.dll release
#cp $openssl_path\bin\ssleay32.dll release
cp ..\src\huggle_res\Resources\huggle.ico huggle.ico
cp ..\src\huggle_res\Resources\huggle.ico release
# missing Qt dll, bug in winqtdeploy :/
$path = Join-Path $qt_path 'bin'
$fileQt5 = 'Qt5Multimedia.dll'
$fileQt6 = 'Qt6Multimedia.dll'

if (Test-Path (Join-Path $path $fileQt5))
{
Copy-Item (Join-Path $path $fileQt5) 'release'
}
elseif (Test-Path (Join-Path $path $fileQt6))
{
Copy-Item (Join-Path $path $fileQt6) 'release'
}
else
{
Write-Error 'Neither Qt5Multimedia.dll nor Qt6Multimedia.dll was found.'
}

# Older SSL, used by Qt 5.10 and older
#cp $openssl_path\libssl32.dll release
#cp $openssl_path\bin\ssleay32.dll release
#cp $openssl_path\bin\libeay32.dll release

# New SSL
Expand Down
Loading