X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.gradle;h=2c7f1389e00baacb75cdba452b755d11a4854c82;hb=60418a01c0fd5c38fba873b3a275e503ed3e29e6;hp=4bb52b04611c72df8b38f4a37f42dd36bf8e173d;hpb=34a1ef54cc5d13727129e9b57137356d6d9c1d86;p=jalview.git diff --git a/build.gradle b/build.gradle index 4bb52b0..2c7f138 100644 --- a/build.gradle +++ b/build.gradle @@ -84,7 +84,7 @@ ext { // Expect jalview.version and target release branch in jalview.release def releaseProps = new Properties(); def releasePropFile = findProperty("JALVIEW_RELEASE_FILE"); - def defaultReleasePropFile = "${jalviewDir}/RELEASE"; + def defaultReleasePropFile = "${jalviewDirAbsolutePath}/RELEASE"; try { (new File(releasePropFile!=null ? releasePropFile : defaultReleasePropFile)).withInputStream { releaseProps.load(it) @@ -958,6 +958,16 @@ test { workingDir = jalviewDir //systemProperties 'clover.jar' System.properties.clover.jar + def testLaf = project.findProperty("test_laf") + if (testLaf != null) { + println("Setting Test LaF to '${testLaf}'") + systemProperty "laf", testLaf + } + def testHiDPIScale = project.findProperty("test_HiDPIScale") + if (testHiDPIScale != null) { + println("Setting Test HiDPI Scale to '${testHiDPIScale}'") + systemProperty "sun.java2d.uiScale", testHiDPIScale + } sourceCompatibility = compile_source_compatibility targetCompatibility = compile_target_compatibility jvmArgs += additional_compiler_args @@ -1300,8 +1310,10 @@ task getdownWebsite() { // a helper task to allow getdown digest of any dir: `gradle getdownDigestDir -PDIGESTDIR=/path/to/my/random/getdown/dir task getdownDigestDir(type: JavaExec) { + group "Help" + description "A task to run a getdown Digest on a dir with getdown.txt. Provide a DIGESTDIR property via -PDIGESTDIR=..." + def digestDirPropertyName = "DIGESTDIR" - description = "Digest a local dir (-P${digestDirPropertyName}=...) for getdown" doFirst { classpath = files(getdownLauncher) def digestDir = findProperty(digestDirPropertyName) @@ -1421,7 +1433,8 @@ task copyInstall4jTemplate { // NB we're deleting the /other/ one! // Also remove the examples subdir from non-release versions def customizedIdToDelete = "PROGRAM_GROUP_RELEASE" - if (CHANNEL=="RELEASE") { + // 2.11.1.0 NOT releasing with the Examples folder in the Program Group + if (false && CHANNEL=="RELEASE") { // remove 'false && ' to include Examples folder in RELEASE channel customizedIdToDelete = "PROGRAM_GROUP_NON_RELEASE" } else { // remove the examples subdir from Full File Set