Merge tag 'R6-0' from multiple repositories

Repositories:
	support
	utils
	documentation
	configure

configure/.gitattributes

@@ -0,0 +1,5 @@
+#Which files need CRLF handling
+* text=auto
+*.sh eol=lf
+*.bat eol=crlf
+*.cmd -text

configure/.gitignore

@@ -0,0 +1,18 @@
+*~
+O.*
+*.swp
+*BAK.adl
+bin/
+db/
+dbd/
+html/
+include/
+lib/
+templates/
+cdCommands
+envPaths
+dllPath.bat
+auto_settings.sav*
+auto_positions.sav*
+EPICS_BASE*
+SUPPORT*

configure/CONFIG

@@ -0,0 +1,31 @@
+# CONFIG - Load build configuration data
+#
+# Do not make changes to this file!
+
+# Allow user to override where the build rules come from
+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)
+-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
+endif
+
+CONFIG = $(RULES)/configure
+include $(CONFIG)/CONFIG
+
+# Override the Base definition:
+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)
+ -include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
+endif
+

configure/CONFIG_SITE

@@ -0,0 +1,40 @@
+# CONFIG_SITE
+
+# Make any application-specific changes to the EPICS build
+# configuration variables in this file.  Do this before building.
+# If you change it after building, the safest course is to do a complete
+# rebuild.
+#
+# Host/target specific settings can be specified in files named
+#  CONFIG_SITE.$(EPICS_HOST_ARCH).Common
+#  CONFIG_SITE.Common.$(T_A)
+#  CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
+
+# Set this when you only want to compile this application
+# for a subset of the cross-compiled target architectures
+# that Base is built for.
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
+
+#Set the following variable to YES if libusb has been installled
+#on the host Linux system for the DXP support module,
+#otherwise, set to NO.
+LINUX_USB_INSTALLED = YES
+export LINUX_USB_INSTALLED
+
+#Set the following variable to YES if libnet has been installled
+#on the host Linux system for the MCA support module, otherwise,
+#set to NO.
+LINUX_NET_INSTALLED = YES
+export LINUX_NET_INSTALLED
+
+# Set this when your IOC and the host use different paths
+# to access the application. This will be needed to boot
+# from a Microsoft FTP server or with some NFS mounts.
+# You must rebuild in the iocBoot directory for this to
+# take effect.
+#IOCS_APPL_TOP = <path to application top as seen by IOC>
+
+# If you don't want to install into $(TOP) then
+# define INSTALL_LOCATION here
+#INSTALL_LOCATION=<fullpathname>
+-include $(SUPPORT)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH)

configure/CONFIG_SITE.linux-x86_64

@@ -0,0 +1,8 @@
+# These are needed only to convert adl files to ui, edl, and opi
+# Uncomment these definitions if you want to run make in the op/ directories.
+# Define these as the full paths to the executables if they are not in the PATH
+#ADL2UI = adl2ui
+#ADL2EDL = adl2edl
+#CSS = css -nosplash -application org.csstudio.opibuilder.adl2boy.application
+
+LINUX_NET_INSTALLED = NO

configure/EXAMPLE_EPICS_BASE.win32-x86

@@ -0,0 +1 @@
+EPICS_BASE=H:/epics/base-3.14.12.5

configure/EXAMPLE_EPICS_BASE.win32-x86-debug

@@ -0,0 +1 @@
+EPICS_BASE=H:/epics/base-3.14.12.5

configure/EXAMPLE_EPICS_BASE.win32-x86-static

@@ -0,0 +1 @@
+EPICS_BASE=H:/epics/base-3.14.12.5

configure/EXAMPLE_EPICS_BASE.windows-x64

@@ -0,0 +1 @@
+EPICS_BASE=H:/epics/base-3.14.12.5

configure/EXAMPLE_EPICS_BASE.windows-x64-debug

@@ -0,0 +1 @@
+EPICS_BASE=H:/epics/base-3.14.12.5

configure/EXAMPLE_EPICS_BASE.windows-x64-static

@@ -0,0 +1 @@
+EPICS_BASE=H:/epics/base-3.14.12.5

configure/EXAMPLE_SUPPORT.cygwin-x86

@@ -0,0 +1 @@
+SUPPORT=/cygdrive/j/epics/devel/

configure/EXAMPLE_SUPPORT.win32-x86

@@ -0,0 +1 @@
+SUPPORT=J:/epics/devel

configure/EXAMPLE_SUPPORT.win32-x86-debug

@@ -0,0 +1 @@
+SUPPORT=J:/epics/devel

