Skip to content

Commit

Permalink
Merge pull request #463 from ryuichis/llvm-5.0.0
Browse files Browse the repository at this point in the history
Release 0.13
  • Loading branch information
ryuichis committed Sep 29, 2017
2 parents 7e91f69 + bf0715a commit 089e21e
Show file tree
Hide file tree
Showing 11 changed files with 27 additions and 13 deletions.
20 changes: 17 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,23 @@ before_install:
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 50;
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 50;
fi
- sudo pip install cpp-coveralls
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install ninja; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install ninja-build -y; fi
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then
brew update;
brew install pyenv;
eval "$(pyenv init -)";
pyenv install 2.7.6;
pyenv global 2.7.6;
pyenv rehash;
pip install cpp-coveralls;
pyenv rehash;
else
sudo pip install --upgrade cpp-coveralls;
fi
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then
brew install ninja;
else
sudo apt-get install ninja-build -y;
fi

script:
- cd oclint-scripts
Expand Down
2 changes: 1 addition & 1 deletion oclint-core/LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Copyright (C) 2010-2014 Longyi Qi and the OCLint project contributors.
Copyright (C) 2015-2017 Ryuichi Saito, LLC and the OCLint project contributors.
Copyright (C) 2015-2017 Ryuichi Laboratories and the OCLint project contributors.
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion oclint-core/cmake/OCLintConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ ENDIF()

SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)

SET(OCLINT_VERSION_RELEASE "0.13-rc2")
SET(OCLINT_VERSION_RELEASE "0.13")

IF(LLVM_ROOT)
IF(NOT EXISTS ${LLVM_ROOT}/include/llvm)
Expand Down
2 changes: 1 addition & 1 deletion oclint-core/lib/Version.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ using namespace oclint;

std::string Version::identifier()
{
return "0.13-rc2";
return "0.13";
}
2 changes: 1 addition & 1 deletion oclint-core/test/VersionTest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ using namespace oclint;

TEST(VersionTest, VersionString)
{
EXPECT_THAT(Version::identifier(), StrEq("0.13-rc2"));
EXPECT_THAT(Version::identifier(), StrEq("0.13"));
}

int main(int argc, char **argv)
Expand Down
2 changes: 1 addition & 1 deletion oclint-driver/LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Copyright (C) 2010-2014 Longyi Qi and the OCLint project contributors.
Copyright (C) 2015-2017 Ryuichi Saito, LLC and the OCLint project contributors.
Copyright (C) 2015-2017 Ryuichi Laboratories and the OCLint project contributors.
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion oclint-metrics/LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Copyright (C) 2010-2014 Longyi Qi and the OCLint project contributors.
Copyright (C) 2015-2017 Ryuichi Saito, LLC and the OCLint project contributors.
Copyright (C) 2015-2017 Ryuichi Laboratories and the OCLint project contributors.
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion oclint-reporters/LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Copyright (C) 2010-2014 Longyi Qi and the OCLint project contributors.
Copyright (C) 2015-2017 Ryuichi Saito, LLC and the OCLint project contributors.
Copyright (C) 2015-2017 Ryuichi Laboratories and the OCLint project contributors.
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion oclint-rules/LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Copyright (C) 2010-2014 Longyi Qi and the OCLint project contributors.
Copyright (C) 2015-2017 Ryuichi Saito, LLC and the OCLint project contributors.
Copyright (C) 2015-2017 Ryuichi Laboratories and the OCLint project contributors.
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion oclint-scripts/LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Copyright (C) 2010-2014 Longyi Qi and the OCLint project contributors.
Copyright (C) 2015-2017 Ryuichi Saito, LLC and the OCLint project contributors.
Copyright (C) 2015-2017 Ryuichi Laboratories and the OCLint project contributors.
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion oclint-scripts/oclintscripts/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def dev_version():
return "src"

def oclint_version():
return "0.13-rc2"
return "0.13"

def oclint_dev_version():
return oclint_version() + '.dev.' + dev_version()
Expand Down

0 comments on commit 089e21e

Please sign in to comment.