Skip to content

Commit d0d5ff6

Browse files
committedJan 9, 2016
Merge remote-tracking branch 'origin' into codedb
2 parents 2f8dac4 + 648a80c commit d0d5ff6

File tree

448 files changed

+9352
-6418
lines changed

Some content is hidden

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

448 files changed

+9352
-6418
lines changed
 

‎.travis.yml

+38-34
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,58 @@
11
language: cpp
2-
32
compiler:
4-
- gcc
5-
- clang
6-
3+
- clang
74
before_install:
8-
- echo $LANG
9-
- echo $LC_ALL
10-
- if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update && sudo apt-get install -y llvm-3.4 llvm-3.4-dev; fi
11-
- if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install llvm && brew link --force llvm; fi
12-
- rvm use $RVM --install --binary --fuzzy
13-
- gem update --system
14-
- gem --version
15-
5+
- echo $LANG
6+
- echo $LC_ALL
7+
- if [ $TRAVIS_OS_NAME == linux ]; then ./scripts/llvm.sh; fi
8+
- if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install llvm35 && brew link --force llvm35; fi
9+
- rvm use $RVM --install --binary --fuzzy
10+
- gem update --system
11+
- gem --version
1612
before_script:
17-
- travis_retry bundle
18-
- if [ $TRAVIS_OS_NAME == linux ]; then travis_retry ./configure --llvm-config llvm-config-3.4; fi
19-
- if [ $TRAVIS_OS_NAME == osx ]; then travis_retry ./configure --llvm-config /usr/local/opt/llvm/bin/llvm-config; fi
20-
13+
- travis_retry bundle
14+
- if [ $TRAVIS_OS_NAME == linux ]; then travis_retry ./configure --llvm-config=./vendor/llvm/Release/bin/llvm-config; fi
15+
- if [ $TRAVIS_OS_NAME == osx ]; then travis_retry ./configure; fi
2116
script: rake ci
22-
2317
after_success:
24-
- if [ $TRAVIS_BRANCH == $TRAVIS_TAG ]; then rake deploy; fi
25-
18+
- if [ $TRAVIS_BRANCH == $TRAVIS_TAG ]; then ./scripts/deploy.sh all; fi
2619
branches:
2720
only:
28-
- master
29-
- 1.8.7
30-
- 2.2
31-
- /^v\d+\./
32-
21+
- master
22+
- 1.8.7
23+
- 2.2
24+
- "/^v\\d+\\./"
3325
notifications:
3426
email: false
3527
irc:
3628
channels:
37-
- "chat.freenode.net#rubinius"
29+
- chat.freenode.net#rubinius
3830
template:
39-
- "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}"
31+
- "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}"
4032
webhooks:
4133
urls:
42-
- https://webhooks.gitter.im/e/9502afd22ca6c8e85fb3
34+
- https://webhooks.gitter.im/e/9502afd22ca6c8e85fb3
4335
on_success: change
4436
on_failure: always
4537
on_start: always
46-
38+
matrix:
39+
exclude:
40+
- compiler: clang
41+
- os: linux
42+
- os: osx
43+
include:
44+
- env: RVM=rbx-2
45+
os: osx
46+
- env: RVM=2.2.0
47+
os: linux
48+
compiler: clang
4749
env:
48-
- RVM=2.0.0 LANG="en_US.UTF-8"
49-
50+
global:
51+
- LANG="en_US.UTF-8"
52+
- secure: olbok/GN6rOYvPnHBYWGz7giCoCdLFpT/7WSBHukYO3E0uNeqAUOOgW2BFOwCVWdSEJ/iTvJXZQ4qVZHX+6jRfvILZeGv+D2P93VdD8UFQRoTOfFC7esAo525s9fuKm9ehUGWZxlzGOBHHckky1jn6pEf8mlXAVM5e76dlH0fck=
53+
- secure: aqG9eB/PrzQ7XJQN6YX/00sNVvwSB77saxXQzguL2WFjAXB74h6168Hzq+awHtNX/vfOb6ta7fpWLHrA0D+gmZnvTR29VlP6nd0vs1tkdX1/jWbiBHjamRffp+NWVdKbJKYn5iLOGXcuUMOzY/opLKOdvxKZfkxGMxR2tTNLZUE=
54+
- secure: eElvNLjuFZAuixJdgom4Kv8RDziE4ArFcSEwYctvprMe/414CAaJcFkjQKg0RrJzAxZ51oGjdcZhEfmjNXcUU1gA5l++IdnlQm0x4kt8r7aql+q2geHzrrjhhwPujT9a8JNtXs6dHnbi+quNlxyVItWzeGJsjyhJzH8hxiFhCYI=
5055
os:
51-
- linux
52-
# - osx
53-
54-
osx_image: xcode61
56+
- linux
57+
- osx
58+
sudo: false

‎BSD_LICENSE

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
BSD 3-clause License
2+
3+
Copyright (c) 2007-2015, Evan Phoenix and contributors
4+
All rights reserved.
5+
6+
Redistribution and use in source and binary forms, with or without
7+
modification, are permitted provided that the following conditions are met:
8+
9+
* Redistributions of source code must retain the above copyright notice, this
10+
list of conditions and the following disclaimer.
11+
* Redistributions in binary form must reproduce the above copyright notice
12+
this list of conditions and the following disclaimer in the documentation
13+
and/or other materials provided with the distribution.
14+
* Neither the name of Rubinius nor the names of its contributors
15+
may be used to endorse or promote products derived from this software
16+
without specific prior written permission.
17+
18+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
19+
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
20+
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
22+
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
23+
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
24+
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
25+
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
26+
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
27+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

0 commit comments

Comments
 (0)
Failed to load comments.