From 0984c959931d388b6ea24374f2c0a72df9c4e49e Mon Sep 17 00:00:00 2001
From: Tejas Guruswamy <tguruswamy@anl.gov>
Date: Thu, 27 Jan 2022 16:29:11 -0600
Subject: [PATCH] Update build script for ADViewers-R1-7; remove old backup
files
---
AreaDetector_Scripts/start_imageJ_GC1380H~ | 3 ---
AreaDetector_Scripts/start_imageJ_GC2450~ | 5 -----
AreaDetector_Scripts/start_imageJ_XrayEye~ | 5 -----
AreaDetector_Scripts/start_imageJ_andor~ | 5 -----
AreaDetector_Scripts/start_imageJ_mar345~ | 5 -----
ImageJ_Profiles/DP_CoolSnap.properties~ | 3 ---
ImageJ_Profiles/DP_GC1380H.properties | 0
ImageJ_Profiles/DP_GC1380H.properties~ | 3 ---
ImageJ_Profiles/DP_GC2450.properties | 0
ImageJ_Profiles/DP_GC2450.properties~ | 3 ---
ImageJ_Profiles/DP_XrayEye.properties~ | 3 ---
ImageJ_Profiles/dp_mar165_a.properties | 0
ImageJ_Profiles/dp_mar165_a.properties~ | 3 ---
ImageJ_Profiles/dp_mar165_c.properties~ | 3 ---
ImageJ_Profiles/dp_mar345.properties~ | 3 ---
build_imagej+ad_plugins.sh | 12 ++++++++----
16 files changed, 8 insertions(+), 48 deletions(-)
delete mode 100755 AreaDetector_Scripts/start_imageJ_GC1380H~
delete mode 100755 AreaDetector_Scripts/start_imageJ_GC2450~
delete mode 100755 AreaDetector_Scripts/start_imageJ_XrayEye~
delete mode 100644 AreaDetector_Scripts/start_imageJ_andor~
delete mode 100644 AreaDetector_Scripts/start_imageJ_mar345~
delete mode 100644 ImageJ_Profiles/DP_CoolSnap.properties~
mode change 100755 => 100644 ImageJ_Profiles/DP_GC1380H.properties
delete mode 100755 ImageJ_Profiles/DP_GC1380H.properties~
mode change 100755 => 100644 ImageJ_Profiles/DP_GC2450.properties
delete mode 100755 ImageJ_Profiles/DP_GC2450.properties~
delete mode 100644 ImageJ_Profiles/DP_XrayEye.properties~
mode change 100755 => 100644 ImageJ_Profiles/dp_mar165_a.properties
delete mode 100755 ImageJ_Profiles/dp_mar165_a.properties~
delete mode 100755 ImageJ_Profiles/dp_mar165_c.properties~
delete mode 100644 ImageJ_Profiles/dp_mar345.properties~
diff --git a/AreaDetector_Scripts/start_imageJ_GC1380H~ b/AreaDetector_Scripts/start_imageJ_GC1380H~
deleted file mode 100755
index 217ca83..0000000
--- a/AreaDetector_Scripts/start_imageJ_GC1380H~
+++ /dev/null
@@ -1,3 +0,0 @@
-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" &
diff --git a/AreaDetector_Scripts/start_imageJ_GC2450~ b/AreaDetector_Scripts/start_imageJ_GC2450~
deleted file mode 100755
index 58e2bf8..0000000
--- a/AreaDetector_Scripts/start_imageJ_GC2450~
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/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" &
diff --git a/AreaDetector_Scripts/start_imageJ_XrayEye~ b/AreaDetector_Scripts/start_imageJ_XrayEye~
deleted file mode 100755
index 58e2bf8..0000000
--- a/AreaDetector_Scripts/start_imageJ_XrayEye~
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/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" &
diff --git a/AreaDetector_Scripts/start_imageJ_andor~ b/AreaDetector_Scripts/start_imageJ_andor~
deleted file mode 100644
index ff60fa8..0000000
--- a/AreaDetector_Scripts/start_imageJ_andor~
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/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" &
diff --git a/AreaDetector_Scripts/start_imageJ_mar345~ b/AreaDetector_Scripts/start_imageJ_mar345~
deleted file mode 100644
index f0e544c..0000000
--- a/AreaDetector_Scripts/start_imageJ_mar345~
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/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" &
diff --git a/ImageJ_Profiles/DP_CoolSnap.properties~ b/ImageJ_Profiles/DP_CoolSnap.properties~
deleted file mode 100644
index 12c6197..0000000
--- a/ImageJ_Profiles/DP_CoolSnap.properties~
+++ /dev/null
@@ -1,3 +0,0 @@
-#EPICS_AD_Viewer Properties
-#Fri Mar 01 10:25:41 CST 2013
-PVPrefix=dp_coolsnap_xrd24\:image1\:
diff --git a/ImageJ_Profiles/DP_GC1380H.properties b/ImageJ_Profiles/DP_GC1380H.properties
old mode 100755
new mode 100644
diff --git a/ImageJ_Profiles/DP_GC1380H.properties~ b/ImageJ_Profiles/DP_GC1380H.properties~
deleted file mode 100755
index d213f30..0000000
--- a/ImageJ_Profiles/DP_GC1380H.properties~
+++ /dev/null
@@ -1,3 +0,0 @@
-#EPICS_AD_Viewer Properties
-#Fri Mar 01 10:25:41 CST 2013
-PVPrefix=dp_gc1380H\:image1\:
diff --git a/ImageJ_Profiles/DP_GC2450.properties b/ImageJ_Profiles/DP_GC2450.properties
old mode 100755
new mode 100644
diff --git a/ImageJ_Profiles/DP_GC2450.properties~ b/ImageJ_Profiles/DP_GC2450.properties~
deleted file mode 100755
index 37dbf0a..0000000
--- a/ImageJ_Profiles/DP_GC2450.properties~
+++ /dev/null
@@ -1,3 +0,0 @@
-#EPICS_AD_Viewer Properties
-#Fri Mar 01 10:25:41 CST 2013
-PVPrefix=DP_GC2450\:image1\:
diff --git a/ImageJ_Profiles/DP_XrayEye.properties~ b/ImageJ_Profiles/DP_XrayEye.properties~
deleted file mode 100644
index fddd9c3..0000000
--- a/ImageJ_Profiles/DP_XrayEye.properties~
+++ /dev/null
@@ -1,3 +0,0 @@
-#EPICS_AD_Viewer Properties
-#Fri Mar 01 10:25:41 CST 2013
-PVPrefix=dp_xrayeye\:image1\:
diff --git a/ImageJ_Profiles/dp_mar165_a.properties b/ImageJ_Profiles/dp_mar165_a.properties
old mode 100755
new mode 100644
diff --git a/ImageJ_Profiles/dp_mar165_a.properties~ b/ImageJ_Profiles/dp_mar165_a.properties~
deleted file mode 100755
index 0848657..0000000
--- a/ImageJ_Profiles/dp_mar165_a.properties~
+++ /dev/null
@@ -1,3 +0,0 @@
-#EPICS_AD_Viewer Properties
-#Fri Mar 01 10:25:41 CST 2013
-PVPrefix=dp_mar345\:image1\:
diff --git a/ImageJ_Profiles/dp_mar165_c.properties~ b/ImageJ_Profiles/dp_mar165_c.properties~
deleted file mode 100755
index 54e4a43..0000000
--- a/ImageJ_Profiles/dp_mar165_c.properties~
+++ /dev/null
@@ -1,3 +0,0 @@
-#EPICS_AD_Viewer Properties
-#Fri Mar 01 10:25:41 CST 2013
-PVPrefix=dp_mar165_b\:image1\:
diff --git a/ImageJ_Profiles/dp_mar345.properties~ b/ImageJ_Profiles/dp_mar345.properties~
deleted file mode 100644
index 9578bab..0000000
--- a/ImageJ_Profiles/dp_mar345.properties~
+++ /dev/null
@@ -1,3 +0,0 @@
-#EPICS_AD_Viewer Properties
-#Fri Mar 01 10:25:41 CST 2013
-PVPrefix=dp_mar165_a\:image1\:
diff --git a/build_imagej+ad_plugins.sh b/build_imagej+ad_plugins.sh
index 0debebe..9e687d1 100644
--- a/build_imagej+ad_plugins.sh
+++ b/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
--
GitLab