Include Pyrogenesis.h and os_path.h where needed
ClosedPublic
Actions

Authored by linkmauve on Dec 18 2019, 3:23 PM.

Details

Reviewers

vladislavbelov

Commits

rP23321: Include Pyrogenesis.h and os_path.h where needed

Summary

These two headers were missing in various places, preventing build in some cases.

Test Plan

Build pyrogenesis.

Diff Detail

Repository

rP 0 A.D. Public Repository

Branch

include-missing-headers

Lint

Lint OK

Unit

No Unit Test Coverage

Build Status

Buildable 10420
Build 17815: Vulcan Build	Jenkins
Build 17814: Vulcan Build (Windows)	Jenkins
Build 17813: arc lint + arc unit

Event Timeline

linkmauve created this revision.Dec 18 2019, 3:23 PM

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/785/display/redirect

Successful build - Chance fights ever on the side of the prudent.

Linter detected issues:
Executing section Source...

source/ps/ModIo.h
|   1| /*·Copyright·(C)·2018·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2019" year instead of "2018"

source/ps/ModIo.h
|  50| »   std::map<std::string,·std::string>·properties;
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'std::map' is invalid C code. Use --std or --language to configure the language.

source/ps/Replay.h
|  33| class·IReplayLogger
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classIReplayLogger{' is invalid C code. Use --std or --language to configure the language.

source/ps/VisualReplay.h
|  30| namespace·VisualReplay
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'namespaceVisualReplay{' is invalid C code. Use --std or --language to configure the language.
Executing section JS...
Executing section cli...

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/1301/display/redirect

Harbormaster completed remote builds in B10359: Diff 10634.Dec 18 2019, 3:34 PM

vladislavbelov added a subscriber: vladislavbelov.Dec 20 2019, 1:02 AM

vladislavbelov added inline comments.

source/ps/ModIo.h
1	It needs to update the year.
source/ps/VisualReplay.h
23	Wrong order.

Add newline to split header sections.
Increment the copyright year.

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/807/display/redirect

Successful build - Chance fights ever on the side of the prudent.

Linter detected issues:
Executing section Source...

source/ps/ModIo.h
|  50| »   std::map<std::string,·std::string>·properties;
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'std::map' is invalid C code. Use --std or --language to configure the language.

source/ps/Replay.h
|  33| class·IReplayLogger
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classIReplayLogger{' is invalid C code. Use --std or --language to configure the language.

source/ps/VisualReplay.h
|  31| namespace·VisualReplay
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'namespaceVisualReplay{' is invalid C code. Use --std or --language to configure the language.
Executing section JS...
Executing section cli...

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/1323/display/redirect

Harbormaster completed remote builds in B10389: Diff 10664.Dec 20 2019, 11:57 AM

vladislavbelov added inline comments.Dec 21 2019, 1:34 AM

source/ps/ModIo.h
1	We didn't move to ranges yet - we need a discussion. So currently we use just one (last) year.
source/ps/VisualReplay.h
23	`l` < `s`, they're in the same section.

The rest of the patch looks good to me. I tested it on VS2015 on Windows 10.

Builds on (L)Ubuntu 18.04 with gcc.

Change include order again.
Change copyright year.

Successful build - Chance fights ever on the side of the prudent.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/828/display/redirect

Successful build - Chance fights ever on the side of the prudent.

Linter detected issues:
Executing section Source...

source/ps/VisualReplay.h
|  30| namespace·VisualReplay
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'namespaceVisualReplay{' is invalid C code. Use --std or --language to configure the language.

source/ps/ModIo.h
|  50| »   std::map<std::string,·std::string>·properties;
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'std::map' is invalid C code. Use --std or --language to configure the language.

source/ps/Replay.h
|  33| class·IReplayLogger
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Code 'classIReplayLogger{' is invalid C code. Use --std or --language to configure the language.
Executing section JS...
Executing section cli...

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/1344/display/redirect

Harbormaster completed remote builds in B10420: Diff 10697.Dec 21 2019, 2:11 PM

The patch looks good and not overhead. Since all includes provides used classes. I'm going to test and commit the patch.

This revision is now accepted and ready to land.Dec 26 2019, 3:58 PM

Closed by commit rP23321: Include Pyrogenesis.h and os_path.h where needed (authored by vladislavbelov). · Explain WhyJan 2 2020, 7:08 PM

This revision was automatically updated to reflect the committed changes.

vladislavbelov added a commit: rP23321: Include Pyrogenesis.h and os_path.h where needed.