ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: minor gradle project setup fix

Browse Source
This commit is contained in:
mlangkabel
2017-10-31 17:12:37 +01:00
parent 90f9e2645b
commit 8dbfa61234
2 changed files with 40 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/app/data/java/gradle/init.gradle
+38 -26
View File
@@ -1,41 +1,53 @@
allprojects { pp ->
task printMainSrcDirs << {
if (project.hasProperty("sourceSets")) {
project.sourceSets.main.java.srcDirs.each { dir ->
println "${dir}"
}
task printMainSrcDirs {
doLast {
if (project.hasProperty("sourceSets")) {
if (project.sourceSets.hasProperty("main")) {
project.sourceSets.main.java.srcDirs.each { dir ->
println "${dir}"
}
}
}
}
}
task printTestSrcDirs << {
if (project.hasProperty("sourceSets")) {
project.sourceSets.test.java.srcDirs.each { dir ->
println "${dir}"
task printTestSrcDirs {
doLast {
if (project.hasProperty("sourceSets")) {
if (project.sourceSets.hasProperty("test")) {
project.sourceSets.test.java.srcDirs.each { dir ->
println "${dir}"
}
}
}
}
}
task copyCompileLibs << {
File rootDir = pp.getRootDir()
String destination = project.hasProperty('sourcetrail_lib_path') ? project.property('sourcetrail_lib_path').replace("\"", "") : rootDir.getPath() + rootDir.separator + "lib"
println destination;
if (pp.configurations.hasProperty("compile")) {
copy {
into destination
from pp.configurations.compile
eachFile { println "copying file \"" + it.file.name + "\" to \"" + destination + "\"" }
task copyCompileLibs {
doLast {
File rootDir = pp.getRootDir()
String destination = project.hasProperty('sourcetrail_lib_path') ? project.property('sourcetrail_lib_path').replace("\"", "") : rootDir.getPath() + rootDir.separator + "lib"
println destination;
if (pp.configurations.hasProperty("compile")) {
copy {
into destination
from pp.configurations.compile
eachFile { println "copying file \"" + it.file.name + "\" to \"" + destination + "\"" }
}
}
}
}
task copyTestCompileLibs << {
File rootDir = pp.getRootDir()
String destination = project.hasProperty('sourcetrail_lib_path') ? project.property('sourcetrail_lib_path') : rootDir.getPath() + rootDir.separator + "lib"
if (pp.configurations.hasProperty("testCompile")) {
copy {
into destination
from pp.configurations.testCompile
eachFile { println "copying file \"" + it.file.name + "\" to \"" + destination + "\"" }
task copyTestCompileLibs {
doLast {
File rootDir = pp.getRootDir()
String destination = project.hasProperty('sourcetrail_lib_path') ? project.property('sourcetrail_lib_path') : rootDir.getPath() + rootDir.separator + "lib"
if (pp.configurations.hasProperty("testCompile")) {
copy {
into destination
from pp.configurations.testCompile
eachFile { println "copying file \"" + it.file.name + "\" to \"" + destination + "\"" }
}
}
}
}
src/lib_java/utility/utilityGradle.cpp
+2 -2
View File
@@ -66,7 +66,7 @@ namespace utility
{
// TODO: move error handling to caller of this function
const std::string dialogMessage =
"The following error occurred while executing a Maven command:\n\n" + utility::replace(output, "\r\n", "\n");
"The following error occurred while executing a Gradle command:\n\n" + utility::replace(output, "\r\n", "\n");
MessageStatus(dialogMessage, true, false).dispatch();
Application::getInstance()->handleDialog(dialogMessage);
@@ -88,7 +88,7 @@ namespace utility
{
// TODO: move error handling to caller of this function
const std::string dialogMessage =
"The following error occurred while executing a Maven command:\n\n" + utility::replace(output, "\r\n", "\n");
"The following error occurred while executing a Gradle command:\n\n" + utility::replace(output, "\r\n", "\n");
MessageStatus(dialogMessage, true, false).dispatch();
Application::getInstance()->handleDialog(dialogMessage);