MCoreUtils in e3

MCoreUtils.Makefile

@@ -15,14 +15,10 @@
 #  this program. If not, see https://www.gnu.org/licenses/gpl-2.0.txt
 #
 # 
-# Author  : jhlee
-# email   : jhlee@esss.se
-# Date    : generated by 2018Sep15-1203-30CEST
-# version : 0.0.0 
-#
-# template file is generated by e3TemplateGenerator.bash with b01084b
-# Please look at many other _module_.Makefile in e3-* repository
-# 
+# Author  : Jeong Han Lee
+# email   : jeonghan.lee@gmail.com
+# Date    : Saturday, September 15 12:05:10 CEST 2018
+# version : 0.0.1
 
 ## The following lines are mandatory, please don't change them.
 where_am_I := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
@@ -30,124 +26,26 @@ include $(E3_REQUIRE_TOOLS)/driver.makefile
 include $(where_am_I)/../configure/DECOUPLE_FLAGS
 
 
-
-
-# If one would like to use the module dependency restrictly,
-# one should look at other modules makefile to add more
-# In most case, one should ignore the following lines:
-
-#ifneq ($(strip $(ASYN_DEP_VERSION)),)
-#asyn_VERSION=$(ASYN_DEP_VERSION)
-#endif
-
-
-
-
-
 ## Exclude linux-ppc64e6500
 ##EXCLUDE_ARCHS = linux-ppc64e6500
 
+APP:=MCoreUtilsApp
+APPSRC:=$(APP)
 
-# APP:=calcApp
-# APPDB:=$(APP)/Db
-# APPSRC:=$(APP)/src
-
-
-# USR_INCLUDES += -I$(where_am_I)$(APPSRC)
-
-# USR_CFLAGS   += -Wno-unused-variable
-# USR_CFLAGS   += -Wno-unused-function
-# USR_CFLAGS   += -Wno-unused-but-set-variable
-# USR_CPPFLAGS += -Wno-unused-variable
-# USR_CPPFLAGS += -Wno-unused-function
-# USR_CPPFLAGS += -Wno-unused-but-set-variable
-
-# TEMPLATES += $(wildcard $(APPDB)/*.db)
-
-# DBDINC_SRCS += $(APPSRC)/swaitRecord.c
-# DBDINC_SRCS += $(APPSRC)/sseqRecord.c
-# DBDINC_SRCS += $(APPSRC)/aCalcoutRecord.c
-# DBDINC_SRCS += $(APPSRC)/sCalcoutRecord.c
-# DBDINC_SRCS += $(APPSRC)/transformRecord.c
-
-# DBDINC_DBDS = $(subst .c,.dbd,   $(DBDINC_SRCS:$(APPSRC)/%=%))
-# DBDINC_HDRS = $(subst .c,.h,     $(DBDINC_SRCS:$(APPSRC)/%=%))
-# DBDINC_DEPS = $(subst .c,$(DEP), $(DBDINC_SRCS:$(APPSRC)/%=%))
-
-
-# HEADERS += $(APPSRC)/sCalcPostfix.h
-# HEADERS += $(APPSRC)/aCalcPostfix.h
-# HEADERS += $(DBDINC_HDRS)
-
-
-# SOURCES += $(APPSRC)/sCalcPostfix.c
-# SOURCES += $(APPSRC)/sCalcPerform.c
-# SOURCES += $(APPSRC)/aCalcPostfix.c
-# SOURCES += $(APPSRC)/aCalcPerform.c
 
-# SOURCES += $(APPSRC)/calcUtil.c
-# SOURCES += $(APPSRC)/myFreeListLib.c
-# SOURCES += $(APPSRC)/devsCalcoutSoft.c
-# SOURCES += $(APPSRC)/devaCalcoutSoft.c
-# SOURCES += $(APPSRC)/subAve.c
-# SOURCES += $(APPSRC)/swaitRecord.c
-# SOURCES += $(APPSRC)/editSseq.st
-# SOURCES += $(APPSRC)/interp.c
-# SOURCES += $(APPSRC)/arrayTest.c
-# SOURCES += $(APPSRC)/aCalcMonitorMem.c
-# # DBDINC_SRCS should be last of the series of SOURCES
-# SOURCES += $(DBDINC_SRCS)
+USR_INCLUDES += -I$(where_am_I)$(APPSRC)
 
-# DBDS += $(APPSRC)/calcSupport_LOCAL.dbd
-# DBDS += $(APPSRC)/calcSupport_withSNCSEQ.dbd
-# DBDS += $(APPSRC)/calcSupport_withSSCAN.dbd
-
-#
-# $(DBDINC_DEPS): $(DBDINC_HDRS)
-#
-# .dbd.h:
-# 	$(DBTORECORDTYPEH)  $(USR_DBDFLAGS) -o $@ $<
-#
-# .PHONY: $(DBDINC_DEPS) .dbd.h
-#
-#
-# The following lines could be useful if one uses the external lib
-#
-# Examples...
-# 
-# USR_CFLAGS += -fPIC
-# USR_CFLAGS   += -DDEBUG_PRINT
-# USR_CPPFLAGS += -DDEBUG_PRINT
-# USR_CPPFLAGS += -DUSE_TYPED_RSET
-# USR_INCLUDES += -I/usr/include/libusb-1.0
-# USR_LDFLAGS += -lusb-1.0
-# USR_LDFLAGS += -L /opt/etherlab/lib
-# USR_LDFLAGS += -lethercat
-# USR_LDFLAGS += -Wl,-rpath=/opt/etherlab/lib
-
-## SYSTEM LIBS 
-##
-# USR_LIBS += boost_regex
-# USR_LIBS += readline
-# USR_LIBS += xml2
-
-#
-
-# # We don't have LIB_INSTALLS, so will tackle later
-# ifeq ($(T_A),linux-x86_64)
-# USR_LDFLAGS += -Wl,--enable-new-dtags
-# USR_LDFLAGS += -Wl,-rpath=$(E3_MODULES_VENDOR_LIBS_LOCATION)
-# USR_LDFLAGS += -L$(E3_MODULES_VENDOR_LIBS_LOCATION)
-# USR_LDFLAGS += -lflycapture
-# endif
-
-# According to its makefile
-# VENDOR_LIBS += $(SUPPORT)/os/linux-x86_64/libflycapture.so.2.8.3.1
-# VENDOR_LIBS += $(SUPPORT)/os/linux-x86_64/libflycapture.so.2
-# VENDOR_LIBS += $(SUPPORT)/os/linux-x86_64/libflycapture.so
+USR_CFLAGS += -D_GNU_SOURCE
+USR_CFLAGS += -DVERSION=\"$(LIBVERSION)\"
 
