From: Ben Soares Date: Thu, 5 Jan 2023 13:38:00 +0000 (+0000) Subject: JAL-4111 Fixed channel.props to allow replacement of __SUFFIX__. Generic background... X-Git-Tag: Release_2_11_3_0~27 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=deb17f488d8703a82b350c25c9ab846cc4a778fe;p=jalview.git JAL-4111 Fixed channel.props to allow replacement of __SUFFIX__. Generic background images with 'branch version' for getdown and DMG --- diff --git a/build.gradle b/build.gradle index f2e4aec..e6b7e33 100644 --- a/build.gradle +++ b/build.gradle @@ -109,12 +109,13 @@ ext { getdownChannelName = CHANNEL.toLowerCase() // default to "default". Currently only has different cosmetics for "develop", "release", "default" propertiesChannelName = ["develop", "release", "test-release", "jalviewjs", "jalviewjs-release" ].contains(getdownChannelName) ? getdownChannelName : "default" + channelDirName = propertiesChannelName // Import channel_properties - if (getdownChannelName.startsWith("develop")) { - propertiesChannelName = file("${jalviewDir}/${channel_properties_dir}/${getdownChannelName}").exists() ? getdownChannelName : "develop" + if (getdownChannelName.startsWith("develop-")) { + channelDirName = "develop-SUFFIX" println("SET propertiesChannelName to '${propertiesChannelName}'") } - channelDir = string("${jalviewDir}/${channel_properties_dir}/${propertiesChannelName}") + channelDir = string("${jalviewDir}/${channel_properties_dir}/${channelDirName}") channelGradleProperties = string("${channelDir}/channel_gradle.properties") channelPropsFile = string("${channelDir}/${resource_dir}/${channel_props}") overrideProperties(channelGradleProperties, false) @@ -203,6 +204,7 @@ ext { testSourceDir = useClover ? cloverTestInstrDir : testDir testClassesDir = useClover ? cloverTestClassesDir : "${jalviewDir}/${test_output_dir}" + channelSuffix = null getdownChannelDir = string("${getdown_website_dir}/${propertiesChannelName}") getdownAppBaseDir = string("${jalviewDir}/${getdownChannelDir}/${JAVA_VERSION}") getdownArchiveDir = string("${jalviewDir}/${getdown_archive_dir}") @@ -305,6 +307,7 @@ ext { getdownAppBaseDir = string("${jalviewDir}/${getdownChannelDir}/${JAVA_VERSION}") getdownDir = string("${getdownChannelName}/${JAVA_VERSION}") getdownAppBase = string("${getdown_channel_base}/${getdownDir}") + channelSuffix = string(suffix) break case "DEVELOP": @@ -1639,7 +1642,19 @@ task copyChannelResources(type: Copy) { def inputDir = "${channelDir}/${resource_dir}" def outputDir = resourcesBuildDir - from inputDir + from(inputDir) { + include(channel_props) + filter(ReplaceTokens, + beginToken: '__', + endToken: '__', + tokens: [ + 'SUFFIX': channelSuffix + ] + ) + } + from(inputDir) { + exclude(channel_props) + } into outputDir inputs.dir(inputDir) @@ -1917,6 +1932,13 @@ task getdownWebsite() { copy { from channelPropsFile + filter(ReplaceTokens, + beginToken: '__', + endToken: '__', + tokens: [ + 'SUFFIX': channelSuffix + ] + ) into getdownAppBaseDir } getdownWebsiteResourceFilenames += file(channelPropsFile).getName() 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 deleted file mode 100644 index 3586676..0000000 Binary files a/utils/channels/develop-2.12/images/jalview_develop_dmg_background-72dpi.png and /dev/null 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 deleted file mode 100644 index 5a874d3..0000000 Binary files a/utils/channels/develop-2.12/images/jalview_develop_dmg_background.png and /dev/null differ 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 deleted file mode 100644 index d4a05bb..0000000 Binary files a/utils/channels/develop-2.12/images/jalview_develop_getdown_background.png and /dev/null 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 deleted file mode 100644 index 07c5a30..0000000 Binary files a/utils/channels/develop-2.12/images/jalview_develop_getdown_background_error.png and /dev/null 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 deleted file mode 100644 index 5a9cce3..0000000 Binary files a/utils/channels/develop-2.12/images/jalview_develop_getdown_background_initialising.png and /dev/null differ diff --git a/utils/channels/develop-2.12/channel_gradle.properties b/utils/channels/develop-SUFFIX/channel_gradle.properties similarity index 93% rename from utils/channels/develop-2.12/channel_gradle.properties rename to utils/channels/develop-SUFFIX/channel_gradle.properties index 57cdcd7..6e239c4 100644 --- a/utils/channels/develop-2.12/channel_gradle.properties +++ b/utils/channels/develop-SUFFIX/channel_gradle.properties @@ -1,7 +1,7 @@ # 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_images_dir = utils/channels/develop-SUFFIX/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 @@ -23,7 +23,7 @@ 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_images_dir = utils/channels/develop-SUFFIX/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 diff --git a/utils/channels/develop-2.12/images/UoD_banner-28.png b/utils/channels/develop-SUFFIX/images/UoD_banner-28.png similarity index 100% rename from utils/channels/develop-2.12/images/UoD_banner-28.png rename to utils/channels/develop-SUFFIX/images/UoD_banner-28.png diff --git a/utils/channels/develop-2.12/images/UoD_banner-32.png b/utils/channels/develop-SUFFIX/images/UoD_banner-32.png similarity index 100% rename from utils/channels/develop-2.12/images/UoD_banner-32.png rename to utils/channels/develop-SUFFIX/images/UoD_banner-32.png diff --git a/utils/channels/develop-2.12/images/barton_group-30.png b/utils/channels/develop-SUFFIX/images/barton_group-30.png similarity index 100% rename from utils/channels/develop-2.12/images/barton_group-30.png rename to utils/channels/develop-SUFFIX/images/barton_group-30.png diff --git a/utils/channels/develop-2.12/images/barton_group-512.png b/utils/channels/develop-SUFFIX/images/barton_group-512.png similarity index 100% rename from utils/channels/develop-2.12/images/barton_group-512.png rename to utils/channels/develop-SUFFIX/images/barton_group-512.png diff --git a/utils/channels/develop-2.12/images/barton_group-62.png b/utils/channels/develop-SUFFIX/images/barton_group-62.png similarity index 100% rename from utils/channels/develop-2.12/images/barton_group-62.png rename to utils/channels/develop-SUFFIX/images/barton_group-62.png diff --git a/utils/channels/develop-2.12/images/barton_group-white-512.png b/utils/channels/develop-SUFFIX/images/barton_group-white-512.png similarity index 100% rename from utils/channels/develop-2.12/images/barton_group-white-512.png rename to utils/channels/develop-SUFFIX/images/barton_group-white-512.png diff --git a/utils/channels/develop-2.12/images/barton_group-white-62.png b/utils/channels/develop-SUFFIX/images/barton_group-white-62.png similarity index 100% rename from utils/channels/develop-2.12/images/barton_group-white-62.png rename to utils/channels/develop-SUFFIX/images/barton_group-white-62.png diff --git a/utils/channels/develop-2.12/images/barton_group-white.svg b/utils/channels/develop-SUFFIX/images/barton_group-white.svg similarity index 100% rename from utils/channels/develop-2.12/images/barton_group-white.svg rename to utils/channels/develop-SUFFIX/images/barton_group-white.svg diff --git a/utils/channels/develop-2.12/images/barton_group.svg b/utils/channels/develop-SUFFIX/images/barton_group.svg similarity index 100% rename from utils/channels/develop-2.12/images/barton_group.svg rename to utils/channels/develop-SUFFIX/images/barton_group.svg diff --git a/utils/channels/develop-2.12/images/jalview_develop_banner.xcf b/utils/channels/develop-SUFFIX/images/jalview_develop_banner.xcf similarity index 100% rename from utils/channels/develop-2.12/images/jalview_develop_banner.xcf rename to utils/channels/develop-SUFFIX/images/jalview_develop_banner.xcf diff --git a/utils/channels/develop-2.12/images/jalview_develop_dmg_DS_Store b/utils/channels/develop-SUFFIX/images/jalview_develop_dmg_DS_Store similarity index 74% rename from utils/channels/develop-2.12/images/jalview_develop_dmg_DS_Store rename to utils/channels/develop-SUFFIX/images/jalview_develop_dmg_DS_Store index 94f871b..f5e6e2e 100644 Binary files a/utils/channels/develop-2.12/images/jalview_develop_dmg_DS_Store and b/utils/channels/develop-SUFFIX/images/jalview_develop_dmg_DS_Store differ diff --git a/utils/channels/develop-SUFFIX/images/jalview_develop_dmg_background-72dpi.png b/utils/channels/develop-SUFFIX/images/jalview_develop_dmg_background-72dpi.png new file mode 100644 index 0000000..dfcd39e Binary files /dev/null and b/utils/channels/develop-SUFFIX/images/jalview_develop_dmg_background-72dpi.png differ diff --git a/utils/channels/develop-SUFFIX/images/jalview_develop_dmg_background.png b/utils/channels/develop-SUFFIX/images/jalview_develop_dmg_background.png new file mode 100644 index 0000000..3ed3e8e Binary files /dev/null and b/utils/channels/develop-SUFFIX/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-SUFFIX/images/jalview_develop_dmg_background.svg similarity index 85% rename from utils/channels/develop-2.12/images/jalview_develop_dmg_background.svg rename to utils/channels/develop-SUFFIX/images/jalview_develop_dmg_background.svg index 6a0cd9d..42047c6 100644 --- a/utils/channels/develop-2.12/images/jalview_develop_dmg_background.svg +++ b/utils/channels/develop-SUFFIX/images/jalview_develop_dmg_background.svg @@ -8,9 +8,9 @@ style="enable-background:new 0 0 499.8 461.3;" xml:space="preserve" sodipodi:docname="jalview_develop_dmg_background.svg" - inkscape:export-filename="/home/bsoares/Work/git/develop/jalview/utils/channels/develop/images/jalview_develop_dmg_background2.png" - inkscape:export-xdpi="38.549999" - inkscape:export-ydpi="38.549999" + inkscape:export-filename="jalview_develop_dmg_background.png" + inkscape:export-xdpi="96" + inkscape:export-ydpi="96" inkscape:version="1.2.1 (9c6d41e, 2022-07-14)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" @@ -7498,10 +7498,10 @@ inkscape:collect="always" style="color-interpolation-filters:sRGB" id="filter5193" - x="-0.0095545036" - width="1.019109" - y="-0.010743615" - height="1.0214872"> + id="g12049" + transform="translate(32)"> + id="g12063" + transform="translate(10)"> + id="g12061" + transform="translate(1.9999786)"> @@ -11260,4 +11265,14 @@ id="tspan10257" x="210.69186" y="64.488739" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:45.3333px;font-family:'Fira Code Light';-inkscape-font-specification:'Fira Code Light, ';fill:#b4b4b4;fill-opacity:1">Develop + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:45.3333px;font-family:'Fira Code Light';-inkscape-font-specification:'Fira Code Light, ';fill:#b4b4b4;fill-opacity:1">Developbranch version diff --git a/utils/channels/develop-SUFFIX/images/jalview_develop_getdown_background.png b/utils/channels/develop-SUFFIX/images/jalview_develop_getdown_background.png new file mode 100644 index 0000000..8caab7c Binary files /dev/null and b/utils/channels/develop-SUFFIX/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-SUFFIX/images/jalview_develop_getdown_background.xcf similarity index 98% rename from utils/channels/develop-2.12/images/jalview_develop_getdown_background.xcf rename to utils/channels/develop-SUFFIX/images/jalview_develop_getdown_background.xcf index b61fb4e..985921d 100644 Binary files a/utils/channels/develop-2.12/images/jalview_develop_getdown_background.xcf and b/utils/channels/develop-SUFFIX/images/jalview_develop_getdown_background.xcf differ diff --git a/utils/channels/develop-SUFFIX/images/jalview_develop_getdown_background_error.png b/utils/channels/develop-SUFFIX/images/jalview_develop_getdown_background_error.png new file mode 100644 index 0000000..355b1ba Binary files /dev/null and b/utils/channels/develop-SUFFIX/images/jalview_develop_getdown_background_error.png differ diff --git a/utils/channels/develop-SUFFIX/images/jalview_develop_getdown_background_initialising.png b/utils/channels/develop-SUFFIX/images/jalview_develop_getdown_background_initialising.png new file mode 100644 index 0000000..ce9332b Binary files /dev/null and b/utils/channels/develop-SUFFIX/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-SUFFIX/images/jalview_develop_getdown_progress_bar.png similarity index 100% rename from utils/channels/develop-2.12/images/jalview_develop_getdown_progress_bar.png rename to utils/channels/develop-SUFFIX/images/jalview_develop_getdown_progress_bar.png diff --git a/utils/channels/develop-2.12/images/jalview_develop_logo.icns b/utils/channels/develop-SUFFIX/images/jalview_develop_logo.icns similarity index 100% rename from utils/channels/develop-2.12/images/jalview_develop_logo.icns rename to utils/channels/develop-SUFFIX/images/jalview_develop_logo.icns diff --git a/utils/channels/develop-2.12/images/jalview_develop_logo.ico b/utils/channels/develop-SUFFIX/images/jalview_develop_logo.ico similarity index 100% rename from utils/channels/develop-2.12/images/jalview_develop_logo.ico rename to utils/channels/develop-SUFFIX/images/jalview_develop_logo.ico diff --git a/utils/channels/develop-2.12/images/jalview_develop_logo.png b/utils/channels/develop-SUFFIX/images/jalview_develop_logo.png similarity index 100% rename from utils/channels/develop-2.12/images/jalview_develop_logo.png rename to utils/channels/develop-SUFFIX/images/jalview_develop_logo.png diff --git a/utils/channels/develop-2.12/images/jalview_develop_logo.svg b/utils/channels/develop-SUFFIX/images/jalview_develop_logo.svg similarity index 100% rename from utils/channels/develop-2.12/images/jalview_develop_logo.svg rename to utils/channels/develop-SUFFIX/images/jalview_develop_logo.svg diff --git a/utils/channels/develop-2.12/images/jalview_develop_logo_background_fade-640x480.png b/utils/channels/develop-SUFFIX/images/jalview_develop_logo_background_fade-640x480.png similarity index 100% rename from utils/channels/develop-2.12/images/jalview_develop_logo_background_fade-640x480.png rename to utils/channels/develop-SUFFIX/images/jalview_develop_logo_background_fade-640x480.png diff --git a/utils/channels/develop-2.12/resources/channel.props b/utils/channels/develop-SUFFIX/resources/channel.props similarity index 78% rename from utils/channels/develop-2.12/resources/channel.props rename to utils/channels/develop-SUFFIX/resources/channel.props index 7ed5197..37457d6 100644 --- a/utils/channels/develop-2.12/resources/channel.props +++ b/utils/channels/develop-SUFFIX/resources/channel.props @@ -1,4 +1,4 @@ -app_name=Jalview Develop 2.12 +app_name=Jalview Develop __SUFFIX__ banner=/images/jalview_develop_banner.png logo.16=/images/jalview_develop_logo-16.png logo.32=/images/jalview_develop_logo-32.png @@ -15,6 +15,6 @@ 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 +default_appbase=https://www.jalview.org/getdown/develop-__SUFFIX__/11 +preferences.filename=.jalview_develop-__SUFFIX___properties +channel=develop-__SUFFIX__ diff --git a/utils/channels/develop-2.12/resources/images/UoD_banner-28.png b/utils/channels/develop-SUFFIX/resources/images/UoD_banner-28.png similarity index 100% rename from utils/channels/develop-2.12/resources/images/UoD_banner-28.png rename to utils/channels/develop-SUFFIX/resources/images/UoD_banner-28.png diff --git a/utils/channels/develop-2.12/resources/images/UoD_banner-30.png b/utils/channels/develop-SUFFIX/resources/images/UoD_banner-30.png similarity index 100% rename from utils/channels/develop-2.12/resources/images/UoD_banner-30.png rename to utils/channels/develop-SUFFIX/resources/images/UoD_banner-30.png diff --git a/utils/channels/develop-2.12/resources/images/UoD_banner-32.png b/utils/channels/develop-SUFFIX/resources/images/UoD_banner-32.png similarity index 100% rename from utils/channels/develop-2.12/resources/images/UoD_banner-32.png rename to utils/channels/develop-SUFFIX/resources/images/UoD_banner-32.png diff --git a/utils/channels/develop-2.12/resources/images/UoD_banner.png b/utils/channels/develop-SUFFIX/resources/images/UoD_banner.png similarity index 100% rename from utils/channels/develop-2.12/resources/images/UoD_banner.png rename to utils/channels/develop-SUFFIX/resources/images/UoD_banner.png diff --git a/utils/channels/develop-2.12/resources/images/barton_group-28.png b/utils/channels/develop-SUFFIX/resources/images/barton_group-28.png similarity index 100% rename from utils/channels/develop-2.12/resources/images/barton_group-28.png rename to utils/channels/develop-SUFFIX/resources/images/barton_group-28.png diff --git a/utils/channels/develop-2.12/resources/images/barton_group-30.png b/utils/channels/develop-SUFFIX/resources/images/barton_group-30.png similarity index 100% rename from utils/channels/develop-2.12/resources/images/barton_group-30.png rename to utils/channels/develop-SUFFIX/resources/images/barton_group-30.png diff --git a/utils/channels/develop-2.12/resources/images/barton_group-32.png b/utils/channels/develop-SUFFIX/resources/images/barton_group-32.png similarity index 100% rename from utils/channels/develop-2.12/resources/images/barton_group-32.png rename to utils/channels/develop-SUFFIX/resources/images/barton_group-32.png diff --git a/utils/channels/develop-2.12/resources/images/jalview_develop_banner.png b/utils/channels/develop-SUFFIX/resources/images/jalview_develop_banner.png similarity index 100% rename from utils/channels/develop-2.12/resources/images/jalview_develop_banner.png rename to utils/channels/develop-SUFFIX/resources/images/jalview_develop_banner.png diff --git a/utils/channels/develop-2.12/resources/images/jalview_develop_logo-128.png b/utils/channels/develop-SUFFIX/resources/images/jalview_develop_logo-128.png similarity index 100% rename from utils/channels/develop-2.12/resources/images/jalview_develop_logo-128.png rename to utils/channels/develop-SUFFIX/resources/images/jalview_develop_logo-128.png diff --git a/utils/channels/develop-2.12/resources/images/jalview_develop_logo-16.png b/utils/channels/develop-SUFFIX/resources/images/jalview_develop_logo-16.png similarity index 100% rename from utils/channels/develop-2.12/resources/images/jalview_develop_logo-16.png rename to utils/channels/develop-SUFFIX/resources/images/jalview_develop_logo-16.png diff --git a/utils/channels/develop-2.12/resources/images/jalview_develop_logo-256.png b/utils/channels/develop-SUFFIX/resources/images/jalview_develop_logo-256.png similarity index 100% rename from utils/channels/develop-2.12/resources/images/jalview_develop_logo-256.png rename to utils/channels/develop-SUFFIX/resources/images/jalview_develop_logo-256.png diff --git a/utils/channels/develop-2.12/resources/images/jalview_develop_logo-32.png b/utils/channels/develop-SUFFIX/resources/images/jalview_develop_logo-32.png similarity index 100% rename from utils/channels/develop-2.12/resources/images/jalview_develop_logo-32.png rename to utils/channels/develop-SUFFIX/resources/images/jalview_develop_logo-32.png diff --git a/utils/channels/develop-2.12/resources/images/jalview_develop_logo-38.png b/utils/channels/develop-SUFFIX/resources/images/jalview_develop_logo-38.png similarity index 100% rename from utils/channels/develop-2.12/resources/images/jalview_develop_logo-38.png rename to utils/channels/develop-SUFFIX/resources/images/jalview_develop_logo-38.png diff --git a/utils/channels/develop-2.12/resources/images/jalview_develop_logo-48.png b/utils/channels/develop-SUFFIX/resources/images/jalview_develop_logo-48.png similarity index 100% rename from utils/channels/develop-2.12/resources/images/jalview_develop_logo-48.png rename to utils/channels/develop-SUFFIX/resources/images/jalview_develop_logo-48.png diff --git a/utils/channels/develop-2.12/resources/images/jalview_develop_logo-512.png b/utils/channels/develop-SUFFIX/resources/images/jalview_develop_logo-512.png similarity index 100% rename from utils/channels/develop-2.12/resources/images/jalview_develop_logo-512.png rename to utils/channels/develop-SUFFIX/resources/images/jalview_develop_logo-512.png diff --git a/utils/channels/develop-2.12/resources/images/jalview_develop_logo-64.png b/utils/channels/develop-SUFFIX/resources/images/jalview_develop_logo-64.png similarity index 100% rename from utils/channels/develop-2.12/resources/images/jalview_develop_logo-64.png rename to utils/channels/develop-SUFFIX/resources/images/jalview_develop_logo-64.png diff --git a/utils/channels/develop-2.12/resources/images/rotatable_jalview_develop_logo-38.png b/utils/channels/develop-SUFFIX/resources/images/rotatable_jalview_develop_logo-38.png similarity index 100% rename from utils/channels/develop-2.12/resources/images/rotatable_jalview_develop_logo-38.png rename to utils/channels/develop-SUFFIX/resources/images/rotatable_jalview_develop_logo-38.png