Skip to content
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.

Sign up for GitHub

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

Jump to bottom

makepkg-git: use AsciiDoctor again #21

Merged
merged 8 commits into from
Sep 7, 2024
Merged

makepkg-git: use AsciiDoctor again #21

merged 8 commits into from
Sep 7, 2024

Commits on Aug 13, 2024

  1. minimal-sdk: now also need libpsl 

    ... because it's a new dependency of libcurl.

Ported-from-git-sdk-64: f76ce43 (minimal: now also need libpsl, 2022-12-21)
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    @dscho
    dscho committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    2cd83da View commit details
    Browse the repository at this point in the history

  2. minimal-sdk: (re-)include the ca-bundle.crt file 

    It was moved recently:
msys2/MINGW-packages#15143

This is yet another fall-out.

Ported-from-git-sdk-64: c1be5c8 (minimal: (re-)include the `ca-bundle.crt` file, 2023-01-21)
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    @dscho
    dscho committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    95bf689 View commit details
    Browse the repository at this point in the history

  3. minimal-sdk: include stat.exe, to support the Coverity Pipeline 

    At https://dev.azure.com/Git-for-Windows/git/_build?definitionId=35, Git
for Windows maintains automation that submits builds to Coverity for
security scanning.

We just switched that Pipeline to use a minimal SDK (because it really
does not need to spend 4 minutes, 500GB worth of downloaded Git objects
and 2GB worth of disk space, just to compile Git and pre-analyze it for
Coverity).

Among other problems, this uncovered the fact that the pretty basic
`stat.exe` utility was not included in the minimal SDK.

Now, Git's test suite seems to be fine, probably because 1) it runs via
Bash, which has `stat` as a built-in, or 2) errors might be ignored or
misinterpreted.

But let's just include `stat` in minimal SDK.

Ported-from-git-sdk-64: ed0213b (minimal-sdk: include `stat.exe`, to support the Coverity Pipeline, 2023-03-08)
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    @dscho
    dscho committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    a14ce0c View commit details
    Browse the repository at this point in the history

  4. minimal-sdk: fix unzip 

    The `unzip.exe` tool we are including in the minimal subset of Git for
Windows' SDK nowadays links to `msys-bz2-1.dll`, but that library was
not included.

Let's include it, and add a test that verifies that this tool works.

Ported-from-git-sdk-64: 994f67f (minimal-zip: fix `unzip`, 2023-03-08)
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    @dscho
    dscho committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    2f3fabb View commit details
    Browse the repository at this point in the history

  5. minimal-sdk: make Clang's gcc-compat functional 

    The `gcc.exe` provided by Clang needs another DLL that was not required
when `gcc.exe` really was GCC.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    @dscho
    dscho committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    0d5e711 View commit details
    Browse the repository at this point in the history

  6. makepkg-git: do include gettext and error_highlight 

    In msys2/MSYS2-packages@d7c37ffdadd, `gettext`
was identified as an incorrect dependency of the `xz` package and that
dependency was dropped.

As a consequence, Git for Windows no longer included `gettext`, which
uncovered a bug in the definition of the `makepkg-git` SDK artifact
where it relied on that implicit dependency instead of making it an
explicit requirement (because it is needed by `makepkg` and
`makepkg-mingw`).

Let's make it explicit that `gettext.exe` (and `xgettext.exe`) are to be
included in the `makepkg-git` SDK artifact.

While at it, also avoid the "`error_highlight' was not loaded." warning
when building Git for Windows' `mingw-w64-git-doc-html` package.

This addresses the previously-forgotten x86_64 part of
git-for-windows/git#4952; The i686 part of was
fixed by git-for-windows/build-extra#560
already.

Ported-from-git-sdk-64: a6f190c (makepkg-git: do include gettext and error_highlight, 2024-07-22)
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    @dscho
    dscho committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    84b845e View commit details
    Browse the repository at this point in the history

  7. makepkg-git: update superseded OpenSSL version 

    It is a bit strange that this seems to work in git-sdk-64, because in
git-sdk-arm64 `bsdtar.exe` fails to load, complaining about a missing
`msys-crypto-3.dll`.

It is the right thing to loosen the pattern anyway, though, so let's do
that.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    @dscho
    dscho committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    59d5d84 View commit details
    Browse the repository at this point in the history

  8. makepkg-git: use AsciiDoctor again 

    In #6, we switched
the `makepkg-git` SDK artifact in git-sdk-arm64 away from using
AsciiDoctor to using AsciiDoc instead. The reason was that the former
was not yet supported in the `clangarm64` packages in MSYS2.

In the meantime, AsciiDoctor is not only supported, but now also
required to build `mingw-w64-clang-aarch64-git`.

So let's adjust the `makepkg-git` sparse checkout definition
accordingly.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
    @dscho
    dscho committed Aug 13, 2024
    Configuration menu
    Copy the full SHA
    5345bf6 View commit details
    Browse the repository at this point in the history