Don't create links in llvm-prepare

It's a good idea to keep the knowledge about links in as few places as possible,
and we already have a script that deals with links in particular: llvm-projs.

With this change, building llvm after running llvm-prepare will by default build
only llvm (without clang, compiler-rt etc). In order to build other projects as
well, it will be necessary to run llvm-projs with the corresponding args.

This commit also contains a nit: extracting the repo paths into variables
(gitroot and svnroot).

Change-Id: I85719b5ba4866b74e9983584eeabc7e79016d1c9

1 files changed, 29 insertions, 44 deletions

diff --git a/helpers/llvm-prepare b/helpers/llvm-prepare
index 204bfa4..a6cd8cf 100755
--- a/helpers/llvm-prepare
+++ b/helpers/llvm-prepare
@@ -9,9 +9,8 @@
 
 function prepare() {
   src=$1
-  link=$2
-  origin=$3
-  svn=$4
+  origin=$2
+  svn=$3
   dir=`basename $src`
   # Clone Linaro repo
   if [ ! -d $src/.git ]; then
@@ -26,61 +25,47 @@ function prepare() {
     safe_run git config svn-remote.svn.fetch :refs/remotes/origin/master
     safe_run git svn fetch
   fi
-  # Create the symlink into LLVM's source
-  if [[ $link != "no" && ! -x $link ]]; then
-    cd $src
-    ln -sf $src $link
-  fi
 }
 
+gitroot=ssh://$LLVM_GITUSER@review.linaro.org:29418/toolchain/llvm
+svnroot=https://llvm.org/svn/llvm-project
+
 echo " + Setting up LLVM"
-prepare $LLVM_SRC $LLVM_SRC \
-        ssh://$LLVM_GITUSER@review.linaro.org:29418/toolchain/llvm/llvm \
-        https://llvm.org/svn/llvm-project/llvm/trunk
+prepare $LLVM_SRC $gitroot/llvm $svnroot/llvm/trunk
+
 echo " + Setting up Clang"
-prepare $LLVM_SRC/../clang $LLVM_SRC/tools/clang \
-        ssh://$LLVM_GITUSER@review.linaro.org:29418/toolchain/llvm/clang \
-        https://llvm.org/svn/llvm-project/cfe/trunk
+prepare $LLVM_SRC/../clang $gitroot/clang $svnroot/cfe/trunk
+
 echo " + Setting up Clang Tools Extra"
-prepare $LLVM_SRC/../clang-tools-extra $LLVM_SRC/../clang/tools/extra \
-        ssh://$LLVM_GITUSER@review.linaro.org:29418/toolchain/llvm/clang-tools-extra \
-        https://llvm.org/svn/llvm-project/clang-tools-extra/trunk
+prepare $LLVM_SRC/../clang-tools-extra \
+        $gitroot/clang-tools-extra $svnroot/clang-tools-extra/trunk
+
 echo " + Setting up Compiler-RT"
-prepare $LLVM_SRC/../compiler-rt $LLVM_SRC/projects/compiler-rt \
-        ssh://$LLVM_GITUSER@review.linaro.org:29418/toolchain/llvm/compiler-rt \
-        https://llvm.org/svn/llvm-project/compiler-rt/trunk
+prepare $LLVM_SRC/../compiler-rt $gitroot/compiler-rt $svnroot/compiler-rt/trunk
+
 echo " + Setting up LLD Linker"
-prepare $LLVM_SRC/../lld $LLVM_SRC/tools/lld \
-        ssh://$LLVM_GITUSER@review.linaro.org:29418/toolchain/llvm/lld \
-        https://llvm.org/svn/llvm-project/lld/trunk
+prepare $LLVM_SRC/../lld $gitroot/lld $svnroot/lld/trunk
+
 echo " + Setting up LibC++"
-prepare $LLVM_SRC/../libcxx no \
-        ssh://$LLVM_GITUSER@review.linaro.org:29418/toolchain/llvm/libcxx \
-        https://llvm.org/svn/llvm-project/libcxx/trunk
+prepare $LLVM_SRC/../libcxx $gitroot/libcxx $svnroot/libcxx/trunk
+
 echo " + Setting up LibC++ABI"
-prepare $LLVM_SRC/../libcxxabi no \
-        ssh://$LLVM_GITUSER@review.linaro.org:29418/toolchain/llvm/libcxxabi \
-        https://llvm.org/svn/llvm-project/libcxxabi/trunk
+prepare $LLVM_SRC/../libcxxabi $gitroot/libcxxabi $svnroot/libcxxabi/trunk
+
 echo " + Setting up LibUnwind"
-prepare $LLVM_SRC/../libunwind $LLVM_SRC/projects/libunwind \
-        ssh://$LLVM_GITUSER@review.linaro.org:29418/toolchain/llvm/libunwind \
-        https://llvm.org/svn/llvm-project/libunwind/trunk
+prepare $LLVM_SRC/../libunwind $gitroot/libunwind $svnroot/libunwind/trunk
+
 echo " + Setting up LLDB Debugger"
-prepare $LLVM_SRC/../lldb $LLVM_SRC/tools/lldb \
-        ssh://$LLVM_GITUSER@review.linaro.org:29418/toolchain/llvm/lldb \
-        https://llvm.org/svn/llvm-project/lldb/trunk
+prepare $LLVM_SRC/../lldb $gitroot/lldb $svnroot/lldb/trunk
+
 echo " + Setting up Test Suite"
-prepare $LLVM_SRC/../test-suite $LLVM_SRC/projects/test-suite \
-        ssh://$LLVM_GITUSER@review.linaro.org:29418/toolchain/llvm/test-suite \
-        https://llvm.org/svn/llvm-project/test-suite/trunk
+prepare $LLVM_SRC/../test-suite $gitroot/test-suite $svnroot/test-suite/trunk
+
 echo " + Setting up LNT Test harness"
-prepare $LLVM_SRC/../lnt $LLVM_SRC/projects/lnt \
-        ssh://$LLVM_GITUSER@review.linaro.org:29418/toolchain/llvm/lnt \
-        https://llvm.org/svn/llvm-project/lnt/trunk
+prepare $LLVM_SRC/../lnt $gitroot/lnt $svnroot/lnt/trunk
+
 echo " + Setting up Zorg Buildbot Config"
-prepare $LLVM_SRC/../zorg $LLVM_SRC/projects/zorg \
-        ssh://$LLVM_GITUSER@review.linaro.org:29418/toolchain/llvm/zorg \
-        https://llvm.org/svn/llvm-project/zorg/trunk
+prepare $LLVM_SRC/../zorg $gitroot/zorg $svnroot/zorg/trunk
 
 mkdir -p $LLVM_BLD