From 15cef034979ede7fccc04fa167903c351e9500ab Mon Sep 17 00:00:00 2001
From: Strahinja Val Markovic <val@markovic.io>
Date: Tue, 13 May 2014 15:03:32 -0700
Subject: [PATCH] Shell scripts now use new ycmd location

---
 install.sh                                          | 12 ++++++------
 print_todos.sh                                      |  2 +-
 run_tests.sh                                        |  7 ++++---
 style_format.sh => third_party/ycmd/style_format.sh |  0
 update_boost.sh => third_party/ycmd/update_boost.sh |  0
 5 files changed, 11 insertions(+), 10 deletions(-)
 rename style_format.sh => third_party/ycmd/style_format.sh (100%)
 rename update_boost.sh => third_party/ycmd/update_boost.sh (100%)

diff --git a/install.sh b/install.sh
index 84571a26..5ef0d13b 100755
--- a/install.sh
+++ b/install.sh
@@ -70,14 +70,14 @@ function num_cores {
 
 
 function install {
-  ycm_dir=`pwd`
+  ycmd_dir=`pwd`/third_party/ycmd
   build_dir=`mktemp -d -t ycm_build.XXXXXX`
   pushd $build_dir
 
   if [[ `uname -s` == "Darwin" ]]; then
-    cmake -G "Unix Makefiles" $(python_finder) "$@" . $ycm_dir/cpp
+    cmake -G "Unix Makefiles" $(python_finder) "$@" . $ycmd_dir/cpp
   else
-    cmake -G "Unix Makefiles" "$@" . $ycm_dir/cpp
+    cmake -G "Unix Makefiles" "$@" . $ycmd_dir/cpp
   fi
 
   make -j $(num_cores) ycm_support_libs
@@ -86,14 +86,14 @@ function install {
 }
 
 function testrun {
-  ycm_dir=`pwd`
+  ycmd_dir=`pwd`/third_party/ycmd
   build_dir=`mktemp -d -t ycm_build.XXXXXX`
   pushd $build_dir
 
-  cmake -G "Unix Makefiles" "$@" . $ycm_dir/cpp
+  cmake -G "Unix Makefiles" "$@" . $ycmd_dir/cpp
   make -j $(num_cores) ycm_core_tests
   cd ycm/tests
-  LD_LIBRARY_PATH=$ycm_dir/python ./ycm_core_tests
+  LD_LIBRARY_PATH=$ycmd_dir ./ycm_core_tests
 
   popd
   rm -rf $build_dir
diff --git a/print_todos.sh b/print_todos.sh
index 66e0a456..c07471cb 100755
--- a/print_todos.sh
+++ b/print_todos.sh
@@ -5,4 +5,4 @@ ag \
 --ignore OmniSharpServer \
 --ignore testdata \
 TODO \
-cpp/ycm python autoload plugin
+third_party/ycmd/cpp/ycm python autoload plugin
diff --git a/run_tests.sh b/run_tests.sh
index 06e00e46..36dca4cd 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -7,7 +7,8 @@ function usage {
   exit 0
 }
 
-flake8 --select=F,C9 --max-complexity=10 python
+flake8 --select=F,C9 --max-complexity=10 --exclude=.git,cpp \
+   python third_party/ycmd/ycmd
 
 use_clang_completer=true
 for flag in $@; do
@@ -40,7 +41,7 @@ for directory in third_party/*; do
 done
 
 if $use_clang_completer; then
-  nosetests -v python
+  nosetests -v python third_party/ycmd/ycmd
 else
-  nosetests -v --exclude=".*Clang.*" python
+  nosetests -v --exclude=".*Clang.*" python third_party/ycmd/ycmd
 fi
diff --git a/style_format.sh b/third_party/ycmd/style_format.sh
similarity index 100%
rename from style_format.sh
rename to third_party/ycmd/style_format.sh
diff --git a/update_boost.sh b/third_party/ycmd/update_boost.sh
similarity index 100%
rename from update_boost.sh
rename to third_party/ycmd/update_boost.sh