diff options
| author | Diana Picus <diana.picus@linaro.org> | 2017-10-31 15:35:24 +0100 |
|---|---|---|
| committer | Diana Picus <diana.picus@linaro.org> | 2017-11-03 14:38:57 +0100 |
| commit | 36317e8a70960c6a2467eb4c01aa8ee74caa285c (patch) | |
| tree | 069fbb2e1edbe904fe60a637cfa18838cd35de3f /helpers/llvm-branch | |
| parent | 95226d4cd09790c3628ab8474cfdb21bf3fe99ad (diff) | |
Minor fixes to scripts interfaces
* Remove all references to clang-tools-extra in helpers
We do not support clang tools extra in the python scripts, since it's
too complicated and nobody is working on it yet. Therefore, clean up all
references to it in the helpers as well, to avoid any confusion.
* Add a bit more info to llvm.py --help
Change-Id: I5990925cebafce182b081227a4d33aecead7b4ac
Diffstat (limited to 'helpers/llvm-branch')
| -rwxr-xr-x | helpers/llvm-branch | 20 |
1 files changed, 1 insertions, 19 deletions
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 |