Merge pull request #59 from ISISComputingGroup/merge_r7_3_to_master

merge in epics-motor R7-3 to our master
ISISComputingGroup · Jun 2, 2023 · ddcc4e9 · ddcc4e9
2 parents 407a34f + 78ba65e
commit ddcc4e9
Show file tree

Hide file tree

Showing 2,215 changed files with 1,657,752 additions and 16,189 deletions.
diff --git a/.ci/travis-prepare.sh b/.ci/travis-prepare.sh
diff --git a/.gitignore b/.gitignore
@@ -9,12 +9,21 @@ O.*
 /include/
 /lib/
 /templates/
+bin/
+/db/
+dbd/
+html/
+include/
+/iocsh/
+lib/
+templates/
 cdCommands
 envPaths
 dllPath*.bat
 auto_settings.sav*
 auto_positions.sav*
 .ccfxprepdir/
+*.local
 runIOC.bat
 runIOC.sh
 relPaths.sh

diff --git a/.travis.yml b/.travis.yml
diff --git a/Makefile b/Makefile
@@ -7,15 +7,7 @@ include $(TOP)/configure/CONFIG
 DIRS += configure motorApp
 motorApp_DEPEND_DIRS   = configure
 
-# To build motor examples;
-# 1st - uncomment lines below.
-# 2nd - uncomment required support module lines at the bottom of
-#       <motor>/configure/RELEASE.
-# 3rd - make clean uninstall
-# 4th - make
-
-DIRS += motorExApp iocBoot
-motorExApp_DEPEND_DIRS = motorApp
-iocBoot_DEPEND_DIRS    = motorExApp
+DIRS += modules
+modules_DEPEND_DIRS = motorApp
 
 include $(TOP)/configure/RULES_TOP