9 Commits
Author SHA1 Message Date
Ilmari Lauhakangas 5c4eeb28ba Update Ant in .winget files to point to 1.10.18
Switch to archive.apache.org for the URL as dlcdn does not retain old releases.

Change-Id: I295a1c8371ac543b73773749ba14e66671f8ced3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/210561
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2026-09-09 14:53:20 +02:00
Christian Lohmaier 709c16676a follow-up fix to the ant update in winget configuration files
ac3cd43c08 didn't adjust the checksum so
the admin step would fail, and also didn't adapt the user step to use
the new file.

Change-Id: I0d5133eb5e62ec0cb23c56a85dfee3eaa2779cea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/204319
Tested-by: Jenkins
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
2026-04-25 09:24:46 +02:00
Ilmari Lauhakangas ac3cd43c08 Update Ant download URL in .winget file to point to 1.10.17
For some reason, 1.10.15 has vanished from apache.org

Change-Id: Icca9314f5b0319db1ab7a68f5e14c26267edc6a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/203767
Tested-by: Jenkins
Reviewed-by: Jakub Trzebiatowski <ubap.dev@gmail.com>
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakangas@libreoffice.org>
2026-04-17 07:15:32 +02:00
Christian Lohmaier 92dcfb23ec winget config: avoid ubuntu2404.exe wrapper/add MediaPack (for Windows N)
…since that only is made available when installing wsl via the appstore.
Keep the call to the explicit cloud-init status --wait command since
other commands can prevent the cloud-init from being
processed/completed.

Media Libraries are unconditionally required for the build after
65d72f816a (Introduce Microsoft Media
Foundation APIs) at least when using --enable-mergedlibs

Also libfont-ttf-perl is no longer necessary since
6e93419f46 (check for the perl modules on
the windows side, not in the wsl-container)
and pkg-config since 29b930ae63 (enforce
pkgconf-2.4.3.exe on windows/error if not found)

Add gettext to allow building with translations

Additionally add a check whether a reboot is pending since winget
configure doesn't forward that info when installing components that need
it (there is a mechanism when it installs normal packages that ask for
reboot, but not for wsl install or the newly-added installation of the
MediaPack for Windows N)
Also add a note about the securityContext directive not being respected
by all states/why the admin one still needs to be separate and run with
admin privileges directly.

Change-Id: I3185c6cc45b9c801c8656273d2719ef77f739f75
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/201269
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
2026-03-20 15:14:42 +01:00
Christian Lohmaier 6210ab8ae3 remove git from VS modules (use winget copy instead matching wiki docs)
the versions differ now, and when you try to apply the configuration
from within git-bash the Visual Studio installation fails because it
wants to replace bash that is still-in-use.

Also fix a bug in the cloud-init config for the wsl container,
locked_passwd defaults to true in 24.04, and that effectively disables
the password, rendering sudo inoperable. (could still run
"wsl.exe -u root" to login as root and do admin tasks that way)

Alternatively the user could be reconfigured to allow for passwordless
sudo, but that's a matter of preference, I'm just personally so used to
always use sudo with password/it is a nice reminder to only change that
if you know what you're doing/that the container was installed for a
specific purpose and the user might want to install a second copy for
other stuff.

PS:
On Windows Server 2025 the installation using the ubuntu2404.exe alias
won't work/has to be done manually using
    wsl.exe --install --distribution Ubuntu-24.04
need some further testing whether that's wider change or specific to
Windows Server

Change-Id: Ie73fdd14cc692aa22e6bc1de5e7465ca60f8a0cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190970
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
2025-09-16 18:56:44 +02:00
Christian Lohmaier 50d699d04a winget configuration: let configure find pkgconf in PATH
when only specifying with filename only (not with full path),
it might be mistreated as C:/pkgconf-2.4.3.exe and then the
build breaks.
configure has in the meantime been changed to explicitly
search for the versioned executable on windows, so there's no
need to manually set PKG_CONFIG anymore

Change-Id: I88a2af433c934adac4f1e9d20954a14e56e6abe7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/190552
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
2025-09-03 15:22:56 +02:00
Christian Lohmaier 0a5b17c722 winget based setup: don't manually pull meson, use the build's copy
meson is available as an external module/it just needs to be extracted.
That simplifies quite a few things, not to mention a new bug where
specifying it like that would strip the slashes, so if it should be used
manually the mixed style path needs to be used.

Change-Id: Icc39db01c2bc484a64bea76ce68b7dfcb6e5d353
2025-08-25 23:11:33 +02:00
Christian Lohmaier b01838cce5 winget configuration: add pkgconf and meson
also securityContext: elevated directives so the the winget configure
step doesn't need to be done in Admin-shell. If run with regular user
permissions UAC will prompt.

ninja is part of CMake tools for Windows (that are part of a default
installation with recommended packages, but not in minimal workload)

Change-Id: I952fc7ac02142d537b2555c1f0e39a53032b96ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183806
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
2025-04-14 18:36:31 +02:00
Muhammad Danish b4fd0468f6 Make WinGet config files consistent with new recommendations
The new file naming conventions for WinGet configurations files are:

- Use the `.winget` extension instead of `.dsc.yaml`. This allows user to run the configuration directly
  from the file explorer.
- The configurations should be placed in a `.config` directory in the root of the repository.

Reference: https://learn.microsoft.com/en-us/windows/package-manager/configuration/create#file-naming-convention

This commit also removes `allowPrerelease: true` directive from the `Microsoft.WinGet.DSC` resource.
The Microsoft.WinGet.DSC module is GA (stable) so the directive is no longer needed.
See https://www.powershellgallery.com/packages/Microsoft.WinGet.DSC/

For reference, maintainers may see these recommendations enacted in the following Microsoft repositories:

- WinGet CLI: https://github.com/microsoft/winget-cli/tree/master/.config
- WinGet Packages: https://github.com/microsoft/winget-pkgs/tree/master/.config
- WinGet Create: https://github.com/microsoft/winget-create/tree/main/.config
- PowerToys: https://github.com/microsoft/PowerToys/tree/main/.config

Change-Id: Ib88598f5fb93b1bb0ed1b608e0d690c196cf9b80
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/182675
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
2025-03-12 14:37:59 +01:00