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.

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

Use CMake's FindIconv (see #10887) #10888

Merged
merged 1 commit into from
May 25, 2024
Merged

Use CMake's FindIconv (see #10887) #10888

merged 1 commit into from
May 25, 2024

Conversation

Croydon
Copy link
Contributor

@Croydon Croydon commented May 22, 2024

By the way, I have found that the Windows CI is always ending up using the lib binary files in git, even though that the CI is installing libiconv via another way. Example CI log: https://github.com/doxygen/doxygen/actions/runs/9178874312/job/25239722835#step:25:110. I am not going to change anything there as I consider it off-topic. Generally, I don't think that those built libraries should be in git and used. There should be enough options nowadays to get libiconv on Windows installed.

I renamed winbuild -> deps/iconv_winbuild to make it clearer what it is about. I had to give it sub-directories to let standard CMake's FindIconv find the right library.

See also #10887

@Croydon Croydon marked this pull request as ready for review May 22, 2024 23:50
@albert-github albert-github added the install/build bug in the installation or build scripts label May 23, 2024
@albert-github
Copy link
Collaborator

albert-github commented May 23, 2024

Regarding:

There should be enough options nowadays to get libiconv on Windows installed.

In GitHub there is indeed the step:

    - name: Install libiconv (Windows)
      uses: suisei-cn/actions-download-file@v1
      with:
        url: "https://github.com/pffang/libiconv-for-Windows/releases/download/v1.16/libiconv-for-Windows_1.16.7z"
        target: .
      if: matrix.config.os == 'windows-latest'

a bit strange that this is not used but I also don't see that the file is expanded.
@doxygen any idea why?

I tried to manually download the mentioned file but didn't succeed so I cannot tell whether the file would be suitable for usage in the GitHub Actions. I'm not even sure whether the file exists ...

@Croydon Do you have other suggestions for places to find an up to date libiconv (which can be used for "normal" / non CI usage) ?

@Croydon you used the the fix with the number of the related issue, due to the "magic" of GitHub adds a link to the issue (good) but it also adds a link that will automatically close the issue when this proposed Pull Request is integrated:
image

doxygen leaves the issues open and will automatically close the issue with a new release , please remove this automatic closing "merge" link.

@Croydon Croydon changed the title Use CMake's FindIconv (fix #10887) Use CMake's FindIconv (see #10887) May 23, 2024
@Croydon
Copy link
Contributor Author

Croydon commented May 23, 2024

doxygen leaves the issues open and will automatically close the issue with a new release , please remove this automatic closing "merge" link.

Done. Thanks for pointing it out, have forgotten about it in the meantime.

I will comment on / look into the rest later.

@doxygen doxygen merged commit a4e48db into doxygen:master May 25, 2024
8 checks passed
@albert-github albert-github added bug fixed but not released Bug is fixed in github, but still needs to make its way to an official release labels May 26, 2024
@Croydon Croydon deleted the iconv branch May 31, 2024 03:22
@Croydon
Copy link
Contributor Author

Croydon commented Jun 12, 2024

Just for protocol, I have a WIP branch to improve CI overall, but I unearthed several bugs in packages providing dependencies in the process. I will probably return to work on that eventually, but it might be months.

For now, everything merged so far should be fine for Doxygen, so it isn't really time-sensitive.

@doxygen doxygen removed the fixed but not released Bug is fixed in github, but still needs to make its way to an official release label Aug 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug install/build bug in the installation or build scripts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants