Skip to content

Commit 49fdfbd

Browse files
committed
Relase 1.5: Solstice
2 parents 6c06833 + fba943d commit 49fdfbd

36 files changed

+821
-1320
lines changed

Makefile

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ HTSPREFIX =
9292
include htslib_vars.mk
9393

9494

95-
PACKAGE_VERSION = 1.4.1
95+
PACKAGE_VERSION = 1.5
9696
LIBHTS_SOVERSION = 2
9797

9898

@@ -175,9 +175,7 @@ LIBHTS_OBJS = \
175175
cram/pooled_alloc.o \
176176
cram/rANS_static.o \
177177
cram/sam_header.o \
178-
cram/string_alloc.o \
179-
cram/vlen.o \
180-
cram/zfio.o
178+
cram/string_alloc.o
181179

182180
PLUGIN_EXT =
183181
PLUGIN_OBJS =
@@ -292,13 +290,13 @@ cyghts-$(LIBHTS_SOVERSION).dll: $(LIBHTS_OBJS)
292290
bgzf.o bgzf.pico: bgzf.c config.h $(htslib_hts_h) $(htslib_bgzf_h) $(htslib_hfile_h) $(htslib_thread_pool_h) cram/pooled_alloc.h $(htslib_khash_h)
293291
errmod.o errmod.pico: errmod.c config.h $(htslib_hts_h) $(htslib_ksort_h)
294292
kstring.o kstring.pico: kstring.c config.h $(htslib_kstring_h)
295-
knetfile.o knetfile.pico: knetfile.c config.h $(htslib_knetfile_h)
293+
knetfile.o knetfile.pico: knetfile.c config.h $(htslib_hts_log_h) $(htslib_knetfile_h)
296294
hfile.o hfile.pico: hfile.c config.h $(htslib_hfile_h) $(hfile_internal_h) $(hts_internal_h) $(htslib_khash_h)
297295
hfile_gcs.o hfile_gcs.pico: hfile_gcs.c config.h $(htslib_hts_h) $(htslib_kstring_h) $(hfile_internal_h)
298296
hfile_libcurl.o hfile_libcurl.pico: hfile_libcurl.c config.h $(hfile_internal_h) $(htslib_hts_h) $(htslib_kstring_h)
299297
hfile_net.o hfile_net.pico: hfile_net.c config.h $(hfile_internal_h) $(htslib_knetfile_h)
300298
hfile_s3.o hfile_s3.pico: hfile_s3.c config.h $(hts_internal_h) $(hfile_internal_h) $(htslib_hts_h) $(htslib_kstring_h)
301-
hts.o hts.pico: hts.c config.h $(htslib_hts_h) $(htslib_bgzf_h) $(cram_h) $(htslib_hfile_h) version.h $(hts_internal_h) $(htslib_khash_h) $(htslib_kseq_h) $(htslib_ksort_h)
299+
hts.o hts.pico: hts.c config.h $(htslib_hts_h) $(htslib_bgzf_h) $(cram_h) $(hfile_internal_h) $(htslib_hfile_h) version.h $(hts_internal_h) $(htslib_khash_h) $(htslib_kseq_h) $(htslib_ksort_h)
302300
vcf.o vcf.pico: vcf.c config.h $(htslib_vcf_h) $(htslib_bgzf_h) $(htslib_tbx_h) $(htslib_hfile_h) $(hts_internal_h) $(htslib_khash_str2int_h) $(htslib_kstring_h) $(htslib_khash_h) $(htslib_kseq_h) $(htslib_hts_endian_h)
303301
sam.o sam.pico: sam.c config.h $(htslib_sam_h) $(htslib_bgzf_h) $(cram_h) $(hts_internal_h) $(htslib_hfile_h) $(htslib_khash_h) $(htslib_kseq_h) $(htslib_kstring_h) $(htslib_hts_endian_h)
304302
tbx.o tbx.pico: tbx.c config.h $(htslib_tbx_h) $(htslib_bgzf_h) $(hts_internal_h) $(htslib_khash_h)
@@ -320,20 +318,18 @@ cram/cram_codecs.o cram/cram_codecs.pico: cram/cram_codecs.c config.h $(cram_h)
320318
cram/cram_decode.o cram/cram_decode.pico: cram/cram_decode.c config.h $(cram_h) $(cram_os_h) $(htslib_hts_h)
321319
cram/cram_encode.o cram/cram_encode.pico: cram/cram_encode.c config.h $(cram_h) $(cram_os_h) $(htslib_hts_h) $(htslib_hts_endian_h)
322320
cram/cram_external.o cram/cram_external.pico: cram/cram_external.c config.h $(htslib_hfile_h) $(cram_h)
323-
cram/cram_index.o cram/cram_index.pico: cram/cram_index.c config.h $(htslib_hfile_h) $(hts_internal_h) $(cram_h) $(cram_os_h) cram/zfio.h
321+
cram/cram_index.o cram/cram_index.pico: cram/cram_index.c config.h $(htslib_bgzf_h) $(htslib_hfile_h) $(hts_internal_h) $(cram_h) $(cram_os_h)
324322
cram/cram_io.o cram/cram_io.pico: cram/cram_io.c config.h $(cram_h) $(cram_os_h) $(htslib_hts_h) $(cram_open_trace_file_h) cram/rANS_static.h $(htslib_hfile_h) $(htslib_bgzf_h) $(htslib_faidx_h) $(hts_internal_h)
325323
cram/cram_samtools.o cram/cram_samtools.pico: cram/cram_samtools.c config.h $(cram_h) $(htslib_sam_h)
326324
cram/cram_stats.o cram/cram_stats.pico: cram/cram_stats.c config.h $(cram_h) $(cram_os_h)
327325
cram/files.o cram/files.pico: cram/files.c config.h $(cram_misc_h)
328-
cram/mFILE.o cram/mFILE.pico: cram/mFILE.c config.h $(cram_os_h) cram/mFILE.h cram/vlen.h
326+
cram/mFILE.o cram/mFILE.pico: cram/mFILE.c config.h $(cram_os_h) cram/mFILE.h
329327
cram/open_trace_file.o cram/open_trace_file.pico: cram/open_trace_file.c config.h $(cram_os_h) $(cram_open_trace_file_h) $(cram_misc_h) $(htslib_hfile_h)
330328
cram/pooled_alloc.o cram/pooled_alloc.pico: cram/pooled_alloc.c config.h cram/pooled_alloc.h $(cram_misc_h)
331329
cram/rANS_static.o cram/rANS_static.pico: cram/rANS_static.c config.h cram/rANS_static.h cram/rANS_byte.h
332330
cram/sam_header.o cram/sam_header.pico: cram/sam_header.c config.h $(cram_sam_header_h) cram/string_alloc.h
333331
cram/string_alloc.o cram/string_alloc.pico: cram/string_alloc.c config.h cram/string_alloc.h
334332
thread_pool.o thread_pool.pico: thread_pool.c config.h $(thread_pool_internal_h)
335-
cram/vlen.o cram/vlen.pico: cram/vlen.c config.h cram/vlen.h $(cram_os_h)
336-
cram/zfio.o cram/zfio.pico: cram/zfio.c config.h $(cram_os_h) cram/zfio.h
337333