+SOURCES += $(APPSRC)/threadShow.c
+SOURCES += $(APPSRC)/threadRules.c
+SOURCES += $(APPSRC)/memLock.c
+SOURCES += $(APPSRC)/shellCommands.c
+SOURCES += $(APPSRC)/utils.c
 
 
+DBDS += $(APPSRC)/mcoreutils.dbd
 
 ## This RULE should be used in case of inflating DB files 
 ## db rule is the default in RULES_DB, so add the empty one
@@ -157,44 +55,12 @@ db:
 
 .PHONY: db 
 
-# EPICS_BASE_HOST_BIN = $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)
-# MSI = $(EPICS_BASE_HOST_BIN)/msi
-#
-# USR_DBFLAGS += -I . -I ..
-# USR_DBFLAGS += -I $(EPICS_BASE)/db
-# USR_DBFLAGS += -I $(APPDB)
-#
-# SUBS=$(wildcard $(APPDB)/*.substitutions)
-# TMPS=$(wildcard $(APPDB)/*.template)
-#
-# db: $(SUBS) $(TMPS)
-
-# $(SUBS):
-#	@printf "Inflating database ... %44s >>> %40s \n" "$@" "$(basename $(@)).db"
-#	@rm -f  $(basename $(@)).db.d  $(basename $(@)).db
-#	@$(MSI) -D $(USR_DBFLAGS) -o $(basename $(@)).db -S $@  > $(basename $(@)).db.d
-#	@$(MSI)    $(USR_DBFLAGS) -o $(basename $(@)).db -S $@
-
-# $(TMPS):
-#	@printf "Inflating database ... %44s >>> %40s \n" "$@" "$(basename $(@)).db"
-#	@rm -f  $(basename $(@)).db.d  $(basename $(@)).db
-#	@$(MSI) -D $(USR_DBFLAGS) -o $(basename $(@)).db $@  > $(basename $(@)).db.d
-#	@$(MSI)    $(USR_DBFLAGS) -o $(basename $(@)).db $@
-
-#
-# .PHONY: db $(SUBS) $(TMPS)
 
 vlibs:
 
 .PHONY: vlibs
 
-# vlibs: $(VENDOR_LIBS)
-
-# $(VENDOR_LIBS):
-# 	$(QUIET)$(SUDO) install -m 555 -d $(E3_MODULES_VENDOR_LIBS_LOCATION)/
-# 	$(QUIET)$(SUDO) install -m 555 $@ $(E3_MODULES_VENDOR_LIBS_LOCATION)/
 
-# .PHONY: $(VENDOR_LIBS) vlibs
 
 
 

configure/CONFIG_MODULE

 #
 EPICS_MODULE_NAME:=MCoreUtils
 
-EPICS_MODULE_TAG:=master
+EPICS_MODULE_TAG:=tags/1.2.1
 #
-E3_MODULE_VERSION:=master
+E3_MODULE_VERSION:=1.2.1
 
 # DEPENDENT MODULE VERSION
 # Example, 

configure/DECOUPLE_FLAGS

@@ -19,6 +19,7 @@ pcre_VERSION=
 stream_VERSION=
 s7plc_VERSION=
 recsync_VERSION=
+MCoreUtils_VERSION=
 
 devlib2_VERSION=
 mrfioc2_VERSION=

configure/E3/RULES_EPICS

@@ -4,12 +4,8 @@
 .PHONY: epics epics-clean
 
 epics:
-	$(QUIET)echo "EPICS_BASE=$(EPICS_BASE)"        > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/RELEASE
-#	$(QUIET)echo "ASYN=$(M_ASYN)"                  > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/RELEASE
-#	$(QUIET)echo "SSCAN=$(M_SSCAN)"               >> $(TOP)/$(E3_MODULE_SRC_PATH)/configure/RELEASE
-#	$(QUIET)echo "SNCSEQ=$(M_SNCSEQ)"             >> $(TOP)/$(E3_MODULE_SRC_PATH)/configure/RELEASE
-	$(QUIET)echo "CHECK_RELEASE = YES"              > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/CONFIG_SITE
-#	$(QUIET)echo "INSTALL_LOCATION=$(M_DEVLIB2)"  >> $(TOP)/$(E3_MODULE_SRC_PATH)/configure/CONFIG_SITE
+	$(QUIET)echo "EPICS_BASE=$(EPICS_BASE)"        > $(TOP)/$(E3_MODULE_SRC_PATH)/configure/RELEASE.local
+	#(QUIET)echo "EPICS_BASE=$(EPICS_BASE)"        > $(TOP)/$(E3_MODULE_SRC_PATH)/exampleTop/configure/RELEASE.local
 	$(SUDOBASH) "$(MAKE) -C $(E3_MODULE_SRC_PATH)"
 
 epics-clean: