Skip to content
Snippets Groups Projects
Commit 555af41e authored by Simon Rose's avatar Simon Rose
Browse files

Cleaned up whitespace/end-of-files

parent db7360c3
No related branches found
No related tags found
1 merge request!43Cleaned up whitespace/end-of-files
Pipeline #85564 passed
Stage: check
Stage: build
Stage: test
Hide whitespace changes
Inline Side-by-side
Showing
with 14 additions and 30 deletions
configure/CONFIG
+ 0
− 1
View file @ 555af41e
...@@ -37,4 +37,3 @@ VARS_EXCLUDES+=EPICS_DEV_SNAPSHOT ...@@ -37,4 +37,3 @@ VARS_EXCLUDES+=EPICS_DEV_SNAPSHOT
VARS_EXCLUDES+=EPICS_PATCH_VSTRING VARS_EXCLUDES+=EPICS_PATCH_VSTRING
VARS_EXCLUDES+=EPICS_SITE_VSTRING VARS_EXCLUDES+=EPICS_SITE_VSTRING
VARS_EXCLUDES+=COMMIT_DATE VARS_EXCLUDES+=COMMIT_DATE
configure/CONFIG_MODULE
+ 0
− 1
View file @ 555af41e
...@@ -19,4 +19,3 @@ E3_MODULE_VERSION=$(E3_REQUIRE_VERSION) ...@@ -19,4 +19,3 @@ E3_MODULE_VERSION=$(E3_REQUIRE_VERSION)
-include $(TOP)/../../REQUIRE_CONFIG_MODULE.local -include $(TOP)/../../REQUIRE_CONFIG_MODULE.local
-include $(TOP)/../REQUIRE_CONFIG_MODULE.local -include $(TOP)/../REQUIRE_CONFIG_MODULE.local
-include $(TOP)/configure/CONFIG_MODULE.local -include $(TOP)/configure/CONFIG_MODULE.local
configure/CONFIG_MODULE_DEV
+ 0
− 1
View file @ 555af41e
...@@ -18,4 +18,3 @@ E3_MODULE_DEV_GITURL:="https://github.com/icshwi/require-ess" ...@@ -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)/../REQUIRE_CONFIG_MODULE_DEV.local -include $(TOP)/../REQUIRE_CONFIG_MODULE_DEV.local
-include $(TOP)/configure/CONFIG_MODULE_DEV.local -include $(TOP)/configure/CONFIG_MODULE_DEV.local
configure/E3/CONFIG_E3_MAKEFILE
+ 0
− 1
View file @ 555af41e
...@@ -34,4 +34,3 @@ E3_MODULE_MAKE_CMDS:=make $(E3_REQUIRE_MAKEFILE_INPUT_OPTIONS) ...@@ -34,4 +34,3 @@ E3_MODULE_MAKE_CMDS:=make $(E3_REQUIRE_MAKEFILE_INPUT_OPTIONS)
## the following variables to display ## the following variables to display
VARS_EXCLUDES+=E3_REQUIRE_MAKEFILE_INPUT_OPTIONS VARS_EXCLUDES+=E3_REQUIRE_MAKEFILE_INPUT_OPTIONS
configure/E3/CONFIG_E3_PATH
+ 0
− 1
View file @ 555af41e
...@@ -3,4 +3,3 @@ ...@@ -3,4 +3,3 @@
E3_SITEMODS_PATH:=$(E3_REQUIRE_LOCATION)/siteMods E3_SITEMODS_PATH:=$(E3_REQUIRE_LOCATION)/siteMods
E3_SITELIBS_PATH:=$(E3_REQUIRE_LOCATION)/siteLibs E3_SITELIBS_PATH:=$(E3_REQUIRE_LOCATION)/siteLibs
E3_SITEAPPS_PATH:=$(E3_REQUIRE_LOCATION)/siteApps E3_SITEAPPS_PATH:=$(E3_REQUIRE_LOCATION)/siteApps
configure/E3/CONFIG_EPICS
+ 1
− 2
View file @ 555af41e
...@@ -42,7 +42,7 @@ export M_ADSUPPORT ...@@ -42,7 +42,7 @@ export M_ADSUPPORT
export M_ADCORE export M_ADCORE
export M_OPCUA export M_OPCUA
### Exclude the following variables to display ### Exclude the following variables to display
VARS_EXCLUDES+=COMMUNITY_EPICS_MODULES VARS_EXCLUDES+=COMMUNITY_EPICS_MODULES
VARS_EXCLUDES+=M_AUTOSAVE VARS_EXCLUDES+=M_AUTOSAVE
VARS_EXCLUDES+=M_DEVLIB2 VARS_EXCLUDES+=M_DEVLIB2
...@@ -63,4 +63,3 @@ VARS_EXCLUDES+=M_IPAC ...@@ -63,4 +63,3 @@ VARS_EXCLUDES+=M_IPAC
VARS_EXCLUDES+=M_ADSUPPORT VARS_EXCLUDES+=M_ADSUPPORT
VARS_EXCLUDES+=M_ADCORE VARS_EXCLUDES+=M_ADCORE
VARS_EXCLUDES+=M_OPCUA VARS_EXCLUDES+=M_OPCUA
configure/E3/CONFIG_REQUIRE
+ 0
− 1
View file @ 555af41e
...@@ -15,4 +15,3 @@ E3_REQUIRE_CONFIG:=$(E3_REQUIRE_LOCATION)/configure ...@@ -15,4 +15,3 @@ E3_REQUIRE_CONFIG:=$(E3_REQUIRE_LOCATION)/configure
EXPORT_VARS+=$(filter E3_REQUIRE_%,$(.VARIABLES)) EXPORT_VARS+=$(filter E3_REQUIRE_%,$(.VARIABLES))
configure/E3/DEFINES_FT
+ 1
− 2
View file @ 555af41e
...@@ -31,11 +31,10 @@ ifndef VERBOSE ...@@ -31,11 +31,10 @@ ifndef VERBOSE
QUIET := @ QUIET := @
endif endif
### Exclude the following variables to display ### Exclude the following variables to display
VARS_EXCLUDES+=git_update VARS_EXCLUDES+=git_update
VARS_EXCLUDES+=git_module_init_update VARS_EXCLUDES+=git_module_init_update
VARS_EXCLUDES+=patch_site VARS_EXCLUDES+=patch_site
VARS_EXCLUDES+=patch_revert_site VARS_EXCLUDES+=patch_revert_site
VARS_EXCLUDES+=QUIET VARS_EXCLUDES+=QUIET
VARS_EXCLUDES+=SHELL VARS_EXCLUDES+=SHELL
configure/E3/DEFINES_REQUIRE
+ 1
− 1
View file @ 555af41e
...@@ -31,4 +31,4 @@ endef ...@@ -31,4 +31,4 @@ endef
VARS_EXCLUDES+=E3_CFG_VARS VARS_EXCLUDES+=E3_CFG_VARS
VARS_EXCLUDES+=G_E3_VAR0 VARS_EXCLUDES+=G_E3_VAR0
\ No newline at end of file
configure/E3/RULES_DB
+ 1
− 1
View file @ 555af41e
# -*- mode: Makefile;-*- # -*- mode: Makefile;-*-
## This RULE should be used in case of inflating DB files ## This RULE should be used in case of inflating DB files
## ##
.PHONY: db .PHONY: db
......
configure/E3/RULES_E3
+ 4
− 4
View file @ 555af41e
...@@ -7,10 +7,10 @@ ...@@ -7,10 +7,10 @@
default: help default: help
# # help is defined in # # help is defined in
# # https://gist.github.com/rcmachado/af3db315e31383502660 # # https://gist.github.com/rcmachado/af3db315e31383502660
help: help:
$(info --------------------------------------- ) $(info --------------------------------------- )
$(info Available targets) $(info Available targets)
$(info --------------------------------------- ) $(info --------------------------------------- )
$(QUIET) awk '/^[a-zA-Z\-\_0-9]+:/ { \ $(QUIET) awk '/^[a-zA-Z\-\_0-9]+:/ { \
...@@ -23,7 +23,7 @@ help: ...@@ -23,7 +23,7 @@ help:
print $$1 "\t" helpMsg; \ print $$1 "\t" helpMsg; \
} \ } \
{ helpMsg = $$0 }' \ { helpMsg = $$0 }' \
$(MAKEFILE_LIST) | column -ts: $(MAKEFILE_LIST) | column -ts:
...@@ -48,7 +48,7 @@ forceuninstall: conf ...@@ -48,7 +48,7 @@ forceuninstall: conf
$(QUIET) $(E3_MODULE_MAKE_CMDS) uninstall $(QUIET) $(E3_MODULE_MAKE_CMDS) uninstall
## Build current module. ## Build current module.
build: conf build: conf
$(QUIET) $(E3_MODULE_MAKE_CMDS) build $(QUIET) $(E3_MODULE_MAKE_CMDS) build
## Displays information about the build process ## Displays information about the build process
......
configure/E3/RULES_EPICS
+ 1
− 2
View file @ 555af41e
...@@ -7,9 +7,8 @@ ...@@ -7,9 +7,8 @@
# epics: # epics:
# $(QUIET)echo "EPICS_BASE=$(EPICS_BASE)" > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/RELEASE # $(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) # $(MAKE) -C $(E3_MODULE_SRC_PATH)
#epics-clean: #epics-clean:
# $(MAKE) -C $(E3_MODULE_SRC_PATH) clean # $(MAKE) -C $(E3_MODULE_SRC_PATH) clean
configure/E3/RULES_PATCH
+ 2
− 3
View file @ 555af41e
...@@ -2,11 +2,10 @@ ...@@ -2,11 +2,10 @@
.PHONY: patch patchrevert .PHONY: patch patchrevert
## Apply Patch Files ## Apply Patch Files
patch: patch:
$(QUIET) $(call patch_site) $(QUIET) $(call patch_site)
## Revert Patch Files ## Revert Patch Files
patchrevert: patchrevert:
$(QUIET) $(call patch_revert_site) $(QUIET) $(call patch_revert_site)
configure/E3/RULES_REQUIRE
+ 2
− 3
View file @ 555af41e
# -*- mode: Makefile;-*- # -*- mode: Makefile;-*-
# The following VARIABLES are defined in RULES_REQUIRE instead of CONFIG_REQUIRE, # 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 # CentOS7.4 and Debian 8, it works
IOCSH_HASH_VERSION:=$(shell git rev-parse --short HEAD) IOCSH_HASH_VERSION:=$(shell git rev-parse --short HEAD)
...@@ -35,7 +35,7 @@ requireconf: e3-site-path e3-site-conf e3-require-path ...@@ -35,7 +35,7 @@ requireconf: e3-site-path e3-site-conf e3-require-path
e3-require-path: e3-require-path:
$(QUIET) install -d -m 755 $(E3_REQUIRE_TOOLS) $(QUIET) install -d -m 755 $(E3_REQUIRE_TOOLS)
$(QUIET) install -d -m 755 $(E3_REQUIRE_BIN) $(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: e3-site-path:
...@@ -60,4 +60,3 @@ VARS_EXCLUDES+=E3_IOC_CFG_FILES ...@@ -60,4 +60,3 @@ VARS_EXCLUDES+=E3_IOC_CFG_FILES
VARS_EXCLUDES+=E3_REQUIRE_CONF_FILES VARS_EXCLUDES+=E3_REQUIRE_CONF_FILES
VARS_EXCLUDES+=E3_ESSENVCFG_FILE VARS_EXCLUDES+=E3_ESSENVCFG_FILE
VARS_EXCLUDES+=E3_CONFIG_FILE VARS_EXCLUDES+=E3_CONFIG_FILE
configure/RELEASE
+ 0
− 1
View file @ 555af41e
...@@ -8,4 +8,3 @@ E3_REQUIRE_VERSION:=3.4.1 ...@@ -8,4 +8,3 @@ E3_REQUIRE_VERSION:=3.4.1
-include $(TOP)/../../RELEASE.local -include $(TOP)/../../RELEASE.local
-include $(TOP)/../RELEASE.local -include $(TOP)/../RELEASE.local
-include $(TOP)/configure/RELEASE.local -include $(TOP)/configure/RELEASE.local
configure/RELEASE_DEV
+ 0
− 1
View file @ 555af41e
...@@ -8,4 +8,3 @@ E3_REQUIRE_VERSION=$(E3_MODULE_VERSION) ...@@ -8,4 +8,3 @@ E3_REQUIRE_VERSION=$(E3_MODULE_VERSION)
-include $(TOP)/../../RELEASE_DEV.local -include $(TOP)/../../RELEASE_DEV.local
-include $(TOP)/../RELEASE_DEV.local -include $(TOP)/../RELEASE_DEV.local
-include $(TOP)/configure/RELEASE_DEV.local -include $(TOP)/configure/RELEASE_DEV.local
configure/modules/CONFIG
+ 0
− 1
View file @ 555af41e
...@@ -22,4 +22,3 @@ VARS_EXCLUDES+=EPICS_DEV_SNAPSHOT ...@@ -22,4 +22,3 @@ VARS_EXCLUDES+=EPICS_DEV_SNAPSHOT
VARS_EXCLUDES+=EPICS_PATCH_VSTRING VARS_EXCLUDES+=EPICS_PATCH_VSTRING
VARS_EXCLUDES+=EPICS_SITE_VSTRING VARS_EXCLUDES+=EPICS_SITE_VSTRING
VARS_EXCLUDES+=COMMIT_DATE VARS_EXCLUDES+=COMMIT_DATE
configure/modules/CONFIG_CELL
+ 1
− 1
View file @ 555af41e
...@@ -9,7 +9,7 @@ E3_CELL_PATH=$(TOP)/cellMods ...@@ -9,7 +9,7 @@ E3_CELL_PATH=$(TOP)/cellMods
## ##
## Useful if one would like to install many different modules in ## Useful if one would like to install many different modules in
## a specific directory for massive debugging purpose ## a specific directory for massive debugging purpose
## ##
-include $(TOP)/../CONFIG_CELL.local -include $(TOP)/../CONFIG_CELL.local
-include $(TOP)/configure/CONFIG_CELL.local -include $(TOP)/configure/CONFIG_CELL.local
E3_MODULES_PATH=$(E3_CELL_PATH)/$(notdir $(EPICS_BASE))/require-$(E3_REQUIRE_VERSION) E3_MODULES_PATH=$(E3_CELL_PATH)/$(notdir $(EPICS_BASE))/require-$(E3_REQUIRE_VERSION)
......
configure/modules/CONFIG_E3_MAKEFILE
+ 0
− 1
View file @ 555af41e
...@@ -31,4 +31,3 @@ E3_MODULE_MAKE_CMDS:=make $(E3_REQUIRE_MAKEFILE_INPUT_OPTIONS) ...@@ -31,4 +31,3 @@ E3_MODULE_MAKE_CMDS:=make $(E3_REQUIRE_MAKEFILE_INPUT_OPTIONS)
## the following variables to display ## the following variables to display
VARS_EXCLUDES+=E3_REQUIRE_MAKEFILE_INPUT_OPTIONS VARS_EXCLUDES+=E3_REQUIRE_MAKEFILE_INPUT_OPTIONS
configure/modules/CONFIG_E3_PATH
+ 0
− 1
View file @ 555af41e
...@@ -20,4 +20,3 @@ E3_MODULES_INSTALL_LOCATION_BIN:=$(E3_MODULES_INSTALL_LOCATION)/bin ...@@ -20,4 +20,3 @@ E3_MODULES_INSTALL_LOCATION_BIN:=$(E3_MODULES_INSTALL_LOCATION)/bin
E3_MODULES_INSTALL_LOCATION_LIB:=$(E3_MODULES_INSTALL_LOCATION)/lib E3_MODULES_INSTALL_LOCATION_LIB:=$(E3_MODULES_INSTALL_LOCATION)/lib
EXPORT_VARS+=E3_MODULES_INSTALL_LOCATION_LIB EXPORT_VARS+=E3_MODULES_INSTALL_LOCATION_LIB
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment