Merge pull request #20 from epics-motor/issue19

moved iocsh to newportApp dir; install iocsh files. Fixes #19
epics-motor · May 15, 2023 · f83d4a5 · f83d4a5
2 parents 022c28f + 58db91a
commit f83d4a5
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@ db/
 dbd/
 html/
 include/
+/iocsh/
 lib/
 templates/
 cdCommands

diff --git a/newportApp/Makefile b/newportApp/Makefile
@@ -5,4 +5,5 @@ DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*))
 DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*))
 DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*))
 DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *op*))
+DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *iocsh*))
 include $(TOP)/configure/RULES_DIRS
diff --git a/newportApp/iocsh/Makefile b/newportApp/iocsh/Makefile
@@ -0,0 +1,6 @@
+TOP = ../..
+include $(TOP)/configure/CONFIG
+
+#IOCSH += EXAMPLE_controller.substitutions
+
+include $(TOP)/configure/RULES
diff --git a/iocsh/Newport_ESP300.iocsh → newportApp/iocsh/Newport_ESP300.iocsh b/iocsh/Newport_ESP300.iocsh → newportApp/iocsh/Newport_ESP300.iocsh
diff --git a/iocsh/Newport_MM4000.iocsh → newportApp/iocsh/Newport_MM4000.iocsh b/iocsh/Newport_MM4000.iocsh → newportApp/iocsh/Newport_MM4000.iocsh
diff --git a/iocsh/Newport_PM500.iocsh → newportApp/iocsh/Newport_PM500.iocsh b/iocsh/Newport_PM500.iocsh → newportApp/iocsh/Newport_PM500.iocsh