From: Ben Soares Date: Thu, 22 Dec 2022 00:51:44 +0000 (+0000) Subject: JAL-4111 Allow -PCHANNEL=DEVELOP-version for new appbase. Add a utils/channel/develo... X-Git-Tag: Release_2_11_3_0~29 X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=12cbc82ecab52eb8696515580daa17b3f45e725b JAL-4111 Allow -PCHANNEL=DEVELOP-version for new appbase. Add a utils/channel/develop-2.12 dir with new getdown images. --- diff --git a/build.gradle b/build.gradle index bde50b5..f2e4aec 100644 --- a/build.gradle +++ b/build.gradle @@ -9,6 +9,7 @@ import org.gradle.util.ConfigureUtil import org.gradle.plugins.ide.eclipse.model.Output import org.gradle.plugins.ide.eclipse.model.Library import java.security.MessageDigest +import java.util.regex.Matcher import groovy.transform.ExternalizeMethods import groovy.util.XmlParser import groovy.xml.XmlUtil @@ -109,6 +110,10 @@ ext { // default to "default". Currently only has different cosmetics for "develop", "release", "default" propertiesChannelName = ["develop", "release", "test-release", "jalviewjs", "jalviewjs-release" ].contains(getdownChannelName) ? getdownChannelName : "default" // Import channel_properties + if (getdownChannelName.startsWith("develop")) { + propertiesChannelName = file("${jalviewDir}/${channel_properties_dir}/${getdownChannelName}").exists() ? getdownChannelName : "develop" + println("SET propertiesChannelName to '${propertiesChannelName}'") + } channelDir = string("${jalviewDir}/${channel_properties_dir}/${propertiesChannelName}") channelGradleProperties = string("${channelDir}/channel_gradle.properties") channelPropsFile = string("${channelDir}/${resource_dir}/${channel_props}") @@ -287,6 +292,21 @@ ext { install4jExtraScheme = "jalviewa" break + case ~/^DEVELOP-([\.\-\w]*)$/: + def suffix = Matcher.lastMatcher[0][1] + reportRsyncCommand = true + getdownSetAppBaseProperty = true + JALVIEW_VERSION=JALVIEW_VERSION+"-d${suffix}-${buildDate}" + install4jSuffix = "Develop ${suffix}" + install4jExtraScheme = "jalviewd" + install4jInstallerName = "${jalview_name} Develop ${suffix} Installer" + getdownChannelName = string("develop-${suffix}") + getdownChannelDir = string("${getdown_website_dir}/${getdownChannelName}") + getdownAppBaseDir = string("${jalviewDir}/${getdownChannelDir}/${JAVA_VERSION}") + getdownDir = string("${getdownChannelName}/${JAVA_VERSION}") + getdownAppBase = string("${getdown_channel_base}/${getdownDir}") + break + case "DEVELOP": reportRsyncCommand = true getdownSetAppBaseProperty = true diff --git a/utils/channels/develop-2.12/channel_gradle.properties b/utils/channels/develop-2.12/channel_gradle.properties new file mode 100644 index 0000000..57cdcd7 --- /dev/null +++ b/utils/channels/develop-2.12/channel_gradle.properties @@ -0,0 +1,32 @@ +# These properties will be read into the build.gradle REPLACING any properties with the same name in gradle.properties +# BEFORE local_properties is read +# The purpose of this is to change cosmetic/themed items, and use the channel specific channels_properties file in Jalview +getdown_images_dir = utils/channels/develop-2.12/images +getdown_background_image = jalview_develop_getdown_background.png +getdown_instant_background_image = jalview_develop_getdown_background_initialising.png +getdown_error_background = jalview_develop_getdown_background_error.png +getdown_progress_image = jalview_develop_getdown_progress_bar.png +getdown_mac_dock_icon = jalview_develop_logo.icns +getdown_icon = jalview_develop_logo.png +getdown_txt_allow_offline = true +getdown_txt_max_concurrent_downloads = 10 +getdown_txt_ui.background = 000000 +getdown_txt_ui.progress = 0, 473, 640, 7 +getdown_txt_ui.progress_bar = AAAA00 +getdown_txt_ui.progress_text = 000000 +getdown_txt_ui.hide_progress_text = true +getdown_txt_ui.status = 21, 178, 273, 194 +getdown_txt_ui.status_text = C0C0C0 +getdown_txt_ui.hide_decorations = true +getdown_txt_ui.install_error = https://www.jalview.org/faq/getdownerror +getdown_alt_java8_min_version = 01080000 +getdown_alt_java8_max_version = 01089999 +getdown_alt_java11_min_version = 11000000 +getdown_alt_java11_max_version = +install4j_images_dir = utils/channels/develop-2.12/images +install4j_mac_icons_file = jalview_develop_logo.icns +install4j_windows_icons_file = jalview_develop_logo.ico +install4j_png_icon_file = jalview_develop_logo.png +install4j_background = jalview_develop_logo_background_fade-640x480.png +install4j_dmg_background = jalview_develop_dmg_background-72dpi.png +install4j_dmg_ds_store = jalview_develop_dmg_DS_Store diff --git a/utils/channels/develop-2.12/images/UoD_banner-28.png b/utils/channels/develop-2.12/images/UoD_banner-28.png new file mode 100644 index 0000000..5a7a940 Binary files /dev/null and b/utils/channels/develop-2.12/images/UoD_banner-28.png differ diff --git a/utils/channels/develop-2.12/images/UoD_banner-32.png b/utils/channels/develop-2.12/images/UoD_banner-32.png new file mode 100644 index 0000000..d7dd5d2 Binary files /dev/null and b/utils/channels/develop-2.12/images/UoD_banner-32.png differ diff --git a/utils/channels/develop-2.12/images/barton_group-30.png b/utils/channels/develop-2.12/images/barton_group-30.png new file mode 100644 index 0000000..40c95d5 Binary files /dev/null and b/utils/channels/develop-2.12/images/barton_group-30.png differ diff --git a/utils/channels/develop-2.12/images/barton_group-512.png b/utils/channels/develop-2.12/images/barton_group-512.png new file mode 100644 index 0000000..cd5fa37 Binary files /dev/null and b/utils/channels/develop-2.12/images/barton_group-512.png differ diff --git a/utils/channels/develop-2.12/images/barton_group-62.png b/utils/channels/develop-2.12/images/barton_group-62.png new file mode 100644 index 0000000..542acd9 Binary files /dev/null and b/utils/channels/develop-2.12/images/barton_group-62.png differ diff --git a/utils/channels/develop-2.12/images/barton_group-white-512.png b/utils/channels/develop-2.12/images/barton_group-white-512.png new file mode 100644 index 0000000..f04412c Binary files /dev/null and b/utils/channels/develop-2.12/images/barton_group-white-512.png differ diff --git a/utils/channels/develop-2.12/images/barton_group-white-62.png b/utils/channels/develop-2.12/images/barton_group-white-62.png new file mode 100644 index 0000000..5e5a83a Binary files /dev/null and b/utils/channels/develop-2.12/images/barton_group-white-62.png differ diff --git a/utils/channels/develop-2.12/images/barton_group-white.svg b/utils/channels/develop-2.12/images/barton_group-white.svg new file mode 100644 index 0000000..27824f7 --- /dev/null +++ b/utils/channels/develop-2.12/images/barton_group-white.svg @@ -0,0 +1,128 @@ + +image/svg+xml + + + + + + + + + + + + + diff --git a/utils/channels/develop-2.12/images/barton_group.svg b/utils/channels/develop-2.12/images/barton_group.svg new file mode 100644 index 0000000..2becec4 --- /dev/null +++ b/utils/channels/develop-2.12/images/barton_group.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + diff --git a/utils/channels/develop-2.12/images/jalview_develop_banner.xcf b/utils/channels/develop-2.12/images/jalview_develop_banner.xcf new file mode 100644 index 0000000..cc26868 Binary files /dev/null and b/utils/channels/develop-2.12/images/jalview_develop_banner.xcf differ diff --git a/utils/channels/develop-2.12/images/jalview_develop_dmg_DS_Store b/utils/channels/develop-2.12/images/jalview_develop_dmg_DS_Store new file mode 100644 index 0000000..4d126bf Binary files /dev/null and b/utils/channels/develop-2.12/images/jalview_develop_dmg_DS_Store differ diff --git a/utils/channels/develop-2.12/images/jalview_develop_dmg_background-72dpi.png b/utils/channels/develop-2.12/images/jalview_develop_dmg_background-72dpi.png new file mode 100644 index 0000000..de7f6df Binary files /dev/null and b/utils/channels/develop-2.12/images/jalview_develop_dmg_background-72dpi.png differ diff --git a/utils/channels/develop-2.12/images/jalview_develop_dmg_background.png b/utils/channels/develop-2.12/images/jalview_develop_dmg_background.png new file mode 100644 index 0000000..aa8e3c5 Binary files /dev/null and b/utils/channels/develop-2.12/images/jalview_develop_dmg_background.png differ diff --git a/utils/channels/develop-2.12/images/jalview_develop_dmg_background.svg b/utils/channels/develop-2.12/images/jalview_develop_dmg_background.svg new file mode 100644 index 0000000..24ddbb4 --- /dev/null +++ b/utils/channels/develop-2.12/images/jalview_develop_dmg_background.svg @@ -0,0 +1,19501 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Develop diff --git a/utils/channels/develop-2.12/images/jalview_develop_getdown_background.png b/utils/channels/develop-2.12/images/jalview_develop_getdown_background.png new file mode 100644 index 0000000..d4a05bb Binary files /dev/null and b/utils/channels/develop-2.12/images/jalview_develop_getdown_background.png differ diff --git a/utils/channels/develop-2.12/images/jalview_develop_getdown_background.xcf b/utils/channels/develop-2.12/images/jalview_develop_getdown_background.xcf new file mode 100644 index 0000000..b61fb4e Binary files /dev/null and b/utils/channels/develop-2.12/images/jalview_develop_getdown_background.xcf differ diff --git a/utils/channels/develop-2.12/images/jalview_develop_getdown_background_error.png b/utils/channels/develop-2.12/images/jalview_develop_getdown_background_error.png new file mode 100644 index 0000000..07c5a30 Binary files /dev/null and b/utils/channels/develop-2.12/images/jalview_develop_getdown_background_error.png differ diff --git a/utils/channels/develop-2.12/images/jalview_develop_getdown_background_initialising.png b/utils/channels/develop-2.12/images/jalview_develop_getdown_background_initialising.png new file mode 100644 index 0000000..5a9cce3 Binary files /dev/null and b/utils/channels/develop-2.12/images/jalview_develop_getdown_background_initialising.png differ diff --git a/utils/channels/develop-2.12/images/jalview_develop_getdown_progress_bar.png b/utils/channels/develop-2.12/images/jalview_develop_getdown_progress_bar.png new file mode 100644 index 0000000..3b1cfe1 Binary files /dev/null and b/utils/channels/develop-2.12/images/jalview_develop_getdown_progress_bar.png differ diff --git a/utils/channels/develop-2.12/images/jalview_develop_logo.icns b/utils/channels/develop-2.12/images/jalview_develop_logo.icns new file mode 100644 index 0000000..ceab689 Binary files /dev/null and b/utils/channels/develop-2.12/images/jalview_develop_logo.icns differ diff --git a/utils/channels/develop-2.12/images/jalview_develop_logo.ico b/utils/channels/develop-2.12/images/jalview_develop_logo.ico new file mode 100644 index 0000000..76e6dd6 Binary files /dev/null and b/utils/channels/develop-2.12/images/jalview_develop_logo.ico differ diff --git a/utils/channels/develop-2.12/images/jalview_develop_logo.png b/utils/channels/develop-2.12/images/jalview_develop_logo.png new file mode 100644 index 0000000..9a6a135 Binary files /dev/null and b/utils/channels/develop-2.12/images/jalview_develop_logo.png differ diff --git a/utils/channels/develop-2.12/images/jalview_develop_logo.svg b/utils/channels/develop-2.12/images/jalview_develop_logo.svg new file mode 100644 index 0000000..5830354 --- /dev/null +++ b/utils/channels/develop-2.12/images/jalview_develop_logo.svg @@ -0,0 +1,538 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/utils/channels/develop-2.12/images/jalview_develop_logo_background_fade-640x480.png b/utils/channels/develop-2.12/images/jalview_develop_logo_background_fade-640x480.png new file mode 100644 index 0000000..fde68b9 Binary files /dev/null and b/utils/channels/develop-2.12/images/jalview_develop_logo_background_fade-640x480.png differ diff --git a/utils/channels/develop-2.12/resources/channel.props b/utils/channels/develop-2.12/resources/channel.props new file mode 100644 index 0000000..7ed5197 --- /dev/null +++ b/utils/channels/develop-2.12/resources/channel.props @@ -0,0 +1,20 @@ +app_name=Jalview Develop 2.12 +banner=/images/jalview_develop_banner.png +logo.16=/images/jalview_develop_logo-16.png +logo.32=/images/jalview_develop_logo-32.png +logo.38=/images/jalview_develop_logo-38.png +logo.48=/images/jalview_develop_logo-48.png +logo.64=/images/jalview_develop_logo-64.png +logo.128=/images/jalview_develop_logo-128.png +logo.256=/images/jalview_develop_logo-256.png +logo.512=/images/jalview_develop_logo-512.png +rotatable_logo.48=/images/rotatable_jalview_develop_logo-38.png +bg_logo.28=/images/barton_group-28.png +bg_logo.30=/images/barton_group-30.png +bg_logo.32=/images/barton_group-32.png +uod_banner.28=/images/UoD_banner-28.png +uod_banner.30=/images/UoD_banner-30.png +uod_banner.32=/images/UoD_banner-32.png +default_appbase=https://www.jalview.org/getdown/develop-2.12/11 +preferences.filename=.jalview_develop-2_12_properties +channel=develop-2.12 diff --git a/utils/channels/develop-2.12/resources/images/UoD_banner-28.png b/utils/channels/develop-2.12/resources/images/UoD_banner-28.png new file mode 100644 index 0000000..5a7a940 Binary files /dev/null and b/utils/channels/develop-2.12/resources/images/UoD_banner-28.png differ diff --git a/utils/channels/develop-2.12/resources/images/UoD_banner-30.png b/utils/channels/develop-2.12/resources/images/UoD_banner-30.png new file mode 100644 index 0000000..3f56b13 Binary files /dev/null and b/utils/channels/develop-2.12/resources/images/UoD_banner-30.png differ diff --git a/utils/channels/develop-2.12/resources/images/UoD_banner-32.png b/utils/channels/develop-2.12/resources/images/UoD_banner-32.png new file mode 100644 index 0000000..d7dd5d2 Binary files /dev/null and b/utils/channels/develop-2.12/resources/images/UoD_banner-32.png differ diff --git a/utils/channels/develop-2.12/resources/images/UoD_banner.png b/utils/channels/develop-2.12/resources/images/UoD_banner.png new file mode 100644 index 0000000..2aff7e2 Binary files /dev/null and b/utils/channels/develop-2.12/resources/images/UoD_banner.png differ diff --git a/utils/channels/develop-2.12/resources/images/barton_group-28.png b/utils/channels/develop-2.12/resources/images/barton_group-28.png new file mode 100644 index 0000000..8d95482 Binary files /dev/null and b/utils/channels/develop-2.12/resources/images/barton_group-28.png differ diff --git a/utils/channels/develop-2.12/resources/images/barton_group-30.png b/utils/channels/develop-2.12/resources/images/barton_group-30.png new file mode 100644 index 0000000..40c95d5 Binary files /dev/null and b/utils/channels/develop-2.12/resources/images/barton_group-30.png differ diff --git a/utils/channels/develop-2.12/resources/images/barton_group-32.png b/utils/channels/develop-2.12/resources/images/barton_group-32.png new file mode 100644 index 0000000..70de633 Binary files /dev/null and b/utils/channels/develop-2.12/resources/images/barton_group-32.png differ diff --git a/utils/channels/develop-2.12/resources/images/jalview_develop_banner.png b/utils/channels/develop-2.12/resources/images/jalview_develop_banner.png new file mode 100644 index 0000000..bd3dfe1 Binary files /dev/null and b/utils/channels/develop-2.12/resources/images/jalview_develop_banner.png differ diff --git a/utils/channels/develop-2.12/resources/images/jalview_develop_logo-128.png b/utils/channels/develop-2.12/resources/images/jalview_develop_logo-128.png new file mode 100644 index 0000000..ee5b769 Binary files /dev/null and b/utils/channels/develop-2.12/resources/images/jalview_develop_logo-128.png differ diff --git a/utils/channels/develop-2.12/resources/images/jalview_develop_logo-16.png b/utils/channels/develop-2.12/resources/images/jalview_develop_logo-16.png new file mode 100644 index 0000000..7e4b262 Binary files /dev/null and b/utils/channels/develop-2.12/resources/images/jalview_develop_logo-16.png differ diff --git a/utils/channels/develop-2.12/resources/images/jalview_develop_logo-256.png b/utils/channels/develop-2.12/resources/images/jalview_develop_logo-256.png new file mode 100644 index 0000000..45cb392 Binary files /dev/null and b/utils/channels/develop-2.12/resources/images/jalview_develop_logo-256.png differ diff --git a/utils/channels/develop-2.12/resources/images/jalview_develop_logo-32.png b/utils/channels/develop-2.12/resources/images/jalview_develop_logo-32.png new file mode 100644 index 0000000..ac42ed0 Binary files /dev/null and b/utils/channels/develop-2.12/resources/images/jalview_develop_logo-32.png differ diff --git a/utils/channels/develop-2.12/resources/images/jalview_develop_logo-38.png b/utils/channels/develop-2.12/resources/images/jalview_develop_logo-38.png new file mode 100644 index 0000000..671f776 Binary files /dev/null and b/utils/channels/develop-2.12/resources/images/jalview_develop_logo-38.png differ diff --git a/utils/channels/develop-2.12/resources/images/jalview_develop_logo-48.png b/utils/channels/develop-2.12/resources/images/jalview_develop_logo-48.png new file mode 100644 index 0000000..4bd8284 Binary files /dev/null and b/utils/channels/develop-2.12/resources/images/jalview_develop_logo-48.png differ diff --git a/utils/channels/develop-2.12/resources/images/jalview_develop_logo-512.png b/utils/channels/develop-2.12/resources/images/jalview_develop_logo-512.png new file mode 100644 index 0000000..9a6a135 Binary files /dev/null and b/utils/channels/develop-2.12/resources/images/jalview_develop_logo-512.png differ diff --git a/utils/channels/develop-2.12/resources/images/jalview_develop_logo-64.png b/utils/channels/develop-2.12/resources/images/jalview_develop_logo-64.png new file mode 100644 index 0000000..55a3f12 Binary files /dev/null and b/utils/channels/develop-2.12/resources/images/jalview_develop_logo-64.png differ diff --git a/utils/channels/develop-2.12/resources/images/rotatable_jalview_develop_logo-38.png b/utils/channels/develop-2.12/resources/images/rotatable_jalview_develop_logo-38.png new file mode 100644 index 0000000..2cdb8dc Binary files /dev/null and b/utils/channels/develop-2.12/resources/images/rotatable_jalview_develop_logo-38.png differ