Skip to content

Commit 7c16b56

Browse files
committed
Release 1.10
2 parents 1832d3a + 128c0e3 commit 7c16b56

File tree

200 files changed

+25567
-6245
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

200 files changed

+25567
-6245
lines changed

.appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ build_script:
3030
- set HOME=.
3131
- set MSYSTEM=MINGW64
3232
- set PATH=C:/msys64/usr/bin;C:/msys64/mingw64/bin;%PATH%
33-
- "sh -lc \"aclocal && autoheader && autoconf && ./configure && make -j2\""
33+
- "sh -lc \"aclocal && autoheader && autoconf && ./configure --enable-werror CFLAGS='-g -O3' && make -j2\""
3434

3535
#build_script:
3636
# - make
3737

3838
test_script:
39-
- "sh -lc \"make test\""
39+
- "sh -lc \"make test-shlib-exports && make test\""

.gitignore

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
*.dSYM
55
*.exe
66
*.dll
7+
*.dll.a
78
*.pc.tmp
89
*-uninstalled.pc
910
/version.h
@@ -22,6 +23,7 @@ hfile_*.cygdll
2223
hfile_*.dll
2324
hfile_*.so
2425

26+
hts-object-files
2527
htslib_static.mk
2628

2729
cyg*.dll
@@ -31,24 +33,33 @@ lib*.dylib
3133
lib*.so
3234
lib*.so.*
3335

