Merge f02884d into 71a1ff1

epics-base · Apr 30, 2021 · 0a120f7 · 0a120f7
2 parents 71a1ff1 + f02884d
commit 0a120f7
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/src/template/base/top/configure/CONFIG b/src/template/base/top/configure/CONFIG
@@ -13,6 +13,11 @@ ifdef T_A
 -include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
 endif
 
+# Check for proper EPICS_BASE
+ifneq (file,$(origin EPICS_BASE))
+ $(error EPICS_BASE must be defined in configure/RELEASE or a similar file or it will not be correctly read by convertRelease.pl!)
+endif
+
 CONFIG = $(RULES)/configure
 include $(CONFIG)/CONFIG
 

diff --git a/src/template/ext/top/configure/CONFIG b/src/template/ext/top/configure/CONFIG
@@ -17,6 +17,11 @@ ifdef T_A
   -include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
 endif
 
+# Check for proper EPICS_BASE
+ifneq (file,$(origin EPICS_BASE))
+ $(error EPICS_BASE must be defined in configure/RELEASE or a similar file or it will not be correctly read by convertRelease.pl!)
+endif
+
 CONFIG = $(RULES)/configure
 include $(CONFIG)/CONFIG
 

diff --git a/src/tools/convertRelease.pl b/src/tools/convertRelease.pl
@@ -113,6 +113,9 @@ sub HELP_MESSAGE {
 #
 sub releaseTops {
     my @includes = grep !m/^ (TOP | TEMPLATE_TOP) $/x, @apps;
+    if (!@includes) {
+        die "No variables defined in RELEASE*s";
+    }
     print join(' ', @includes), "\n";
 }
 
@@ -256,6 +259,9 @@ sub checkRelease {
     }
 
     my @modules = grep(!m/^(RULES|TOP|TEMPLATE_TOP)$/, @apps);
+    if (!@modules) {
+        die "No variables defined in RELEASE*s";
+    }
     my $app = shift @modules;
     my $latest = AbsPath($macros{$app});
     my %paths = ($latest => $app);