From 652e779e8a9343959137f013d5323b91762b77af Mon Sep 17 00:00:00 2001 From: Kevin Peterson Date: Fri, 20 Mar 2020 09:22:07 -0500 Subject: [PATCH 1/8] Don't add SUPPORT to RELEASE.local; Comment out SUPPORT in RELEASE for travis builds --- .ci-local/travis/post-prepare.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.ci-local/travis/post-prepare.sh b/.ci-local/travis/post-prepare.sh index 79b3d0c5..a3b8d551 100755 --- a/.ci-local/travis/post-prepare.sh +++ b/.ci-local/travis/post-prepare.sh @@ -13,9 +13,15 @@ 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 +sedi "s|^(SUPPORT=.*)$|#\1|g" ./configure/RELEASE + +echo -e "${ANSI_BLUE}Updated motor/configure/RELEASE${ANSI_RESET}" +grep SUPPORT ./configure/RELEASE From c5ca938b30ff10c74c53a5e89c100e32dea40c9c Mon Sep 17 00:00:00 2001 From: Kevin Peterson Date: Fri, 20 Mar 2020 09:29:17 -0500 Subject: [PATCH 2/8] Call sed directly rather than using the sedi function from utils.sh --- .ci-local/travis/post-prepare.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci-local/travis/post-prepare.sh b/.ci-local/travis/post-prepare.sh index a3b8d551..7f37a4cf 100755 --- a/.ci-local/travis/post-prepare.sh +++ b/.ci-local/travis/post-prepare.sh @@ -21,7 +21,7 @@ pwd #!cat ${CACHEDIR}/RELEASE.local # Comment out SUPPORT from motor's RELEASE file -sedi "s|^(SUPPORT=.*)$|#\1|g" ./configure/RELEASE +sed -i -e "s|^\(SUPPORT=.*\)$|#\1|g" ./configure/RELEASE echo -e "${ANSI_BLUE}Updated motor/configure/RELEASE${ANSI_RESET}" grep SUPPORT ./configure/RELEASE From af59280dc797901fd7f2a733eda77d4f1c82e7b2 Mon Sep 17 00:00:00 2001 From: Kevin Peterson Date: Fri, 20 Mar 2020 09:38:48 -0500 Subject: [PATCH 3/8] post-prepare.sh: also comment out SUPPORT in motorOms's RELEASE file. --- .ci-local/travis/post-prepare.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.ci-local/travis/post-prepare.sh b/.ci-local/travis/post-prepare.sh index 7f37a4cf..c6508839 100755 --- a/.ci-local/travis/post-prepare.sh +++ b/.ci-local/travis/post-prepare.sh @@ -22,6 +22,12 @@ pwd # 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 From 87267646c3d5a7ff748a98792d163c00a6fa4e93 Mon Sep 17 00:00:00 2001 From: Kevin Peterson Date: Mon, 23 Mar 2020 14:27:35 -0500 Subject: [PATCH 4/8] Updated motorHytec to 5d7a72d173d75b70015dff998943014959a93417 --- modules/motorHytec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/motorHytec b/modules/motorHytec index b82e4a4b..5d7a72d1 160000 --- a/modules/motorHytec +++ b/modules/motorHytec @@ -1 +1 @@ -Subproject commit b82e4a4bee64ac7b78f9affd9a15ffb0a2794f1e +Subproject commit 5d7a72d173d75b70015dff998943014959a93417 From 7b9abb54d690c56911ba983c480db33da5164af5 Mon Sep 17 00:00:00 2001 From: Kevin Peterson Date: Mon, 23 Mar 2020 15:19:10 -0500 Subject: [PATCH 5/8] Updated motorOmsAsyn to 549bd6dc241ece183ee4544f29ae01e94899acfd --- modules/motorOmsAsyn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/motorOmsAsyn b/modules/motorOmsAsyn index 4fdd003b..549bd6dc 160000 --- a/modules/motorOmsAsyn +++ b/modules/motorOmsAsyn @@ -1 +1 @@ -Subproject commit 4fdd003bcede7728327026525ad633beab6cfcaf +Subproject commit 549bd6dc241ece183ee4544f29ae01e94899acfd From 6d121ac66f96ebb887450c7b54b78b2af33ea54d Mon Sep 17 00:00:00 2001 From: Kevin Peterson Date: Mon, 23 Mar 2020 15:20:15 -0500 Subject: [PATCH 6/8] Updated motorHytec to aaa9af21ec8c2bcc9120a80f9e028f3423c8ca96 --- modules/motorHytec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/motorHytec b/modules/motorHytec index 5d7a72d1..aaa9af21 160000 --- a/modules/motorHytec +++ b/modules/motorHytec @@ -1 +1 @@ -Subproject commit 5d7a72d173d75b70015dff998943014959a93417 +Subproject commit aaa9af21ec8c2bcc9120a80f9e028f3423c8ca96 From 129e7f075a08d214b953c4184a1f642aa263ad34 Mon Sep 17 00:00:00 2001 From: keenanlang Date: Wed, 6 May 2020 13:21:37 -0500 Subject: [PATCH 7/8] Install iocsh files --- motorApp/Makefile | 1 + motorApp/iocsh/Makefile | 4 ++++ {iocsh => motorApp/iocsh}/allstop.iocsh | 0 3 files changed, 5 insertions(+) create mode 100644 motorApp/iocsh/Makefile rename {iocsh => motorApp/iocsh}/allstop.iocsh (100%) diff --git a/motorApp/Makefile b/motorApp/Makefile index 96d99cee..6737e02c 100644 --- a/motorApp/Makefile +++ b/motorApp/Makefile @@ -14,5 +14,6 @@ SoftMotorSrc_DEPEND_DIRS = MotorSrc DIRS += op DIRS += Db +DIRS += iocsh include $(TOP)/configure/RULES_DIRS diff --git a/motorApp/iocsh/Makefile b/motorApp/iocsh/Makefile new file mode 100644 index 00000000..ae43c986 --- /dev/null +++ b/motorApp/iocsh/Makefile @@ -0,0 +1,4 @@ +TOP = ../.. +include $(TOP)/configure/CONFIG + +include $(TOP)/configure/RULES diff --git a/iocsh/allstop.iocsh b/motorApp/iocsh/allstop.iocsh similarity index 100% rename from iocsh/allstop.iocsh rename to motorApp/iocsh/allstop.iocsh From de29f768d1c2ae7ece35a2947cd00e57cbfb4d29 Mon Sep 17 00:00:00 2001 From: keenanlang Date: Wed, 6 May 2020 13:55:44 -0500 Subject: [PATCH 8/8] Add support definition so modules can install iocsh --- modules/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/Makefile b/modules/Makefile index fe0e2146..a047bbfb 100644 --- a/modules/Makefile +++ b/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)