Skip to content

VP1 Ninja Compatibility, master branch (2019.10.10.)

Attila Krasznahorkay requested to merge akraszna/athena:VP1NinjaComp-master-20191010 into master

While working on ATLINFR-3221 I ran into an old issue. That new Ninja versions are unable to build Athena in the master branch out of the box.

So I removed the duplicate .vp1 files from VP1AlgsBatch. These files exist in VP1UtilsBase as well, in exactly the same versions.

[tcsh][pcadp02]:athena > diff -ur graphics/VP1/VP1UtilsBase/share/ graphics/VP1/VP1AlgsBatch/share/
Only in graphics/VP1/VP1UtilsBase/share/: ATLAS-Logo-New_300pixels.png
Only in graphics/VP1/VP1AlgsBatch/share/: vp1batch
Only in graphics/VP1/VP1AlgsBatch/share/: vp1batch.py
[tcsh][pcadp02]:athena >

They made Ninja confused about where to install the files from during the build. (Remember that unlike GNU Make, Ninja sees all build steps of the entire project at once. That's why it detects such duplications, which make can't.)

Since VP1UtilsBase seems to be a "lower level" package, it seemed logical to keep the files in that one.

Cc-ing @rbianchi to let him know about the update.

Merge request reports