JAL-3234 enable codesigning and executable-post-processor for install4j

[jalview.git] / build.gradle

diff --git a/build.gradle b/build.gradle
index 3f444be..b2da5be 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -39,6 +39,7 @@ if (clover.equals("true")) {
 
 // configure classpath/args for j8/j11 compilation
 
+def jalviewDirAbsolutePath = file(jalviewDir).getAbsolutePath()
 def libDir
 def libDistDir
 def compile_source_compatibility
@@ -52,7 +53,7 @@ ext {
   getdownJ11libDir = getdownWebsiteDir + '/' + getdown_j11lib_dir
   getdownResourceDir = getdownWebsiteDir + '/' + getdown_resource_dir
   getdownLauncher = jalviewDir + '/' + getdown_launcher
-  getdownFilesDir = jalviewDir + '/' + getdown_files_dir
+  getdownFilesDir = jalviewDir + '/' + getdown_files_dir + '/' + JAVA_VERSION + '/'
   getdownLib1 = jalviewDir + '/' + getdown_lib1
   def getdownChannel = getdown_channel_name
   if (getdown_channel_name.equals("COMMIT")) {
@@ -699,6 +700,8 @@ task getdownWebsite() {
       }
     }
 
+    // NOT USING MODULES YET, EVERYTHING SHOULD BE IN dist
+    /*
     if (JAVA_VERSION.equals("11")) {
       def j11libFiles = fileTree(dir: "$jalviewDir/$j11libDir", include: ["*.jar"]).getFiles()
       j11libFiles.sort().each{f ->
@@ -710,6 +713,7 @@ task getdownWebsite() {
         }
       }
     }
+    */
 
     getdownTextString += "code = " + file(getdownLauncher).getName() + "\n"
     getdownTextString += "class = " + mainClass + "\n"
@@ -724,22 +728,17 @@ task getdownWebsite() {
 
     copy {
       from getdownLauncher
-      into project.ext.getdownWebsiteDir
-    }
-
-    copy {
-      from getdownLauncher
       into project.ext.getdownFilesDir
     }
 
     copy {
-      from getdownLib1
-      into project.ext.getdownFilesDir
+      from getdownLauncher
+      into project.ext.getdownWebsiteDir
     }
 
     copy {
       from getdownLib1
-      into project.ext.getdownWebsiteDir
+      into project.ext.getdownFilesDir + '/' + packageDir
     }
 
     copy {
@@ -810,7 +809,7 @@ task copyInstall4jTemplate(type: Copy) {
     include install4jTemplate
     rename (install4jTemplate, install4jConfFile)
     filter(ReplaceTokens, beginToken: '', endToken: '', tokens: ['9999999999': JAVA_VERSION])
-    filter(ReplaceTokens, beginToken: '$$', endToken: '$$', tokens: ['VERSION': JALVIEW_VERSION, 'MACOS_JAVA_VM_DIR': macosJavaVMDir, 'WINDOWS_JAVA_VM_DIR': windowsJavaVMDir])
+    filter(ReplaceTokens, beginToken: '$$', endToken: '$$', tokens: ['JAVA_VERSION': JAVA_VERSION, 'VERSION': JALVIEW_VERSION, 'MACOS_JAVA_VM_DIR': macosJavaVMDir, 'WINDOWS_JAVA_VM_DIR': windowsJavaVMDir])
   }
   into install4jDir
   inputs.files("$install4jDir/$install4jTemplate")
@@ -824,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)