From 6ff69cccf6893fe82730bf7fde0af507a3f42511 Mon Sep 17 00:00:00 2001 From: Normen Hansen Date: Tue, 13 Jan 2015 20:17:56 +0100 Subject: [PATCH] - add run task to jme3-examples - use run task of jme3-examples in main project run task --- build.gradle | 13 ++----------- jme3-examples/build.gradle | 6 +++++- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 3c1edbc41..420c42a7c 100644 --- a/build.gradle +++ b/build.gradle @@ -11,16 +11,8 @@ subprojects { // } } -task run(dependsOn: ':jme3-examples:build', type: JavaExec) { +task run(dependsOn: ':jme3-examples:run') { description = 'Run the jME3 examples' - main = 'jme3test.TestChooser' - classpath += files(subprojects.collect{project -> - project.sourceSets*.runtimeClasspath}) -// classpath += files(subprojects.collect {project -> -// project.sourceSets*.output}) -// classpath = sourceSets.main.runtimeClasspath -// args 'mrhaki' -// systemProperty 'simple.message', 'Hello ' } defaultTasks 'run' @@ -65,8 +57,7 @@ task createZipDistribution(type:Zip,dependsOn:["dist","libDist"], description:"P } into("/sources") { from {"$buildDir/libDist/sources"} - } - println archiveName + } } task copyLibs(type: Copy){ diff --git a/jme3-examples/build.gradle b/jme3-examples/build.gradle index 9ccd184a7..2c363283d 100644 --- a/jme3-examples/build.gradle +++ b/jme3-examples/build.gradle @@ -4,7 +4,10 @@ if (!hasProperty('mainClass')) { ext.mainClass = 'jme3test.TestChooser' } -//mainClassName = ext.mainClass +task run(dependsOn: 'build', type:JavaExec) { + main = mainClass + classpath = sourceSets.main.runtimeClasspath +} dependencies { compile project(':jme3-blender') @@ -12,6 +15,7 @@ dependencies { compile project(':jme3-desktop') compile project(':jme3-effects') // compile project(':jme3-bullet') +// compile project(':jme3-bullet-native') compile project(':jme3-jbullet') compile project(':jme3-jogg') // compile project(':jme3-jogl')