diff --git a/Makefile b/Makefile
index b0faf3723bde3c3a3cc6a050021a4e6e38663b8a..62803fb3043aeb87abfb7ded921225bc42164651 100644
--- a/Makefile
+++ b/Makefile
@@ -30,4 +30,3 @@ TOP:=$(CURDIR)
include $(TOP)/configure/CONFIG
include $(TOP)/configure/RULES
-
diff --git a/SPECIAL_MODE.md b/SPECIAL_MODE.md
index 59daf09bb0b9978663afd3990a187a31e246e453..dcc82787b9ca1809dc2433cf35db6c2f4715bc82 100644
--- a/SPECIAL_MODE.md
+++ b/SPECIAL_MODE.md
@@ -1,13 +1,13 @@
Special Modes for ESS EPICS Environment (e3)
===
-The Special modes are optional. However it will give users to explore more posssibilities while running IOC in any circumstances.
+The Special modes are optional. However it will give users to explore more posssibilities while running IOC in any circumstances.
## Cell Mode
-When a user faces the difficulty to work within entire work-flow in terms of the tighted-controlled deployment or within limited RW permissions. Sometimes, it is very difficult to compile and run any IOC appplication within the ESS EPICS environment. Thus, the Cell Mode is introduced.
+When a user faces the difficulty to work within entire work-flow in terms of the tighted-controlled deployment or within limited RW permissions. Sometimes, it is very difficult to compile and run any IOC appplication within the ESS EPICS environment. Thus, the Cell Mode is introduced.
-One should define `E3_CELL_PATH`, where one can has the RW permission. The default is `$(TOP)/cellMods` because the e3 has the assumption that one can download the e3-modules or e3-application within a writable path. This variable can be overried with `CONFIG_CELL.local` or `configure/CONFIG_CELL.local` as the same as other `CONFIG_MODULE` or `RELEASE` files. The different commands are shown in
+One should define `E3_CELL_PATH`, where one can has the RW permission. The default is `$(TOP)/cellMods` because the e3 has the assumption that one can download the e3-modules or e3-application within a writable path. This variable can be overried with `CONFIG_CELL.local` or `configure/CONFIG_CELL.local` as the same as other `CONFIG_MODULE` or `RELEASE` files. The different commands are shown in
```
make cellinstall
make celluninstall
@@ -25,15 +25,15 @@ iocsh.bash -l ${E3_CELL_PATH}
The e3 will handle all modules and applications as a dynamic libraries, which we have to consider when all symbols are resolved. We put this time at startup moment. Although it can slow down any IOC initialization, it is only way to avoid non-deterministic latencies during IOC execution [1].
-Here we set the `LD_BIND_NOW=1` before we are going into actually IOC application, and run a IOC application with a scheduler policy of FIFO and a prority of 1. One needs the proper permission to execute it `chrt`, mostly `realtime` group should be created and a user should be in that group.
+Here we set the `LD_BIND_NOW=1` before we are going into actually IOC application, and run a IOC application with a scheduler policy of FIFO and a prority of 1. One needs the proper permission to execute it `chrt`, mostly `realtime` group should be created and a user should be in that group.
* Command
```
-iocsh.bash -rt
+iocsh.bash -rt
```
## ESS Site System Application Mode
-ESS is planing to deploy its through site-wide NFS shared directories. Due to long-term maintenance issues and minimal footprints on e3 application, we also introduce the SAMode (System Application Mode). It only is valid for the site-wide deployment system, not for any local installation.
+ESS is planing to deploy its through site-wide NFS shared directories. Due to long-term maintenance issues and minimal footprints on e3 application, we also introduce the SAMode (System Application Mode). It only is valid for the site-wide deployment system, not for any local installation.
Technically, e3 uses `E3_SITEAPPS_PATH` to install any system specific applications. Without any modification, the default path is defined as follows:
```
@@ -47,7 +47,7 @@ However, for the system or subsystem deployment procedure, we will replace them
* Target : `/siteApps/tgt`
* Experiments : `/siteApps/exp` and `/siteApps/exp{1..16}`
-These parameter is define in each `configure/CONFIG_SITE_SYSTEMAPPS` as `E3_MODULES_PATH:=` and can be overridden via `configure/CONFIG_SITE_SYSTEMAPPS.local` also during the static (configure, build, and install) procedure.
+These parameter is define in each `configure/CONFIG_SITE_SYSTEMAPPS` as `E3_MODULES_PATH:=` and can be overridden via `configure/CONFIG_SITE_SYSTEMAPPS.local` also during the static (configure, build, and install) procedure.
When an IOC is running, each IOC should know where they are belong into through `IOCID`, and will set `SITE_SYSTEMAPPS_PATH` before doing `source setE3Env.bash` and `iocsh.bash` or run `iocsh.bash` directly.
@@ -86,17 +86,17 @@ Loaded myexample version master
Loading dbd file /siteApps/icsApps//myexample/master/dbd/myexample.dbd
Calling function myexample_registerRecordDeviceDriver
Loading module info records for myexample
-# Set the IOC Prompt String One
+# Set the IOC Prompt String One
epicsEnvSet IOCSH_PS1 "c72f6a5.kaffee.31345 > "
```
-For the deployment system, we have to define each `E3_MODULES_PATH` differently within system specific application, it will be done with the global `CONFIG_SITE_SYSTEMAPPS.local`. And each ioc should know `SITE_SYSTEMAPPS_PATH` in order to match `E3_MODULES_PATH` before it starts.
+For the deployment system, we have to define each `E3_MODULES_PATH` differently within system specific application, it will be done with the global `CONFIG_SITE_SYSTEMAPPS.local`. And each ioc should know `SITE_SYSTEMAPPS_PATH` in order to match `E3_MODULES_PATH` before it starts.
-* `IOCID` defines a system group
-* Before the systemd service, the additional systemd service check "mountable" path, which will be used in `SITE_SYSTEMAPPS_PATH`, and do `export $SITE_SYSTEMAPPS_PATH` globally.
+* `IOCID` defines a system group
+* Before the systemd service, the additional systemd service check "mountable" path, which will be used in `SITE_SYSTEMAPPS_PATH`, and do `export $SITE_SYSTEMAPPS_PATH` globally.
## References
-[1] Original paragraph from Red Hat Enterprise Linux for Real Time 7 Tuning Guide. 2018-04-30 / CC BY-SA 3.0 https://creativecommons.org/licenses/by-sa/3.0/
+[1] Original paragraph from Red Hat Enterprise Linux for Real Time 7 Tuning Guide. 2018-04-30 / CC BY-SA 3.0 https://creativecommons.org/licenses/by-sa/3.0/
diff --git a/cmds/runScript_test.cmd b/cmds/runScript_test.cmd
deleted file mode 100644
index a5e25d3d30c73a7278bea0e7aa055584edd20fa4..0000000000000000000000000000000000000000
--- a/cmds/runScript_test.cmd
+++ /dev/null
@@ -1,4 +0,0 @@
-require iocStats,617a4fd
-
-var runScriptDebug 1
-
diff --git a/cmds/test.cmd b/cmds/test.cmd
deleted file mode 100644
index 5b9ddcaa4f3bb1eca84287e6a7f5d804d9d14cc0..0000000000000000000000000000000000000000
--- a/cmds/test.cmd
+++ /dev/null
@@ -1,10 +0,0 @@
-
-var requireDebug 1
-require iocStats,617a4fd
-
-
-
-loadIocsh("iocStats.iocsh", "IOCNAME=TEST1:")
-
-iocInit()
-
diff --git a/configure/CONFIG b/configure/CONFIG
index 9756166a880a341f3e99bcc312e84753026cf688..84aeef5924b60db6559a2f0aa2c92708fb3db9fa 100644
--- a/configure/CONFIG
+++ b/configure/CONFIG
@@ -37,4 +37,3 @@ VARS_EXCLUDES+=EPICS_DEV_SNAPSHOT
VARS_EXCLUDES+=EPICS_PATCH_VSTRING
VARS_EXCLUDES+=EPICS_SITE_VSTRING
VARS_EXCLUDES+=COMMIT_DATE
-
diff --git a/configure/CONFIG_MODULE b/configure/CONFIG_MODULE
index 405f00d6d21777b7baa40551ee1248690966df2d..89e53b59bda583ab44e126f880a7cd4ff444d524 100644
--- a/configure/CONFIG_MODULE
+++ b/configure/CONFIG_MODULE
@@ -19,4 +19,3 @@ E3_MODULE_VERSION=$(E3_REQUIRE_VERSION)
-include $(TOP)/../../REQUIRE_CONFIG_MODULE.local
-include $(TOP)/../REQUIRE_CONFIG_MODULE.local
-include $(TOP)/configure/CONFIG_MODULE.local
-
diff --git a/configure/CONFIG_MODULE_DEV b/configure/CONFIG_MODULE_DEV
index 23621d365c5dedd598804935dad16260fc05a473..d59c0198bd4a3eac44954ae58d1782d8991d3629 100644
--- a/configure/CONFIG_MODULE_DEV
+++ b/configure/CONFIG_MODULE_DEV
@@ -18,4 +18,3 @@ E3_MODULE_DEV_GITURL:="https://github.com/icshwi/require-ess"
-include $(TOP)/../../REQUIRE_CONFIG_MODULE_DEV.local
-include $(TOP)/../REQUIRE_CONFIG_MODULE_DEV.local
-include $(TOP)/configure/CONFIG_MODULE_DEV.local
-
diff --git a/configure/E3/CONFIG_E3_MAKEFILE b/configure/E3/CONFIG_E3_MAKEFILE
index 1afd8b72a1d7a186c50eb3b0614a754128e569ec..090cdb476df41cac572d64128a82bbcc10ef6c19 100644
--- a/configure/E3/CONFIG_E3_MAKEFILE
+++ b/configure/E3/CONFIG_E3_MAKEFILE
@@ -34,4 +34,3 @@ E3_MODULE_MAKE_CMDS:=make $(E3_REQUIRE_MAKEFILE_INPUT_OPTIONS)
## the following variables to display
VARS_EXCLUDES+=E3_REQUIRE_MAKEFILE_INPUT_OPTIONS
-
diff --git a/configure/E3/CONFIG_E3_PATH b/configure/E3/CONFIG_E3_PATH
index a3adee5215748c422bfcb7132e4ef3295b71bf7b..ec621bda6661ae6aa7beabeb1d46f8b6499483ee 100644
--- a/configure/E3/CONFIG_E3_PATH
+++ b/configure/E3/CONFIG_E3_PATH
@@ -3,4 +3,3 @@
E3_SITEMODS_PATH:=$(E3_REQUIRE_LOCATION)/siteMods
E3_SITELIBS_PATH:=$(E3_REQUIRE_LOCATION)/siteLibs
E3_SITEAPPS_PATH:=$(E3_REQUIRE_LOCATION)/siteApps
-
diff --git a/configure/E3/CONFIG_EPICS b/configure/E3/CONFIG_EPICS
index 1515d0bbd25dc5523c20790578aad4a538d15fbd..320b00b92643843e967449d05453104cc4ac7fb2 100644
--- a/configure/E3/CONFIG_EPICS
+++ b/configure/E3/CONFIG_EPICS
@@ -42,7 +42,7 @@ export M_ADSUPPORT
export M_ADCORE
export M_OPCUA
-### Exclude the following variables to display
+### Exclude the following variables to display
VARS_EXCLUDES+=COMMUNITY_EPICS_MODULES
VARS_EXCLUDES+=M_AUTOSAVE
VARS_EXCLUDES+=M_DEVLIB2
@@ -63,4 +63,3 @@ VARS_EXCLUDES+=M_IPAC
VARS_EXCLUDES+=M_ADSUPPORT
VARS_EXCLUDES+=M_ADCORE
VARS_EXCLUDES+=M_OPCUA
-
diff --git a/configure/E3/CONFIG_REQUIRE b/configure/E3/CONFIG_REQUIRE
index 673e6c371d7e677510c298422768d9f7554c4289..6cdf4a4089b37f17ac2b0525c1915e8b3bb4d724 100644
--- a/configure/E3/CONFIG_REQUIRE
+++ b/configure/E3/CONFIG_REQUIRE
@@ -15,4 +15,3 @@ E3_REQUIRE_CONFIG:=$(E3_REQUIRE_LOCATION)/configure
EXPORT_VARS+=$(filter E3_REQUIRE_%,$(.VARIABLES))
-
diff --git a/configure/E3/DEFINES_FT b/configure/E3/DEFINES_FT
index 28a67f4731e27489ea00a8a3c6fa6a67e0b782a3..3a50916c73c22924cb20be2ba1f57eaa81bac0b1 100644
--- a/configure/E3/DEFINES_FT
+++ b/configure/E3/DEFINES_FT
@@ -31,11 +31,10 @@ ifndef VERBOSE
QUIET := @
endif
-### Exclude the following variables to display
+### Exclude the following variables to display
VARS_EXCLUDES+=git_update
VARS_EXCLUDES+=git_module_init_update
VARS_EXCLUDES+=patch_site
VARS_EXCLUDES+=patch_revert_site
VARS_EXCLUDES+=QUIET
VARS_EXCLUDES+=SHELL
-
diff --git a/configure/E3/DEFINES_REQUIRE b/configure/E3/DEFINES_REQUIRE
index fddbd2e18b5b8364d2a3a7207705effe3a84eeb0..c457312bbf2907f50e9d58761ef91d9baf9bb37b 100644
--- a/configure/E3/DEFINES_REQUIRE
+++ b/configure/E3/DEFINES_REQUIRE
@@ -31,4 +31,4 @@ endef
VARS_EXCLUDES+=E3_CFG_VARS
-VARS_EXCLUDES+=G_E3_VAR0
\ No newline at end of file
+VARS_EXCLUDES+=G_E3_VAR0
diff --git a/configure/E3/RULES_DB b/configure/E3/RULES_DB
index c824940786050b5ecc5e79a219213293e074677b..9c751131d4076db1cf1c94f4dbd986867d1142e4 100644
--- a/configure/E3/RULES_DB
+++ b/configure/E3/RULES_DB
@@ -1,6 +1,6 @@
# -*- mode: Makefile;-*-
## This RULE should be used in case of inflating DB files
-##
+##
.PHONY: db
diff --git a/configure/E3/RULES_E3 b/configure/E3/RULES_E3
index 7e0952d35d4300a09fa061d06c2995ab8aa01519..8a2dfdb214b4084cf211e3cd503390368e415394 100644
--- a/configure/E3/RULES_E3
+++ b/configure/E3/RULES_E3
@@ -7,10 +7,10 @@
default: help
-# # help is defined in
+# # help is defined in
# # https://gist.github.com/rcmachado/af3db315e31383502660
help:
- $(info --------------------------------------- )
+ $(info --------------------------------------- )
$(info Available targets)
$(info --------------------------------------- )
$(QUIET) awk '/^[a-zA-Z\-\_0-9]+:/ { \
@@ -23,7 +23,7 @@ help:
print $$1 "\t" helpMsg; \
} \
{ helpMsg = $$0 }' \
- $(MAKEFILE_LIST) | column -ts:
+ $(MAKEFILE_LIST) | column -ts:
@@ -48,7 +48,7 @@ forceuninstall: conf
$(QUIET) $(E3_MODULE_MAKE_CMDS) uninstall
## Build current module.
-build: conf
+build: conf
$(QUIET) $(E3_MODULE_MAKE_CMDS) build
## Displays information about the build process
diff --git a/configure/E3/RULES_EPICS b/configure/E3/RULES_EPICS
index f1347c465cc3827551587fad19f951e6db1a76b3..c62191404fab080b999845183425c7ba362dbeee 100644
--- a/configure/E3/RULES_EPICS
+++ b/configure/E3/RULES_EPICS
@@ -7,9 +7,8 @@
# epics:
# $(QUIET)echo "EPICS_BASE=$(EPICS_BASE)" > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/RELEASE
-# $(QUIET)echo "INSTALL_LOCATION=$(M_IOCSTATS)" > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/CONFIG_SITE
+# $(QUIET)echo "INSTALL_LOCATION=$(M_IOCSTATS)" > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/CONFIG_SITE
# $(MAKE) -C $(E3_MODULE_SRC_PATH)
#epics-clean:
# $(MAKE) -C $(E3_MODULE_SRC_PATH) clean
-
diff --git a/configure/E3/RULES_PATCH b/configure/E3/RULES_PATCH
index 55d70ab0275f64c6082c02df40b7b7942617c020..fb3d8ada42821b29b23c4c56a66c691798f8a51f 100644
--- a/configure/E3/RULES_PATCH
+++ b/configure/E3/RULES_PATCH
@@ -2,11 +2,10 @@
.PHONY: patch patchrevert
-## Apply Patch Files
+## Apply Patch Files
patch:
$(QUIET) $(call patch_site)
-## Revert Patch Files
+## Revert Patch Files
patchrevert:
$(QUIET) $(call patch_revert_site)
-
diff --git a/configure/E3/RULES_REQUIRE b/configure/E3/RULES_REQUIRE
index 329da32aeeef3035136f0e1b13b154a725393e82..da876c85e9ead93e1242ee2924312b4216598674 100644
--- a/configure/E3/RULES_REQUIRE
+++ b/configure/E3/RULES_REQUIRE
@@ -1,7 +1,7 @@
# -*- mode: Makefile;-*-
# The following VARIABLES are defined in RULES_REQUIRE instead of CONFIG_REQUIRE,
-# because they are used in ONLY RULES_REQUIRE. It is easy to understand them.
+# because they are used in ONLY RULES_REQUIRE. It is easy to understand them.
#
# CentOS7.4 and Debian 8, it works
IOCSH_HASH_VERSION:=$(shell git rev-parse --short HEAD)
@@ -35,7 +35,7 @@ requireconf: e3-site-path e3-site-conf e3-require-path
e3-require-path:
$(QUIET) install -d -m 755 $(E3_REQUIRE_TOOLS)
$(QUIET) install -d -m 755 $(E3_REQUIRE_BIN)
- $(QUIET) install -d -m 755 $(E3_REQUIRE_CONFIG)
+ $(QUIET) install -d -m 755 $(E3_REQUIRE_CONFIG)
e3-site-path:
@@ -60,4 +60,3 @@ VARS_EXCLUDES+=E3_IOC_CFG_FILES
VARS_EXCLUDES+=E3_REQUIRE_CONF_FILES
VARS_EXCLUDES+=E3_ESSENVCFG_FILE
VARS_EXCLUDES+=E3_CONFIG_FILE
-
diff --git a/configure/RELEASE b/configure/RELEASE
index f45151d6c737b6cf9abbe3a4c1081855c23f6510..03c6c15d1c2eefa9042efda7a33ff4fbe51e28e8 100644
--- a/configure/RELEASE
+++ b/configure/RELEASE
@@ -8,4 +8,3 @@ E3_REQUIRE_VERSION:=3.4.1
-include $(TOP)/../../RELEASE.local
-include $(TOP)/../RELEASE.local
-include $(TOP)/configure/RELEASE.local
-
diff --git a/configure/RELEASE_DEV b/configure/RELEASE_DEV
index fc90b69cb8f2abf5af430187106d540fba29b48d..b03cfd8f64bc7e96aed50c0044dc258ee7bbba9e 100644
--- a/configure/RELEASE_DEV
+++ b/configure/RELEASE_DEV
@@ -8,4 +8,3 @@ E3_REQUIRE_VERSION=$(E3_MODULE_VERSION)
-include $(TOP)/../../RELEASE_DEV.local
-include $(TOP)/../RELEASE_DEV.local
-include $(TOP)/configure/RELEASE_DEV.local
-
diff --git a/configure/modules/CONFIG b/configure/modules/CONFIG
index 0286b58b55f41f275049d4c2c5dc56b8e7420efe..bd4f65e399cc5c7595c91cdfa4df9864497048fd 100644
--- a/configure/modules/CONFIG
+++ b/configure/modules/CONFIG
@@ -22,4 +22,3 @@ VARS_EXCLUDES+=EPICS_DEV_SNAPSHOT
VARS_EXCLUDES+=EPICS_PATCH_VSTRING
VARS_EXCLUDES+=EPICS_SITE_VSTRING
VARS_EXCLUDES+=COMMIT_DATE
-
diff --git a/configure/modules/CONFIG_CELL b/configure/modules/CONFIG_CELL
index 710312ea4732dae2e165466d948ea02e1c31e63e..4dafb395cb505e6ece363821c17f714cfaf02548 100644
--- a/configure/modules/CONFIG_CELL
+++ b/configure/modules/CONFIG_CELL
@@ -9,7 +9,7 @@ E3_CELL_PATH=$(TOP)/cellMods
##
## Useful if one would like to install many different modules in
## a specific directory for massive debugging purpose
-##
+##
-include $(TOP)/../CONFIG_CELL.local
-include $(TOP)/configure/CONFIG_CELL.local
E3_MODULES_PATH=$(E3_CELL_PATH)/$(notdir $(EPICS_BASE))/require-$(E3_REQUIRE_VERSION)
diff --git a/configure/modules/CONFIG_E3_MAKEFILE b/configure/modules/CONFIG_E3_MAKEFILE
index 4a8f16faa6293d9676b817e6e9d44356eeb8185d..9ec0800f99a1957a1f0d69a4417c0e8c8c3b4b17 100644
--- a/configure/modules/CONFIG_E3_MAKEFILE
+++ b/configure/modules/CONFIG_E3_MAKEFILE
@@ -31,4 +31,3 @@ E3_MODULE_MAKE_CMDS:=make $(E3_REQUIRE_MAKEFILE_INPUT_OPTIONS)
## the following variables to display
VARS_EXCLUDES+=E3_REQUIRE_MAKEFILE_INPUT_OPTIONS
-
diff --git a/configure/modules/CONFIG_E3_PATH b/configure/modules/CONFIG_E3_PATH
index 820deff1ad85c438a221f3da2e88bddb9db03d97..41abeb90ed2467b83efb4c43475032f29a9fdeb7 100644
--- a/configure/modules/CONFIG_E3_PATH
+++ b/configure/modules/CONFIG_E3_PATH
@@ -20,4 +20,3 @@ E3_MODULES_INSTALL_LOCATION_BIN:=$(E3_MODULES_INSTALL_LOCATION)/bin
E3_MODULES_INSTALL_LOCATION_LIB:=$(E3_MODULES_INSTALL_LOCATION)/lib
EXPORT_VARS+=E3_MODULES_INSTALL_LOCATION_LIB
-
diff --git a/configure/modules/CONFIG_EPICS b/configure/modules/CONFIG_EPICS
index 57aa7d01c0731a25d165dd64ea817133273b6760..51577a87bdb88b4e696998c137bb198bac022aeb 100644
--- a/configure/modules/CONFIG_EPICS
+++ b/configure/modules/CONFIG_EPICS
@@ -56,7 +56,7 @@ export M_OPCUA
## And so that last line will only run if SUDOBASH is defined to be "bash -c"
SUDOBASH := "bash -c"
-### Exclude the following variables to display
+### Exclude the following variables to display
VARS_EXCLUDES+=COMMUNITY_EPICS_MODULES
VARS_EXCLUDES+=M_AUTOSAVE
VARS_EXCLUDES+=M_DEVLIB2
@@ -77,4 +77,3 @@ VARS_EXCLUDES+=M_IPAC
VARS_EXCLUDES+=M_ADSUPPORT
VARS_EXCLUDES+=M_ADCORE
VARS_EXCLUDES+=M_OPCUA
-
diff --git a/configure/modules/CONFIG_TEST b/configure/modules/CONFIG_TEST
index f679a454982b0cf87986291b95631e2941681ae4..6ed93714c761d8283cfe164b0aefc37bc0c64d1c 100644
--- a/configure/modules/CONFIG_TEST
+++ b/configure/modules/CONFIG_TEST
@@ -3,4 +3,4 @@ RUN_IOCSH_TEST_COMMAND = run-iocsh --name "${EPICS_BASE}/require/${E3_REQUIRE_VE
TEMP_CELL_PATH := $(TOP)/testMods-$(shell date +"%y%m%d%H%M%S")
RMDIR = $(RM) -rf
-EXPORT_VARS += TEMP_CELL_PATH
\ No newline at end of file
+EXPORT_VARS += TEMP_CELL_PATH
diff --git a/configure/modules/DEFINES_FT b/configure/modules/DEFINES_FT
index c2772f4de22e49fac73401b9950ac6dde3a53860..a91260bb8c94f3e7b2c74b8a413eae05e50cb0cd 100644
--- a/configure/modules/DEFINES_FT
+++ b/configure/modules/DEFINES_FT
@@ -42,11 +42,10 @@ ifndef VERBOSE
QUIET := @
endif
-### Exclude the following variables to display
+### Exclude the following variables to display
VARS_EXCLUDES+=git_update
VARS_EXCLUDES+=git_module_init_update
VARS_EXCLUDES+=patch_site
VARS_EXCLUDES+=patch_revert_site
VARS_EXCLUDES+=QUIET
VARS_EXCLUDES+=SHELL
-
diff --git a/configure/modules/RULES_DEV b/configure/modules/RULES_DEV
index 50e6cf293a7933c98af1f3a7d4a1724431938cbf..02e2df964500f3d5ab384220dca794dfe14a27e0 100644
--- a/configure/modules/RULES_DEV
+++ b/configure/modules/RULES_DEV
@@ -68,5 +68,3 @@ devexistent: existent
devdep: dep
devvers: vers
endif
-
-
diff --git a/configure/modules/RULES_DKMS b/configure/modules/RULES_DKMS
index 2c418b941b974a7144f44096806f4aafc42411d5..41c3edc3b8c0ac37419a5e4b2997a75d9ddf54fa 100644
--- a/configure/modules/RULES_DKMS
+++ b/configure/modules/RULES_DKMS
@@ -17,7 +17,6 @@ dkms_install:
dkms_uninstall:
$(DKMS) uninstall $(DKMS_ARGS)
- $(QUIET) depmod
+ $(QUIET) depmod
.PHONY: dkms_build dkms_install dkms_remove dkms_uninstall
-
diff --git a/configure/modules/RULES_E3_SITEAPPS b/configure/modules/RULES_E3_SITEAPPS
index 4d32fff4c608d62cbd8f449ddfe3c14dc5d31d21..fbab8d1a7e213db87d48ae9c75d124ef9df1bbf1 100644
--- a/configure/modules/RULES_E3_SITEAPPS
+++ b/configure/modules/RULES_E3_SITEAPPS
@@ -1,8 +1,7 @@
# Create symbolic links in siteLibs
-.PHONY: install_links
+.PHONY: install_links
-# GNU find
+# GNU find
install_links: hdrs
-
diff --git a/configure/modules/RULES_E3_SITELIBS b/configure/modules/RULES_E3_SITELIBS
index 7a46a1dbdef0fdf8c8668bfb5ed0712a3a596348..436d526507b0940b2391921243385707dd07c226 100644
--- a/configure/modules/RULES_E3_SITELIBS
+++ b/configure/modules/RULES_E3_SITELIBS
@@ -3,18 +3,16 @@
.PHONY: install_links $(INSTALLED_EPICS_BASE_ARCHS)
-# GNU find
+# GNU find
install_links: $(INSTALLED_EPICS_BASE_ARCHS) hdrs
# ln -snf $(E3_MODULES_INSTALL_LOCATION_INC) $(E3_MODULES_INSTALL_LOCATION_INC_LINK)
# ln -snf $(E3_MODULES_INSTALL_LOCATION_DB) $(E3_MODULES_INSTALL_LOCATION_DB_LINK)
# ln -snf $(E3_MODULES_INSTALL_LOCATION_BIN) $(E3_MODULES_INSTALL_LOCATION_BIN_LINK)
# ln -snf $(E3_MODULES_INSTALL_LOCATION_LIB) $(E3_MODULES_INSTALL_LOCATION_LIB_LINK)
# ln -sf $(E3_MODULES_INSTALL_LOCATION_DBD) $(E3_MODULES_INSTALL_LOCATION_DBD_LINK)
-# find $(E3_SITELIBS_PATH) -xtype l -delete
+# find $(E3_SITELIBS_PATH) -xtype l -delete
$(INSTALLED_EPICS_BASE_ARCHS):
# mkdir -p $(E3_SITELIBS_PATH)/$@
# ln -sf $(E3_MODULES_INSTALL_LOCATION)/lib/$@/$(E3_MODULES_LIBNAME) $(E3_SITELIBS_PATH)/$@/$(E3_MODULES_LIBLINKNAME)
-
-
diff --git a/configure/modules/RULES_PATCH b/configure/modules/RULES_PATCH
index 19e968d0ab20699b4df502c10f242e8a54235be8..d2a6d0f6613be31117328fd8f01c4ba5b3fad9e8 100644
--- a/configure/modules/RULES_PATCH
+++ b/configure/modules/RULES_PATCH
@@ -6,11 +6,10 @@ check_for_old_patches:
$(if $(wildcard $(TOP)/patch/Site/$(patsubst %+0,%,$(E3_MODULE_VERSION))*.p0.patch),$(warning Warning: old-style patches detected. Please move them to patch/Site/$$E3_MODULE_VERSION/.))
-## Apply Patch Files
+## Apply Patch Files
patch: check_for_old_patches
$(QUIET) $(call patch_site)
-## Revert Patch Files
+## Revert Patch Files
patchrevert: check_for_old_patches
$(QUIET) $(call patch_revert_site)
-
diff --git a/configure/modules/RULES_PROD b/configure/modules/RULES_PROD
index 7927a009ea1f962c0ec14be82b457e475c649747..8181c49051151fe82a81f3311cf7f9ad3c72caae 100644
--- a/configure/modules/RULES_PROD
+++ b/configure/modules/RULES_PROD
@@ -6,4 +6,3 @@ prod_env:
$(QUIET) echo " -------- In most case, you can run the following export in a terminal --------"
$(QUIET) echo "export PATH=$(PROD_BIN_PATH):$${PATH}"
$(QUIET) echo " ------------------------------------------------------------------------------"
-
diff --git a/configure/modules/RULES_SITEAPPS b/configure/modules/RULES_SITEAPPS
index 32671279f348a76127cf800317c454c429b5314e..e2e71258ec8e05063a415a7bd33358074a76f930 100644
--- a/configure/modules/RULES_SITEAPPS
+++ b/configure/modules/RULES_SITEAPPS
@@ -14,5 +14,3 @@ include $(REQUIRE_CONFIG)/RULES_VARS
ifneq (,$(findstring dev,$(MAKECMDGOALS)))
-include $(REQUIRE_CONFIG)/RULES_DEV
endif
-
-
diff --git a/configure/modules/RULES_SITEMODS b/configure/modules/RULES_SITEMODS
index a461663a3cfacd30e2849cb36fda92d78c65d241..73ac0c3a2e947da5b2a4e1b6762357ed5141e754 100644
--- a/configure/modules/RULES_SITEMODS
+++ b/configure/modules/RULES_SITEMODS
@@ -14,5 +14,3 @@ include $(REQUIRE_CONFIG)/RULES_VARS
#include $(REQUIRE_CONFIG)/RULES_EPICS
include $(REQUIRE_CONFIG)/RULES_DEV
-
-
diff --git a/configure/modules/RULES_TEST b/configure/modules/RULES_TEST
index 95b8b88a5048739a7f07737e1a6c3be851776768..f542ecb693592fb72d2be104a9af22ee88f25880 100644
--- a/configure/modules/RULES_TEST
+++ b/configure/modules/RULES_TEST
@@ -26,4 +26,4 @@ else # if the if-run-iocsh-exists test fails
test:
$(error run-iocsh must be installed to use the test capability. Please install run-iocsh from PyPI.)
-endif
\ No newline at end of file
+endif
diff --git a/configure/modules/RULES_VARS b/configure/modules/RULES_VARS
index a358156ff466f137978eb392dab773d63ef5d9ca..98c485fae02df64a9f2efc80693572af6f2dfb26 100644
--- a/configure/modules/RULES_VARS
+++ b/configure/modules/RULES_VARS
@@ -54,7 +54,7 @@ dep:
$(foreach v, $(DEP_MODULES), $(info $(v) = $($(v)))) @#noop
ifneq ("$(wildcard $(GENERATED_DEP_FILE))","")
$(QUIET)echo "> generated ..."
- $(QUIET)tail -n+2 $(GENERATED_DEP_FILE)
+ $(QUIET)tail -n+2 $(GENERATED_DEP_FILE)
endif
.PHONY: vers
diff --git a/configure/modules/RULES_VLIBS b/configure/modules/RULES_VLIBS
index 427bdef2006165db46e1fa0378bf231b1b8da55b..4fd909975f74756b4d6f93526c5e7fe986f21f49 100644
--- a/configure/modules/RULES_VLIBS
+++ b/configure/modules/RULES_VLIBS
@@ -4,4 +4,3 @@
## Install vendor libraries
#vlibs: conf
# $(QUIET) $(E3_MODULE_MAKE_CMDS) vlibs
-
diff --git a/docs/HowTo.md b/docs/HowTo.md
index eec16d27c94d7c1295e47e0baba7f5520c33a783..94da27b6c8d83cacf3decec40fae22160e6c8c4f 100644
--- a/docs/HowTo.md
+++ b/docs/HowTo.md
@@ -91,7 +91,7 @@ jhlee@kaffee: e3-require (target_path_test)$ tree -L 2 /testing/epics/
├── [root 4.0K] startup
└── [root 4.0K] templates
```
-
+
```
diff --git a/docs/README.md b/docs/README.md
index ca1882770c72643edfa64f4ee5bef18dd9de85e6..965b7e151b8797621d1db0801bf4546356979687 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -9,16 +9,16 @@ This repository works with the following dependent repositories as well. And ESS
## Goals
*Building Environment SHOULD*
-* Be transparent to any Linux flavors, then any users can enjoy this environment if they want to. At least, Debian and CentOS MUST be supported.
+* Be transparent to any Linux flavors, then any users can enjoy this environment if they want to. At least, Debian and CentOS MUST be supported.
* Minimize to use additional scripts, i.e., Python, which made some troubles on early environment building system.
* Use the restricted and manual version control to resolve many troubles in terms of modules version dependency
* Use the one global environmental variables to allow us to track which systems are installed
* Use the transparent EPICS environment in order to switch version between require versions, and to enable or disable the E3 environment
-* Provide a way to setup the Generic EPICS BASE environment also.
+* Provide a way to setup the Generic EPICS BASE environment also.
## Dependent Repositories
-* e3-base https://github.com/icshwi/e3-base
+* e3-base https://github.com/icshwi/e3-base
* e3-env https://github.com/icshwi/e3-env
## Setup
@@ -29,7 +29,7 @@ This repository works with the following dependent repositories as well. And ESS
$ make init
```
-* Print pre-defined environments. Note that this should be synced with e3-base one.
+* Print pre-defined environments. Note that this should be synced with e3-base one.
```
$ make env
```
@@ -51,12 +51,12 @@ make install
```
## Execute iocsh
-* Once one installs e3-require, one can execute the simple iocsh for testing.
+* Once one installs e3-require, one can execute the simple iocsh for testing.
```
e3-require (master)$ . e3-env/setE3Env.bash
-e3-require (master)$ iocsh.bash
+e3-require (master)$ iocsh.bash
#
#
# Start at "2017-W49-Dec04-1805-28-CET"
@@ -87,21 +87,21 @@ e3-require (master)$ iocsh.bash
# Please Use Version and other environment variables
# in order to report or debug this shell
#
-# Loading the mandatory require module ...
-#
+# Loading the mandatory require module ...
+#
dlload /epics/modules/require/2.5.4/R3.15.5/lib/linux-x86_64/librequire.so
dbLoadDatabase /epics/modules/require/2.5.4/R3.15.5/dbd/require.dbd
require_registerRecordDeviceDriver
Loading module info records for require
-#
-#
+#
+#
epicsEnvSet IOCSH_PS1 "0d11bf5.kaffee.13650 > "
epicsEnvShow T_A
T_A is not an environment variable.
epicsEnvShow EPICS_HOST_ARCH
EPICS_HOST_ARCH=linux-x86_64
var requireDebug 1
-0d11bf5.kaffee.13650 >
+0d11bf5.kaffee.13650 >
```
@@ -161,4 +161,3 @@ jhlee@kaffee: require-ess ((d7cf410...))$ git st
HEAD detached from 34c293d
```
Assume that individual files were changed before doing that.
-
diff --git a/docs/TODO.md b/docs/TODO.md
index a384cc9ca864652cfc79aafad41aa57c4b2e74d5..50bbab732bd53ffbed953729a2d83425d9119860 100644
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -12,7 +12,7 @@
* Fix the install permissions for cellMods FIXED aa4749f887ed92fb90f577326c9e756fadbc081b
* `cellinstall` should write the version of base/require! b9168c9a3479bb4efe3df1e7bbfdb667903aa5ab
* require gets its version from CONFIG_MODULE, so why is it specified in RELEASE? This is confusing. ac9ec7b6e73dc5968b5500f8daf93155fb4699fe
-* Remove `rm -rf cellMods` from `celluninstall` target; this is not a great idea if we are using multiple modules installed in the same place. 598cf611260fb40780db204cdc814f7c3a0e305e
+* Remove `rm -rf cellMods` from `celluninstall` target; this is not a great idea if we are using multiple modules installed in the same place. 598cf611260fb40780db204cdc814f7c3a0e305e
* Go through and figure out if we should remove all of the `sudo` usage. 922905e247d6f6ac309b0909f994576f9fedc2b5
## Not done
@@ -23,9 +23,9 @@
* Figure out how to fix the fact that asyn, on build, installs devEpics.dbd *** IMPORTANT <=== Needs a patch on EPICS base
* `make cellinstall` does not install vendor libraries anywhere.
* Moreover, vlibs are installed with no reference to `$(T_A)`, which isn't a good idea! One possible idea:
- we could move the `vlibs` target into driver.makefile instead of letting it reside outside in the
+ we could move the `vlibs` target into driver.makefile instead of letting it reside outside in the
module makefile. This needs to be discussed.
* module_DB vs module_DIR: DIR includes trailing slash, DB does not. Fix?
* Should there be an error message if non-existent versions of e.g. sequencer are specified?
* base/require version should be added to shared library object; this is needed for cellinstall but should
- more generally be used on startup to check that the library was compiled with the running version of base/require.
\ No newline at end of file
+ more generally be used on startup to check that the library was compiled with the running version of base/require.
diff --git a/docs/module_location.md b/docs/module_location.md
index 3b6e30f275b065c91bdd710de0f3814044c1c7ab..fea1884df715ceb895dee06a4e9aad17e9dc238b 100644
--- a/docs/module_location.md
+++ b/docs/module_location.md
@@ -47,7 +47,7 @@ Tuesday, December 5 15:50:42 CET 2017, jhlee
driver.makefile
-1) Remove base_VERSION directory below modules
+1) Remove base_VERSION directory below modules
uninstall.%:
$(RMDIR) $(wildcard ${MODULE_LOCATION}/R*${@:uninstall.%=%}*)
@@ -59,7 +59,3 @@ ${MODULE_LOCATION}/R${EPICSVERSION}/lib/${T_A}
To
${MODULE_LOCATION}/lib/${T_A}
-
-
-
-
diff --git a/require.Makefile b/require.Makefile
index d07ccfc6f8ede6bcd2435cae8bbb4334af16f8d9..01b8594e2a1ae0cd5531d8ab5fc83689bb50058c 100644
--- a/require.Makefile
+++ b/require.Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004 - 2017 Paul Scherrer Institute
+# Copyright (c) 2004 - 2017 Paul Scherrer Institute
# Copyright (c) 2017 - Present European Spallation Source ERIC
#
# The program is free software: you can redistribute
@@ -66,12 +66,12 @@ HEADERS += $(APPSRC)/require.h
#HEADERS += require_env.h
# We need to find the Linux link.h before the EPICS link.h
-USR_INCLUDES_Linux=-idirafter $(EPICS_BASE)/include
+USR_INCLUDES_Linux=-idirafter $(EPICS_BASE)/include
# ESS require doesn't use T_A, because Linux should handle linux as "1"
# instead of its name. ESS require can handle them within the EPICS
# IOC shell internally.
-#
+#
#USR_CFLAGS += -DT_A='"${T_A}"'
# ESS doesn't support WIN32
@@ -101,7 +101,7 @@ TEMS = $(wildcard $(APPDB)/*.template)
db: $(TEMS)
-$(TEMS):
+$(TEMS):
@printf "Inflating database ... %44s >>> %40s \n" "$@" "$(basename $(@)).db"
@rm -f $(basename $(@)).db.d $(basename $(@)).db
@$(MSI) -D $(USR_DBFLAGS) -o $(basename $(@)).db $@ > $(basename $(@)).db.d
@@ -110,4 +110,4 @@ $(TEMS):
-.PHONY: db $(TEMS)
+.PHONY: db $(TEMS)
diff --git a/tools/README.md b/tools/README.md
index 4794efebda5a3c536db8687bc37b1caa2037e066..f22f0c81db58de52199d22a6dd766e6478893e73 100644
--- a/tools/README.md
+++ b/tools/README.md
@@ -16,4 +16,3 @@ $ iocsh.bash e3_local/cmds/iocStats.cmd
In this case,
```E3_CMD_TOP``` is defined as ```"${HOME}/e3_local/cmds"```
```E3_IOCSH_TOP``` is defined as ```"${HOME}"```
-