aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xhelpers/.llvm-env-remove1
-rwxr-xr-xhelpers/llvm-branch20
-rwxr-xr-xhelpers/llvm-prepare4
-rwxr-xr-xhelpers/llvm-projs23
-rwxr-xr-xhelpers/llvm-reset1
-rwxr-xr-xhelpers/llvm-sync9
6 files changed, 2 insertions, 56 deletions
diff --git a/helpers/.llvm-env-remove b/helpers/.llvm-env-remove
index fba6deb..c68530a 100755
--- a/helpers/.llvm-env-remove
+++ b/helpers/.llvm-env-remove
@@ -29,7 +29,6 @@ fi
# worktrees are removed too, so we only need to prune the repos)
safe_run remove_worktree $llvm_repo_dir $llvm_worktree_dir
safe_run remove_worktree $llvm_repo_dir/../clang
-safe_run remove_worktree $llvm_repo_dir/../clang-tools-extra
safe_run remove_worktree $llvm_repo_dir/../compiler-rt
safe_run remove_worktree $llvm_repo_dir/../lld
safe_run remove_worktree $llvm_repo_dir/../libcxx
diff --git a/helpers/llvm-branch b/helpers/llvm-branch
index 5343914..4952141 100755
--- a/helpers/llvm-branch
+++ b/helpers/llvm-branch
@@ -71,13 +71,6 @@ if [ -d $CLANG_SRC ]; then
clang_branches=`get_branches`
fi
-CLANG_EXTRA_SRC=$LLVM_SRC/tools/clang/tools/extra
-if [ -d $CLANG_EXTRA_SRC ]; then
- cd $CLANG_EXTRA_SRC
- clang_extra_branch=`get_branch`
- clang_extra_branches=`get_branches`
-fi
-
RT_SRC=$LLVM_SRC/projects/compiler-rt
if [ -d $RT_SRC ]; then
cd $RT_SRC
@@ -149,11 +142,6 @@ if [[ $1 = '' ]]; then
print_branches $clang_branch $clang_branches
echo
fi
- if [ -d $CLANG_EXTRA_SRC ]; then
- echo -n "Clang tools extra branches: "
- print_branches $clang_extra_branch $clang_extra_branches
- echo
- fi
if [ -d $RT_SRC ]; then
echo -n "Compiler-RT branches: "
print_branches $rt_branch $rt_branches
@@ -203,10 +191,6 @@ if [[ $DELETE != '' ]]; then
echo "Cannot delete $branch - it is checked out in clang"
exit 2
fi
- if [[ $branch = $clang_extra_branch ]]; then
- echo "Cannot delete $branch - it is checked out in clang tools extra"
- exit 2
- fi
if [[ $branch = $rt_branch ]]; then
echo "Cannot delete $branch - it is checked out in compiler rt"
exit 2
@@ -236,7 +220,6 @@ fi
# Check which projects have the branch
in_llvm=`has $branch $llvm_branches`
in_clang=`has $branch $clang_branches`
-in_clang_extra=`has $branch $clang_extra_branches`
in_rt=`has $branch $rt_branches`
in_cxx=`has $branch $cxx_branches`
in_cxxabi=`has $branch $cxxabi_branches`
@@ -244,7 +227,7 @@ in_unw=`has $branch $unw_branches`
in_lld=`has $branch $lld_branches`
in_lldb=`has $branch $lldb_branches`
if [[ $CREATE = '' ]]; then
- if [[ $in_clang = 'no' && $in_clang_extra && $in_llvm = 'no' && \
+ if [[ $in_clang = 'no' && $in_llvm = 'no' && \
$in_rt = 'no' && $in_cxx = 'no' && $in_cxxabi = 'no' && \
$in_unw = 'no' && $in_lld = 'no' && $in_lldb = 'no' ]]; then
echo "Branch $branch doesn't exist on any repository"
@@ -256,7 +239,6 @@ fi
# DO IT
switch $LLVM_SRC $branch $in_llvm
switch $CLANG_SRC $branch $in_clang
-switch $CLANG_EXTRA_SRC $branch $in_clang_extra
switch $RT_SRC $branch $in_rt
switch $CXX_SRC $branch $in_cxx
switch $CXXABI_SRC $branch $in_cxxabi
diff --git a/helpers/llvm-prepare b/helpers/llvm-prepare
index 0281fd6..66a223b 100755
--- a/helpers/llvm-prepare
+++ b/helpers/llvm-prepare
@@ -42,10 +42,6 @@ prepare $llvm_repos/llvm $gitroot/llvm $svnroot/llvm/trunk
echo " + Setting up Clang"
prepare $llvm_repos/clang $gitroot/clang $svnroot/cfe/trunk
-echo " + Setting up Clang Tools Extra"
-prepare $llvm_repos/clang-tools-extra \
- $gitroot/clang-tools-extra $svnroot/clang-tools-extra/trunk
-
echo " + Setting up Compiler-RT"
prepare $llvm_repos/compiler-rt $gitroot/compiler-rt $svnroot/compiler-rt/trunk
diff --git a/helpers/llvm-projs b/helpers/llvm-projs
index 3429b89..ecc9d0e 100755
--- a/helpers/llvm-projs
+++ b/helpers/llvm-projs
@@ -12,7 +12,7 @@ prog=`basename $0`
syntax() {
echo "Syntax: $prog [clang|lldb|lld|rt|libs|all|none] {+/-}[c|x|r|k|d|l|a|u|t]"
echo " no args: List linked projects"
- echo " clang: Clang + Clang Tools Extra"
+ echo " clang: Clang"
echo " lldb: Clang + lldb"
echo " lld: Clang + lld"
echo " rt: Clang + compiler-rt"
@@ -21,7 +21,6 @@ syntax() {
echo " none: Unlink all projects"
echo " {+/-}: link / unlink projects (default: link)"
echo " c Clang"
- echo " x Clang Tools Extra"
echo " r Compiler-rt"
echo " k lld"
echo " d lldb"
@@ -35,8 +34,6 @@ syntax() {
# Dirs and links into LLVM
clang_dir=clang
clang_link=tools/clang
-clang_extra_dir=clang-tools-extra
-clang_extra_link=tools/clang/tools/extra
rt_dir=compiler-rt
rt_link=projects/compiler-rt
libcxx_dir=libcxx
@@ -101,7 +98,6 @@ update_build_dirs() {
list_all() {
echo "Projects linked:"
has_link $clang_link && echo " + Clang"
- has_link $clang_extra_link && echo " + Clang Tools Extra"
has_link $rt_link && echo " + Compiler-RT"
has_link $libcxx_link && echo " + LibC++"
has_link $libcxxabi_link && echo " + LibC++abi"
@@ -115,7 +111,6 @@ list_all() {
need_all() {
need=$1
clang=$need
- clang_extra=$need
rt=$need
libcxx=$need
libcxxabi=$need
@@ -135,7 +130,6 @@ fi
# Need/not need
clang=`init $clang_link`
-clang_extra=`init $clang_extra_link`
rt=`init $rt_link`
libcxx=`init $libcxx_link`
libcxxabi=`init $libcxxabi_link`
@@ -150,7 +144,6 @@ case $opt in
clang)
need_all OFF
clang=ON
- clang_extra=ON
shift
;;
lldb)
@@ -218,9 +211,6 @@ while ! test -z $1; do
c)
clang=$flag
;;
- x)
- clang_extra=$flag
- ;;
r)
rt=$flag
;;
@@ -249,15 +239,6 @@ while ! test -z $1; do
shift
done
-# clang and clang-tools-extra have a special relationship: we can't enable
-# clang-tools-extra without enabling clang, and we also can't disable clang
-# without also disabling clang-tools-extra
-if [ "$clang_extra" = ON -a "$clang" = OFF ]; then
- echo "Can't have Clang Tools Extra without Clang! Try to add +c or -x"
- exit
-fi
-
-
# Update links
update $tests_dir $tests_link $tests
update $lldb_dir $lldb_link $lldb
@@ -267,7 +248,6 @@ update $libcxxabi_dir $libcxxabi_link $libcxxabi
update $libcxx_dir $libcxx_link $libcxx
update $rt_dir $rt_link $rt
update $clang_dir $clang_link $clang
-update $clang_extra_dir $clang_extra_link $clang_extra
update_build_dirs -DLLVM_TOOL_LLDB_BUILD=$lldb \
-DLLVM_TOOL_LLD_BUILD=$lld \
-DLLVM_TOOL_LIBUNWIND_BUILD=$libunwind \
@@ -275,5 +255,4 @@ update_build_dirs -DLLVM_TOOL_LLDB_BUILD=$lldb \
-DLLVM_TOOL_LIBCXX_BUILD=$libcxx \
-DLLVM_TOOL_COMPILER_RT_BUILD=$rt \
-DLLVM_TOOL_CLANG_BUILD=$clang \
- -DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=$clang_extra
list_all
diff --git a/helpers/llvm-reset b/helpers/llvm-reset
index 37a1b00..a031589 100755
--- a/helpers/llvm-reset
+++ b/helpers/llvm-reset
@@ -19,7 +19,6 @@ llvm_repos=$LLVM_ROOT/repos
reset_git_svn LLVM $llvm_repos/llvm
reset_git_svn Clang $llvm_repos/clang
-reset_git_svn ClangToolsExtra $llvm_repos/clang-tools-extra
reset_git_svn Compiler-RT $llvm_repos/compiler-rt
reset_git_svn Libc++ $llvm_repos/libcxx
reset_git_svn Libc++abi $llvm_repos/libcxxabi
diff --git a/helpers/llvm-sync b/helpers/llvm-sync
index 9784006..95e4954 100755
--- a/helpers/llvm-sync
+++ b/helpers/llvm-sync
@@ -38,7 +38,6 @@ function repo_sync () {
prog=`basename $0`
clang=false
-cextra=false
rt=false
libcxx=false
libcxxabi=false
@@ -49,7 +48,6 @@ tests=false
web=false
clang_workdir=$LLVM_SRC/tools/clang
-extra_workdir=$LLVM_SRC/tools/clang/tools/extra
rt_workdir=$LLVM_SRC/projects/compiler-rt
libcxx_workdir=$LLVM_SRC/projects/libcxx
libcxxabi_workdir=$LLVM_SRC/projects/libcxxabi
@@ -59,7 +57,6 @@ lldb_workdir=$LLVM_SRC/tools/lldb
test_workdir=$LLVM_SRC/projects/test-suite
if [ -d $clang_workdir ]; then clang=true; fi
-if [ -d $extra_workdir ]; then cextra=true; fi
if [ -d $rt_workdir ]; then rt=true; fi
if [ -d $libcxx_workdir ]; then libcxx=true; fi
if [ -d $libcxxabi_workdir ]; then libcxxabi=true; fi
@@ -75,7 +72,6 @@ while getopts "wa" opt; do
;;
a)
clang=true
- cextra=true
rt=true
libcxx=true
libcxxabi=true
@@ -103,11 +99,6 @@ if $clang; then
repo_sync Clang $llvm_repos/clang $clang_workdir
fi
-# Optional updates
-if $cextra; then
- repo_sync ClangToolsExtra $llvm_repos/clang-tools-extra $extra_workdir
-fi
-
if $rt; then
repo_sync RT $llvm_repos/compiler-rt $rt_workdir
fi