Skip to content

Commit 5d17cbe

Browse files
author
Jeremiah Wala
committed
trying clang test
1 parent 2e8ceef commit 5d17cbe

File tree

2 files changed

+18
-66
lines changed

2 files changed

+18
-66
lines changed

.travis.yml

+8
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@ language: cpp
22

33
compiler:
44
- gcc
5+
- clang
56

67
env:
78
global:
9+
- BOOST_VERSION_MIN="1.59.0"
10+
- BOOST_VERSION_MAX="1.60.0" # List of required boost libraries to build"
11+
- BOOST_LIBS="test"
812
- secure: c7M47d76dYyjOsYiRWdJ7DaKyV6qo9tUk1l+QlSTX5AgfWGGIsI3eWxHrSid/b1PXTVCOQTBwJKlM13gNPO5kLEAxrT/Bl8rtFUQdBwqA5gZaY1Yyt7h51hRR9GADwUY4lmudLBiPRDp8Pd3WSiP+gOud7hA8U/AP0BPBfbhDkhvUC6GqvHzEp28NIHB0nhOv4r4yl7C2UeNk358ipDmYqs89m17TNTmbReYjqiaswYSkhCjikUT33QyDTLwl502NBRIJZpZZZ3imxorSM4A1uQmuq5Ggx4PyODgt8MpzH/bCHeamNFzYCi/JSh+MsuOv6tD6xsM9p1MzI5Fg7eQk+FtdmfQhgyTYjg24Ugyn0rrnu2i26FjLqkX3jqdgIldncoerJZly92+M0wRv4IrjjQLCrNLT2Wv4WRElKR5W2dRSnKBT/vIrfJQU9HwYPvISLS3yhpm9NcZnP09Mfoe3xU1mrWnSfbsbXAQ6tfQ14ysOD2/8RhxG3+0lLqS5s5DWefqtz1ouXviLKPcO08kdlcKgTkbh8nZPJNm8byh01tJe0DRPY7z6TJJRMdE/+Yz9VsKjxs9KautacdJmYruVL6AlHb97FlzhvQhaCU5LpOkw2wO5AHpFfgvaygWvi9RQksrr4AulnAcIE7aikcXJnpEqzgup3AyNzlVFu/s1Fo=
913
- secure: IR0O5HtMRDbEj0x7wHqXuLADszJcXLBUHeuMqm9K9oqzs0ne/ZAqNBODQVLvxAwcxsLRgiuBCuCTuJdalxusycZuAn5tD43RhAv6OhWIG4w+jh6elr2jmLsMb2VxTXto/VX1wQ4X9lLC4+q9p/vlZzIxwza8ZN//jGIlHNx7h896+euEIBy4F28yqk6Ua3V4Td5mg99uVWjiHeIiwIOmE+ClrYfdFXzLdWKDBmmkZTqPRfw16iVaSBKpkSd9rneQoKSyalFx0OGURADxabO1N5uTCRlK06JTx5220zma29w9BuhniaNmxbjf7gD1pcFZr7da7dZekKaxXy6d0nu/hci7UNsolti13a6bQCLj4AjxjY6GxGjX9dZxtjGvIPxiJKIDfQznwyfiaQYFhLb+Ieyv67lN6quDTuVuRdxxqnQprOz3JAvzTbyHatcKvvDfgWcxUGUCmOiLAWiQan8RuxZHt/+8kCQnySVGXmlGm0TbYwM2w99pMdwRCT6uQHyCKPH7cvnbFG+XHGSccDGazuzhHnRJLR2uz2dhDQ/dophTeNJugeaFSEFbO6lbLOBmoh+fD7ULWYFzXMjwMcv7kLqasGCHojp+Kya9foqj5hqwPTGQHllyfMFxDJWmytov2lc20rdZLT9H2sXriXHa0AtY5ZKvy9Y9tj5gO7YIvsE=
1014

