Merge pull request #541 from ryuichis/llvm-8

Sync up with LLVM 8; Remove Analytics

.gitignore

@@ -3,7 +3,6 @@ oclint-json-compilation-database/
 oclint-xcodebuild/
 
 # Third-party dependencies and build directory
-countly/
 googletest/
 llvm/
 build/

.travis.yml

@@ -3,62 +3,62 @@ language: cpp
 matrix:
  include:
  - os: linux
- dist: trusty
+ dist: xenial
  sudo: required
- env: BUILD="test" MODULE="core" COMPILER="gcc5"
+ env: BUILD="test" MODULE="core"
  - os: linux
- dist: trusty
+ dist: xenial
  sudo: required
- env: BUILD="test" MODULE="metrics" COMPILER="gcc5"
+ env: BUILD="test" MODULE="metrics"
  - os: linux
- dist: trusty
+ dist: xenial
  sudo: required
- env: BUILD="test" MODULE="rules" DEP="core metrics" COMPILER="gcc5"
+ env: BUILD="test" MODULE="rules" DEP="core metrics"
  - os: linux
- dist: trusty
+ dist: xenial
  sudo: required
- env: BUILD="test" MODULE="reporters" DEP="core" COMPILER="gcc5"
+ env: BUILD="test" MODULE="reporters" DEP="core"
  - os: linux
- dist: trusty
+ dist: xenial
  sudo: required
- env: BUILD="test" MODULE="driver" DEP="core" COMPILER="gcc5"
+ env: BUILD="test" MODULE="driver" DEP="core"
  - os: linux
- dist: trusty
+ dist: xenial
  sudo: required
- env: BUILD="build" COMPILER="gcc5"
+ env: BUILD="build"
  - os: linux
- dist: trusty
+ dist: xenial
  sudo: required
- env: BUILD="docgen" COMPILER="gcc5"
+ env: BUILD="docgen"
  - os: osx
- osx_image: xcode9.2
- env: BUILD="test" MODULE="core" COMPILER="apple9"
+ osx_image: xcode10.2
+ env: BUILD="test" MODULE="core"
  - os: osx
- osx_image: xcode9.2
- env: BUILD="test" MODULE="metrics" COMPILER="apple9"
+ osx_image: xcode10.2
+ env: BUILD="test" MODULE="metrics"
  - os: osx
- osx_image: xcode9.2
- env: BUILD="test" MODULE="rules" DEP="core metrics" COMPILER="apple9"
+ osx_image: xcode10.2
+ env: BUILD="test" MODULE="rules" DEP="core metrics"
  - os: osx
- osx_image: xcode9.2
- env: BUILD="test" MODULE="reporters" DEP="core" COMPILER="apple9"
+ osx_image: xcode10.2
+ env: BUILD="test" MODULE="reporters" DEP="core"
  - os: osx
- osx_image: xcode9.2
- env: BUILD="test" MODULE="driver" DEP="core" COMPILER="apple9"
+ osx_image: xcode10.2
+ env: BUILD="test" MODULE="driver" DEP="core"
  - os: osx
- osx_image: xcode9.2
- env: BUILD="build" COMPILER="apple9"
+ osx_image: xcode10.2
+ env: BUILD="build"
  - os: osx
- osx_image: xcode9.2
- env: BUILD="docgen" COMPILER="apple9"
+ osx_image: xcode10.2
+ env: BUILD="docgen"
 
 before_install:
-- if [ "$COMPILER" == "gcc5" ]; then
+- if [ "$TRAVIS_OS_NAME" == "linux" ]; then
  sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y;
  sudo apt-get update -q;
- sudo apt-get install gcc-5 g++-5 -y --allow-unauthenticated;
- 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;
+ sudo apt-get install gcc-7 g++-7 -y --allow-unauthenticated;
+ sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 50;
+ sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-7 50;
  fi
 - if [ "$TRAVIS_OS_NAME" == "osx" ]; then
  brew update;

oclint-core/LICENSE

@@ -1,5 +1,6 @@
 Copyright (C) 2010-2014 Longyi Qi and the OCLint project contributors.
 Copyright (C) 2015-2018 Ryuichi Laboratories and the OCLint project contributors.
+Copyright (C) 2019 Ryuichi Intellectual Property and the OCLint project contributors.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

oclint-core/cmake/OCLintConfig.cmake

@@ -24,8 +24,8 @@ ELSE()
 ENDIF()
 
 IF(APPLE)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden -mmacosx-version-min=10.12")
- SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -mmacosx-version-min=10.12")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden -mmacosx-version-min=10.14")
+ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -mmacosx-version-min=10.14")
 ENDIF()
 
 IF(OCLINT_BUILD_TYPE STREQUAL "Release")
