Skip to content

Assorted build updates#1230

Merged
jkbonfield merged 3 commits intosamtools:developfrom
daviesrob:build-updates
Feb 15, 2021
Merged

Assorted build updates#1230
jkbonfield merged 3 commits intosamtools:developfrom
daviesrob:build-updates

Conversation

@daviesrob
Copy link
Copy Markdown
Member

Small updates for build / release:

  • Update .gitattributes to keep .cirrus.yml out of release tar files
  • Add targets to htslib.mk so HTSlib's distclean and check / test can be run from packages that embed it (e.g. SAMtools / BCFtools).
  • Clarify that the htscodecs submodule is part of htslib in messages printed when it's missing, so it's easier to see what needs to be updated when building SAMtools / BCFtools with HTSlib embedded. Fixes htscodecs submodule need to run make samtools#1364.

So distclean-all, check-all and test-all targets can be added
to samtools/bcftools build systems.
The original message printed when the submodule files are not
present could be confusing if HTSlib was being built as an
embedded part of SAMtools.  Alter the message slightly to make
it clearer that the submodule needs to be updated in the htslib
checkout.

Fixes samtools/samtools#1364
# clean: clean-htslib

all-htslib clean-htslib install-htslib plugins-htslib:
all-htslib check-htslib clean-htslib distclean-htslib install-htslib plugins-htslib test-htslib:
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Should we also have check-all test-all and distclean-all targets, in a similar vein to clean-all?
"distclean-all" is the one I miss the most when testing releases.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Those would need to be added to the samtools and bcftools Makefiles. The parts here are the bits that they reference and need to be in place first.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Ah yes my mistake.

@jkbonfield jkbonfield merged commit 550c6b1 into samtools:develop Feb 15, 2021
@daviesrob daviesrob deleted the build-updates branch February 17, 2021 16:02
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.

htscodecs submodule need to run make

2 participants