R2-5: ADEiger moved to the areaDetector organization

README.md

@@ -18,15 +18,11 @@ Notes:
 * ~~ADEiger is currently incompatible with ADSupport's hdf5 because ADEiger depends on hdf5_hl.~~
     * ADSupport R1-3 now provides hdf5_hl
 
-How to compile:
----------------
+Before compiling:
+-----------------
 
-* Clone and compile [areaDetector](https://github.com/areaDetector/areaDetector) according to its instructions.
-* Clone this repository.
-* Edit `AREADETECTOR` variable inside `ADEiger/configure/RELEASE` to point to the correct location.
 * Set `ZMQ` variables inside `ADEiger/configure/CONFIG_SITE` to point to a ZeroMQ installation location if a system package is not installed (`libzmq3-dev` on Debian systems).
   - ZeroMQ 4 is required
-* Run `make` inside `ADEiger`.
 
 HDF5 Plugins:
 -------------
@@ -49,7 +45,6 @@ How to run:
 -----------
 
 * Under `ADEiger/iocs/eigerIOC/iocBoot/iocEiger/` there is already a ready to use IOC:
-  - If there is no `envPaths`, run `make envPaths` there.
   - Change the IP address in `st.cmd`.
   - Run `./st.cmd`.
 * There is a CS-Studio screen under `areaDetector/ADEiger/eigerApp/op/opi`, just use it with Controls System Studio.

RELEASE.md

@@ -2,14 +2,18 @@ ADEiger Releases
 ==================
 
 The latest untagged master branch can be obtained at
-https://github.com/brunoseivam/ADEiger.
+https://github.com/areaDetector/ADEiger.
 
 Tagged source code can be obtained at
-https://github.com/brunoseivam/ADEiger/releases.
+https://github.com/areaDetector/ADEiger/releases.
 
 Release Notes
 =============
 
+R2-5
+----
+* ADEiger moved to the areaDetector organization.
+
 R2-4
 ----
 * Added EDM screens, courtesy of Gary Yendell from Diamond Light Source

configure/RELEASE

@@ -2,8 +2,6 @@
 # Run "gnumake clean uninstall install" in the application
 # top directory each time this file is changed.
 
-AREADETECTOR=/epics/src/areaDetector
-
--include $(AREADETECTOR)/configure/RELEASE_PATHS.local
--include $(AREADETECTOR)/configure/RELEASE_PRODS.local
--include $(AREADETECTOR)/configure/RELEASE_LIBS.local
+-include $(TOP)/../configure/RELEASE_LIBS_INCLUDE
+-include $(TOP)/RELEASE.local
+-include $(TOP)/configure/RELEASE.local

eigerApp/commonDriverMakefile

@@ -3,7 +3,7 @@
 
 $(PROD_NAME)_DBD += eigerDetectorSupport.dbd
 
-PROD_LIBS += eigerDetector frozen lz4
+PROD_LIBS += eigerDetector frozen lz4 hdf5_hl
 
 ifdef ZMQ_LIB
   zmq_DIR        += $(ZMQ_LIB)
@@ -12,9 +12,3 @@ else
   PROD_SYS_LIBS  += zmq
 endif
 
-ifdef HDF5_LIB
-  hdf5_hl_DIR    += $(HDF5_LIB)
-  PROD_LIBS      += hdf5_hl
-else
-  PROD_SYS_LIBS  += hdf5_hl
-endif

eigerApp/src/eigerDetector.cpp

@@ -56,7 +56,7 @@ using std::string;
 using std::vector;
 using std::map;
 
-static const string DRIVER_VERSION("2-4");
+static const string DRIVER_VERSION("2-5");
 
 enum data_source
 {

iocs/eigerIOC/configure/RELEASE

@@ -2,6 +2,8 @@
 # Run "gnumake clean uninstall install" in the application
 # top directory each time this file is changed.
 
-ADEIGER=$(TOP)/../../
+ADEIGER=$(TOP)/../..
 
--include $(ADEIGER)/configure/RELEASE
+-include $(TOP)/../../../configure/RELEASE_PRODS_INCLUDE
+-include $(TOP)/RELEASE.local
+-include $(TOP)/configure/RELEASE.local