diff --git a/CHANGELOG.md b/CHANGELOG.md index 991ff1efcbb062116942477efd8fd914f80e613c..7bf71a9ba3ff7462401883879c98054c00ba8d52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * 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/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