Skip to content

Commit

Permalink
Merge pull request #369 from ryuichis/llvm-3.9.0
Browse files Browse the repository at this point in the history
Catching up with LLVM 3.9.0 final branch
  • Loading branch information
Ryuichi Saito committed Sep 2, 2016
2 parents 83d541f + 2f90258 commit 4c5d7dc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 2 additions & 0 deletions oclint-driver/lib/ConfigFile.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "oclint/ConfigFile.h"

#include <climits>

#include <llvm/Support/SourceMgr.h>
#include <llvm/Support/YAMLParser.h>

Expand Down
8 changes: 4 additions & 4 deletions oclint-scripts/oclintscripts/path.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ class url:
json_compilation_database = 'https://github.com/oclint/oclint-json-compilation-database.git'
xcodebuild = 'https://github.com/oclint/oclint-xcodebuild.git'

clang_prebuilt_binary_for_xcode_8 = 'http://clang-snapshots.oclint.org/llvm-3.9.0-dev-snapshot-mac-10.12-xcode-8-oclint-16.07.11.tar.gz'
clang_prebuilt_binary_for_xcode_7 = 'http://clang-snapshots.oclint.org/llvm-3.8.1-final-mac-10.11-xcode-7-oclint-16.07.11.tar.gz'
clang_prebuilt_binary_for_ubuntu_lts_14 = 'http://clang-snapshots.oclint.org/llvm-3.8.1-final-ubuntu-14.04-oclint-16.07.11.tar.gz'
clang_prebuilt_binary_for_ubuntu_lts_16 = 'http://clang-snapshots.oclint.org/llvm-3.8.1-final-ubuntu-16.04-oclint-16.07.11.tar.gz'
clang_prebuilt_binary_for_xcode_8 = 'http://clang-snapshots.oclint.org/llvm-3.9.0-dev-snapshot-mac-10.12-xcode-8-oclint-16.09.01.tar.gz'
clang_prebuilt_binary_for_xcode_7 = 'http://clang-snapshots.oclint.org/llvm-3.9.0-final-mac-10.11-xcode-7-oclint-16.09.01.tar.gz'
clang_prebuilt_binary_for_ubuntu_lts_14 = 'http://clang-snapshots.oclint.org/llvm-3.9.0-final-ubuntu-14.04-oclint-16.09.01.tar.gz'
clang_prebuilt_binary_for_ubuntu_lts_16 = 'http://clang-snapshots.oclint.org/llvm-3.9.0-final-ubuntu-16.04-oclint-16.09.01.tar.gz'

def cd(dir_path):
os.chdir(dir_path)
Expand Down
4 changes: 1 addition & 3 deletions oclint-scripts/oclintscripts/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,10 @@ def llvm_branches():
return [llvm_master_branch(), llvm_latest_release_branch()]

def llvm_default_branch():
if environment.is_xcode8():
return llvm_master_branch()
return llvm_latest_release_branch()

def llvm_master_branch():
return 'trunk'

def llvm_latest_release_branch():
return 'tags/RELEASE_381/final'
return 'tags/RELEASE_390/final'

0 comments on commit 4c5d7dc

Please sign in to comment.