Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions require-ess/src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ ifeq ($(strip $(REQUIRE_VERSION)),)
REQUIRE_VERSION=$(shell git describe --tags)
endif

LOADABLE_LIBRARY = require
LOADABLE_LIBRARY = require3

require_SRCS += require_registerRecordDeviceDriver.cpp
require_registerRecordDeviceDriver_CPPFLAGS += -DLIBVERSION='"$(REQUIRE_VERSION)"' -DMODULE_NAME='"require"' -DMODULE_SYMBOL_NAME='"require"'
require3_SRCS += require3_registerRecordDeviceDriver.cpp
require3_registerRecordDeviceDriver_CPPFLAGS += -DLIBVERSION='"$(REQUIRE_VERSION)"' -DMODULE_NAME='"require3"' -DMODULE_SYMBOL_NAME='"require3"'

require_SRCS += require.c
require_SRCS += common.c
require_SRCS += module.c
require3_SRCS += require.c
Comment thread
simon-ess marked this conversation as resolved.
Resolved
require3_SRCS += common.c
require3_SRCS += module.c

require_DBD += require_.dbd
require3_DBD += require_.dbd

ifeq ($(strip $(WITH_AFTERINIT)),YES)
require_SRCS += afterInit.c
require_DBD += afterInit.dbd
require3_SRCS += afterInit.c
require3_DBD += afterInit.dbd
endif

DBD += require.dbd
DBD += require3.dbd

INC += require.h
INC += module.h
Expand All @@ -38,7 +38,7 @@ include $(TOP)/configure/RULES
# ADD RULES AFTER THIS LINE

# Override this rule from RULES.Db
require_registerRecordDeviceDriver.cpp: $(COMMON_DIR)/require.dbd
require3_registerRecordDeviceDriver.cpp: $(COMMON_DIR)/require3.dbd
$(PERL) $(EPICS_BASE_HOST_BIN)/registerRecordDeviceDriver.pl $< $(basename $@) | grep -v 'iocshRegisterCommon();' > $@
sed -i'.bak' -E '/^.*= Registration\(\)\;$$/d' $@
echo "#include <init.cpp>" >> $@
4 changes: 2 additions & 2 deletions require-ess/src/module.c
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ int register_module(const char *moduleName, const char *version,
}

/* Does not add require on the "modules list" */
if (strcmp(moduleName, "require") != 0) {
if (strcmp(moduleName, "require3") != 0) {
if (linked_list.size == 0) {
linked_list.head = module;
} else {
Expand All @@ -242,7 +242,7 @@ int register_module(const char *moduleName, const char *version,
linked_list.size++;
}

require_custom_path = getenv("require_DIR");
require_custom_path = getenv("require3_DIR");
if (require_custom_path == NULL)
return 0;
if (asprintf(&require_absolute_path,
Expand Down
2 changes: 1 addition & 1 deletion require-ess/tools/iocsh_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def __init__(self, iocname: str = None) -> None:

# load require
self.add_command(
f"dlload {str(Path(os.environ['E3_REQUIRE_LIB']) / f'librequire.{shared_lib_suffix}')}"
f"dlload {str(Path(os.environ['E3_REQUIRE_LIB']) / f'librequire3.{shared_lib_suffix}')}"
)

@property
Expand Down
Loading