Merge branch 'e3_517_cleanup_makevars' into 'master'

E3-517: Cleanup `make vars`

See merge request e3/e3-require!55

CHANGELOG.md

@@ -28,12 +28,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Removed duplicated entries from generated `.dep` files
 
 ### Other changes
-* removed `e3.cfg`, `ess-env.conf` and `DEFINES_REQUIRE` files and associated codes in `RULES_REQUIRE`, `setE3Env.bash` and `.gitignore`. 
+* removed `e3.cfg`, `ess-env.conf` and `DEFINES_REQUIRE` files and associated codes in `RULES_REQUIRE`, `setE3Env.bash` and `.gitignore`.
 * removed legacy code from setE3Env.bash
 * Removed usage of `env.sh` - now there is a check only for seeing if the environment variable `$IOCNAME` is set
 * Fix typos in `iocsh_functions.bash` comments
 * Rearrange usage to match order of options in code
 * Add information about realtime option to usage
+* Cleaned up the output of `make vars` and `make devvars`
 
 ## [3.4.1]
 

configure/CONFIG

@@ -29,6 +29,10 @@ include $(TOP)/configure/E3/CONFIG_EXPORT
 include $(TOP)/configure/E3/CONFIG_TEST
 
 
+VARS_EXCLUDES+=BASE_3_14
+VARS_EXCLUDES+=BASE_3_15
+VARS_EXCLUDES+=BASE_3_16
+VARS_EXCLUDES+=BASE_7_0
 VARS_EXCLUDES+=EPICS_VERSION
 VARS_EXCLUDES+=EPICS_REVISION
 VARS_EXCLUDES+=EPICS_MODIFICATION

configure/E3/CONFIG_E3_MAKEFILE

@@ -34,3 +34,4 @@ E3_MODULE_MAKE_CMDS:=make $(E3_REQUIRE_MAKEFILE_INPUT_OPTIONS)
 ## the following variables to display
 
 VARS_EXCLUDES+=E3_REQUIRE_MAKEFILE_INPUT_OPTIONS
+VARS_EXCLUDES+=GIT_REMOTE_NAME

configure/E3/CONFIG_SHELL

@@ -4,3 +4,5 @@ ifdef DEBUG_SHELL
 else
   SHELL = /usr/bin/bash
 endif
+
+VARS_EXCLUDES += SHELL

configure/E3/CONFIG_TEST

 TEST_DIR:=$(TOP)/tests
+
+VARS_EXCLUDES+=TEST_DIR

configure/modules/CONFIG

@@ -14,6 +14,10 @@ include $(REQUIRE_CONFIG)/CONFIG_EPICS
 include $(REQUIRE_CONFIG)/CONFIG_DKMS
 include $(REQUIRE_CONFIG)/CONFIG_EXPORT
 
+VARS_EXCLUDES+=BASE_3_14
+VARS_EXCLUDES+=BASE_3_15
+VARS_EXCLUDES+=BASE_3_16
+VARS_EXCLUDES+=BASE_7_0
 VARS_EXCLUDES+=EPICS_VERSION
 VARS_EXCLUDES+=EPICS_REVISION
 VARS_EXCLUDES+=EPICS_MODIFICATION

configure/modules/CONFIG_E3_MAKEFILE

@@ -31,3 +31,4 @@ E3_MODULE_MAKE_CMDS:=make $(E3_REQUIRE_MAKEFILE_INPUT_OPTIONS)
 ## the following variables to display
 
 VARS_EXCLUDES+=E3_REQUIRE_MAKEFILE_INPUT_OPTIONS
+VARS_EXCLUDES+=GIT_REMOTE_NAME

configure/modules/CONFIG_EPICS

@@ -54,7 +54,7 @@ export M_OPCUA
 #	$(SUDOBASH) "$(MAKE) -C $(E3_MODULE_SRC_PATH)"
 #
 ## And so that last line will only run if SUDOBASH is defined to be "bash -c"
-SUDOBASH := "bash -c"
+SUDOBASH := bash -c
 
 ### Exclude the following variables to display
 VARS_EXCLUDES+=COMMUNITY_EPICS_MODULES
@@ -77,3 +77,5 @@ VARS_EXCLUDES+=M_IPAC
 VARS_EXCLUDES+=M_ADSUPPORT
 VARS_EXCLUDES+=M_ADCORE
 VARS_EXCLUDES+=M_OPCUA
+
+VARS_EXCLUDES+=SUDOBASH

configure/modules/CONFIG_SHELL

@@ -4,3 +4,5 @@ ifdef DEBUG_SHELL
 else
   SHELL = /usr/bin/bash
 endif
+
+VARS_EXCLUDES+=SHELL

configure/modules/CONFIG_TEST

@@ -4,3 +4,6 @@ TEMP_CELL_PATH := $(TOP)/testMods-$(shell date +"%y%m%d%H%M%S")
 RMDIR = $(RM) -rf
 
 EXPORT_VARS += TEMP_CELL_PATH
+
+VARS_EXCLUDES += RMDIR
+VARS_EXCLUDES += TEMP_CELL_PATH

configure/modules/RULES_VARS

@@ -3,22 +3,6 @@
 E3_MODULES_VARIABLES:=$(sort $(filter-out $(VARS_EXCLUDES) VARS_EXCLUDES,$(.VARIABLES)))
 
 DEP_MODULES:=$(filter %_DEP_VERSION, $(E3_MODULES_VARIABLES))
-DEP_NAMES:=$(patsubst %_DEP_VERSION,%,$(DEP_MODULES))
-
-COMMA := ,
-EMPTY :=
-SPACE := $(EMPTY) $(EMPTY)
-
-COMMA_DEP_NAMES:=$(subst $(SPACE),$(COMMA),$(DEP_NAMES))
-
-blank :=
-define newline
-
-$(blank)
-endef
-
-#LOWER_DEP_MODULES:=$(shell echo $(DEP_MODULES) | tr A-Z a-z)
-#DEP_MODULES_NAME:=$(subst _DEP_VERSION, "", $(DEP_MODULES))
 
 LEVEL?=2
 
@@ -27,7 +11,8 @@ GENERATED_DEP_FILE:=$(E3_MODULES_INSTALL_LOCATION_LIB)/$(EPICS_HOST_ARCH)/$(E3_M
 ## Print relevant environment variables
 .PHONY: vars
 vars: header
-	$(foreach v, $(E3_MODULES_VARIABLES), $(info $(v) = $($(v)))) @#noop
+	$(foreach v, $(filter-out %_DEP_VERSION,$(E3_MODULES_VARIABLES)), $(info $(v) = $($(v)))) @#noop
+	$(foreach v, $(filter %_DEP_VERSION,$(E3_MODULES_VARIABLES)), $(info $(v) = $($(v)))) @#noop
 
 .PHONY: header
 header: