Skip to content

Travis: switch sof/doc sub-build to Ninja#215

Merged
lgirdwood merged 1 commit intothesofproject:masterfrom
marc-hb:ninja-doxygen
Apr 8, 2020
Merged

Travis: switch sof/doc sub-build to Ninja#215
lgirdwood merged 1 commit intothesofproject:masterfrom
marc-hb:ninja-doxygen

Conversation

@marc-hb
Copy link
Collaborator

@marc-hb marc-hb commented Apr 8, 2020

Since commit a97756a was merged, Travis shows the following harmless but
misleading message:

 # To build doxygen APIs too run this first:
 #   cmake -GNinja -S ../sof/doc -B ../sof/doc

Example: https://travis-ci.org/github/thesofproject/sof-docs/builds/670800271

That's because the sof-docs documentation and sof-docs/Makefile now
expect a sof/doc/ninja.build. So switch sof-docs/.travis.yml away from
Make and to ninja.

In the future we'll probably want cmake -S sof/doc to use a separate
-B build directory. One thing at a time.

Signed-off-by: Marc Herbert marc.herbert@intel.com

@marc-hb marc-hb force-pushed the ninja-doxygen branch 3 times, most recently from 5e49ba6 to b7014cd Compare April 8, 2020 02:53
Since commit a97756a was merged, Travis shows the following harmless but
misleading message:

 # To build doxygen APIs too run this first:
 #   cmake -GNinja -S ../sof/doc -B ../sof/doc

Example: https://travis-ci.org/github/thesofproject/sof-docs/builds/670800271

That's because the sof-docs documentation and sof-docs/Makefile now
expect a sof/doc/ninja.build. Stop invoking make and let the main build
invoke ninja

In the future we'll probably want cmake -S sof/doc to use a separate
-B build directory. One thing at a time.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
@marc-hb marc-hb marked this pull request as ready for review April 8, 2020 03:36
@marc-hb marc-hb requested a review from xiulipan April 8, 2020 03:37
@marc-hb
Copy link
Collaborator Author

marc-hb commented Apr 8, 2020

See also thesofproject/sof#2741

@lgirdwood lgirdwood merged commit 40df138 into thesofproject:master Apr 8, 2020
@marc-hb marc-hb deleted the ninja-doxygen branch April 9, 2020 18:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants