X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=build.gradle;h=84c38db45b55018616f6ff30e89e4bdc40248342;hb=a9c365d7d21a454d1befb178a4286b6cede19d20;hp=810eb578e4f6aeefe9f94ecf792df623d8c95a95;hpb=a770e3a56aaa5da7e6e88faa199ae9882339489a;p=jalview.git diff --git a/build.gradle b/build.gradle index 810eb57..84c38db 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ plugins { id 'eclipse' id 'com.github.johnrengelman.shadow' version '4.0.3' id 'com.install4j.gradle' version '8.0.2' - id 'com.dorongold.task-tree' version '1.4' // only needed to display task dependency tree with gradle task1 [task2 ...] taskTree + id 'com.dorongold.task-tree' version '1.5' // only needed to display task dependency tree with gradle task1 [task2 ...] taskTree } repositories { @@ -117,39 +117,36 @@ ext { classes = classesDir getdownWebsiteDir = string("${jalviewDir}/${getdown_website_dir}/${JAVA_VERSION}") - getdownDir = string("") - reportRsyncCmd = false buildDist = true - buildProperties = build_properties_file + + // the following values might be overridden by the CHANNEL switch + getdownChannelName = CHANNEL.toLowerCase() + getdownDir = string("${getdownChannelName}/${JAVA_VERSION}") + getdownAppBase = string("${getdown_channel_base}/${getdownDir}") getdownLauncher = string("${jalviewDir}/${getdown_lib_dir}/${getdown_launcher}") + getdownAppDistDir = getdown_app_dir_alt + buildProperties = string("${classesDir}/${build_properties_file}") + reportRsyncCmd = false switch (CHANNEL) { case "BUILD": // TODO: get bamboo build artifact URL for getdown artifacts getdown_channel_base = bamboo_channelbase - getdown_channel_name = string("${bamboo_planKey}/${JAVA_VERSION}") - getdown_app_base = string("${bamboo_channelbase}/${bamboo_planKey}${bamboo_getdown_channel_suffix}/${JAVA_VERSION}") - getdown_app_dir = getdown_app_dir_alt - buildProperties = string("${classesDir}/${build_properties_file}") + getdownChannelName = string("${bamboo_planKey}/${JAVA_VERSION}") + getdownAppBase = string("${bamboo_channelbase}/${bamboo_planKey}${bamboo_getdown_channel_suffix}/${JAVA_VERSION}") break case "RELEASE": - getdown_channel_name = CHANNEL.toLowerCase() - getdownDir = string("${getdown_channel_name}/${JAVA_VERSION}") - getdown_app_base = string("${getdown_channel_base}/${getdownDir}") - getdown_app_dir = getdown_app_dir_release - buildProperties = string("${classesDir}/${build_properties_file}") + getdownAppDistDir = getdown_app_dir_release reportRsyncCommand = true break case "ARCHIVE": - getdown_channel_name = CHANNEL.toLowerCase()+"/${JALVIEW_VERSION}" - getdownDir = string("${getdown_channel_name}/${JAVA_VERSION}") - getdown_app_base = string("${getdown_channel_base}/${getdownDir}") - getdown_app_dir = getdown_app_dir_alt + getdownChannelName = CHANNEL.toLowerCase()+"/${JALVIEW_VERSION}" + getdownDir = string("${getdownChannelName}/${JAVA_VERSION}") + getdownAppBase = string("${getdown_channel_base}/${getdownDir}") if (!file("${ARCHIVEDIR}/${packageDir}").exists()) { - print "Must provide an ARCHIVEDIR value to produce an archive distribution" - exit + throw new GradleException("Must provide an ARCHIVEDIR value to produce an archive distribution") } else { packageDir = string("${ARCHIVEDIR}/${packageDir}") buildProperties = string("${ARCHIVEDIR}/${classes_dir}/${build_properties_file}") @@ -159,13 +156,11 @@ ext { break case "ARCHIVELOCAL": - getdown_channel_name = string("archive/${JALVIEW_VERSION}") - getdownDir = string("${getdown_channel_name}/${JAVA_VERSION}") - getdown_app_base = file(getdownWebsiteDir).toURI().toString() - getdown_app_dir = getdown_app_dir_alt + getdownChannelName = string("archive/${JALVIEW_VERSION}") + getdownDir = string("${getdownChannelName}/${JAVA_VERSION}") + getdownAppBase = file(getdownWebsiteDir).toURI().toString() if (!file("${ARCHIVEDIR}/${packageDir}").exists()) { - print "Must provide an ARCHIVEDIR value to produce an archive distribution" - exit + throw new GradleException("Must provide an ARCHIVEDIR value to produce an archive distribution") } else { packageDir = string("${ARCHIVEDIR}/${packageDir}") buildProperties = string("${ARCHIVEDIR}/${classes_dir}/${build_properties_file}") @@ -176,52 +171,37 @@ ext { break case "DEVELOP": - getdown_channel_name = CHANNEL.toLowerCase() - getdownDir = string("${getdown_channel_name}/${JAVA_VERSION}") - getdown_app_base = string("${getdown_channel_base}/${getdownDir}") - getdown_app_dir = getdown_app_dir_alt - buildProperties = string("${classesDir}/${build_properties_file}") reportRsyncCommand = true break case "TEST-RELEASE": - getdown_channel_name = CHANNEL.toLowerCase() - getdownDir = string("${getdown_channel_name}/${JAVA_VERSION}") - getdown_app_base = string("${getdown_channel_base}/${getdownDir}") - getdown_app_dir = getdown_app_dir_alt - buildProperties = string("${classesDir}/${build_properties_file}") reportRsyncCommand = true break case ~/^SCRATCH(|-[-\w]*)$/: - getdown_channel_name = CHANNEL - getdownDir = string("${getdown_channel_name}/${JAVA_VERSION}") - getdown_app_base = string("${getdown_channel_base}/${getdownDir}") - getdown_app_dir = getdown_app_dir_alt - buildProperties = string("${classesDir}/${build_properties_file}") + getdownChannelName = CHANNEL + getdownDir = string("${getdownChannelName}/${JAVA_VERSION}") + getdownAppBase = string("${getdown_channel_base}/${getdownDir}") reportRsyncCommand = true break case "LOCAL": - getdown_app_base = file(getdownWebsiteDir).toURI().toString() - getdown_app_dir = getdown_app_dir_alt - buildProperties = string("${classesDir}/${build_properties_file}") + getdownAppBase = file(getdownWebsiteDir).toURI().toString() getdownLauncher = string("${jalviewDir}/${getdown_lib_dir}/${getdown_launcher_local}") break default: // something wrong specified - println("CHANNEL must be one of BUILD, RELEASE, ARCHIVE, DEVELOP, TEST-RELEASE, SCRATCH-..., LOCAL [default]") - exit + throw new GradleException("CHANNEL must be one of BUILD, RELEASE, ARCHIVE, DEVELOP, TEST-RELEASE, SCRATCH-..., LOCAL [default]") break } - // override getdown_app_base if requested + // override getdownAppBase if requested if (findProperty("getdown_appbase_override") != null) { - getdown_app_base = string(getProperty("getdown_appbase_override")) - println("Overriding getdown appbase with '${getdown_app_base}'") + getdownAppBase = string(getProperty("getdown_appbase_override")) + println("Overriding getdown appbase with '${getdownAppBase}'") } - getdownAppDir = string("${getdownWebsiteDir}/${getdown_app_dir}") + getdownAppDir = string("${getdownWebsiteDir}/${getdownAppDistDir}") //getdownJ11libDir = "${getdownWebsiteDir}/${getdown_j11lib_dir}" getdownResourceDir = string("${getdownWebsiteDir}/${getdown_resource_dir}") getdownInstallDir = string("${getdownWebsiteDir}/${getdown_install_dir}") @@ -995,7 +975,6 @@ task getdownWebsite() { def getdownWebsiteResourceFilenames = [] def getdownTextString = "" def getdownResourceDir = getdownResourceDir - def getdownAppDir = getdownAppDir def getdownResourceFilenames = [] doFirst { @@ -1008,7 +987,7 @@ task getdownWebsite() { rename(build_properties_file, getdown_build_properties) into getdownAppDir } - getdownWebsiteResourceFilenames += "${getdown_app_dir}/${getdown_build_properties}" + getdownWebsiteResourceFilenames += "${getdownAppDistDir}/${getdown_build_properties}" // go through properties looking for getdown_txt_... def props = project.properties.sort { it.key } @@ -1022,7 +1001,7 @@ task getdownWebsite() { props.put("getdown_txt_multi_java_location", getdownAltMultiJavaLocation) } - props.put("getdown_txt_appbase", getdown_app_base) + props.put("getdown_txt_appbase", getdownAppBase) props.each{ prop, val -> if (prop.startsWith("getdown_txt_") && val != null) { if (prop.startsWith("getdown_txt_multi_")) { @@ -1077,7 +1056,7 @@ task getdownWebsite() { } codeFiles.sort().each{f -> def name = f.getName() - def line = "code = ${getdown_app_dir}/${name}\n" + def line = "code = ${getdownAppDistDir}/${name}\n" getdownTextString += line copy { from f.getPath() @@ -1109,6 +1088,7 @@ task getdownWebsite() { def getdown_txt = file("${getdownWebsiteDir}/getdown.txt") getdown_txt.write(getdownTextString) + def getdownLaunchJvl = ( (getdownChannelName != null && getdownChannelName.length() > 0)?"${getdownChannelName}_":"" ) + getdown_launch_jvl def launch_jvl = file("${getdownWebsiteDir}/${getdown_launch_jvl}") launch_jvl.write("appbase="+props.get("getdown_txt_appbase")) @@ -1173,7 +1153,7 @@ task getdownDigest(type: JavaExec) { description = "Digest the getdown website folder" dependsOn getdownWebsite doFirst { - classpath = files("${getdownWebsiteDir}/${getdown_launcher}") + classpath = files(getdownLauncher) } main = "com.threerings.getdown.tools.Digester" args getdownWebsiteDir @@ -1322,7 +1302,7 @@ task installers(type: com.install4j.gradle.Install4jTask) { '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_DIST_DIR': getdownAppDistDir, 'GETDOWN_ALT_DIR': getdown_app_dir_alt, 'GETDOWN_INSTALL_DIR': getdown_install_dir, 'INFO_PLIST_FILE_ASSOCIATIONS_FILE': install4j_info_plist_file_associations,