X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.gradle;h=d81604e68e8f27a5156e204e017c32cb753ff2e8;hb=797296a31f6cb12c2c7fc990d39966f07b600862;hp=00888450d1aafa830a9ed693cda144d587ad0e7b;hpb=80495b6099b0fc51b49945dcee69c2491b8ce0a8;p=jalview.git diff --git a/build.gradle b/build.gradle index 0088845..d81604e 100644 --- a/build.gradle +++ b/build.gradle @@ -55,7 +55,6 @@ ext { getdownResourceDir = getdownWebsiteDir + '/' + getdown_resource_dir getdownLauncher = jalviewDir + '/' + getdown_launcher getdownFilesDir = jalviewDir + '/' + getdown_files_dir + '/' + JAVA_VERSION + '/' - getdownLib1 = jalviewDir + '/' + getdown_lib1 def getdownChannel = getdown_channel_name if (getdown_channel_name.equals("COMMIT")) { getdownChannel = getGitHash() @@ -648,6 +647,9 @@ task getdownWebsite() { props.put("getdown_txt_java_min_version", getdown_alt_java_min_version) props.put("getdown_txt_multi_java_location", getdown_alt_multi_java_location) + if (getdown_local == "true") { + getdown_app_base = "file://"+file(getdownWebsiteDir).getAbsolutePath() + } props.put("getdown_txt_appbase", getdown_app_base) props.each{ prop, val -> if (prop.startsWith("getdown_txt_") && val != null) { @@ -747,11 +749,6 @@ task getdownWebsite() { } copy { - from getdownLib1 - into project.ext.getdownFilesDir + '/' + packageDir - } - - copy { from jalviewDir + '/' + project.getProperty('getdown_txt_ui.background_image') from jalviewDir + '/' + project.getProperty('getdown_txt_ui.error_background') from jalviewDir + '/' + project.getProperty('getdown_txt_ui.progress_image') @@ -770,8 +767,7 @@ task getdownDigest(type: JavaExec) { group = "distribution" description = "Digest the getdown website folder" dependsOn getdownWebsite - classpath = files(jalviewDir + '/' + getdown_core) - classpath file(jalviewDir + '/' + getdown_lib1) + classpath = files(jalviewDir + '/' + getdown_core, jalviewDir+'/'+getdown_launcher) main = "com.threerings.getdown.tools.Digester" args project.ext.getdownWebsiteDir inputs.dir(project.ext.getdownWebsiteDir)