@@ -18,10 +22,14 @@ before_install:
1822
- sudo update-alternatives --install /usr/bin/gcov gcov /usr/bin/gcov-4.8 20
1923
- sudo update-alternatives --config gcc
2024
- sudo update-alternatives --config g++
25+
- if [ "${TRAVIS_BRANCH}" = "master" ]; then export BOOST_VERSION="${BOOST_VERSION_MIN}"; else export BOOST_VERSION="${BOOST_VERSION_MAX}"; fi
26+
- if [ -n "${BOOST_VERSION}" ]; then export BOOST_ROOT="${TRAVIS_BUILD_DIR}/../boost-trunk"; export CMAKE_MODULE_PATH="${BOOST_ROOT}"; fi
2127
- if [ "${CXX}" = "g++" ]; then export CXX="$(which g++-4.8)"; export CC="$(which gcc-4.8)"; fi
2228
- if [ "${TRAVIS_OS_NAME}" = "osx" -a "${CXX}" = "clang++" ]; then export CXX="$(which c++)"; export CC="$(which cc)"; fi
2329

2430
script:
31+
- if [ "$CXX" == "clang++" ]; then .travis_scripts/clang.sh; fi
32+
- if [ "$CXX" == "g++" ]; then .travis_scripts/gcc.sh; fi
2533
- ./configure && make
2634

2735
after_success:

LICENSE

+10-66
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,13 @@
1-
[Files in this distribution outwith the cram/ subdirectory are distributed
2-
according to the terms of the following MIT/Expat license.]
1+
Copyright 2016 Jeremiah A. Wala
32

4-
The MIT/Expat License
3+
Licensed under the Apache License, Version 2.0 (the "License");
4+
you may not use this file except in compliance with the License.
5+
You may obtain a copy of the License at
56

6-
Copyright (C) 2012-2014 Genome Research Ltd.
7+
http://www.apache.org/licenses/LICENSE-2.0
78

8-
Permission is hereby granted, free of charge, to any person obtaining a copy
9-
of this software and associated documentation files (the "Software"), to deal
10-
in the Software without restriction, including without limitation the rights
11-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12-
copies of the Software, and to permit persons to whom the Software is
13-
furnished to do so, subject to the following conditions:
14-
15-
The above copyright notice and this permission notice shall be included in
16-
all copies or substantial portions of the Software.
17-
18-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
21-
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
23-
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
24-
DEALINGS IN THE SOFTWARE.
25-
26-
27-
[Files within the cram/ subdirectory in this distribution are distributed
28-
according to the terms of the following Modified 3-Clause BSD license.]
29-
30-
The Modified-BSD License
31-
32-
Copyright (C) 2012-2014 Genome Research Ltd.
33-
34-
Redistribution and use in source and binary forms, with or without
35-
modification, are permitted provided that the following conditions are met:
36-
37-
1. Redistributions of source code must retain the above copyright notice,
38-
this list of conditions and the following disclaimer.
39-
40-
2. Redistributions in binary form must reproduce the above copyright notice,
41-
this list of conditions and the following disclaimer in the documentation
42-
and/or other materials provided with the distribution.
43-
44-
3. Neither the names Genome Research Ltd and Wellcome Trust Sanger Institute
45-
nor the names of its contributors may be used to endorse or promote products
46-
derived from this software without specific prior written permission.
47-
48-
THIS SOFTWARE IS PROVIDED BY GENOME RESEARCH LTD AND CONTRIBUTORS "AS IS"
49-
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
50-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
51-
DISCLAIMED. IN NO EVENT SHALL GENOME RESEARCH LTD OR ITS CONTRIBUTORS BE LIABLE
52-
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
53-
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
54-
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
55-
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
56-
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
57-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
58-
59-
60-
[The use of a range of years within a copyright notice in this distribution
61-
should be interpreted as being equivalent to a list of years including the
62-
first and last year specified and all consecutive years between them.
63-
64-
For example, a copyright notice that reads "Copyright (C) 2005, 2007-2009,
65-
2011-2012" should be interpreted as being identical to a notice that reads
66-
"Copyright (C) 2005, 2007, 2008, 2009, 2011, 2012" and a copyright notice
67-
that reads "Copyright (C) 2005-2012" should be interpreted as being identical
68-
to a notice that reads "Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010,
69-
2011, 2012".]
9+
Unless required by applicable law or agreed to in writing, software
10+
distributed under the License is distributed on an "AS IS" BASIS,
11+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
See the License for the specific language governing permissions and
13+
limitations under the License.

0 commit comments

Comments
 (0)