From 59927569c5ff2b9bda410ab51e3248e34d2727fd Mon Sep 17 00:00:00 2001 From: Keith Thorne <keith.thorne@ligo.org> Date: Mon, 11 Feb 2019 21:20:56 +0000 Subject: [PATCH] Add installer support for kamioka,indigo,anu,uwa,cardiff,bham sites git-svn-id: https://redoubt.ligo-wa.caltech.edu/svn/advLigoRTS/trunk@4904 6dcd42c9-f523-4c6d-aada-af552506706e --- NEWS | 1 + install | 6 ++++++ install-adclist | 6 ++++++ install-noawg | 6 ++++++ install-nort | 6 ++++++ src/epics/util/feCodeGen.pl | 2 ++ uninstall | 6 ++++++ 7 files changed, 33 insertions(+) diff --git a/NEWS b/NEWS index 5cfceae60..4c1ebd9e7 100644 --- a/NEWS +++ b/NEWS @@ -21,6 +21,7 @@ Changes for 3.5 (NOT YET RELEASED) - Set rate=32K in IOP model Parameter Block - Set virtualIOP=3 in IOP model Parameter Block - NOTE: Presently, this only reads ADC modules ie not DAC writes, as it was implemented for PEM DAQ channel.s +- Add installer support for kamioka,indigo,anu,uwa,cardiff,bham sites ================================================================================================== Changes for 3.4.5 ================================================================================================== diff --git a/install b/install index 8972e61e7..20f8484b2 100755 --- a/install +++ b/install @@ -29,6 +29,12 @@ if test ${site} = geo; then site_letter=G; fi if test ${site} = caltech; then site_letter=C; fi if test ${site} = tst; then site_letter=X; fi if test ${site} = stn; then site_letter=S; fi +if test ${site} = kamioka; then site_letter=K; fi +if test ${site} = indigo; then site_letter=I; fi +if test ${site} = anu; then site_letter=A; fi +if test ${site} = uwa; then site_letter=U; fi +if test ${site} = cardiff; then site_letter=W; fi +if test ${site} = bham; then site_letter=B; fi ifo=`grep ifo= target/${system}epics/${system}epics*.cmd | head -1 |sed 's/.*ifo=\([a-zA-Z0-9]*\).*/\1/g'` lower_ifo=`echo $ifo | tr A-Z a-z` diff --git a/install-adclist b/install-adclist index b7510c8ac..42ea0730f 100755 --- a/install-adclist +++ b/install-adclist @@ -22,6 +22,12 @@ if test ${site} = geo; then site_letter=G; fi if test ${site} = caltech; then site_letter=C; fi if test ${site} = tst; then site_letter=X; fi if test ${site} = stn; then site_letter=S; fi +if test ${site} = kamioka; then site_letter=K; fi +if test ${site} = indigo; then site_letter=I; fi +if test ${site} = anu; then site_letter=A; fi +if test ${site} = uwa; then site_letter=U; fi +if test ${site} = cardiff; then site_letter=W; fi +if test ${site} = bham; then site_letter=B; fi ifo=`grep ifo= target/${system}epics/${system}epics*.cmd | head -1 |sed 's/.*ifo=\([a-zA-Z0-9]*\).*/\1/g'` lower_ifo=`echo $ifo | tr A-Z a-z` diff --git a/install-noawg b/install-noawg index d38b96a12..51ce6e60c 100755 --- a/install-noawg +++ b/install-noawg @@ -22,6 +22,12 @@ if test ${site} = geo; then site_letter=G; fi if test ${site} = caltech; then site_letter=C; fi if test ${site} = tst; then site_letter=X; fi if test ${site} = stn; then site_letter=S; fi +if test ${site} = kamioka; then site_letter=K; fi +if test ${site} = indigo; then site_letter=I; fi +if test ${site} = anu; then site_letter=A; fi +if test ${site} = uwa; then site_letter=U; fi +if test ${site} = cardiff; then site_letter=W; fi +if test ${site} = bham; then site_letter=B; fi ifo=`grep ifo= target/${system}epics/${system}epics*.cmd | head -1 |sed 's/.*ifo=\([a-zA-Z0-9]*\).*/\1/g'` lower_ifo=`echo $ifo | tr A-Z a-z` diff --git a/install-nort b/install-nort index f7973da59..f0369b47d 100755 --- a/install-nort +++ b/install-nort @@ -23,6 +23,12 @@ if test ${site} = geo; then site_letter=G; fi if test ${site} = caltech; then site_letter=C; fi if test ${site} = tst; then site_letter=X; fi if test ${site} = stn; then site_letter=S; fi +if test ${site} = kamioka; then site_letter=K; fi +if test ${site} = indigo; then site_letter=I; fi +if test ${site} = anu; then site_letter=A; fi +if test ${site} = uwa; then site_letter=U; fi +if test ${site} = cardiff; then site_letter=W; fi +if test ${site} = bham; then site_letter=B; fi #ifo=`grep ifo= target/${system}epics/${system}epics*.cmd | head -1 |sed 's/.*ifo=\([a-zA-Z0-9]*\).*/\1/g'` lower_ifo=`grep MODEL_IFO target/${system}epics/${system}epics*.cmd | head -1 |sed 's/.*MODEL_IFO \([a-zA-Z0-9]*\).*/\1/g'` ifo=`echo $lower_ifo | tr a-z A-Z` diff --git a/src/epics/util/feCodeGen.pl b/src/epics/util/feCodeGen.pl index 146093369..c7ca10de0 100755 --- a/src/epics/util/feCodeGen.pl +++ b/src/epics/util/feCodeGen.pl @@ -192,6 +192,8 @@ if (@ARGV > 3) { $location = "uwa"; } elsif ($site =~ /^W/) { $location = "cardiff"; + } elsif ($site =~ /^B/) { + $location = "bham"; } } if (@ARGV > 4) { diff --git a/uninstall b/uninstall index 7a346b63a..11f4985eb 100755 --- a/uninstall +++ b/uninstall @@ -21,6 +21,12 @@ if test ${site} = geo; then site_letter=G; fi if test ${site} = caltech; then site_letter=C; fi if test ${site} = tst; then site_letter=X; fi if test ${site} = stn; then site_letter=S; fi +if test ${site} = kamioka; then site_letter=K; fi +if test ${site} = indigo; then site_letter=I; fi +if test ${site} = anu; then site_letter=A; fi +if test ${site} = uwa; then site_letter=U; fi +if test ${site} = cardiff; then site_letter=W; fi +if test ${site} = bham; then site_letter=B; fi ifo=`grep ifo= target/${system}epics/${system}epics*.cmd | head -1 | sed 's/.*ifo=\([a-zA-Z0-9]*\).*/\1/g'` gds_node=`grep rmid build/${system}epics/${system}.par | head -1| sed 's/[^0-9]*\([0-9]*\)/\1/'` datarate=`grep datarate build/${system}epics/${system}.par | head -1| sed 's/[^0-9]*\([0-9]*\)/\1/'` -- GitLab