Merge pull request #11 from epics-motor/issue7

moved iocsh to newFocusApp dir; install iocsh files. Fixes #10
epics-motor · May 15, 2023 · 532fb45 · 532fb45
2 parents 8d909a3 + 171e4f1
commit 532fb45
Show file tree

Hide file tree

Showing 4 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/newFocusApp/Makefile b/newFocusApp/Makefile
@@ -4,4 +4,5 @@ DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*))
 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 *iocsh*))
 include $(TOP)/configure/RULES_DIRS
diff --git a/newFocusApp/iocsh/Makefile b/newFocusApp/iocsh/Makefile
@@ -0,0 +1,6 @@
+TOP = ../..
+include $(TOP)/configure/CONFIG
+
+#IOCSH += EXAMPLE_controller.substitutions
+
+include $(TOP)/configure/RULES
diff --git a/iocsh/Newfocus_PMNC87xx.iocsh → newFocusApp/iocsh/Newfocus_PMNC87xx.iocsh b/iocsh/Newfocus_PMNC87xx.iocsh → newFocusApp/iocsh/Newfocus_PMNC87xx.iocsh
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ db/ @@
     dbd/
     html/
     include/
+    /iocsh/
     lib/
     templates/
     cdCommands
@@ Expand Down @@