diff --git a/sdk/build.gradle b/sdk/build.gradle index 2513455fb..2d0d0a7cb 100644 --- a/sdk/build.gradle +++ b/sdk/build.gradle @@ -304,7 +304,7 @@ createProjectXml.inputs.files configurations.corelibs.resolve() createProjectXml.inputs.files configurations.optlibs.resolve() createProjectXml.outputs.dir "jme3-project-baselibs/src/com/jme3/gde/project/baselibs/" -task copyProjectLibs(dependsOn: configurations.corelibs) <<{ +task copyProjectLibs(dependsOn: [configurations.corelibs, configurations.testdatalibs]) <<{ description "Copies the jar files needed to supply the J2SE Libraries in the "+ "SDK to jme3-project-baselibs and jme3-project-libraries" @@ -335,12 +335,28 @@ task copyProjectLibs(dependsOn: configurations.corelibs) <<{ into "jme3-project-libraries/release/libs/" } } - + + project.configurations.testdatalibs.dependencies.each {dep -> + // copy jme3 test data to jme3-project-testdata + dep.dependencyProject.configurations.archives.allArtifacts.each{ artifact-> + if(artifact.classifier == "sources"){ + } else if(artifact.classifier == "javadoc"){ + } else{ + copy { + from artifact.file + into "jme3-project-testdata/release/libs/" + rename ("jme3-testdata(.*)", "jme3-testdata.jar") + } + } + } + } } copyProjectLibs.inputs.files configurations.corelibs.resolve() copyProjectLibs.inputs.files configurations.optlibs.resolve() +copyProjectLibs.inputs.files configurations.testdatalibs.resolve() copyProjectLibs.outputs.dir "jme3-project-baselibs/release/libs/" copyProjectLibs.outputs.dir "jme3-project-libraries/release/libs/" +copyProjectLibs.outputs.dir "jme3-project-testdata/release/libs/" ant.properties['plugins.version'] = jmeVersion ant.properties['app.version']= jmeMainVersion + jmeVersionSuffix @@ -354,7 +370,11 @@ task buildSdk(dependsOn: [copyBaseLibs, copyProjectLibs, createProjectXml, creat } buildSdk.inputs.files configurations.corelibs.resolve() buildSdk.inputs.files configurations.optlibs.resolve() -buildSdk.inputs.files "jme3-*" +file('.').eachDir{ + if(it.name.startsWith("jme3-") && it.isDirectory()){ + buildSdk.inputs.dir it + } +} buildSdk.outputs.dir "build" task cleanSdk() <<{ diff --git a/sdk/jme3-project-testdata/src/com/jme3/gde/project/testdata/jme3-test-data.xml b/sdk/jme3-project-testdata/src/com/jme3/gde/project/testdata/jme3-test-data.xml index 646a4bd16..9b40201b8 100644 --- a/sdk/jme3-project-testdata/src/com/jme3/gde/project/testdata/jme3-test-data.xml +++ b/sdk/jme3-project-testdata/src/com/jme3/gde/project/testdata/jme3-test-data.xml @@ -10,7 +10,7 @@ and open the template in the editor. com.jme3.gde.project.testdata.Bundle classpath - jar:nbinst://com.jme3.gde.project.testdata/libs/jME3-testdata.jar!/ + jar:nbinst://com.jme3.gde.project.testdata/libs/jme3-testdata.jar!/ src