Merge pull request #1 from ISISComputingGroup/Ticket2593_IPS_Conversi…

…on_from_DLS

Now looks to compile

.gitignore

@@ -0,0 +1,18 @@
+O.*/
+/db
+/bin
+/dbd
+/include
+/lib
+/templates
+envPaths
+cdCommands
+dllPath.bat
+runIOC.bat
+runIOC.sh
+relPaths.sh
+*.tag
+/data/
+/doc/
+*_info_positions.req
+*_info_settings.req

OxInstIPSApp/src/Makefile

@@ -6,7 +6,7 @@ include $(TOP)/configure/CONFIG
 # Build an Diamond Support Module
 # -------------------------------
 
-LIBRARY_IOC += OxInstIPS
+PROD_IOC += OxInstIPS
 
 # xxxRecord.h will be created from xxxRecord.dbd
 #DBDINC += xxx.h
@@ -43,7 +43,7 @@ OxInstIPS_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
 
 # This line says that this IOC Application depends on the
 # xxx Support Module
-#OxInstIPS_LIBS += xxx
+OxInstIPS_LIBS += stream asyn calc
 
 # We need to link this IOC Application against the EPICS Base libraries
 OxInstIPS_LIBS += $(EPICS_BASE_IOC_LIBS)

configure/RELEASE

@@ -20,14 +20,12 @@ TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
 SUPPORT=/dls_sw/prod/R3.14.12.3/support
 
 # Support Modules
-ASYN=$(SUPPORT)/asyn/4-21
-STREAM=$(SUPPORT)/streamDevice/2-5dls2
-CALC=$(SUPPORT)/calc/3-1
+ASYN=$(SUPPORT)/asyn/master
+STREAM=$(SUPPORT)/streamDevice/master
+CALC=$(SUPPORT)/calc/master
 
-# EPICS_BASE usually appears last so other apps can override stuff:
-EPICS_BASE=/dls_sw/epics/R3.14.12.3/base
-
-#Capfast users may need the following definitions
-#CAPFAST_TEMPLATES=
-#SCH2EDIF_PATH=
+# optional extra local definitions here
 -include $(TOP)/configure/RELEASE.private
+
+include $(TOP)/../../../ISIS_CONFIG
+-include $(TOP)/../../../ISIS_CONFIG.$(EPICS_HOST_ARCH)