Fix eclipse build. (#28236)

Relates #28191
This commit is contained in:
Adrien Grand 2018-01-16 10:50:07 +01:00 committed by GitHub
parent 196c7b80dc
commit efe2e52118
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 0 deletions

View File

@ -0,0 +1,2 @@
// this is just shell gradle file for eclipse to have separate projects for elasticsearch-core src and tests
apply from: '../../build.gradle'

View File

@ -0,0 +1,6 @@
// this is just shell gradle file for eclipse to have separate projects for elasticsearch-core src and tests
apply from: '../../build.gradle'
dependencies {
testCompile project(':libs:elasticsearch-core')
}

View File

@ -110,6 +110,7 @@ if (isEclipse) {
// eclipse cannot handle an intermediate dependency between main and test, so we must create separate projects // eclipse cannot handle an intermediate dependency between main and test, so we must create separate projects
// for server-src and server-tests // for server-src and server-tests
projects << 'server-tests' projects << 'server-tests'
projects << 'libs:elasticsearch-core-tests'
projects << 'libs:elasticsearch-nio-tests' projects << 'libs:elasticsearch-nio-tests'
} }
@ -128,6 +129,10 @@ if (isEclipse) {
project(":server").buildFileName = 'eclipse-build.gradle' project(":server").buildFileName = 'eclipse-build.gradle'
project(":server-tests").projectDir = new File(rootProject.projectDir, 'server/src/test') project(":server-tests").projectDir = new File(rootProject.projectDir, 'server/src/test')
project(":server-tests").buildFileName = 'eclipse-build.gradle' project(":server-tests").buildFileName = 'eclipse-build.gradle'
project(":libs:elasticsearch-core").projectDir = new File(rootProject.projectDir, 'libs/elasticsearch-core/src/main')
project(":libs:elasticsearch-core").buildFileName = 'eclipse-build.gradle'
project(":libs:elasticsearch-core-tests").projectDir = new File(rootProject.projectDir, 'libs/elasticsearch-core/src/test')
project(":libs:elasticsearch-core-tests").buildFileName = 'eclipse-build.gradle'
project(":libs:elasticsearch-nio").projectDir = new File(rootProject.projectDir, 'libs/elasticsearch-nio/src/main') project(":libs:elasticsearch-nio").projectDir = new File(rootProject.projectDir, 'libs/elasticsearch-nio/src/main')
project(":libs:elasticsearch-nio").buildFileName = 'eclipse-build.gradle' project(":libs:elasticsearch-nio").buildFileName = 'eclipse-build.gradle'
project(":libs:elasticsearch-nio-tests").projectDir = new File(rootProject.projectDir, 'libs/elasticsearch-nio/src/test') project(":libs:elasticsearch-nio-tests").projectDir = new File(rootProject.projectDir, 'libs/elasticsearch-nio/src/test')