Moved the C++ code under the cpp sub-directory (elastic/elasticsearch#584)

The $PRELERT_SRC_HOME environment variable is replaced with $CPP_SRC_HOME,
which points to the cpp sub-directory off the repository root

Original commit: elastic/x-pack-elasticsearch@02ef6d6be6
This commit is contained in:
David Roberts 2016-12-20 11:03:00 +00:00 committed by GitHub
parent 78fdca65d5
commit 1615be4ff3
1 changed files with 1 additions and 1 deletions

View File

@ -41,7 +41,7 @@ if (['true', 'false', 'auto'].contains(cppEnabledStr) == false) {
project.ext.cppEnabled = cppEnabledStr == 'true' project.ext.cppEnabled = cppEnabledStr == 'true'
if (cppEnabledStr == 'auto') { if (cppEnabledStr == 'auto') {
// Disable the C++ build if the 3rd party tools/libraries aren't available // Disable the C++ build if the 3rd party tools/libraries aren't available
String[] cmdArray = [ project.ext.bash, '-c', 'source cpp/set_env.sh && 3rd_party/3rd_party.sh --check' ] String[] cmdArray = [ project.ext.bash, '-c', 'source cpp/set_env.sh && cpp/3rd_party/3rd_party.sh --check' ]
Process checkProcess = Runtime.getRuntime().exec(cmdArray, null, rootDir) Process checkProcess = Runtime.getRuntime().exec(cmdArray, null, rootDir)
StringBuffer checkOutput = new StringBuffer() StringBuffer checkOutput = new StringBuffer()
checkProcess.consumeProcessOutputStream(checkOutput) checkProcess.consumeProcessOutputStream(checkOutput)