Makes elasticsearch plugin generation depend on cpp (elastic/elasticsearch#433)

The changes the way the Elasticsearch plugin module gets the cpp code when running the bundlePlugin task. Instead of manually going into the cpp builds output and grabbing the folders it depends on the buildZip task of the :cpp project and grabs the resource that task builds. This means that it does not matter if the cpp buildZip task is changed as long as it results in a zip being generated.

Original commit: elastic/x-pack-elasticsearch@257e5df2e7
This commit is contained in:
Colin Goodheart-Smithe 2016-12-01 09:49:03 +00:00 committed by GitHub
parent ee54258908
commit f0a968292a
1 changed files with 2 additions and 9 deletions

View File

@ -40,14 +40,7 @@ integTest {
integTest.mustRunAfter noBootstrapTest
bundlePlugin {
from("${rootDir}/cppdistribution") {
into '.'
// Don't copy Windows import libraries
exclude "**/*.lib"
// Don't copy the test support library
exclude "**/libPreTest.*"
includeEmptyDirs = false
}
from { zipTree(project(':cpp').buildZip.outputs.files.singleFile) }
}
bundlePlugin.dependsOn(':cpp:strip')
bundlePlugin.dependsOn(':cpp:buildZip')