configure/EXAMPLE_SUPPORT.win32-x86-static

@@ -0,0 +1 @@
+SUPPORT=J:/epics/devel

configure/EXAMPLE_SUPPORT.windows-x64

@@ -0,0 +1 @@
+SUPPORT=J:/epics/devel

configure/EXAMPLE_SUPPORT.windows-x64-debug

@@ -0,0 +1 @@
+SUPPORT=J:/epics/devel

configure/EXAMPLE_SUPPORT.windows-x64-static

@@ -0,0 +1 @@
+SUPPORT=J:/epics/devel

configure/LICENSE

@@ -0,0 +1,65 @@
+
+Copyright (c) 2004 University of Chicago and the Regents of the University of 
+California. All rights reserved.
+
+synApps is distributed subject to the following license conditions:
+SOFTWARE LICENSE AGREEMENT
+Software: synApps 
+Versions: Release 4-5 and higher.
+
+   1. The "Software", below, refers to synApps (in either source code, or 
+      binary form and accompanying documentation). Each licensee is addressed 
+      as "you" or "Licensee."
+
+   2. The copyright holders shown above and their third-party licensors hereby 
+      grant Licensee a royalty-free nonexclusive license, subject to the 
+      limitations stated herein and U.S. Government license rights.
+
+   3. You may modify and make a copy or copies of the Software for use within 
+      your organization, if you meet the following conditions:
+         1. Copies in source code must include the copyright notice and this 
+            Software License Agreement.
+         2. Copies in binary form must include the copyright notice and this 
+            Software License Agreement in the documentation and/or other 
+            materials provided with the copy.
+
+   4. You may modify a copy or copies of the Software or any portion of it, thus 
+      forming a work based on the Software, and distribute copies of such work 
+      outside your organization, if you meet all of the following conditions:
+         1. Copies in source code must include the copyright notice and this 
+            Software License Agreement;
+         2. Copies in binary form must include the copyright notice and this 
+            Software License Agreement in the documentation and/or other 
+            materials provided with the copy;
+         3. Modified copies and works based on the Software must carry 
+            prominent notices stating that you changed specified portions of 
+            the Software.
+
+   5. Portions of the Software resulted from work developed under a 
+      U.S. Government contract and are subject to the following license: 
+      the Government is granted for itself and others acting on its behalf a 
+      paid-up, nonexclusive, irrevocable worldwide license in this computer 
+      software to reproduce, prepare derivative works, and perform publicly and 
+      display publicly.
+
+   6. WARRANTY DISCLAIMER. THE SOFTWARE IS SUPPLIED "AS IS" WITHOUT WARRANTY OF 
+      ANY KIND. THE COPYRIGHT HOLDERS, THEIR THIRD PARTY LICENSORS, THE UNITED 
+      STATES, THE UNITED STATES DEPARTMENT OF ENERGY, AND THEIR EMPLOYEES: (1) 
+      DISCLAIM ANY WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO 
+      ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR 
+      PURPOSE, TITLE OR NON-INFRINGEMENT, (2) DO NOT ASSUME ANY LEGAL LIABILITY 
+      OR RESPONSIBILITY FOR THE ACCURACY, COMPLETENESS, OR USEFULNESS OF THE 
+      SOFTWARE, (3) DO NOT REPRESENT THAT USE OF THE SOFTWARE WOULD NOT 
+      INFRINGE PRIVATELY OWNED RIGHTS, (4) DO NOT WARRANT THAT THE SOFTWARE WILL 
+      FUNCTION UNINTERRUPTED, THAT IT IS ERROR-FREE OR THAT ANY ERRORS WILL BE 
+      CORRECTED.
+
+   7. LIMITATION OF LIABILITY. IN NO EVENT WILL THE COPYRIGHT HOLDERS, THEIR 
+      THIRD PARTY LICENSORS, THE UNITED STATES, THE UNITED STATES DEPARTMENT OF 
+      ENERGY, OR THEIR EMPLOYEES: BE LIABLE FOR ANY INDIRECT, INCIDENTAL, 
+      CONSEQUENTIAL, SPECIAL OR PUNITIVE DAMAGES OF ANY KIND OR NATURE, 
+      INCLUDING BUT NOT LIMITED TO LOSS OF PROFITS OR LOSS OF DATA, FOR ANY 
+      REASON WHATSOEVER, WHETHER SUCH LIABILITY IS ASSERTED ON THE BASIS OF 
+      CONTRACT, TORT (INCLUDING NEGLIGENCE OR STRICT LIABILITY), OR OTHERWISE, 
+      EVEN IF ANY OF SAID PARTIES HAS BEEN WARNED OF THE POSSIBILITY OF SUCH 
+      LOSS OR DAMAGES.

