JAL-3234 Gradle properties for signing: OSX_KEYSTORE, OSX_KEYPASS, JSIGN_SH

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index 0716ae9..b2da5be 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -715,8 +715,7 @@ task getdownWebsite() {
     }
     */
 
-    //moved getdown_launcher into dist
-    //getdownTextString += "code = " + packageDir + '/' + file(getdownLauncher).getName() + "\n"
+    getdownTextString += "code = " + file(getdownLauncher).getName() + "\n"
     getdownTextString += "class = " + mainClass + "\n"
 
     def getdown_txt = file(project.ext.getdownWebsiteDir + "/getdown.txt")
@@ -729,7 +728,12 @@ task getdownWebsite() {
 
     copy {
       from getdownLauncher
-      into project.ext.getdownFilesDir + '/' + packageDir
+      into project.ext.getdownFilesDir
+    }
+
+    copy {
+      from getdownLauncher
+      into project.ext.getdownWebsiteDir
     }
 
     copy {
@@ -819,9 +823,15 @@ task installers(type: com.install4j.gradle.Install4jTask) {
   dependsOn copyInstall4jTemplate
   projectFile = file(install4jConf)
   println("Using projectFile "+projectFile)
-  variables = [majorVersion: version.substring(2, 11), build: 001]
+  variables = [majorVersion: version.substring(2, 11), build: 001, OSX_KEYSTORE: OSX_KEYSTORE, JSIGN_SH: JSIGN_SH]
   destination = "$jalviewDir/$install4jBuildDir/$JAVA_VERSION"
   buildSelected = true
+
+  if (OSX_KEYPASS) {
+    macKeystorePassword=OSX_KEYPASS
+    
+  }
+  
   inputs.dir(project.ext.getdownWebsiteDir)
   inputs.file(install4jConf)
   inputs.dir(macosJavaVMDir)