From 8f88ecf0e8a1cde5df1e5a2e81a2b03c61c370a8 Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Sat, 4 Apr 2020 01:01:39 +0100 Subject: [PATCH] JAL-3577 Added DS_Store for Test release to look like proper installer --- build.gradle | 19 +++++++++++++++---- utils/install4j/DS_Store-TEST-RELEASE | Bin 0 -> 12292 bytes 2 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 utils/install4j/DS_Store-TEST-RELEASE diff --git a/build.gradle b/build.gradle index b47e420..69a7fb6 100644 --- a/build.gradle +++ b/build.gradle @@ -141,7 +141,7 @@ ext { install4jSuffix = CHANNEL.substring(0, 1).toUpperCase() + CHANNEL.substring(1).toLowerCase(); // BUILD -> Build install4jDSStore = "DS_Store-NON-RELEASE" install4jDMGBackgroundImage = "jalview_dmg_background-NON-RELEASE.png" - install4jInstallerName = "${jalview_name} Installer" + install4jInstallerName = "${jalview_name} Non-Release Installer" install4jExecutableName = jalview_name.replaceAll("[^\\w]+", "_").toLowerCase() install4jExtraScheme = "jalviewx" switch (CHANNEL) { @@ -156,6 +156,7 @@ ext { if ("".equals(testngExcludedGroups)) { testngExcludedGroups = "Not-bamboo" } + install4jExtraScheme = "jalviewb" break case "RELEASE": @@ -164,6 +165,7 @@ ext { install4jSuffix = "" install4jDSStore = "DS_Store" install4jDMGBackgroundImage = "jalview_dmg_background.png" + install4jInstallerName = "${jalview_name} Installer" break case "ARCHIVE": @@ -178,6 +180,7 @@ ext { buildDist = false } reportRsyncCommand = true + install4jExtraScheme = "jalviewa" break case "ARCHIVELOCAL": @@ -194,17 +197,22 @@ ext { reportRsyncCommand = true getdownLauncher = string("${jalviewDir}/${getdown_lib_dir}/${getdown_launcher_local}") install4jSuffix = "Archive" + install4jExtraScheme = "jalviewa" break case "DEVELOP": reportRsyncCommand = true + install4jExtraScheme = "jalviewd" break case "TEST-RELEASE": reportRsyncCommand = true - install4jSuffix = "Test" JALVIEW_VERSION = "TEST" + install4jSuffix = "Test" + install4jDSStore = "DS_Store-TEST-RELEASE" + install4jDMGBackgroundImage = "jalview_dmg_background.png" install4jExtraScheme = "jalviewt" + install4jInstallerName = "${jalview_name} Test Installer" break case ~/^SCRATCH(|-[-\w]*)$/: @@ -222,14 +230,18 @@ ext { getdownAppBase = file(file("${LOCALDIR}").getAbsolutePath()).toURI().toString() getdownLauncher = string("${jalviewDir}/${getdown_lib_dir}/${getdown_launcher_local}") } - install4jSuffix = "Test-Local" JALVIEW_VERSION = "TEST" + install4jSuffix = "Test-Local" + install4jDSStore = "DS_Store-TEST-RELEASE" + install4jDMGBackgroundImage = "jalview_dmg_background.png" install4jExtraScheme = "jalviewt" + install4jInstallerName = "${jalview_name} Test Installer" break case "LOCAL": getdownAppBase = file(getdownWebsiteDir).toURI().toString() getdownLauncher = string("${jalviewDir}/${getdown_lib_dir}/${getdown_launcher_local}") + install4jExtraScheme = "jalviewl" break default: // something wrong specified @@ -249,7 +261,6 @@ ext { install4jApplicationName = "${jalview_name}" } else { install4jApplicationName = "${jalview_name} ${install4jSuffix}" - install4jInstallerName = "${jalview_name} Non-Release Installer" } // sanitise folder names install4jApplicationFolder = install4jApplicationName diff --git a/utils/install4j/DS_Store-TEST-RELEASE b/utils/install4j/DS_Store-TEST-RELEASE new file mode 100644 index 0000000000000000000000000000000000000000..164c584ca5fe4c93be500031cb3cb7740dc641c0 GIT binary patch literal 12292 zcmeHNU2Ggz6+Yvv)Adj6@n7nuhKz8lBqZzo&F#fH# ztKIQW;u;x*P>>Mt&=<-}q?Ym&sRAJ(gs3SmR8**ML{TLAz(bHKhp?&rFz96*bN z+KmccrgSK$n>jSTQ%LTT_8R`z5NLrxyna5Lj#Sc(>sO4#!&)R1Pil#<7R?t!iF`aB zNkpQt@aY0NL)w{82!Bp_0OJTmLTB>k(ui8A=o()GHPtBO%(aoKrWOLL)v|^0!uYer zdF;j#j&Wyj#nhLVv|8|0RbMGUS}BnIXVs4U|hO_zxYHWbk(dp8|hd@T3rZt<||{0skRmh|;QH z|M0*lvI3qNlpcl1679Xn+~;AA!nLni%#s`dMjs| zi{E^VMSXH;x5loPs|TI^e}MA=*p{p+VVll5(Hb2V_s@!`ZI+|9DK}~(vQ2<|L-x?ia?{2Ze-Z^Nv?gQ>e43d=mIzOE`qihI?^hZ1?xsy>N0UMqz9o!^(ipRu*N7JK|$#6OrNT<)yKBhfa5%~1UZ^2l1n;h8u4bxLt;T5{yWd)>*fy~&!p+JE z;%pbU572fC^<&h#sP1|Mn$~0er#%?0-v9oa$85V?`P}WFwLpD)ofX(0LQSEbM{UI9 zH=p_BFYY{kc|jfIzDCTE+Oq9_PR*AM%d9OZ=Q8ed=+5{bZVNjYjPZB>`lDO8cQKA< zk`uAXSS%2moD2t|u4o`}27< zmr(P`sG2Ay^#dd zuYORhc@S$Ibk`WB(+yP4pYZ#_g;$aDCw|O{3+GSf1>c-MSrhFo3h?EZ38hsbdfk-= z|CZo;z~2x&=S+Sgc+Q#pO7IGJ-s@aKN|F+k3$C`^cqti|DG*ZO)~H#5hMG zXRlS$Mpc>)u6f8Y4tyBgfiCZr7UkbRFZaFX=WO$Mmdo?h`0U~{YaSa|M_m(?`H#2{ zb50b(ab{^`Wu|KACQ@O1#|Q8TK;aStvA>i<8ZVrj9tlU3g8kSl%w5mOxGsa6Vl#PP9 zn&vcM&6XE~+x&UeTEIB|;Z$MEo<^I$Eh`VKuSXK6l<>wWWj&Dyol;`a_{K(?-~Yt1 z$>(2L{_3~h_}*LJfBOgTIx6nwoPwtlo1`a#uv-r+0Nl- z;5>1e?rHg$DXs`74)2xEfyB-0-}uzIlXf_Czd}zASuY)X*ne)IK04Z*VQLOssb5ln1xX68 zV`pPdgqxd6Iztj;?r+QiG|4>7t+Q@*N$0*@$uHO2z#ZV!66_iZj@e15F_DHCL;Kja z30=U%5652v-WA~K;NFcD>7?hdCV4xAun-p1XaRx4Im$reh&|%{6B~UbAvrUECwKAt z#dSD!$uVs>6>=E4W!N>=FH3E+hG}SR!>L)(=%*9(49#Kn7ip8eO>ff=>F4xoMBsl! zCahiRlZJeqz5(B-eTwgd@3X#BzJM>{i#pnNu8Y|rF`6L0&w=6moEQIl@&EQF+BcTp zH~x2$y?CvTa{~S>(gS<^{~vn2;vwK6@c)W{&oxsQKXVJbeFHlGr0n+|o<{_Fn);C=sjF}(c0m;cxP4hv_cm;e9( literal 0 HcmV?d00001 -- 1.7.10.2