Merge branch 'registration' into 'master'

E3-290: Registration

See merge request e3/e3-require!26

CHANGELOG.md

@@ -4,7 +4,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [3.4.1]
+
+### Bugfixes
+* Fixed an issue where `iocshRegisterCommon()` was called when registering functions for modules as they are loaded. This had
+  the effect of overwriting any functions that have the same name as a common one with their original one (e.g. `dbLoadTemplate`
+  from `require`)
+* Fixed the shebang from `build_number.sh` so that it works in Ubuntu
 
 ## [3.4.0]
 3.4.0 is also a fairly major release, that fixes many bugs but that also enables use of cellmode, to facilitate work against a shared build.

configure/CONFIG_MODULE

@@ -10,7 +10,7 @@ E3_MODULE_SRC_PATH:=$(EPICS_MODULE_NAME)-ess
 E3_MODULE_MAKEFILE:=$(EPICS_MODULE_NAME).Makefile
 #
 E3_MODULE_NAME:=$(EPICS_MODULE_NAME)
-E3_MODULE_VERSION:=3.4.0
+E3_MODULE_VERSION=$(E3_REQUIRE_VERSION)
 #
 #
 #

configure/E3/CONFIG_REQUIRE

-# Keep the same convention with other modules,
-# translate them with E3_REQUIRE_NAME or _VERSION Again
-
-E3_REQUIRE_NAME=$(EPICS_MODULE_NAME)
-E3_REQUIRE_VERSION=$(E3_MODULE_VERSION)
-
-
 #
 # The following VARIABLES are the same as other modules ones.
 #

configure/RELEASE

 EPICS_BASE=/epics/base-7.0.5
 
 E3_REQUIRE_NAME:=require
-E3_REQUIRE_VERSION=$(E3_MODULE_VERSION)
+E3_REQUIRE_VERSION:=3.4.1
 
 
 # The definitions shown below can also be placed in an untracked RELEASE.local

require-ess/tools/build_number.sh

-#!/bin/env bash
+#!/usr/bin/env bash
 # Small script to fetch current build nuber for a given module. If you pass a numeric version
 # but no build number, it fetches the latest build number installed from the target e3 env.
 #

require-ess/tools/driver.makefile

@@ -939,7 +939,7 @@ ${VERSIONFILE}:
 # EPICS R3.14.*:
 # Create file to fill registry from dbd file.
 ${REGISTRYFILE}: ${MODULEDBD}
-	$(PERL) $(EPICS_BASE_HOST_BIN)/registerRecordDeviceDriver.pl $< $(basename $@) > $@
+	$(PERL) $(EPICS_BASE_HOST_BIN)/registerRecordDeviceDriver.pl $< $(basename $@) | grep -v 'iocshRegisterCommon();' > $@
 
 # 3.14.12 complains if this rule is not overwritten
 ./%Include.dbd:
@@ -1053,4 +1053,4 @@ endif # EPICSVERSION defined
 ##
 ## Friday, July 3 2020                      : Force all module names to be lowercase, to allow consistency between conda/nfs startup scripts.
 ##
-## $(DATE)                                  : Removed the V3-specific code. Added metadata file.
+## $(DATE)                                  : Removed the V3-specific code. Adde
\ No newline at end of file