Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2024-11-22 07:35:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove platform arguments, update Travis & AppVeyor to use clang+llvm 6.0.0

Browse Source 
Close #509
This commit is contained in:
Fangrui Song 2018-03-11 21:48:05 -07:00
parent 3a752a3c8f
commit cebd6bb7c7
5 changed files with 6 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.appveyor.yml
View File

@ -26,9 +26,9 @@ build_script:
python waf configure --msvc_version="msvc 15.0" python waf configure --msvc_version="msvc 15.0"
python waf build python waf build
mkdir "${dir}\build\release\bin" -ea 0 mkdir "${dir}\build\release\bin" -ea 0
mkdir "${dir}\build\release\lib\LLVM-5.0.1-win64\lib\clang\5.0.1\" mkdir "${dir}\build\release\lib\LLVM-6.0.0-win64\lib\clang\6.0.0\"
copy "build\release\bin\*" "${dir}\build\release\bin" copy "build\release\bin\*" "${dir}\build\release\bin"
copy -recurse "build\LLVM-5.0.1-win64\lib\clang\5.0.1\include" "${dir}\build\release\lib\LLVM-5.0.1-win64\lib\clang\5.0.1\" copy -recurse "build\LLVM-6.0.0-win64\lib\clang\6.0.0\include" "${dir}\build\release\lib\LLVM-6.0.0-win64\lib\clang\6.0.0\"
7z a -tzip "C:\projects\cquery\${dir}.zip" "${dir}" 7z a -tzip "C:\projects\cquery\${dir}.zip" "${dir}"
} Else { } Else {
C:\msys64\usr\bin\bash -lc @' C:\msys64\usr\bin\bash -lc @'
@ -45,5 +45,5 @@ artifacts:
- path: 'cquery-*.zip' - path: 'cquery-*.zip'
cache: cache:
- C:\projects\cquery\build\LLVM-5.0.1-win64.exe - C:\projects\cquery\build\LLVM-6.0.0-win64.exe
- C:\projects\cquery\build\LLVM-5.0.1-win64\ - C:\projects\cquery\build\LLVM-6.0.0-win64\

4
.travis.yml
View File

@ -26,8 +26,8 @@ os: linux
cache: cache:
directories: directories:
- build/clang+llvm-5.0.1-x86_64-linux-gnu-ubuntu-14.04/ - build/clang+llvm-6.0.0-x86_64-linux-gnu-ubuntu-14.04/
- build/clang+llvm-5.0.1-x86_64-apple-darwin/ - build/clang+llvm-6.0.0-x86_64-apple-darwin/
matrix: matrix:
fast_finish: true fast_finish: true

4
src/platform_posix.cc
View File

@ -259,10 +259,6 @@ bool IsSymLink(const std::string& path) {
return lstat(path.c_str(), &buf) == 0 && S_ISLNK(buf.st_mode); return lstat(path.c_str(), &buf) == 0 && S_ISLNK(buf.st_mode);
} }
std::vector<const char*> GetPlatformClangArguments() {
return {};
}
void FreeUnusedMemory() { void FreeUnusedMemory() {
#if defined(__GLIBC__) #if defined(__GLIBC__)
malloc_trim(0); malloc_trim(0);

15
src/platform_win.cc
View File

@ -129,21 +129,6 @@ bool IsSymLink(const std::string& path) {
return false; return false;
} }
std::vector<const char*> GetPlatformClangArguments() {
//
// Found by executing
//
// $ clang++ -E -x c++ - -v
//
// https://clang.llvm.org/docs/MSVCCompatibility.html
// clang-format off
return {
"-fms-extensions", "-fms-compatibility", "-fdelayed-template-parsing"
};
// clang-format on
}
void FreeUnusedMemory() {} void FreeUnusedMemory() {}
bool RunObjectiveCIndexTests() { bool RunObjectiveCIndexTests() {

8
src/project.cc
View File

@ -27,8 +27,6 @@
#include <unordered_set> #include <unordered_set>
#include <vector> #include <vector>
extern bool gTestOutputMode;
struct CompileCommandsEntry { struct CompileCommandsEntry {
std::string directory; std::string directory;
std::string file; std::string file;
@ -195,12 +193,6 @@ Project::Entry GetCompilationEntryFromCompileCommandEntry(
if (!AnyStartsWith(args, "-working-directory")) if (!AnyStartsWith(args, "-working-directory"))
result.args.emplace_back("-working-directory=" + entry.directory); result.args.emplace_back("-working-directory=" + entry.directory);
if (!gTestOutputMode) {
std::vector<const char*> platform = GetPlatformClangArguments();
for (auto arg: platform)
result.args.push_back(arg);
}
bool next_flag_is_path = false; bool next_flag_is_path = false;
bool add_next_flag_to_quote_dirs = false; bool add_next_flag_to_quote_dirs = false;
bool add_next_flag_to_angle_dirs = false; bool add_next_flag_to_angle_dirs = false;