diff --git a/CHANGELOG.md b/CHANGELOG.md index c309c4d4f1c4449f947bde5a64cfd9637a13da3b..2cec52fb6b72a56664eab71cb391cf4b214af4c0 100644 --- a/CHANGELOG.md +++ b/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. diff --git a/configure/CONFIG_MODULE b/configure/CONFIG_MODULE index 9fa5cd055036a843e4b4dc39be150a9ea0efead5..405f00d6d21777b7baa40551ee1248690966df2d 100644 --- a/configure/CONFIG_MODULE +++ b/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) # # # diff --git a/configure/E3/CONFIG_REQUIRE b/configure/E3/CONFIG_REQUIRE index 03658ae6cc7d506ea876a118800f0be64624e6bf..673e6c371d7e677510c298422768d9f7554c4289 100644 --- a/configure/E3/CONFIG_REQUIRE +++ b/configure/E3/CONFIG_REQUIRE @@ -1,10 +1,3 @@ -# 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. # diff --git a/configure/RELEASE b/configure/RELEASE index 124939fa59f2f2bfa9691f96ff8b3227549f3af3..f45151d6c737b6cf9abbe3a4c1081855c23f6510 100644 --- a/configure/RELEASE +++ b/configure/RELEASE @@ -1,7 +1,7 @@ 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 diff --git a/require-ess/tools/build_number.sh b/require-ess/tools/build_number.sh index 077cd15183ff41f96c1bcc6f71cac5bfb5a96cd5..f508f51e3be2e0ecb3bd0760b40b2cd3c6954801 100755 --- a/require-ess/tools/build_number.sh +++ b/require-ess/tools/build_number.sh @@ -1,4 +1,4 @@ -#!/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. # diff --git a/require-ess/tools/driver.makefile b/require-ess/tools/driver.makefile index 32f1390b1115b80e89c60b61d9c06097e9881091..1cded81ba8709f572e4ee26eeb5d26dcd9b051aa 100644 --- a/require-ess/tools/driver.makefile +++ b/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