Merge branch 'e3_186_fix_dev_targets' into 'master'

E3-186: Removed 'dev' targets for local source mode.

See merge request e3/e3-require!59

CHANGELOG.md

@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Fixed issue where git passwords would be displayed in plaintext in metadata file
 * Fixed issue where `LD_LIBRARY_PATH` could keep old `siteLibs` path around
 * Removed duplicated entries from generated `.dep` files
+* Removed `dev` targets from modules that function in "local source mode"
 
 ### Other changes
 * Removed `<module>_TEMPLATES` in favour of `<module>_DB`
@@ -37,6 +38,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * 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`
+* Merged together `configure/E3` and `configure/MODULES`
 
 ## [3.4.1]
 

configure/CONFIG_MODULE_DEV

-EPICS_MODULE_TAG:=master
-#
-EPICS_MODULE_NAME:=${E3_REQUIRE_NAME}
-#
-E3_MODULE_SRC_PATH:=$(EPICS_MODULE_NAME)
-E3_MODULE_MAKEFILE:=$(EPICS_MODULE_NAME).Makefile
-
-E3_MODULE_NAME:=$(EPICS_MODULE_NAME)
-E3_MODULE_VERSION:=3.3.0
-#
-#
-#
-E3_MODULE_DEV_GITURL:="https://github.com/icshwi/require-ess"
-
-
-
-# The definitions shown below can also be placed in an untracked CONFIG_MODULE.local
--include $(TOP)/../../REQUIRE_CONFIG_MODULE_DEV.local
--include $(TOP)/../REQUIRE_CONFIG_MODULE_DEV.local
--include $(TOP)/configure/CONFIG_MODULE_DEV.local

configure/E3/RULES_DEV

 # -*- mode: Makefile;-*-
 
+ifneq ($(E3_LOCAL_SOURCE),1)
 .PHONY: devvars devenv devinit devbuild devclean devinstall devrebuild devuninstall devdistclean devconf devepics devepics-clean devepics-distclean devpatch devpatchrevert devexistent devdep devvers
 
 devvars: vars
@@ -69,4 +70,11 @@ devpatchrevert: patchrevert
 devexistent: existent
 devdep: dep
 devvers: vers
-endif
+endif # E3_MODULE_SRC_PATH_FLAG
+
+else
+
+dev%:
+	$(error You are in local source mode. No dev targets are available)
+
+endif # E3_LOCAL_SOURCE

configure/RELEASE_DEV

-EPICS_BASE=/epics/base-7.0.4
-
-E3_REQUIRE_NAME:=require
-E3_REQUIRE_VERSION=$(E3_MODULE_VERSION)
-
-
-# The definitions shown below can also be placed in an untracked RELEASE.local
--include $(TOP)/../../RELEASE_DEV.local
--include $(TOP)/../RELEASE_DEV.local
--include $(TOP)/configure/RELEASE_DEV.local