Skip to content

Commit

Permalink
Drop support for Base <3.14.10
Browse files Browse the repository at this point in the history
3.14.10 released in Oct 2008
  • Loading branch information
mdavidsaver committed Jun 9, 2017
1 parent e75af36 commit 627467e
Show file tree
Hide file tree
Showing 11 changed files with 6 additions and 2,181 deletions.
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ TOP = .
include $(TOP)/configure/CONFIG
DIRS := configure mrfCommon evrApp mrmShared evgMrmApp evrMrmApp mrmtestApp evrFRIBApp iocBoot

# 3.14.10 style directory dependencies
# previous versions will just ignore them

define DIR_template
$(1)_DEPEND_DIRS = configure
endef
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ The latest developments can be found in the 'mrfioc2' VCS repository.
Prerequisites
-------------

The required software is EPICS Base >= 3.14.8.2, devLib2 >= 2.6, and the MSI tool (included in Base >= 3.15.1).
The required software is EPICS Base >= 3.14.10, devLib2 >= 2.8, and the MSI tool (included in Base >= 3.15.1).

Base: [http://www.aps.anl.gov/epics/base/R3-14/index.php](http://www.aps.anl.gov/epics/base/R3-14/index.php)
Base: [http://www.aps.anl.gov/epics/base/R3-15/index.php](http://www.aps.anl.gov/epics/base/R3-15/index.php)

devLib2: [https://github.com/epics-modules/devlib2/](https://github.com/epics-modules/devlib2/)

MSI (Base <3.15 only): [http://www.aps.anl.gov/epics/extensions/msi/index.php](http://www.aps.anl.gov/epics/extensions/msi/index.php)
MSI (Base < 3.15 only): [http://www.aps.anl.gov/epics/extensions/msi/index.php](http://www.aps.anl.gov/epics/extensions/msi/index.php)

The Source
----------
Expand Down
4 changes: 2 additions & 2 deletions documentation/mainpage.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ The canonical version of this page is @url http://epics.sourceforge.net/mrfioc2/
@subsection requires Requires
EPICS Base >= 3.14.8.2
EPICS Base >= 3.14.10
@url http://www.aps.anl.gov/epics/
MSI (Macro expension tool)
@url http://www.aps.anl.gov/epics/extensions/msi/index.php
devLib2 >= 2.6
devLib2 >= 2.8
@url http://epics.sourceforge.net/devlib2/
Expand Down
3 changes: 1 addition & 2 deletions evgMrmApp/Db/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ DB += nsls2-inj-seqs.db
#----------------------------------------------------
# Create and install (or just install) into <top>/db
# databases, templates, substitutions like this
#DB += xxx.db

DB += evgMrm.db
DB += evgEvtClk.db
DB += evgSoftEvt.db
Expand All @@ -34,7 +34,6 @@ DB_INSTALLS += $(DEVIOCSTATS)/db/iocAdminRTEMS.db
endif
endif

# Omitted before 3.14.10
USR_DBFLAGS += -I . -I .. -I $(INSTALL_LOCATION)/db

#----------------------------------------------------
Expand Down
1 change: 0 additions & 1 deletion evrFRIBApp/Db/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ include $(TOP)/configure/CONFIG
#----------------------------------------
# ADD MACRO DEFINITIONS AFTER THIS LINE

# Omitted before 3.14.10
USR_DBFLAGS += -I . -I .. -I $(INSTALL_LOCATION)/db

DB += fribevrout.db
Expand Down
1 change: 0 additions & 1 deletion evrMrmApp/Db/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ DB_INSTALLS += $(DEVIOCSTATS)/db/iocAdminRTEMS.db
DB_INSTALLS += $(DEVIOCSTATS)/db/iocAdminSoft.db
endif

# Omitted before 3.14.10
USR_DBFLAGS += -I . -I .. -I $(INSTALL_LOCATION)/db

include $(TOP)/configure/RULES
Expand Down
7 changes: 0 additions & 7 deletions evrMrmApp/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,6 @@ PROD_HOST += evrdump
evrdump_SRCS += evrdump.c
evrdump_LIBS += epicspci $(EPICS_BASE_IOC_LIBS)

ifeq ($(EPICS_VERSION)$(EPICS_REVISION),314)
ifneq ($(findstring $(EPICS_MODIFICATION),1 2 3 4 5 6 7 8 9),)
# libiocsh is merged with libCom starting with 3.14.10
evrdump_LIBS += iocsh
endif
endif

LIBRARY_IOC += evrMrm

evrMrm_SRCS += drvemIocsh.c
Expand Down
12 changes: 0 additions & 12 deletions mrfCommon/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,11 @@ objectTest_SRCS += objectTest.c
objectTest_LIBS += mrfCommon $(EPICS_BASE_IOC_LIBS)
TESTS += objectTest

ifeq ($(EPICS_VERSION)$(EPICS_REVISION),314)
ifeq ($(findstring $(EPICS_MODIFICATION),1 2 3 4 5 6 7 8 9),)

# Test framework added in 3.14.10
TESTPROD_HOST += linkoptionsTest
linkoptionsTest_SRCS += linkoptionsTest.c
linkoptionsTest_LIBS += mrfCommon
TESTS += linkoptionsTest

else

# Added to Base in 3.14.10
DBDINC += aSubRecord
mrfCommon_SRCS += aSubRecord.c
endif
endif

#---------------------
# Install DBD files
#
Expand Down
Loading

0 comments on commit 627467e

Please sign in to comment.