asyn R4-36 in e3

Author: jeonghanlee

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "asyn"]
 	path = asyn
 	url = https://github.com/epics-modules/asyn
-	ignore = all
+	ignore = dirty

asyn

@@ -17,17 +17,21 @@
 #
 # Author  : Jeong Han Lee
 # email   : [email protected]
-# Date    : Thursday, April  4 17:57:31 CEST 2019
-# version : 0.1.5
+# Date    : Wednesday, September  4 00:01:38 CEST 2019
+# version : 0.1.6
 
-# LEGACY_RSET should be defined before driver.makefile
-# require-ess from 3.0.1
-LEGACY_RSET = YES
+# 0.1.5 : R4-33
+#            
+# 0.1.6 : R4-36 : show two new files such as
+# SOURCES += $(MISCELLANEOUS)/asynInterposeDelay.c
+# SOURCES += $(MISCELLANEOUS)/asynInterposeEcho.c
+# So, this version of asyn.Makefile doesn't have backward compatibility. 
 
 where_am_I := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 include $(E3_REQUIRE_TOOLS)/driver.makefile
 include $(E3_REQUIRE_CONFIG)/DECOUPLE_FLAGS
 
+USR_CPPFLAGS += -DUSE_TYPED_RSET
 
 USR_CFLAGS   += -Wno-unused-variable
 USR_CFLAGS   += -Wno-unused-function
@@ -158,12 +162,21 @@ HEADERS += $(MISCELLANEOUS)/asynShellCommands.h
 HEADERS += $(MISCELLANEOUS)/asynInterposeCom.h
 HEADERS += $(MISCELLANEOUS)/asynInterposeEos.h
 HEADERS += $(MISCELLANEOUS)/asynInterposeFlush.h
+
 SOURCES += $(MISCELLANEOUS)/asynShellCommands.c
 SOURCES += $(MISCELLANEOUS)/asynInterposeCom.c
 SOURCES += $(MISCELLANEOUS)/asynInterposeEos.c
 SOURCES += $(MISCELLANEOUS)/asynInterposeFlush.c
 
 
+# From R4-36 : show two new files such as
+# SOURCES += $(MISCELLANEOUS)/asynInterposeDelay.c
+# SOURCES += $(MISCELLANEOUS)/asynInterposeEcho.c
+# We have to use the following tricks to keep the backward compatibility. 
+asynInterposeDelay_src += $(MISCELLANEOUS)/asynInterposeDelay.c
+SOURCES += $(filter $(asynInterposeDelay_src), $(wildcard $(MISCELLANEOUS)/*.c))
+asynInterposeEcho_src += $(MISCELLANEOUS)/asynInterposeEcho.c
+SOURCES += $(filter $(asynInterposeEcho_src), $(wildcard $(MISCELLANEOUS)/*.c))
 
 #
 HEADERS += $(ASYNPORTDRIVER)/exceptions/ParamListInvalidIndex.h

asyn.Makefile

@@ -1,8 +1,8 @@
 EPICS_MODULE_NAME:=asyn
 #
-EPICS_MODULE_TAG:=tags/R4-33
+EPICS_MODULE_TAG:=tags/R4-36
 #
-E3_MODULE_VERSION:=4.33.0
+E3_MODULE_VERSION:=4.36.0
 #
 E3_MODULE_NAME:=$(EPICS_MODULE_NAME)
 #