X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.gradle;h=810eb578e4f6aeefe9f94ecf792df623d8c95a95;hb=b8149f41ceac6b73575206d76e1215f2370fb28e;hp=a6fcf8b9e8c13a22d1ac59c6db8f2a1640c314af;hpb=bc4e160e76b21b2554a78b5695363ca00d524480;p=jalview.git

diff --git a/build.gradle b/build.gradle
index a6fcf8b..810eb57 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1295,9 +1295,11 @@ task installers(type: com.install4j.gradle.Install4jTask) {
     filesMd5 = filesMd5.substring(0,8)
   }
   def install4jTemplateVersion = "${JALVIEW_VERSION}_F${filesMd5}_C${gitHash}"
+  // make install4jBuildDir relative to jalviewDir
+  def install4jBuildDir = "${install4j_build_dir}/${JAVA_VERSION}"
 
-  println("WINDOWS_JAVA_VM_TGZ=${windowsJavaVMTgz}")
   variables = [
+    'JALVIEW_DIR': "../..",
     'OSX_KEYSTORE': OSX_KEYSTORE,
     'JSIGN_SH': JSIGN_SH,
     'JRE_DIR': getdown_app_dir_java,
@@ -1316,14 +1318,18 @@ task installers(type: com.install4j.gradle.Install4jTask) {
     'LINUX_JAVA_VM_TGZ': linuxJavaVMTgz,
     'COPYRIGHT_MESSAGE': install4j_copyright_message,
     'MACOS_BUNDLE_ID': install4j_macOS_bundle_id,
+    'INSTALL4J_UTILS_DIR': install4j_utils_dir,
+    'GETDOWN_WEBSITE_DIR': getdown_website_dir,
+    'GETDOWN_FILES_DIR': getdown_files_dir,
     'GETDOWN_RESOURCE_DIR': getdown_resource_dir,
     'GETDOWN_DIST_DIR': getdown_app_dir,
     'GETDOWN_ALT_DIR': getdown_app_dir_alt,
     'GETDOWN_INSTALL_DIR': getdown_install_dir,
     'INFO_PLIST_FILE_ASSOCIATIONS_FILE': install4j_info_plist_file_associations,
+    'BUILD_DIR': install4jBuildDir,
   ]
 
-  destination = "${jalviewDir}/${install4j_build_dir}/${JAVA_VERSION}"
+  destination = "${jalviewDir}/${install4jBuildDir}"
   buildSelected = true
 
   if (install4j_faster.equals("true") || CHANNEL.startsWith("DEVELOP") || CHANNEL.startsWith("LOCAL")) {