diff --git a/.gitignore b/.gitignore index 52c69f2e68d549d3c9804c8102f291d6de8658c7..3edc164cb9876bd4c38d43705d0742fcbee24bdd 100644 --- a/.gitignore +++ b/.gitignore @@ -19,5 +19,6 @@ cellMods __pycache__ require-ess/require.Makefile +require-ess/O.* require-ess/Db/*.db require-ess/Db/*.d diff --git a/CHANGELOG.md b/CHANGELOG.md index d5a48b880c34c2666db0157f0f45dd1269afc37d..51b39a5b54c3b04500fcf49c256f12a8d6202a06 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [5.0.0] + ### New Features * Recursive dependency for headers at build-time. This is a more major change that involves: * Module dependecies are now fetched from `CONFIG_MODULE` in the sense that `X_DEP_VERSION` is parsed as a diff --git a/configure/RELEASE b/configure/RELEASE index bcaed51db18f42281c1529d4a1ea80d381ba6368..d3138d2e011785f4d45e8b87d86fae300ef4d91a 100644 --- a/configure/RELEASE +++ b/configure/RELEASE @@ -1,7 +1,7 @@ -EPICS_BASE=/epics/base-7.0.6.1 +EPICS_BASE=/epics/base-7.0.7 E3_REQUIRE_NAME:=require -E3_REQUIRE_VERSION:=4.0.0 +E3_REQUIRE_VERSION:=5.0.0 # The definitions shown below can also be placed in an untracked RELEASE.local diff --git a/require-ess/tools/setE3Env.bash b/require-ess/tools/setE3Env.bash index 2bfac7e16ed559505ae967ec7cc0724916e80899..1b808d2f576f9ade057a216a33f69b39f03294e4 100644 --- a/require-ess/tools/setE3Env.bash +++ b/require-ess/tools/setE3Env.bash @@ -1,8 +1,8 @@ #!/usr/bin/env bash # This file exists for (temporary) backwards compatability -echo "setE3Env.bash has been deprecated, please use activate instead" +echo "setE3Env.bash has been deprecated, please use activate instead" >&2 -DIR="${0%/*}" +DIR="${BASH_SOURCE[0]%/*}" # shellcheck source=require-ess/tools/activate . "$DIR"/activate diff --git a/require.Makefile b/require.Makefile index e9b528f1926721681a585c6d491fefeb44849aa6..90d10018c5dadb741b5e27b36defae9d62af0683 100644 --- a/require.Makefile +++ b/require.Makefile @@ -59,16 +59,6 @@ USR_CFLAGS += -std=c99 # USR_CFLAGS += -DT_A='"${T_A}"' TEMPLATES += $(APPDB)/moduleversion.template -# TEMPLATES += moduleversion.db vpath dbLoadTemplate_lex.l ../$(APPSRC) dbLoadTemplate.c: dbLoadTemplate_lex.c ../$(APPSRC)/dbLoadTemplate.h - -# moduleversion should convert to db instead of template -# So, ESS uses it internally independent upon any IOC -# variables -# -USR_DBFLAGS += -I . -I .. -USR_DBFLAGS += -I$(EPICS_BASE)/db - -TMPS = $(wildcard $(APPDB)/*.template)