Merge branch 'master' of github.com:epics-modules/motor

.ci-local/travis/post-prepare.sh

@@ -13,9 +13,21 @@ pwd
 . ./.ci/travis/utils.sh
 
 # Add SUPPORT to RELEASE.local in the cache directory
-update_release_local SUPPORT ${CACHEDIR}
+#!update_release_local SUPPORT ${CACHEDIR}
 # Copy the RELEASE.local from the cache directory to motor's configure directory
-[ -e ./configure ] && cp -f ${CACHEDIR}/RELEASE.local ./configure/RELEASE.local
+#![ -e ./configure ] && cp -f ${CACHEDIR}/RELEASE.local ./configure/RELEASE.local
 
-echo -e "${ANSI_BLUE}Updated contents of RELEASE.local${ANSI_RESET}"
-cat ${CACHEDIR}/RELEASE.local
+#!echo -e "${ANSI_BLUE}Updated contents of RELEASE.local${ANSI_RESET}"
+#!cat ${CACHEDIR}/RELEASE.local
+
+# Comment out SUPPORT from motor's RELEASE file
+sed -i -e "s|^\(SUPPORT=.*\)$|#\1|g" ./configure/RELEASE
+#
+echo -e "${ANSI_BLUE}Updated motor/configure/RELEASE${ANSI_RESET}"
+grep SUPPORT ./configure/RELEASE
+
+# Comment out SUPPORT from motorOms's RELEASE file
+sed -i -e "s|^\(SUPPORT=.*\)$|#\1|g" ./modules/motorOms/configure/RELEASE
+#
+echo -e "${ANSI_BLUE}Updated motor/modules/motorOms/configure/RELEASE${ANSI_RESET}"
+grep SUPPORT ./modules/motorOms/configure/RELEASE

modules/Makefile

@@ -91,5 +91,8 @@ endif
 	$(ECHO) Creating $@, EPICS_BASE = $(EPICS_BASE)
 	@echo EPICS_BASE = $(EPICS_BASE)>> $@
 	
+	$(ECHO) Creating $@, SUPPORT = $(SUPPORT)
+	@echo SUPPORT = $(SUPPORT)>> $@
+	
 realclean:
 	$(RM) $(RELEASE_LOCAL)

motorApp/Makefile

@@ -14,5 +14,6 @@ SoftMotorSrc_DEPEND_DIRS = MotorSrc
 
 DIRS += op
 DIRS += Db
+DIRS += iocsh
 
 include $(TOP)/configure/RULES_DIRS

motorApp/iocsh/Makefile

@@ -0,0 +1,4 @@
+TOP = ../..
+include $(TOP)/configure/CONFIG
+
+include $(TOP)/configure/RULES