configure/Makefile

@@ -0,0 +1,26 @@
+TOP=..
+
+include $(TOP)/configure/CONFIG
+
+TARGETS = $(CONFIG_TARGETS)
+CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS)))
+CHECK_RELEASE = YES
+
+include $(TOP)/configure/RULES
+
+# Configure is not a top-level directory, but it seems easier for us to pretend
+# that it is than to figure out how to make support/Makefile fan out commands
+# to directories some of which are top-level and some of which are not.
+# We want support/Makefile to build configure, so we get CHECK_RELEASE, and we
+# want to be able to do commands like "make uninstall.<arch>" in support.
+# The following rules are modelled on stuff in base/configure/RULES_TOP.
+
+uninstall realuninstall:
+	@echo "\c"
+
+distclean: realclean
+
+uninstallArchTargets = $(foreach arch,$(BUILD_ARCHS), uninstall$(DIVIDER)$(arch))
+
+$(uninstallArchTargets):
+	@echo "\c"

configure/README.md

@@ -0,0 +1,10 @@
+# configure
+APS BCDA synApps module: configure
+
+For more information, see
+   http://www.aps.anl.gov/bcda/synApps
+
+converted from APS SVN repository: Fri Nov  6 12:17:01 CST 2015
+
+Regarding the license of tagged versions prior to synApps 4-5,
+refer to http://www.aps.anl.gov/bcda/synApps/license.php

configure/RELEASE

@@ -0,0 +1,58 @@
+#FILENAME:      RELEASE
+#USAGE:         Specify directory paths to synApps support modules
+
+#NOTES
+#     - To remove modules from the build, delete or comment out the
+#       module name.
+#     - Refer to the "MODULE_LIST" in <synApps>/configure/Makefile 
+#       for the inter-dependencies of the different modules.
+
+SUPPORT=/home/oxygen/MOONEY/epics/synApps/support
+-include $(TOP)/configure/SUPPORT.$(EPICS_HOST_ARCH)
+#EPICS_BASE=/home/oxygen/MOONEY/epics/bazaar/base-3.14
+#EPICS_BASE=/home/oxygen/MOONEY/epics/bazaar/base-3.15
+#EPICS_BASE=/APSshare/epics/base-3.14.12.4
+EPICS_BASE=/home/oxygen/MOONEY/epics/base-3.14.12.5
+-include $(TOP)/configure/EPICS_BASE 
+-include $(TOP)/configure/EPICS_BASE.$(EPICS_HOST_ARCH) 
+
+#/usr/local/iocapps/cvsroot/modules/bus/allenBradley
+ALIVE=$(SUPPORT)/alive-1-0-1
+# http://www.aps.anl.gov/epics/modules/bus/allenBradley
+ALLEN_BRADLEY=$(SUPPORT)/allenBradley-2-3
+AREA_DETECTOR=$(SUPPORT)/areaDetector-2-4
+ADCORE=$(AREA_DETECTOR)/ADCore
+ADBINARIES=$(AREA_DETECTOR)/ADBinaries
+ADEXAMPLE=$(AREA_DETECTOR)/ADExample
+ASYN=$(SUPPORT)/asyn-4-26
+AUTOSAVE=$(SUPPORT)/autosave-5-7-1
+BUSY=$(SUPPORT)/busy-1-6-1
+CALC=$(SUPPORT)/calc-3-6-1
+CAMAC=$(SUPPORT)/camac-2-7
+CAPUTRECORDER=$(SUPPORT)/caputRecorder-1-5-1
+DAC128V=$(SUPPORT)/dac128V-2-8
+DELAYGEN=$(SUPPORT)/delaygen-1-1-1
+DEVIOCSTATS=$(SUPPORT)/devIocStats-3-1-14
+DXP=$(SUPPORT)/dxp-3-5
+IP=$(SUPPORT)/ip-2-17
+IP330=$(SUPPORT)/ip330-2-8
+IPAC=$(SUPPORT)/ipac-2-13
+IPUNIDIG=$(SUPPORT)/ipUnidig-2-10
+LOVE=$(SUPPORT)/love-3-2-5
+MCA=$(SUPPORT)/mca-7-6
+MEASCOMP=$(SUPPORT)/measComp-1-1
+MODBUS=$(SUPPORT)/modbus-2-7
+MOTOR=$(SUPPORT)/motor-6-9
+OPTICS=$(SUPPORT)/optics-2-9-3
+QUADEM=$(SUPPORT)/quadEM-5-0
+#http://www-csr.bessy.de/control/SoftDist/sequencer
+#SNCSEQ=$(SUPPORT)/seq-2-1-18
+SNCSEQ=$(SUPPORT)/seq-2-2-3
+SOFTGLUE=$(SUPPORT)/softGlue-2-7
+SSCAN=$(SUPPORT)/sscan-2-10-2
+STD=$(SUPPORT)/std-3-4-1
+#http://epics.web.psi.ch/software/streamdevice/
+STREAM=$(SUPPORT)/stream-2-6c
+VAC=$(SUPPORT)/vac-1-6
+VME=$(SUPPORT)/vme-2-8-2
+XXX=$(SUPPORT)/xxx-5-8-4

