Index: build.gradle =================================================================== diff -u -N -r132fa48b35a4821ca0d8e241ba27989e573e61e5 -ra0ca13ac05f537ec85620b982650df13826c121e --- build.gradle (.../build.gradle) (revision 132fa48b35a4821ca0d8e241ba27989e573e61e5) +++ build.gradle (.../build.gradle) (revision a0ca13ac05f537ec85620b982650df13826c121e) @@ -98,7 +98,7 @@ getdownChannelName = CHANNEL.toLowerCase() // default to "default". Currently only has different cosmetics for "develop", "release", "default" - propertiesChannelName = ["develop", "release", "test-release"].contains(getdownChannelName) ? getdownChannelName : "default" + propertiesChannelName = ["develop", "release", "test-release", "jalviewjs", "jalviewjs-release" ].contains(getdownChannelName) ? getdownChannelName : "default" // Import channel_properties channelDir = string("${jalviewDir}/${channel_properties_dir}/${propertiesChannelName}") channelGradleProperties = string("${channelDir}/channel_gradle.properties") @@ -221,7 +221,7 @@ install4jExtraScheme = "jalviewb" break - case "RELEASE": + case [ "RELEASE", "JALVIEWJS-RELEASE" ]: getdownAppDistDir = getdown_app_dir_release reportRsyncCommand = true install4jSuffix = "" @@ -307,7 +307,7 @@ install4jInstallerName = "${jalview_name} Test Installer" break - case "LOCAL": + case [ "LOCAL", "JALVIEWJS" ]: JALVIEW_VERSION = "TEST" getdownAppBase = file(getdownWebsiteDir).toURI().toString() getdownLauncher = string("${jalviewDir}/${getdown_lib_dir}/${getdown_launcher_local}") @@ -1270,12 +1270,16 @@ outputs.file("${workingDir}/JavaHelpSearch/TMAP") } -task prepare { +task buildResources { dependsOn copyResources + dependsOn copyChannelResources + dependsOn createBuildProperties +} + +task prepare { + dependsOn buildResources dependsOn copyDocs dependsOn copyHelp - dependsOn createBuildProperties - dependsOn copyChannelResources dependsOn convertMdFiles dependsOn buildIndices } @@ -2313,7 +2317,9 @@ task jalviewjsSyncResources (type: Sync) { - def inputFiles = fileTree(dir: resourceDir) + dependsOn buildResources + + def inputFiles = fileTree(dir: resourcesBuildDir) def outputDir = "${jalviewDir}/${jalviewjsSiteDir}/${jalviewjs_j2s_subdir}" from inputFiles