Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build HTML tables and guides when building product specific content #1723

Merged

Conversation

mpreisler
Copy link
Member

make -j 4 rhel6 now also builds HTML guides and tables. The content only target is now make -j 4 rhel6-content.

This makes cmake more similar to the old system.

Martin Preisler added 5 commits February 24, 2017 14:44
When you use `make -j 4 rhel7` you build content, tables and guides.
When you use `make -j 4 rhel7-content` you only build the content XML
files.
It hints at which target they are coming from.
@mpreisler mpreisler added the Infrastructure Our content build system label Feb 24, 2017
@mpreisler mpreisler added this to the 0.1.32 milestone Feb 24, 2017
BUILD.md Outdated
`$ cmake ../`
`$ make -j4 rhel6-content # SCAP XML files for RHEL6
`$ make -j4 rhel6-guides # HTML guides for RHEL6
`$ make -j4 rhel6-tables # HTML tables for RHEL6
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

need closing ticks

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just noticed this as well, fixed

@shawndwells
Copy link
Member

works for me locally. will watch for jenkins to finish up and merge.

@mpreisler
Copy link
Member Author

The second jenkins run failed because of an issue I outlined here: OpenSCAP/openscap#687

I will work around it in cmake in a separate PR but I don't think it should block this PR. The jenkins run before that worked fine and the last commit just added missing ticks.

@mpreisler
Copy link
Member Author

#1724 fixes the jenkins issue for good.

@redhatrises redhatrises self-assigned this Feb 24, 2017
@redhatrises
Copy link
Contributor

Ack.

@redhatrises redhatrises merged commit f2971c3 into ComplianceAsCode:master Feb 24, 2017
@mpreisler mpreisler deleted the build_tables_as_a_dep_of_product branch February 24, 2017 23:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Infrastructure Our content build system
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants