Update build script for ADViewers-R1-7; remove old backup files

AreaDetector_Scripts/start_imageJ_GC1380H~

-cd /local/DPbin/ImageJ/
-cp /local/DPbin/ImageJ/ImageJ_Profiles/DP_GC1380H.properties ~/EPICS_AD_Viewer.properties
-./jre/bin/java -Xmx512m -jar  ij.jar -run "EPICS AD Viewer" &

AreaDetector_Scripts/start_imageJ_GC2450~

-#!/bin/bash
-cd /local/DPbin/ImageJ/
-cp /local/DPbin/ImageJ/ImageJ_Profiles/DP_GC1380H.properties ~/EPICS_AD_Viewer.properties
-export EPICS_CA_MAX_ARRAY_BYTES=30000000
-./jre/bin/java -Xmx512m -jar  ij.jar -run "EPICS AD Viewer" &

AreaDetector_Scripts/start_imageJ_XrayEye~

-#!/bin/bash
-cd /local/DPbin/ImageJ/
-cp /local/DPbin/ImageJ/ImageJ_Profiles/DP_GC1380H.properties ~/EPICS_AD_Viewer.properties
-export EPICS_CA_MAX_ARRAY_BYTES=30000000
-./jre/bin/java -Xmx512m -jar  ij.jar -run "EPICS AD Viewer" &

AreaDetector_Scripts/start_imageJ_andor~

-#!/bin/bash
-cd /local/DPbin/ImageJ/
-sed -e 's/dp_andor3_xrd34/'$1'/' /local/DPbin/ImageJ/ImageJ_Profiles/DP_Generic.properties > ~/EPICS_AD_Viewer.properties
-export EPICS_CA_MAX_ARRAY_BYTES=30000000
-./jre/bin/java -Xmx1024m -jar  ij.jar -run "EPICS AD Viewer" &

AreaDetector_Scripts/start_imageJ_mar345~

-#!/bin/bash
-cd /local/DPbin/ImageJ/
-cp /local/DPbin/ImageJ/ImageJ_Profiles/mar345.properties ~/EPICS_AD_Viewer.properties
-export EPICS_CA_MAX_ARRAY_BYTES=30000000
-./jre/bin/java -Xmx512m -jar  ij.jar -run "EPICS AD Viewer" &

ImageJ_Profiles/DP_CoolSnap.properties~

-#EPICS_AD_Viewer Properties
-#Fri Mar 01 10:25:41 CST 2013
-PVPrefix=dp_coolsnap_xrd24\:image1\:

ImageJ_Profiles/DP_GC1380H.properties~

-#EPICS_AD_Viewer Properties
-#Fri Mar 01 10:25:41 CST 2013
-PVPrefix=dp_gc1380H\:image1\:

ImageJ_Profiles/DP_GC2450.properties~

-#EPICS_AD_Viewer Properties
-#Fri Mar 01 10:25:41 CST 2013
-PVPrefix=DP_GC2450\:image1\:

ImageJ_Profiles/DP_XrayEye.properties~

-#EPICS_AD_Viewer Properties
-#Fri Mar 01 10:25:41 CST 2013
-PVPrefix=dp_xrayeye\:image1\:

ImageJ_Profiles/dp_mar165_a.properties~

-#EPICS_AD_Viewer Properties
-#Fri Mar 01 10:25:41 CST 2013
-PVPrefix=dp_mar345\:image1\:

ImageJ_Profiles/dp_mar165_c.properties~

-#EPICS_AD_Viewer Properties
-#Fri Mar 01 10:25:41 CST 2013
-PVPrefix=dp_mar165_b\:image1\:

ImageJ_Profiles/dp_mar345.properties~

-#EPICS_AD_Viewer Properties
-#Fri Mar 01 10:25:41 CST 2013
-PVPrefix=dp_mar165_a\:image1\:

build_imagej+ad_plugins.sh

@@ -3,8 +3,8 @@
 # Download and build ImageJ and ADViewers EPICS plugins
 
 IMAGEJ_VER=153
-# Select from https://github.com/areaDetector/ADViewers/releases
-ADVIEWERS_VER="R1-6-1"
+# Select from https://github.com/areaDetector/ADViewers/tags
+ADVIEWERS_VER="R1-7"
 
 # Fetch ImageJ1
 # TODO: update if Java version changes
@@ -51,9 +51,13 @@ for plugin in "${plugins[@]}"; do
     echo "Compiling ${plugin}"
     # This command was extracted from the ImageJ logs after manually running "Plugins -> Compile and Run..."
     # The classpath is constructed from every *.jar file in the plugins/jars and plugins/EPICS_areaDetector folders
-    javac -source 1.6 -target 1.6 -Xlint:unchecked -deprecation \
-        -classpath "${base}/ij.jar:${base}/plugins/EPICS_areaDetector:${base}/plugins/jars/Auto_Threshold.jar:${base}/plugins/jars/BeanShell.jar:${base}/plugins/EPICS_areaDetector/caj-1.1.10.jar:${base}/plugins/EPICS_areaDetector/epics-ntypes-0.3.1.jar:${base}/plugins/EPICS_areaDetector/epics-pvaccess-5.1.1.jar:${base}/plugins/EPICS_areaDetector/epics-pvaclient-4.3.2.jar:${base}/plugins/EPICS_areaDetector/epics-pvdata-6.1.1.jar:${base}/plugins/EPICS_areaDetector/epics-pvdatabase-4.3.1.jar:${base}/plugins/EPICS_areaDetector/jca-2.3.6.jar:${base}/plugins/EPICS_areaDetector/jna-5.1.0.jar" \
+    javac -source 1.8 -target 1.8 -Xlint:unchecked -deprecation \
+        -classpath "${base}/ij.jar:${base}/plugins/EPICS_areaDetector:${base}/plugins/jars/Auto_Threshold.jar:${base}/plugins/jars/BeanShell.jar:${base}/plugins/EPICS_areaDetector/epics-ntypes-0.3.5.jar:${base}/plugins/EPICS_areaDetector/epics-pvaccess-5.1.5.jar:${base}/plugins/EPICS_areaDetector/epics-pvaclient-4.3.2.jar:${base}/plugins/EPICS_areaDetector/epics-pvdata-6.1.5.jar:${base}/plugins/EPICS_areaDetector/epics-util-1.0.3.jar:${base}/plugins/EPICS_areaDetector/jca-2.4.5.jar:${base}/plugins/EPICS_areaDetector/jna-5.1.0.jar" \
         "${base}/plugins/EPICS_areaDetector/${plugin}"
 done
 
 popd
+
+if [ -d "ImageJ_Profiles" ]; then
+    cp -a "ImageJ_Profiles" "ImageJ"
+fi