diff --git a/NEWS b/NEWS index 5cfceae608bb18f878af56bb2980f405a29b4192..4c1ebd9e7ee8b765ebede072594aa87cf74feb51 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 8972e61e71253b686c48e9d84bfa46bb197023cc..20f8484b26ac42df5fa94fe2b1bcb8df01ba0286 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 b7510c8ac42dd6f1d90cda7ae71bfb585b7d265d..42ea0730f152e45f88288d2c5f3c11f0c9f63827 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 d38b96a129d160ed09624b943d300549e3bfa197..51ce6e60ccc507df5f5aa48fce99e452ba325d36 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 f7973da5984c3e8c005be857656494c1a784c163..f0369b47d40bdb600c76691544bec68efbc0daa8 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 1460933696715649b62875ba5dc73df75bcf273e..c7ca10de0d26876253c46c7117631923ea183b6d 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 7a346b63a9f78c53e9a87e9b3caa63d14d7f3344..11f4985eb06397d82da83404047b99cde0043b38 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/'`