From 52ac15ce09358c8e1b0f1509880ad86a81969548 Mon Sep 17 00:00:00 2001 From: Mark Rivers Date: Tue, 18 Feb 2014 18:56:17 -0600 Subject: [PATCH] New version for areaDetector 2-0 --- configure/CONFIG | 2 -- configure/CONFIG_SITE | 75 ++++--------------------------------------- configure/Makefile | 7 ---- configure/RELEASE | 37 +++------------------ 4 files changed, 12 insertions(+), 109 deletions(-) diff --git a/configure/CONFIG b/configure/CONFIG index 156a084..c1a4703 100755 --- a/configure/CONFIG +++ b/configure/CONFIG @@ -7,7 +7,6 @@ RULES = $(EPICS_BASE) # RELEASE files point to other application tops include $(TOP)/configure/RELEASE --include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH) -include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).Common ifdef T_A -include $(TOP)/configure/RELEASE.Common.$(T_A) @@ -22,7 +21,6 @@ INSTALL_LOCATION = $(TOP) # CONFIG_SITE files contain other build configuration settings include $(TOP)/configure/CONFIG_SITE --include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH) -include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).Common ifdef T_A -include $(TOP)/configure/CONFIG_SITE.Common.$(T_A) diff --git a/configure/CONFIG_SITE b/configure/CONFIG_SITE index e3b7291..4df968f 100644 --- a/configure/CONFIG_SITE +++ b/configure/CONFIG_SITE @@ -32,72 +32,11 @@ CHECK_RELEASE = YES # take effect. #IOCS_APPL_TOP = -# We don't set STATIC_BUILD for WIN32 or Cygwin, use base to configure -# We build statically on Linux because want to install on detector systems without many .so files -ifeq (Linux, $(OS_CLASS)) - STATIC_BUILD=YES - SHARED_LIBRARIES=NO +# Get settings from AREA_DETECTOR, so we only have to configure once for all detectors if we want to +-include $(AREA_DETECTOR)/configure/CONFIG_SITE +-include $(AREA_DETECTOR)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH) +-include $(AREA_DETECTOR)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).Common +ifdef T_A + -include $(AREA_DETECTOR)/configure/CONFIG_SITE.Common.$(T_A) + -include $(AREA_DETECTOR)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A) endif -# Building statically on Darwin is not possible (well, it's possible but difficult and discouraged -# by Apple), but we can build depending only on system libraries that are part of Mac OS X -#ifeq (Darwin, $(OS_CLASS)) -# STATIC_BUILD=NO -# SHARED_LIBRARIES=NO -#endif -#ifeq (solaris, $(OS_CLASS)) -# STATIC_BUILD=YES -# SHARED_LIBRARIES=NO -#endif - -############################################### - -#NOTES -# -# - To build the ioc applications set BUILD_APPS to YES -# Otherwise set it to NO - -BUILD_APPS=YES - -# - The plugins - -# - prosilicaSupport must be built before pluginSrc or prosilicaSrc because it installs -# header and library files needed by both -# - On some platforms hdf5Support must be built before nexus because of library dependencies - -HDF5_SUP = hdf5Support -MAGICK_SUP = magickSupport -NETCDF_SRC = netCDFSrc -NEXUS_SRC = nexusSrc -PLUGIN_SRC = pluginSrc -PROSILICA_SUP = prosilicaSupport -TIFF_SUP = tiffSupport - -# - To include GraphicsMagick support set the following to YES -# - To not use it comment out the line or set it to NO -# - GraphicsMagick is required for NDFileMagick and the URL driver. - -USE_GRAPHICSMAGICK=NO - -# - The detectors - -# - To remove detectors from the build, comment out the detector name. - -ADSC = adscSrc -ANDOR = andorSrc -ANDOR3 = andor3Src -BRUKER = brukerSrc -FIREWIRE_WIN = firewireWinSrc -LIGHTFIELD = LightFieldSrc -MAR_345 = mar345Src -MAR_CCD = marCCDSrc -PERKIN_ELMER = perkinElmerSrc -PILATUS = pilatusSrc -PROSILICA = prosilicaSrc -PSL = PSLSrc -PVCAM = pvcamSrc -ROPER = roperSrc -SIM_DETECTOR = simDetectorSrc -URL = URLSrc - - - diff --git a/configure/Makefile b/configure/Makefile index 0317746..9254309 100644 --- a/configure/Makefile +++ b/configure/Makefile @@ -1,15 +1,8 @@ -# Makefile - TOP=.. include $(TOP)/configure/CONFIG -# Set the following to NO to disable consistency checking of -# the support applications defined in $(TOP)/configure/RELEASE -CHECK_RELEASE = YES - TARGETS = $(CONFIG_TARGETS) CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS))) include $(TOP)/configure/RULES - diff --git a/configure/RELEASE b/configure/RELEASE index be403f1..093c65c 100644 --- a/configure/RELEASE +++ b/configure/RELEASE @@ -2,36 +2,9 @@ # Run "gnumake clean uninstall install" in the application # top directory each time this file is changed. -TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top +-include $(TOP)/../RELEASE_PATHS.local +-include $(TOP)/../RELEASE_PATHS.local.$(EPICS_HOST_ARCH) +-include $(TOP)/../RELEASE_LIBS.local +-include $(TOP)/RELEASE.local +-include $(TOP)/configure/RELEASE.local -# If you don't want to install into $(TOP) then -# define INSTALL_LOCATION_APP here -#INSTALL_LOCATION_APP= - -SUPPORT=/corvette/home/epics/devel --include $(TOP)/../configure/SUPPORT.$(EPICS_HOST_ARCH) - -# ASYN is needed for base classes -ASYN=$(SUPPORT)/asyn-4-22 - -# CALC is needed for scalcout record that SSCAN uses -CALC=$(SUPPORT)/calc-3-2 - -# BUSY is needed for busy record -BUSY=$(SUPPORT)/busy-1-6 - -# SSCAN is needed for scanning threshold on Pilatus and general scanning -SSCAN=$(SUPPORT)/sscan-2-9 - -#AUTOSAVE is needed for save_restore -AUTOSAVE=$(SUPPORT)/autosave-5-1 - -AREA_DETECTOR=$(SUPPORT)/areaDetector-1-10 - -# EPICS_BASE usually appears last so other apps can override stuff: -EPICS_BASE=/corvette/usr/local/epics/base-3.14.12.3 --include $(TOP)/../configure/EPICS_BASE.$(EPICS_HOST_ARCH) - -#Capfast users may need the following definitions -#CAPFAST_TEMPLATES= -#SCH2EDIF_PATH=