From 5bc9d933dc194b2f56acc1a72f0a444976d1d16c Mon Sep 17 00:00:00 2001
From: Simon Rose <simon.rose@ess.eu>
Date: Tue, 26 Oct 2021 14:44:07 +0200
Subject: [PATCH] Removed 'dev' targets for local source mode.
Local source mode can theoreticaly run 'make devbuild' and other related targets. However,
this yields somewhat undefined behaviour, since those will potentially be missing configuration
data or clashing with the regular build location. There is no reason to include dev targets for
local source mode, so they should be removed.
---
configure/CONFIG_MODULE_DEV | 20 --------------------
configure/E3/RULES_DEV | 10 +++++++++-
configure/RELEASE_DEV | 10 ----------
3 files changed, 9 insertions(+), 31 deletions(-)
delete mode 100644 configure/CONFIG_MODULE_DEV
delete mode 100644 configure/RELEASE_DEV
diff --git a/configure/CONFIG_MODULE_DEV b/configure/CONFIG_MODULE_DEV
deleted file mode 100644
index d59c0198..00000000
--- a/configure/CONFIG_MODULE_DEV
+++ /dev/null
@@ -1,20 +0,0 @@
-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
diff --git a/configure/E3/RULES_DEV b/configure/E3/RULES_DEV
index 2c7e9a9f..e7b6e7cf 100644
--- a/configure/E3/RULES_DEV
+++ b/configure/E3/RULES_DEV
@@ -1,5 +1,6 @@
# -*- 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
diff --git a/configure/RELEASE_DEV b/configure/RELEASE_DEV
deleted file mode 100644
index b03cfd8f..00000000
--- a/configure/RELEASE_DEV
+++ /dev/null
@@ -1,10 +0,0 @@
-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
--
GitLab