338334

339335
bgzip: bgzip.o libhts.a
@@ -479,6 +475,7 @@ clean: mostlyclean clean-$(SHLIB_FLAVOUR)
479475
distclean maintainer-clean: clean
480476
-rm -f config.cache config.h config.log config.mk config.status
481477
-rm -f TAGS *.pc.tmp *-uninstalled.pc htslib_static.mk
478+
-rm -rf autom4te.cache
482479

483480
clean-so:
484481
-rm -f libhts.so libhts.so.*

NEWS

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
Noteworthy changes in release 1.5 (21st June 2017)
2+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3+
4+
* Added a new logging API: hts_log(), along with hts_log_error(),
5+
hts_log_warn() etc. convenience macros. Thanks go to Anders Kaplan
6+
for the implementation. (#499, #543, #551)
7+
8+
* Added a new file I/O option "block_size" (HTS_OPT_BLOCK_SIZE) to
9+
alter the hFILE buffer size.
10+
11+
* Fixed various bugs, including compilation issues samtools/bcftools#610,
12+
samtools/bcftools#611 and robustness to corrupted data #537, #538,
13+
#541, #546, #548, #549, #554.
14+
15+
116
Noteworthy changes in release 1.4.1 (8th May 2017)
217
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
318

0 commit comments

Comments
 (0)