36+
header-exports.txt
37+
shlib-exports-*.txt
38+
3439
/bgzip
3540
/htsfile
3641
/tabix
3742
/test/fieldarith
3843
/test/hfile
3944
/test/hts_endian
45+
/test/longrefs/*.tmp.*
46+
/test/pileup
4047
/test/sam
4148
/test/tabix/*.tmp.*
4249
/test/tabix/FAIL*
4350
/test/test-bcf-sr
4451
/test/test-bcf-translate
4552
/test/test_bgzf
53+
/test/test_index
54+
/test/test_kstring
55+
/test/test-parse-reg
4656
/test/test_realn
4757
/test/test-regidx
58+
/test/test_str2int
4859
/test/test-vcf-api
4960
/test/test-vcf-sweep
5061
/test/test_view
51-
/test/thrash_threads[1-6]
62+
/test/thrash_threads[1-7]
5263
/test/*.tmp
5364
/test/*.tmp.*
5465

.travis.yml

Lines changed: 77 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,96 @@
11
# Control file for continuous integration testing at http://travis-ci.org/
22

33
language: c
4-
compiler:
5-
- clang
6-
- gcc
7-
8-
os:
9-
- linux
10-
- osx
11-
12-
env:
13-
- USE_CONFIG=no
14-
- USE_CONFIG=yes
154

165
matrix:
176
include:
187
- compiler: gcc
198
os: linux
20-
env: USE_CONFIG=yes USE_LIBDEFLATE=yes
9+
env: DO_MAINTAINER_CHECKS=yes USE_CONFIG=no
10+
11+
- compiler: gcc-8
12+
os: linux
13+
env: USE_CONFIG=yes CC=gcc-8 AR=gcc-ar-8
14+
addons:
15+
apt:
16+
sources:
17+
- ubuntu-toolchain-r-test
18+
packages:
19+
- gcc-8
20+
21+
# An optimised build with address and leak checking, also using libdeflate
22+
- compiler: gcc-8
23+
os: linux
24+
dist: xenial
25+
env: USE_CONFIG=yes USE_LIBDEFLATE=yes CC=gcc-8 AR=gcc-ar-8 CFLAGS="-g -Wall -O3 -fsanitize=address" LDFLAGS="-fsanitize=address"
26+
addons:
27+
apt:
28+
sources:
29+
- ubuntu-toolchain-r-test
30+
packages:
31+
- gcc-8
32+
33+
- compiler: clang
34+
os: osx
35+
env: USE_CONFIG=no
36+
37+
- compiler: clang
38+
os: osx
39+
env: USE_CONFIG=yes
40+
2141
- compiler: clang
2242
os: osx
2343
env: USE_CONFIG=yes USE_LIBDEFLATE=yes
2444

25-
# For linux systems
26-
addons:
27-
apt:
28-
packages:
29-
- liblzma-dev
30-
- libbz2-dev
45+
- compiler: gcc
46+
os: linux
47+
env: USE_CONFIG=yes
48+
49+
- compiler: clang
50+
os: linux
51+
env: USE_CONFIG=yes
52+
53+
- compiler: gcc
54+
os: linux
55+
env: CFLAGS="-std=c99 -pedantic" USE_CONFIG=yes
3156

3257
# For MacOSX systems
3358
before_install:
34-
- if [[ "$TRAVIS_OS_NAME" == "osx" && "$USE_CONFIG" == "no" ]]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install xz || ( brew update && brew install xz ); fi
59+
- |
60+
if [[ "$TRAVIS_OS_NAME" == "osx" && "$USE_CONFIG" == "no" ]]; then
61+
HOMEBREW_NO_AUTO_UPDATE=1 brew install xz || ( brew update && brew install xz )
62+
fi
3563
3664
before_script:
37-
- if test "x$USE_LIBDEFLATE" == "xyes" ; then ( cd "$HOME" && git clone --depth 1 https://github.com/ebiggers/libdeflate.git && cd libdeflate && make -j 2 CFLAGS='-fPIC -O3' libdeflate.a ); fi
65+
- |
66+
if test "x$USE_LIBDEFLATE" == "xyes"; then
67+
pushd "$HOME" && \
68+
git clone --depth 1 https://github.com/ebiggers/libdeflate.git && \
69+
pushd libdeflate && \
70+
make -j 2 CFLAGS='-fPIC -O3' libdeflate.a && \
71+
popd && \
72+
popd
73+
fi
3874
3975
script:
40-
- if test "x$USE_LIBDEFLATE" = "xyes" ; then CONFIG_OPTS='CPPFLAGS="-I$HOME/libdeflate" LDFLAGS="-L$HOME/libdeflate" --with-libdeflate' ; else CONFIG_OPTS='--without-libdeflate' ; fi
41-
- if test "$USE_CONFIG" = "yes" ; then autoreconf && eval ./configure $CONFIG_OPTS || { cat config.log ; false ; } ; fi && make -j 2 -e && make test
76+
- |
77+
if test "x$USE_LIBDEFLATE" = "xyes"; then
78+
CONFIG_OPTS='CPPFLAGS="-I$HOME/libdeflate" LDFLAGS="$LDFLAGS -L$HOME/libdeflate" --with-libdeflate'
79+
else
80+
CONFIG_OPTS='--without-libdeflate'
81+
fi
82+
- |
83+
if test "$USE_CONFIG" = "yes"; then
84+
MAKE_OPTS= ;
85+
autoreconf && \
86+
eval ./configure --enable-werror $CONFIG_OPTS CFLAGS=\"-g -O3 $CFLAGS\" || \
87+
( cat config.log; false )
88+
else
89+
MAKE_OPTS=-e
90+
fi && \
91+
if test "x$DO_MAINTAINER_CHECKS" = "xyes"; then
92+
make maintainer-check
93+
fi && \
94+
make -j 2 $MAKE_OPTS && \
95+
make test-shlib-exports && \
96+
make test

LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ according to the terms of the following MIT/Expat license.]
33

44
The MIT/Expat License
55

6-
Copyright (C) 2012-2018 Genome Research Ltd.
6+
Copyright (C) 2012-2019 Genome Research Ltd.
77

88
Permission is hereby granted, free of charge, to any person obtaining a copy
99
of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,7 @@ according to the terms of the following Modified 3-Clause BSD license.]
2929

3030
The Modified-BSD License
3131

32-
Copyright (C) 2012-2018 Genome Research Ltd.
32+
Copyright (C) 2012-2019 Genome Research Ltd.
3333

3434
Redistribution and use in source and binary forms, with or without
3535
modification, are permitted provided that the following conditions are met:

0 commit comments

Comments
 (0)