Index: build.gradle =================================================================== diff -u -N -rc278f1c989d8b8facc353d36c64d713e67ab24f5 -r9e7c315c6ac828989a2d7f49dcb7e451f38df9ff --- build.gradle (.../build.gradle) (revision c278f1c989d8b8facc353d36c64d713e67ab24f5) +++ build.gradle (.../build.gradle) (revision 9e7c315c6ac828989a2d7f49dcb7e451f38df9ff) @@ -204,7 +204,7 @@ install4jDMGDSStore = "${install4j_images_dir}/${install4j_dmg_ds_store}" install4jDMGBackgroundImage = "${install4j_images_dir}/${install4j_dmg_background}" install4jInstallerName = "${jalview_name} Non-Release Installer" - install4jExecutableName = jalview_name.replaceAll("[^\\w]+", "_").toLowerCase() + install4jExecutableName = install4j_executable_name install4jExtraScheme = "jalviewx" install4jMacIconsFile = string("${install4j_images_dir}/${install4j_mac_icons_file}") install4jWindowsIconsFile = string("${install4j_images_dir}/${install4j_windows_icons_file}") @@ -1575,13 +1575,13 @@ def getdownWrapperScripts = [ getdown_bash_wrapper_script, getdown_powershell_wrapper_script ] getdownWrapperScripts.each{ script -> - def s = file( "${jalviewDir}/utils/getdown/${script}" ) + def s = file( "${jalviewDir}/utils/getdown/${getdown_wrapper_script_dir}/${script}" ) if (s.exists()) { copy { from s - into getdownWebsiteDir + into "${getdownWebsiteDir}/${getdown_wrapper_script_dir}" } - getdownTextString += "resource = ${script}\n" + getdownTextString += "resource = ${getdown_wrapper_script_dir}/${script}\n" } } @@ -1912,8 +1912,10 @@ 'WINDOWS_APPLICATION_ID': install4jWinApplicationId, 'MACOS_DMG_DS_STORE': install4jDMGDSStore, 'MACOS_DMG_BG_IMAGE': install4jDMGBackgroundImage, - 'MACOS_DMG_WRAPPER_LINK': getdown_bash_wrapper_script, - 'MACOS_WRAPPER_SCRIPT': getdown_bash_wrapper_script, + 'WRAPPER_LINK': getdown_wrapper_link, + 'BASH_WRAPPER_SCRIPT': getdown_bash_wrapper_script, + 'POWERSHELL_WRAPPER_SCRIPT': getdown_powershell_wrapper_script, + 'WRAPPER_SCRIPT_BIN_DIR': getdown_wrapper_script_dir, 'INSTALLER_NAME': install4jInstallerName, 'INSTALL4J_UTILS_DIR': install4j_utils_dir, 'GETDOWN_WEBSITE_DIR': getdown_website_dir, @@ -1963,7 +1965,7 @@ println("Using projectFile "+projectFile) if (!disableNotarization) { println("Will notarize OSX App DMG") } } - verbose=true + //verbose=true inputs.dir(getdownWebsiteDir) inputs.file(install4jConfFile)