From c67b28d36c11c8d5a7a25921c57f9c30f1855589 Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Mon, 25 Apr 2022 20:32:54 +0100 Subject: [PATCH] JAL-3989 moved getdown build dirs to build/website/docroot/getdown/CHANNEL, build/website/docroot/old/VERSION and build/getdown/files, and files for hugo into build/website/hugo/... This is better in multiple ways including collating files needed for the hugo website and website docroot. --- build.gradle | 73 +++++++++++++------------ gradle.properties | 11 ++-- utils/install4j/install4j9_template.install4j | 8 +-- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/build.gradle b/build.gradle index b8dd620..3573ac7 100644 --- a/build.gradle +++ b/build.gradle @@ -194,7 +194,8 @@ ext { testSourceDir = useClover ? cloverTestInstrDir : testDir testClassesDir = useClover ? cloverTestClassesDir : "${jalviewDir}/${test_output_dir}" - getdownWebsiteDir = string("${jalviewDir}/${getdown_website_dir}/${JAVA_VERSION}") + getdownChannelDir = string("${getdown_website_dir}/${propertiesChannelName}") + getdownAppBaseDir = string("${jalviewDir}/${getdownChannelDir}/${JAVA_VERSION}") getdownArchiveDir = string("${jalviewDir}/${getdown_archive_dir}") getdownFullArchiveDir = null getdownTextLines = [] @@ -266,7 +267,7 @@ ext { case "ARCHIVELOCAL": getdownChannelName = string("archive/${JALVIEW_VERSION}") getdownDir = string("${getdownChannelName}/${JAVA_VERSION}") - getdownAppBase = file(getdownWebsiteDir).toURI().toString() + getdownAppBase = file(getdownAppBaseDir).toURI().toString() if (!file("${ARCHIVEDIR}/${package_dir}").exists()) { throw new GradleException("Must provide an ARCHIVEDIR value to produce an archive distribution") } else { @@ -330,7 +331,7 @@ ext { case [ "LOCAL", "JALVIEWJS" ]: JALVIEW_VERSION = "TEST" - getdownAppBase = file(getdownWebsiteDir).toURI().toString() + getdownAppBase = file(getdownAppBaseDir).toURI().toString() getdownArchiveAppBase = file("${jalviewDir}/${getdown_archive_dir}").toURI().toString() getdownLauncher = string("${jalviewDir}/${getdown_lib_dir}/${getdown_launcher_local}") install4jExtraScheme = "jalviewl" @@ -348,7 +349,7 @@ ext { if (findProperty("getdown_appbase_override") != null) { // revert to LOCAL if empty string if (string(getdown_appbase_override) == "") { - getdownAppBase = file(getdownWebsiteDir).toURI().toString() + getdownAppBase = file(getdownAppBaseDir).toURI().toString() getdownLauncher = string("${jalviewDir}/${getdown_lib_dir}/${getdown_launcher_local}") } else if (string(getdown_appbase_override).startsWith("file://")) { getdownAppBase = string(getdown_appbase_override) @@ -392,10 +393,10 @@ ext { .toLowerCase() getdownWrapperLink = install4jUnixApplicationFolder // e.g. "jalview_local" - getdownAppDir = string("${getdownWebsiteDir}/${getdownAppDistDir}") - //getdownJ11libDir = "${getdownWebsiteDir}/${getdown_j11lib_dir}" - getdownResourceDir = string("${getdownWebsiteDir}/${getdown_resource_dir}") - getdownInstallDir = string("${getdownWebsiteDir}/${getdown_install_dir}") + getdownAppDir = string("${getdownAppBaseDir}/${getdownAppDistDir}") + //getdownJ11libDir = "${getdownAppBaseDir}/${getdown_j11lib_dir}" + getdownResourceDir = string("${getdownAppBaseDir}/${getdown_resource_dir}") + getdownInstallDir = string("${getdownAppBaseDir}/${getdown_install_dir}") getdownFilesDir = string("${jalviewDir}/${getdown_files_dir}/${JAVA_VERSION}/") getdownFilesInstallDir = string("${getdownFilesDir}/${getdown_install_dir}") /* compile without modules -- using classpath libraries @@ -1531,7 +1532,7 @@ task getdownWebsite() { doFirst { // clean the getdown website and files dir before creating getdown folders - delete getdownWebsiteDir + delete getdownAppBaseDir delete getdownFilesDir copy { @@ -1543,7 +1544,7 @@ task getdownWebsite() { copy { from channelPropsFile - into getdownWebsiteDir + into getdownAppBaseDir } getdownWebsiteResourceFilenames += file(channelPropsFile).getName() @@ -1621,7 +1622,7 @@ task getdownWebsite() { if (s.exists()) { copy { from s - into "${getdownWebsiteDir}/${getdown_wrapper_script_dir}" + into "${getdownAppBaseDir}/${getdown_wrapper_script_dir}" } getdownTextLines += "resource = ${getdown_wrapper_script_dir}/${script}" } @@ -1674,18 +1675,18 @@ task getdownWebsite() { getdownTextLines += "jvmarg = -Dgetdownappbase=${getdownAppBase}" } - def getdownTxt = file("${getdownWebsiteDir}/getdown.txt") + def getdownTxt = file("${getdownAppBaseDir}/getdown.txt") getdownTxt.write(getdownTextLines.join("\n")) getdownLaunchJvl = getdown_launch_jvl_name + ( (jvlChannelName != null && jvlChannelName.length() > 0)?"-${jvlChannelName}":"" ) + ".jvl" - def launchJvl = file("${getdownWebsiteDir}/${getdownLaunchJvl}") + def launchJvl = file("${getdownAppBaseDir}/${getdownLaunchJvl}") launchJvl.write("appbase=${getdownAppBase}") // files going into the getdown website dir: getdown-launcher.jar copy { from getdownLauncher rename(file(getdownLauncher).getName(), getdown_launcher_new) - into getdownWebsiteDir + into getdownAppBaseDir } // files going into the getdown website dir: getdown-launcher(-local).jar @@ -1694,7 +1695,7 @@ task getdownWebsite() { if (file(getdownLauncher).getName() != getdown_launcher) { rename(file(getdownLauncher).getName(), getdown_launcher) } - into getdownWebsiteDir + into getdownAppBaseDir } // files going into the getdown website dir: ./install dir and files @@ -1721,8 +1722,8 @@ task getdownWebsite() { from getdownTxt from launchJvl from getdownLauncher - from "${getdownWebsiteDir}/${getdown_build_properties}" - from "${getdownWebsiteDir}/${channel_props}" + from "${getdownAppBaseDir}/${getdown_build_properties}" + from "${getdownAppBaseDir}/${channel_props}" if (file(getdownLauncher).getName() != getdown_launcher) { rename(file(getdownLauncher).getName(), getdown_launcher) } @@ -1739,7 +1740,7 @@ task getdownWebsite() { if (buildDist) { inputs.dir("${jalviewDir}/${package_dir}") } - outputs.dir(getdownWebsiteDir) + outputs.dir(getdownAppBaseDir) outputs.dir(getdownFilesDir) } @@ -1770,9 +1771,9 @@ task getdownDigest(type: JavaExec) { classpath = files(getdownLauncher) } main = "com.threerings.getdown.tools.Digester" - args getdownWebsiteDir - inputs.dir(getdownWebsiteDir) - outputs.file("${getdownWebsiteDir}/digest2.txt") + args getdownAppBaseDir + inputs.dir(getdownAppBaseDir) + outputs.file("${getdownAppBaseDir}/digest2.txt") } @@ -1782,7 +1783,7 @@ task getdown() { dependsOn getdownDigest doLast { if (reportRsyncCommand) { - def fromDir = getdownWebsiteDir + (getdownWebsiteDir.endsWith('/')?'':'/') + def fromDir = getdownAppBaseDir + (getdownAppBaseDir.endsWith('/')?'':'/') def toDir = "${getdown_rsync_dest}/${getdownDir}" + (getdownDir.endsWith('/')?'':'/') println "LIKELY RSYNC COMMAND:" println "mkdir -p '$toDir'\nrsync -avh --delete '$fromDir' '$toDir'" @@ -1824,7 +1825,7 @@ task getdownArchiveBuild() { // the libdir copy { - from "${getdownWebsiteDir}/${getdownAppDistDir}" + from "${getdownAppBaseDir}/${getdownAppDistDir}" into "${getdownFullArchiveDir}/${vAltDir}" } @@ -1864,9 +1865,9 @@ task getdownArchiveBuild() { // files going into the getdown files dir: getdown.txt, getdown-launcher.jar, channel-launch.jvl, build_properties copy { from getdownLauncher - from "${getdownWebsiteDir}/${getdownLaunchJvl}" - from "${getdownWebsiteDir}/${getdown_launcher_new}" - from "${getdownWebsiteDir}/${channel_props}" + from "${getdownAppBaseDir}/${getdownLaunchJvl}" + from "${getdownAppBaseDir}/${getdown_launcher_new}" + from "${getdownAppBaseDir}/${channel_props}" if (file(getdownLauncher).getName() != getdown_launcher) { rename(file(getdownLauncher).getName(), getdown_launcher) } @@ -1906,7 +1907,7 @@ tasks.withType(JavaCompile) { clean { doFirst { - delete getdownWebsiteDir + delete getdownAppBaseDir delete getdownFilesDir delete getdownArchiveDir } @@ -2075,7 +2076,7 @@ task installerFiles(type: com.install4j.gradle.Install4jTask) { 'WRAPPER_SCRIPT_BIN_DIR': getdown_wrapper_script_dir, 'INSTALLER_NAME': install4jInstallerName, 'INSTALL4J_UTILS_DIR': install4j_utils_dir, - 'GETDOWN_WEBSITE_DIR': getdown_website_dir, + 'GETDOWN_CHANNEL_DIR': getdownChannelDir, 'GETDOWN_FILES_DIR': getdown_files_dir, 'GETDOWN_RESOURCE_DIR': getdown_resource_dir, 'GETDOWN_DIST_DIR': getdownAppDistDir, @@ -2124,7 +2125,7 @@ task installerFiles(type: com.install4j.gradle.Install4jTask) { } //verbose=true - inputs.dir(getdownWebsiteDir) + inputs.dir(getdownAppBaseDir) inputs.file(install4jConfFile) inputs.file("${install4jDir}/${install4j_info_plist_file_associations}") inputs.dir(macosJavaVMDir) @@ -2316,7 +2317,9 @@ task sourceDist(type: Tar) { exclude ("utils/InstallAnywhere") exclude (getdown_files_dir) - exclude (getdown_website_dir) + // getdown_website_dir and getdown_archive_dir moved to build/website/docroot/getdown + //exclude (getdown_website_dir) + //exclude (getdown_archive_dir) // exluding these as not using jars as modules yet exclude ("${j11modDir}/**/*.jar") @@ -2345,7 +2348,7 @@ task sourceDist(type: Tar) { } } -task makeDataJsonFile { +task dataInstallersJson { group "website" description "Create the installers-VERSION.json data file for installer files created" @@ -2375,10 +2378,10 @@ task makeDataJsonFile { } } -makeDataJsonFile.mustRunAfter installers -makeDataJsonFile.mustRunAfter shadowJar -makeDataJsonFile.mustRunAfter sourceDist -makeDataJsonFile.mustRunAfter getdownArchive +dataInstallersJson.mustRunAfter installers +dataInstallersJson.mustRunAfter shadowJar +dataInstallersJson.mustRunAfter sourceDist +dataInstallersJson.mustRunAfter getdownArchive task helppages { diff --git a/gradle.properties b/gradle.properties index 64790d0..92a64cc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -58,17 +58,14 @@ shadow_jar_main_class = jalview.bin.Launcher jalview_name = Jalview -hugo_build_dir = build/hugo +hugo_build_dir = build/website/hugo # these are going to be used in the future to gather website release files together -# getdown_website_dir = build/website/getdown/release -# getdown_archive_dir = build/website/old -# getdown_files_dir = build/getdown/files +getdown_website_dir = build/website/docroot/getdown +getdown_archive_dir = build/website/docroot/old +getdown_files_dir = build/getdown/files getdown_local = false -getdown_website_dir = getdown/website -getdown_archive_dir = getdown/old getdown_resource_dir = resource -getdown_files_dir = getdown/files getdown_lib_dir = getdown/lib getdown_launcher = getdown-launcher.jar getdown_launcher_local = getdown-launcher-local.jar diff --git a/utils/install4j/install4j9_template.install4j b/utils/install4j/install4j9_template.install4j index a6d0893..23ff9c9 100644 --- a/utils/install4j/install4j9_template.install4j +++ b/utils/install4j/install4j9_template.install4j @@ -40,7 +40,7 @@ - + @@ -105,16 +105,16 @@ - + - + - + -- 1.7.10.2