Re: [PATCH] cmake: don't invoke msgfmt with --statistics
- From
- Phillip Wood <phillip.wood123@gmail.com>
- Date
- Dec 19, 2022, 15:00 UTC
- Message-ID
- <45d8d9fc-ca68-5902-0aa7-70034f8383ff@dunelm.org.uk>
- In-Reply-To
- <patch-1.1-0fa41115261-20221219T102205Z-avarab@gmail.com>
Hi Ævar
On 19/12/2022 10:26, Ævar Arnfjörð Bjarmason wrote:
Show 6 quoted lines
> In [1] I made the same change to our Makefile, let's follow-up and do > the same here. > > For "cmake" this is particularly nice with "-G Ninja", as before we'd > emit ~40 lines of overflowed progress bar output, but now it's only > the one line of "ninja"'s progress bar.
I don't really have a strong opinion either way on this but if it matches what we do in the Makefile than it sounds sensible.
Best Wishes
Phillip
Show 54 quoted lines
> 1. 2f12b31b746 (Makefile: don't invoke msgfmt with --statistics,
> 2021-12-17)
>
> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> ---
>
> This trivial fix is extracted from the ab/cmake-nix-and-ci topic which
> was ejected around the time of the release for that previous
> submission see [1], the range-diff is to that topic.
>
> I'm re-arranging and re-submitting topic more piecemeal. There were no
> outstanding issues or feedback with this part of it, so hopefully this
> can advance relatively quickly.
>
> I'll also submit some of the other uncontroversial bits today
> independently, none of which conflict with one another. Then once
> those have landed try to find some acceptable way forward for the
> later bits, which at that point will be easier to review.
>
> 1. https://lore.kernel.org/git/cover-v6-00.15-00000000000-20221206T001617Z-avarab@gmail.com/
>
> Range-diff:
> 1: fc190b379cd = 1: 0fa41115261 cmake: don't invoke msgfmt with --statistics
> 2: 1a11aa233a3 < -: ----------- cmake: use "-S" and "-B" to specify source and build directories
> 3: b9ddb5db1d3 < -: ----------- cmake: update instructions for portable CMakeLists.txt
> 4: 7b7850c00ee < -: ----------- cmake: don't copy chainlint.pl to build directory
> 5: 82ecb797915 < -: ----------- cmake: chmod +x the bin-wrappers/* & SCRIPT_{SH,PERL} & git-p4
> 6: 1f326944a07 < -: ----------- cmake & test-lib.sh: add a $GIT_SOURCE_DIR variable
> 7: 973c8038f54 < -: ----------- cmake: set "USE_LIBPCRE2" in "GIT-BUILD-OPTIONS" for test-lib.sh
> 8: b8448c7a8a6 < -: ----------- Makefile + test-lib.sh: don't prefer cmake-built to make-built git
> 9: 5135e40969e < -: ----------- test-lib.sh: support a "GIT_TEST_BUILD_DIR"
> 10: 65204463730 < -: ----------- cmake: optionally be able to run tests before "ctest"
> 11: e25992b16f1 < -: ----------- cmake: support GIT_TEST_OPTS, abstract away WIN32 defaults
> 12: 4905ce5321d < -: ----------- cmake: increase test timeout on Windows only
> 13: 6c6b530965d < -: ----------- cmake: only look for "sh" in "C:/Program Files" on Windows
> 14: 563f1b9b045 < -: ----------- cmake: copy over git-p4.py for t983[56] perforce test
> 15: 917a884eb65 < -: ----------- CI: add a "linux-cmake-test" to run cmake & ctest on linux
>
> contrib/buildsystems/CMakeLists.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
> index 2f6e0197ffa..8f8b6f375f7 100644
> --- a/contrib/buildsystems/CMakeLists.txt
> +++ b/contrib/buildsystems/CMakeLists.txt
> @@ -897,7 +897,7 @@ if(MSGFMT_EXE)
> foreach(po ${po_files})
> file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/po/build/locale/${po}/LC_MESSAGES)
> add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/po/build/locale/${po}/LC_MESSAGES/git.mo
> - COMMAND ${MSGFMT_EXE} --check --statistics -o ${CMAKE_BINARY_DIR}/po/build/locale/${po}/LC_MESSAGES/git.mo ${CMAKE_SOURCE_DIR}/po/${po}.po)
> + COMMAND ${MSGFMT_EXE} --check -o ${CMAKE_BINARY_DIR}/po/build/locale/${po}/LC_MESSAGES/git.mo ${CMAKE_SOURCE_DIR}/po/${po}.po)
> list(APPEND po_gen ${CMAKE_BINARY_DIR}/po/build/locale/${po}/LC_MESSAGES/git.mo)
> endforeach()
> add_custom_target(po-gen ALL DEPENDS ${po_gen})