Shell scripts now use new ycmd location
This commit is contained in:
parent
f1cf9186cb
commit
15cef03497
12
install.sh
12
install.sh
@ -70,14 +70,14 @@ function num_cores {
|
|||||||
|
|
||||||
|
|
||||||
function install {
|
function install {
|
||||||
ycm_dir=`pwd`
|
ycmd_dir=`pwd`/third_party/ycmd
|
||||||
build_dir=`mktemp -d -t ycm_build.XXXXXX`
|
build_dir=`mktemp -d -t ycm_build.XXXXXX`
|
||||||
pushd $build_dir
|
pushd $build_dir
|
||||||
|
|
||||||
if [[ `uname -s` == "Darwin" ]]; then
|
if [[ `uname -s` == "Darwin" ]]; then
|
||||||
cmake -G "Unix Makefiles" $(python_finder) "$@" . $ycm_dir/cpp
|
cmake -G "Unix Makefiles" $(python_finder) "$@" . $ycmd_dir/cpp
|
||||||
else
|
else
|
||||||
cmake -G "Unix Makefiles" "$@" . $ycm_dir/cpp
|
cmake -G "Unix Makefiles" "$@" . $ycmd_dir/cpp
|
||||||
fi
|
fi
|
||||||
|
|
||||||
make -j $(num_cores) ycm_support_libs
|
make -j $(num_cores) ycm_support_libs
|
||||||
@ -86,14 +86,14 @@ function install {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function testrun {
|
function testrun {
|
||||||
ycm_dir=`pwd`
|
ycmd_dir=`pwd`/third_party/ycmd
|
||||||
build_dir=`mktemp -d -t ycm_build.XXXXXX`
|
build_dir=`mktemp -d -t ycm_build.XXXXXX`
|
||||||
pushd $build_dir
|
pushd $build_dir
|
||||||
|
|
||||||
cmake -G "Unix Makefiles" "$@" . $ycm_dir/cpp
|
cmake -G "Unix Makefiles" "$@" . $ycmd_dir/cpp
|
||||||
make -j $(num_cores) ycm_core_tests
|
make -j $(num_cores) ycm_core_tests
|
||||||
cd ycm/tests
|
cd ycm/tests
|
||||||
LD_LIBRARY_PATH=$ycm_dir/python ./ycm_core_tests
|
LD_LIBRARY_PATH=$ycmd_dir ./ycm_core_tests
|
||||||
|
|
||||||
popd
|
popd
|
||||||
rm -rf $build_dir
|
rm -rf $build_dir
|
||||||
|
@ -5,4 +5,4 @@ ag \
|
|||||||
--ignore OmniSharpServer \
|
--ignore OmniSharpServer \
|
||||||
--ignore testdata \
|
--ignore testdata \
|
||||||
TODO \
|
TODO \
|
||||||
cpp/ycm python autoload plugin
|
third_party/ycmd/cpp/ycm python autoload plugin
|
||||||
|
@ -7,7 +7,8 @@ function usage {
|
|||||||
exit 0
|
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
|
use_clang_completer=true
|
||||||
for flag in $@; do
|
for flag in $@; do
|
||||||
@ -40,7 +41,7 @@ for directory in third_party/*; do
|
|||||||
done
|
done
|
||||||
|
|
||||||
if $use_clang_completer; then
|
if $use_clang_completer; then
|
||||||
nosetests -v python
|
nosetests -v python third_party/ycmd/ycmd
|
||||||
else
|
else
|
||||||
nosetests -v --exclude=".*Clang.*" python
|
nosetests -v --exclude=".*Clang.*" python third_party/ycmd/ycmd
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user