aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml74
-rw-r--r--cgrep.cpp4
-rw-r--r--makefile3
-rw-r--r--pch.hpp2
4 files changed, 44 insertions, 39 deletions
diff --git a/.travis.yml b/.travis.yml
index 8afe63b..d674cf4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,43 +25,43 @@ addons:
matrix:
fast_finish: true
include:
- #- dist: trusty
- #name: llvm5
- #sudo: required
- #language: cpp
- #before_script:
- #- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- #- sudo add-apt-repository ppa:fkrull/deadsnakes -y
- #- sudo apt-get update -y
- #- wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key|sudo apt-key add -
- #- echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main" | sudo tee -a /etc/apt/sources.list
- #- sudo apt-get update -qq
- #- travis_retry sudo apt-get install clang-5.0 libclang-5.0-dev libclang-common-5.0-dev libllvm5.0 llvm-5.0-dev llvm-5.0 llvm-5.0-runtime -y
- #- sudo apt-get install gcc-4.9 g++-4.9
- #- sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.9
- #- git submodule init
- #- git submodule update
- #script:
- #- make CXX=clang-5.0 LLVM_CONF=llvm-config-5.0
- #after_success:
- #bash run.sh
- #- dist: trusty
- #name: llvm6
- #sudo: required
- #language: cpp
- #before_script:
- #- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- #- sudo apt-get update -y
- #- wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key|sudo apt-key add -
- #- echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-6.0 main" | sudo tee -a /etc/apt/sources.list
- #- sudo apt-get update -qq
- #- travis_retry sudo apt-get install clang-6.0 libclang-6.0-dev libclang-common-6.0-dev libllvm6.0 llvm-6.0-dev llvm-6.0 llvm-6.0-runtime -y
- #- git submodule init
- #- git submodule update
- #script:
- #- make CXX=clang-6.0 LLVM_CONF=llvm-config-6.0
- #after_success:
- #./run.sh
+ - dist: trusty
+ name: llvm5
+ sudo: required
+ language: cpp
+ before_script:
+ - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+ - sudo add-apt-repository ppa:fkrull/deadsnakes -y
+ - sudo apt-get update -y
+ - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key|sudo apt-key add -
+ - echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-5.0 main" | sudo tee -a /etc/apt/sources.list
+ - sudo apt-get update -qq
+ - travis_retry sudo apt-get install clang-5.0 libclang-5.0-dev libclang-common-5.0-dev libllvm5.0 llvm-5.0-dev llvm-5.0 llvm-5.0-runtime -y
+ - sudo apt-get install gcc-4.9 g++-4.9
+ - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-4.9
+ - git submodule init
+ - git submodule update
+ script:
+ - make CXX=clang-5.0 LLVM_CONF=llvm-config-5.0
+ after_success:
+ - bash run.sh
+ - dist: trusty
+ name: llvm6
+ sudo: required
+ language: cpp
+ before_script:
+ - sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+ - sudo apt-get update -y
+ - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key|sudo apt-key add -
+ - echo "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-6.0 main" | sudo tee -a /etc/apt/sources.list
+ - sudo apt-get update -qq
+ - travis_retry sudo apt-get install clang-6.0 libclang-6.0-dev libclang-common-6.0-dev libllvm6.0 llvm-6.0-dev llvm-6.0 llvm-6.0-runtime -y
+ - git submodule init
+ - git submodule update
+ script:
+ - make CXX=clang-6.0 LLVM_CONF=llvm-config-6.0
+ after_success:
+ - ./run.sh
- dist: bionic
name: llvm7
sudo: required
diff --git a/cgrep.cpp b/cgrep.cpp
index fdf0323..12d667a 100644
--- a/cgrep.cpp
+++ b/cgrep.cpp
@@ -124,6 +124,7 @@ cl::opt<int> CO_B(
*
* @param path
*/
+#if 0
static void dig(std::string path) {
for (const auto &entry : std::filesystem::directory_iterator(path)) {
std::cout << entry.path() << "\n";
@@ -132,6 +133,7 @@ static void dig(std::string path) {
}
}
}
+#endif
/**
* @brief does some preprocessing on the regex string we get as input
@@ -784,9 +786,11 @@ int main(int argc, const char **argv) {
op.getSourcePathList();
ClangTool Tool(op.getCompilations(), op.getSourcePathList());
int ret = Tool.run(newFrontendActionFactory<AppFrontendAction>().get());
+#if 0
if ("" != CO_RECURSIVE) {
dig(CO_RECURSIVE);
}
+#endif
return ret;
}
/*************************************************************************************************/
diff --git a/makefile b/makefile
index f1374d8..e403348 100644
--- a/makefile
+++ b/makefile
@@ -17,7 +17,8 @@ else
endif
CXX_EXTRA?=
CTAGS_I_PATH?=./
-LD_FLAGS= -lstdc++fs
+#LD_FLAGS= -lstdc++fs
+LD_FLAGS=
EXTRA_LD_FLAGS?=
ADD_SANITIZERS_CC= -g -fsanitize=address -fno-omit-frame-pointer
ADD_SANITIZERS_LD= -g -fsanitize=address
diff --git a/pch.hpp b/pch.hpp
index e54a573..c3e90f7 100644
--- a/pch.hpp
+++ b/pch.hpp
@@ -18,4 +18,4 @@
#include <regex>
#include <string>
#include <vector>
-#include <filesystem>
+//#include <filesystem>