[PATCH] Update cppformat

[leper]

Currently we use 0.11 while the latest upstream version is 2.1.1 (naming scheme changed, so just 7 versions outdated).

​https://github.com/cppformat/cppformat/releases

Also see #3011 for some changes to the bundled version (that should be reapplied or dropped depending on the change (since some where done upstream in a similar/different way)). The remaining changes should be submitted upstream if applicable.

[fsincos]

The attached patches do the following:

cppformat: Update to version 2.1.0 (straight from Github).

cppformatmod: There were some compiler errors related to the isnan function, so I commented it out. This seems to have fixed the errors. It was only a dummy function and shouldn't be used on any sane system anyway.

The patched game compiled flawlessly, passed all tests and "survived" a test game on my system (Linux 4.5.0, GCC 5.3.1). Someone else needs to test this on Windows, OS X, *BSD though.

There are some FMT_THROW calls in there (which I didn't run into) which could be changed to print a warning, similar to patch 0006 from #3011.

[fsincos]

Update to version 2.1.0.

[Stan]

Looks like you forgot to merge your last two patches, don't know if it's intended.

[fsincos]

I wanted to keep the changes from the upstream version in a separate patch so it's easier to reapply / upstream whatever changes we make (especially for updating it in the future).

[Stan]

Ah yeah makes sense by the way you forgot the patch keyword =) I added it

[historic_bruno]

• I tested your patches with MSVC, and while the build succeeds, it's quite noisy:

  5>e:\devel\ps\source\third_party\cppformat\format.h(964): warning C4510: 'fmt::internal::DummyStream' : default constructor could not be generated
  5>          e:\devel\ps\source\third_party\cppformat\format.h(961) : see declaration of 'fmt::internal::DummyStream'
  5>e:\devel\ps\source\third_party\cppformat\format.h(964): warning C4610: struct 'fmt::internal::DummyStream' can never be instantiated - user defined constructor required
  

  Those appear frequently.

• It looks like our posix.h defines a conflicting isnan, can you just add an undef before the problematic line? If that works, it's a little cleaner than commenting it out.

• #3753 has a patch on cppformat to fix an MSVC error. The update doesn't solve the problem, but the patch still applies cleanly after yours.

[fsincos]

isnan conflict resolved (+- warnings on MSVC), workaround for another warning (d’après historic_bruno)

[Itms]

I rebased and completed the patch above, and would like to commit the result. I tested it on Windows, it should be tested on Linux too.

​https://github.com/na-Itms/0ad/tree/cppformat

Future work: #4148

[Itms]

Build fails currently on OSX. I'm taking a look at the issue on my virtual machine.

[elexis]

Moving to the Work In Progress milestone, since there is a patch asking for feedback, but since it is not strictly bound to a specific release.

[leper]

In 19884:

Fix undefined macro usage in cppformat.

This is quite noisy with -Wexpansion-to-defined in both clang 3.9 and gcc 7.
(Refs #3190 and #4148. Upstream might have fixed this, but somewhat clean build logs seem worth it.)

Reviewed By: echotangoecho
Differential Revision: ​https://code.wildfiregames.com/D680

[s0600204]

Without intending to step on any toes: I've got a git branch that builds on top of the changes of ​phab:D2613 and makes the jump straight to fmt 6.1.2 (which is the latest version at time of writing): ​https://github.com/s0600204/0ad/tree/fmt

Once D2613 is in, then if so desired I'll create a revision on Phabricator for consideration.

For linux: as fmt is available from linux distro repos, the build system now attempts to use that by default. This should work with any version of fmt from 4.0 upwards. However, for systems that don't have a recent enough version (see ​https://repology.org/project/fmt/versions), the minimum relevant source is bundled and can be compiled by passing --with-bundled-fmt to update-workspaces.sh.

For windows/osx: I don't have a system to test on, so some work there would be necessary. However, as said above, the relevant source is bundled, so it just be a case of tying into the respective build systems.

[Itms]

Hi s0600204, amazing job! I'll do my best to commit D2613: right now your rebase of it needs a fix, then I'll test manually on whatever slave Jenkins keeps failing on.

[Itms]

In 23562:

Update cppformat from v0.11.0 to v1.1.0, fixes #5646, refs #3190.
Use the opportunity to rename the lib from cppformat to fmt, refs #4148.

Patch By: adrian
Rebased By: s0600204
Differential Revision: ​https://code.wildfiregames.com/D2613

[s0600204]

In 24267:

Update (and debundle) fmt dependancy

We now support the most recent released version of fmt available (at the time
of committing).

As we no longer patch fmt to get it to work within pyrogenesis, this commit
also mostly removes its source from our code-tree (some headers are retained for
Windows builds).

If you are a user of...

Linux/BSD: You will now need to have fmt installed from your distribution's

package repository. The minimum supported version of fmt is 4.0.

OSX: The source is acquired and compiled (in build-osx-libs.sh),

then included and linked automatically.

Windows: The relevant header files are retained and, along with a pre-built

library, are the only things still bundled.

Accepted by: wraitii

Tested by:

• Freagarach (Lubuntu 18.04, fmt 4.0.0)
• Krinkle (MacOS 10.14, fmt 6.1.2)
• nephele (Alpine Linux)
• wraitii (MacOS 10.14)
• Nescio (Fedora 33, fmt 7.0.3)

Windows library files built by: Stan

Fixes: #3190
Differential Revision: ​https://code.wildfiregames.com/D2689