X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.gradle;h=58d27644e414bbc7829f6bd8e5e1e0d653e1e71e;hb=93aa4558431fabba858943e9b2e8f871381a691c;hp=ec4e3b1b1b1d7587c09339fe7fde7c3d18654e25;hpb=12bd110f5aa83819e8417eb6dac136cbc6dc2de5;p=jalview.git

diff --git a/build.gradle b/build.gradle
index ec4e3b1..58d2764 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,11 +46,21 @@ ext {
   jalviewDirRelativePath = jalviewDir
 
   // local build environment properties
-  def localProps = "${jalviewDirAbsolutePath}/local.properties"
+  // can be "projectDir/local.properties"
+  def localProps = "${projectDir}/local.properties"
+  def propsFile = null;
   if (file(localProps).exists()) {
+    propsFile = localProps
+  }
+  // or "../projectDir_local.properties"
+  def dirLocalProps = projectDir.getParent() + "/" + projectDir.getName() + "_local.properties"
+  if (file(dirLocalProps).exists()) {
+    propsFile = dirLocalProps
+  }
+  if (propsFile != null) {
     try {
       def p = new Properties()
-      def localPropsFIS = new FileInputStream(localProps)
+      def localPropsFIS = new FileInputStream(propsFile)
       p.load(localPropsFIS)
       localPropsFIS.close()
       p.each {
@@ -58,9 +68,9 @@ ext {
           def oldval = findProperty(key)
           setProperty(key, val)
           if (oldval != null) {
-            println("Overriding property '${key}' ('${oldval}') with local.properties value '${val}'")
+            println("Overriding property '${key}' ('${oldval}') with ${file(propsFile).getName()} value '${val}'")
           } else {
-            println("Setting unknown property '${key}' with local.properties value '${val}'")
+            println("Setting unknown property '${key}' with ${file(propsFile).getName()}s value '${val}'")
           }
       }
     } catch (Exception e) {
@@ -136,6 +146,10 @@ ext {
     getdownChannelName = string("${bamboo_planKey}/${JAVA_VERSION}")
     getdownAppBase = string("${bamboo_channelbase}/${bamboo_planKey}${bamboo_getdown_channel_suffix}/${JAVA_VERSION}")
     jvlChannelName += "_${getdownChannelName}"
+    // automatically add the test group Not-bamboo for exclusion 
+    if ("".equals(testngExcludedGroups)) { 
+      testngExcludedGroups = "Not-bamboo"
+    }
     break
 
     case "RELEASE":
@@ -405,8 +419,8 @@ sourceSets {
 
 // clover bits
 dependencies {
-  cloverCompile 'org.openclover:clover:4.4.1'
   if (use_clover) {
+    cloverCompile 'org.openclover:clover:4.4.1'
     testCompile 'org.openclover:clover:4.4.1'
   }
 }
@@ -558,7 +572,7 @@ task cloverInstr {
   outputs.dir cloverInstrDir
 
   doFirst {
-    //delete cloverInstrDir
+    delete cloverInstrDir
     def argsList = [
       "--initstring",
       cloverDb,
@@ -608,6 +622,26 @@ task cloverReport {
     com.atlassian.clover.reporters.xml.XMLReporter.runReport(args)
   }
 }
+
+
+compileCloverJava {
+
+  doFirst {
+    sourceCompatibility = compile_source_compatibility
+    targetCompatibility = compile_target_compatibility
+    options.compilerArgs += additional_compiler_args
+    print ("Setting target compatibility to "+targetCompatibility+"\n")
+  }
+  classpath += configurations.cloverRuntime
+}
+
+
+task cleanClover {
+  doFirst {
+    delete cloverInstrDir
+    delete cloverDb
+  }
+}
 // end clover bits
 
 
@@ -639,18 +673,6 @@ compileTestJava {
 }
 
 
-compileCloverJava {
-
-  doFirst {
-    sourceCompatibility = compile_source_compatibility
-    targetCompatibility = compile_target_compatibility
-    options.compilerArgs += additional_compiler_args
-    print ("Setting target compatibility to "+targetCompatibility+"\n")
-  }
-  classpath += configurations.cloverRuntime
-}
-
-
 clean {
   doFirst {
     delete sourceSets.main.java.outputDir
@@ -658,14 +680,6 @@ clean {
 }
 
 
-cleanClover {
-  doFirst {
-    delete cloverInstrDir
-    delete cloverDb
-  }
-}
-
-
 cleanTest {
   dependsOn cleanClover
   doFirst {
@@ -845,10 +859,13 @@ test {
 
   useTestNG() {
     includeGroups testngGroups
+    excludeGroups testngExcludedGroups
     preserveOrder true
     useDefaultListeners=true
   }
 
+  maxHeapSize = "1024m"
+
   workingDir = jalviewDir
   //systemProperties 'clover.jar' System.properties.clover.jar
   sourceCompatibility = compile_source_compatibility
@@ -1372,6 +1389,7 @@ task installers(type: com.install4j.gradle.Install4jTask) {
     'GETDOWN_INSTALL_DIR': getdown_install_dir,
     'INFO_PLIST_FILE_ASSOCIATIONS_FILE': install4j_info_plist_file_associations,
     'BUILD_DIR': install4jBuildDir,
+    'UNIX_DESKTOP_ADDITIONS': install4j_unix_desktop_additions,
   ]
 
   destination = "${jalviewDir}/${install4jBuildDir}"