configure/RULES

@@ -0,0 +1,6 @@
+# RULES
+
+include $(CONFIG)/RULES
+
+# Library should be rebuilt because LIBOBJS may have changed.
+$(LIBNAME): ../Makefile

configure/RULES.ioc

@@ -0,0 +1,2 @@
+#RULES.ioc
+include $(CONFIG)/RULES.ioc

configure/RULES_DIRS

@@ -0,0 +1,2 @@
+#RULES_DIRS
+include $(CONFIG)/RULES_DIRS

configure/RULES_OPI

@@ -0,0 +1,58 @@
+include $(CONFIG)/RULES_DIRS
+
+# these environment definitions are suggested to suppress
+# console notices when converting:
+# 
+# CAQTDM_DISPLAY_PATH
+#    description:
+#        defines paths to directories containing (possibly) 
+#        included screen files
+#    adl2ui notice:
+#        compositeFileParse: Cannot open file: /usr/local/synApps/support/areaDetector/ADSimDetector/simDetectorApp/op/adl/ADSetup.adl
+#    example definition:
+#        export CAQTDM_DISPLAY_PATH=/usr/local/synApps/support/areaDetector/ADCore/ADApp/op/ui/autoconvert
+#
+# stylesheet.qss
+#    description:
+#        to include "stylesheet.qss" and suppress the notice from 
+#        adl2ui, append its directory to CAQTDM_DISPLAY_PATH
+#    adl2ui notice:
+#        adl2ui -- file = <../../adl/simDetector.adl>
+#        adl2ui -- file <stylesheet.qss> could not be loaded, is 'CAQTDM_DISPLAY_PATH' </usr/local/epics/extensions/src/caQtDM/caQtDM_Tests/> defined?
+#        adl2ui -- could be a problem!
+#    example definition:
+#        export STYLESHEET_QSS_DIR=/usr/local/epics/synApps/support/std/stdApp/op/ui/stylesheet.qss
+#        export CAQTDM_DISPLAY_PATH+=:$(STYLESHEET_QSS_DIR)
+
+ADLs := $(filter-out $(wildcard $(ADL_DIR)/*_BAK.adl), $(wildcard $(ADL_DIR)/*.adl))
+
+ifdef ADL2UI
+UIs := $(subst $(ADL_DIR),$(UI_DIR),$(ADLs:.adl=.ui))
+$(UI_DIR)%.ui: $(ADL_DIR)%.adl
+	$(ADL2UI) $<
+	$(MV) -f $(notdir $@) $(dir $@)
+endif
+
+ifdef ADL2EDL
+ifeq (,$(wildcard $(EDMFONTFILE)))
+  ADL2EDL_FONTS=''
+else
+  ADL2EDL_FONTS=-f $(EDMFONTFILE)
+endif
+EDLs := $(subst $(ADL_DIR),$(EDL_DIR),$(ADLs:.adl=.edl))
+$(EDL_DIR)%.edl: $(ADL_DIR)%.adl
+	$(ADL2EDL) -rgb $(ADL2EDL_FONTS) $< $@
+endif
+
+ifdef CSS
+OPIs := $(subst $(ADL_DIR),$(OPI_DIR),$(ADLs:.adl=.opi))
+$(OPI_DIR)%.opi: $(ADL_DIR)%.adl
+	$(CSS) $<
+	$(MV) -f $(ADL_DIR)/$(notdir $@) $(dir $@)
+endif
+
+build install : $(UIs) $(EDLs) $(OPIs)
+
+realclean clean :
+	$(RM) $(UIs) $(EDLs) $(OPIs)
+

configure/RULES_TOP

@@ -0,0 +1,3 @@
+#RULES_TOP
+include $(CONFIG)/RULES_TOP
+