From bf0fb3cb35a1fcb7d0d1c675c3564e6e643cb2f6 Mon Sep 17 00:00:00 2001
From: Peter Waegemann <waegemann@cs.fau.de>
Date: Sat, 5 Mar 2016 14:20:07 +0100
Subject: [PATCH] Update URLs of repositories, add gitignore
---
.gitignore | 6 ++++++
setup.sh | 12 ++++++++----
2 files changed, 14 insertions(+), 4 deletions(-)
create mode 100644 .gitignore
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a4cfcc7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+# LLVM/Clang is tracked independently
+llvm/
+
+# build tree, if building in-source
+build/
+
diff --git a/setup.sh b/setup.sh
index 044686b..87b2213 100755
--- a/setup.sh
+++ b/setup.sh
@@ -3,8 +3,9 @@
# repos
LLVM_GIT="http://llvm.org/git/llvm.git"
CLANG_GIT="http://llvm.org/git/clang.git"
-EXTRA_GIT="http://llvm.org/git/clang-tools-extra.git"
-EXTRA_TACLE_GIT="git@gitlab.cs.fau.de:tacle/tacle-clang-tools-extra.git"
+# use clang-tools-extra repository from TACLe
+EXTRA_GIT="git@gitlab.cs.fau.de:tacle/tacle-clang-tools-extra.git"
+# EXTRA_GIT="http://llvm.org/git/clang-tools-extra.git"
# branch/version
VERSION="release_37"
@@ -13,7 +14,7 @@ VERSION="release_37"
export BASE=`pwd`
export LLVM_SRC="${BASE}/llvm"
export CLANG_SRC="${LLVM_SRC}/tools/clang"
-export EXTRA_SRC="${LLVM_SRC}/tools/clang/tools"
+export EXTRA_SRC="${LLVM_SRC}/tools/clang/tools/extra"
# build path
export LLVM_BUILD="${BASE}/build"
@@ -29,7 +30,7 @@ fi
# get clang
if ! test -d ${CLANG_SRC}; then
git clone ${CLANG_GIT} ${CLANG_SRC}
- cd ${LLVM_SRC}
+ cd ${CLANG_SRC}
git checkout ${VERSION}
cd ${BASE}
fi
@@ -37,6 +38,9 @@ fi
# get clang's extras
if ! test -d ${EXTRA_SRC}; then
git clone ${EXTRA_GIT} ${EXTRA_SRC}
+ cd ${EXTRA_SRC}
+ git checkout ${VERSION}
+ cd ${BASE}
fi
--
GitLab