X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.gradle;h=682b5c29d3290407751b26fce09ed64374f02381;hb=refs%2Fheads%2Fbug%2FJAL-3702_Drag_and_drop_miscalculation_in_linux_HiDPI;hp=ca8de5843db7d9d50bec5e0bfe93ad4ba812017f;hpb=5d2c0511475e6c1a0d5b45765e5e5a8072a45531;p=jalview.git diff --git a/build.gradle b/build.gradle index ca8de58..682b5c2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,6 @@ +/* Convention for properties. Read from gradle.properties, use lower_case_underlines for property names. + * For properties set within build.gradle, use camelCaseNoSpace. + */ import org.apache.tools.ant.filters.ReplaceTokens import org.gradle.internal.os.OperatingSystem import org.gradle.plugins.ide.eclipse.model.Output @@ -136,7 +139,7 @@ ext { cloverBuildDir = "${buildDir}/clover" cloverInstrDir = file("${cloverBuildDir}/clover-instr") cloverClassesDir = file("${cloverBuildDir}/clover-classes") - cloverReportDir = file("${cloverBuildDir}/clover-report") + cloverReportDir = file("${buildDir}/reports/clover") cloverTestInstrDir = file("${cloverBuildDir}/clover-test-instr") cloverTestClassesDir = file("${cloverBuildDir}/clover-test-classes") //cloverTestClassesDir = cloverClassesDir @@ -642,6 +645,7 @@ eclipse { task cleanClover { doFirst { delete cloverBuildDir + delete cloverReportDir } } @@ -764,7 +768,7 @@ task cloverHtmlReport(type: JavaExec) { file(cloverDb).exists() } - def cloverHtmlDir = "${cloverReportDir}/clover" + def cloverHtmlDir = cloverReportDir inputs.dir cloverClassesDir outputs.dir cloverHtmlDir @@ -1086,7 +1090,7 @@ test { doFirst { if (useClover) { - print("Running tests " + (useClover?"WITH":"WITHOUT") + " clover [clover="+useClover+"]\n") + println("Running tests " + (useClover?"WITH":"WITHOUT") + " clover") } } } @@ -1360,7 +1364,7 @@ task getdownWebsite() { // getdown-launcher.jar should not be in main application class path so the main application can move it when updated. Listed as a resource so it gets updated. //getdownTextString += "class = " + file(getdownLauncher).getName() + "\n" getdownTextString += "resource = ${getdown_launcher_new}\n" - getdownTextString += "class = ${mainClass}\n" + getdownTextString += "class = ${main_class}\n" def getdown_txt = file("${getdownWebsiteDir}/getdown.txt") getdown_txt.write(getdownTextString)