@@ -38,7 +38,7 @@ ENDIF()
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 
-SET(OCLINT_VERSION_RELEASE "0.13.1")
+SET(OCLINT_VERSION_RELEASE "0.14")
 
 IF(LLVM_ROOT)
  IF(NOT EXISTS ${LLVM_ROOT}/include/llvm)
@@ -91,7 +91,7 @@ IF(TEST_BUILD)
  )
  LINK_DIRECTORIES(
  ${GOOGLETEST_BUILD}
- ${GOOGLETEST_BUILD}/gtest
+ ${GOOGLETEST_BUILD}/lib
  )
  SET(GTEST_LIBS gmock gtest)
 

oclint-core/lib/Version.cpp

@@ -4,5 +4,5 @@ using namespace oclint;
 
 std::string Version::identifier()
 {
- return "0.13.1";
+ return "0.14";
 }

oclint-core/test/VersionTest.cpp

@@ -8,7 +8,7 @@ using namespace oclint;
 
 TEST(VersionTest, VersionString)
 {
- EXPECT_THAT(Version::identifier(), StrEq("0.13.1"));
+ EXPECT_THAT(Version::identifier(), StrEq("0.14"));
 }
 
 int main(int argc, char **argv)

oclint-driver/CMakeLists.txt

@@ -15,18 +15,6 @@ LINK_DIRECTORIES(
  ${OCLINT_BUILD_DIR}/lib
  )
 
-IF((NOT NO_ANALYTICS) AND (NOT MINGW) AND (NOT DOC_GEN_BUILD) AND (NOT TEST_BUILD))
- # Analytics are only availble on Linux and macOS
- SET(CMAKE_CXX_FLAGS "-DCOUNTLY_ANALYTICS ${CMAKE_CXX_FLAGS}")
- INCLUDE_DIRECTORIES(${COUNTLY_SOURCE_DIR}/include)
- LINK_DIRECTORIES(${COUNTLY_BUILD_DIR}/lib)
- IF(APPLE)
- # use OpenSSL from Homebrew installation due to Apple deprecated its support
- INCLUDE_DIRECTORIES(/usr/local/opt/openssl/include)
- LINK_DIRECTORIES(/usr/local/opt/openssl/lib)
- ENDIF()
-ENDIF()
-
 INCLUDE_DIRECTORIES(${OCLINT_DRIVER_SOURCE_DIR}/include)
 
 ADD_SUBDIRECTORY(lib)
@@ -54,29 +42,13 @@ TARGET_LINK_LIBRARIES(oclint-${OCLINT_VERSION_RELEASE}
  clangStaticAnalyzerCore
  clangRewriteFrontend
  clangRewrite
+ clangCrossTU
+ clangIndex
  ${CLANG_LIBRARIES}
  ${REQ_LLVM_LIBRARIES}
  ${CMAKE_DL_LIBS}
  )
 
-IF((NOT NO_ANALYTICS) AND (NOT MINGW) AND (NOT DOC_GEN_BUILD) AND (NOT TEST_BUILD))
- IF(APPLE)
- TARGET_LINK_LIBRARIES(oclint-${OCLINT_VERSION_RELEASE}
- Countly
- /usr/local/opt/openssl/lib/libssl.a
- /usr/local/opt/openssl/lib/libcrypto.a
- )
- ELSE()
- FIND_LIBRARY(SSL_STATIC_LIB NAMES libssl.a)
- FIND_LIBRARY(CRYPTO_STATIC_LIB NAMES libcrypto.a)
- TARGET_LINK_LIBRARIES(oclint-${OCLINT_VERSION_RELEASE}
- Countly
- ${SSL_STATIC_LIB}
- ${CRYPTO_STATIC_LIB}
- )
- ENDIF()
-ENDIF()
-
 IF(TEST_BUILD)
  TARGET_LINK_LIBRARIES(oclint-${OCLINT_VERSION_RELEASE}
  ${PROFILE_RT_LIBS}

oclint-driver/LICENSE

@@ -1,5 +1,6 @@
 Copyright (C) 2010-2014 Longyi Qi and the OCLint project contributors.
 Copyright (C) 2015-2018 Ryuichi Laboratories and the OCLint project contributors.
+Copyright (C) 2019 Ryuichi Intellectual Property and the OCLint project contributors.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

oclint-driver/include/oclint/Options.h

@@ -32,7 +32,6 @@ namespace option
  bool enableGlobalAnalysis();
  bool enableClangChecker();
  bool allowDuplicatedViolations();
- bool disableAnalytics();
  bool enableVerbose();
 } // end namespace option
 } // end namespace oclint