Skip to content
Snippets Groups Projects
Commit 8d146dd2 authored by Jeong Han Lee's avatar Jeong Han Lee
Browse files

clean up all configurations for next releases

parent d3d8f55f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
configure/E3/CONFIG_EXPORT
+ 2
− 3
View file @ 8d146dd2
...@@ -13,13 +13,12 @@ MSI:=$(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)/msi ...@@ -13,13 +13,12 @@ MSI:=$(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)/msi
EXPORT_VARS+=EPICS_HOST_ARCH EXPORT_VARS+=EPICS_HOST_ARCH
EXPORT_VARS+=EPICS_BASE EXPORT_VARS+=EPICS_BASE
EXPORT_VARS+=MSI EXPORT_VARS+=MSI
EXPORT_VARS+=E3_REQUIRE_TOOLS
EXPORT_VARS+=E3_MODULE_VERSION EXPORT_VARS+=E3_MODULE_VERSION
EXPORT_VARS+=E3_SITEMODS_PATH EXPORT_VARS+=E3_SITEMODS_PATH
EXPORT_VARS+=E3_SITEAPPS_PATH EXPORT_VARS+=E3_SITEAPPS_PATH
EXPORT_VARS+=E3_SITELIBS_PATH EXPORT_VARS+=E3_SITELIBS_PATH
EXPORT_VARS+=E3_SEQUENCER_NAME EXPORT_VARS+=$(filter E3_REQUIRE_%,$(.VARIABLES))
EXPORT_VARS+=E3_SEQUENCER_VERSION
EXPORT_VARS+=QUIET EXPORT_VARS+=QUIET
......
configure/E3/CONFIG_REQUIRE
+ 3
− 2
View file @ 8d146dd2
...@@ -18,7 +18,8 @@ E3_REQUIRE_LIB:=$(E3_REQUIRE_LOCATION)/lib ...@@ -18,7 +18,8 @@ E3_REQUIRE_LIB:=$(E3_REQUIRE_LOCATION)/lib
E3_REQUIRE_DB:=$(E3_REQUIRE_LOCATION)/db E3_REQUIRE_DB:=$(E3_REQUIRE_LOCATION)/db
E3_REQUIRE_DBD:=$(E3_REQUIRE_LOCATION)/dbd E3_REQUIRE_DBD:=$(E3_REQUIRE_LOCATION)/dbd
E3_REQUIRE_INC:=$(E3_REQUIRE_LOCATION)/include E3_REQUIRE_INC:=$(E3_REQUIRE_LOCATION)/include
E3_REQUIRE_CONFIG:=$(E3_REQUIRE_LOCATION)/configure
export E3_REQUIRE_TOOLS
export E3_REQUIRE_BIN EXPORT_VARS+=$(filter E3_REQUIRE_%,$(.VARIABLES))
configure/E3/RULES_REQUIRE
+ 31
− 34
View file @ 8d146dd2
# -*- mode: Makefile;-*- # -*- mode: Makefile;-*-
# The following VARIABLES are defined in RULES_REQUIRE instead of CONFIG_REQUIRE, # The following VARIABLES are defined in RULES_REQUIRE instead of CONFIG_REQUIRE,
# because they are used in ONLY RULES_REQUIRE. It is easy to understand them. # because they are used in ONLY RULES_REQUIRE. It is easy to understand them.
# #
...@@ -10,42 +9,33 @@ IOCSH_HASH_VERSION:=$(shell git rev-parse --short HEAD) ...@@ -10,42 +9,33 @@ IOCSH_HASH_VERSION:=$(shell git rev-parse --short HEAD)
# If git rev-parse returns null, use the EPICS_MODULE_TAG # If git rev-parse returns null, use the EPICS_MODULE_TAG
IOCSH_HASH_VERSION?=$(EPICS_MODULE_TAG) IOCSH_HASH_VERSION?=$(EPICS_MODULE_TAG)
E3_IOC_SHELL_FILE:=$(TOP)/tools/iocsh.bash FILE_FILTER:= %~ %\#
E3_IOC_SHELL_GDB_FILE:=$(TOP)/tools/iocsh_gdb.bash E3_ESSENVCFG_FILE := $(TOP)/tools/ess-env.conf
E3_IOC_SHELL_NICE_FILE:=$(TOP)/tools/iocsh_nice.bash E3_CONFIG_FILE := $(TOP)/tools/e3.cfg
E3_IOC_FUNC_FILE:=$(TOP)/tools/iocsh_functions
E3_IOC_ENVCFG_FILE:=$(TOP)/tools/ess-env.conf
# The following file will be generated in $(TOP),
# and move to $(E3_REQUIRE_BIN), and will be
# used in $(E3_REQUIRE_BIN)/setE3Env.bash
# #
G_E3_CFG_FILE:=$(TOP)/tools/e3.cfg E3_SHELL_FILES := $(wildcard $(TOP)/tools/iocsh*.bash)
G_E3_ENV_FILE:=$(TOP)/tools/setE3Env.bash E3_IOC_CFG_FILES := $(TOP)/tools/iocsh_functions
G_E3_EXCLUDE_FLAGS:=$(TOP)/tools/excludeflags.mk E3_IOC_CFG_FILES += $(E3_ESSENVCFG_FILE)
E3_IOC_CFG_FILES += $(E3_CONFIG_FILE)
E3_IOC_CFG_FILES += $(TOP)/tools/setE3Env.bash
E3_REQUIRE_CONF_FILES := $(filter-out $(FILE_FILTER), $(wildcard $(TOP)/configure/modules/*))
.PHONY: e3-site-conf e3-site-path requireconf .PHONY: e3-site-conf e3-site-path requireconf
requireconf: e3-site-path e3-site-conf requireconf: e3-site-path e3-site-conf e3-require-path
$(QUIET) $(SUDO) install -m 755 $(wildcard $(E3_MODULE_SRC_PATH)/App/tools/*.tcl) $(E3_REQUIRE_TOOLS)/
$(QUIET) $(SUDO) install -m 644 $(E3_MODULE_SRC_PATH)/App/tools/driver.makefile $(E3_REQUIRE_TOOLS)/
$(QUIET) $(SUDO) install -m 755 $(E3_SHELL_FILES) $(E3_REQUIRE_BIN)/
$(QUIET) $(SUDO) install -m 644 $(E3_IOC_CFG_FILES) $(E3_REQUIRE_BIN)/
$(QUIET) $(SUDO) install -m 644 $(E3_REQUIRE_CONF_FILES) $(E3_REQUIRE_CONFIG)/
e3-require-path:
$(QUIET) $(SUDO) install -d -m 755 $(E3_REQUIRE_TOOLS) $(QUIET) $(SUDO) install -d -m 755 $(E3_REQUIRE_TOOLS)
$(QUIET) $(SUDO) install -d -m 755 $(E3_REQUIRE_BIN) $(QUIET) $(SUDO) install -d -m 755 $(E3_REQUIRE_BIN)
$(QUIET) $(SUDO) install -m 644 $(E3_MODULE_SRC_PATH)/App/tools/driver.makefile $(E3_REQUIRE_TOOLS)/ $(QUIET) $(SUDO) install -d -m 755 $(E3_REQUIRE_CONFIG)
$(QUIET) $(SUDO) install -m 644 $(G_E3_EXCLUDE_FLAGS) $(E3_REQUIRE_TOOLS)/
$(QUIET) $(SUDO) install -m 755 $(E3_MODULE_SRC_PATH)/App/tools/*.tcl $(E3_REQUIRE_TOOLS)/
$(QUIET) sed -i 's/^IOCSH_HASH_VERSION=.*/IOCSH_HASH_VERSION=$(IOCSH_HASH_VERSION)/g' $(E3_IOC_ENVCFG_FILE)
$(QUIET) $(SUDO) install -m 644 $(E3_IOC_FUNC_FILE) $(E3_REQUIRE_BIN)/
$(QUIET) $(SUDO) install -m 644 $(E3_IOC_ENVCFG_FILE) $(E3_REQUIRE_BIN)/
$(QUIET) $(SUDO) install -m 755 $(E3_IOC_SHELL_FILE) $(E3_REQUIRE_BIN)/
$(QUIET) $(SUDO) install -m 755 $(E3_IOC_SHELL_GDB_FILE) $(E3_REQUIRE_BIN)/
$(QUIET) $(SUDO) install -m 755 $(E3_IOC_SHELL_NICE_FILE) $(E3_REQUIRE_BIN)/
$(QUIET) $(SUDO) install -m 644 $(G_E3_CFG_FILE) $(E3_REQUIRE_BIN)/
$(QUIET) $(SUDO) install -m 644 $(G_E3_ENV_FILE) $(E3_REQUIRE_BIN)/
$(QUIET) $(SUDO) install -d -m 755 $(E3_REQUIRE_LOCATION)/configure
$(QUIET) $(SUDO) install -m 644 $(TOP)/configure/modules/* $(E3_REQUIRE_LOCATION)/configure/
# Create SITE PATH
e3-site-path: e3-site-path:
$(QUIET) $(SUDO) install -d -m 755 $(E3_SITELIBS_PATH) $(QUIET) $(SUDO) install -d -m 755 $(E3_SITELIBS_PATH)
...@@ -53,13 +43,20 @@ e3-site-path: ...@@ -53,13 +43,20 @@ e3-site-path:
$(QUIET) $(SUDO) install -d -m 755 $(E3_SITEAPPS_PATH) $(QUIET) $(SUDO) install -d -m 755 $(E3_SITEAPPS_PATH)
e3-site-conf: e3-site-conf:
# Makefile VERSION > 4.x is needed, DEFINES_REQUIRE can be found in a19eb01 # Makefile VERSION > 4.x is needed, DEFINES_REQUIRE can be found in a19eb01
# $(QUIET) $(file > $(G_E3_CFG_FILE), $(E3_CFG_VARS)) # $(QUIET) $(file > $(G_E3_CFG_FILE), $(E3_CFG_VARS))
@echo "declare -g DEFAULT_EPICS_BASE=$(E3_MODULES_PATH)" > $(G_E3_CFG_FILE) $(QUIET)echo "declare -g DEFAULT_EPICS_BASE=$(E3_MODULES_PATH)" > $(E3_CONFIG_FILE)
@echo "declare -g DEFAULT_REQUIRE_NAME=$(E3_REQUIRE_NAME)" >> $(G_E3_CFG_FILE) $(QUIET)echo "declare -g DEFAULT_REQUIRE_NAME=$(E3_REQUIRE_NAME)" >> $(E3_CONFIG_FILE)
@echo "declare -g DEFAULT_REQUIRE_VERSION=$(E3_REQUIRE_VERSION)" >> $(G_E3_CFG_FILE) $(QUIET)echo "declare -g DEFAULT_REQUIRE_VERSION=$(E3_REQUIRE_VERSION)" >> $(E3_CONFIG_FILE)
$(QUIET)sed -i 's/^IOCSH_HASH_VERSION=.*/IOCSH_HASH_VERSION=$(IOCSH_HASH_VERSION)/g' $(E3_ESSENVCFG_FILE)
VARS_EXCLUDES+=FILE_FILTER
VARS_EXCLUDES+=E3_SHELL_FILES
VARS_EXCLUDES+=E3_IOC_CFG_FILES
VARS_EXCLUDES+=E3_REQUIRE_CONF_FILES
VARS_EXCLUDES+=E3_ESSENVCFG_FILE
VARS_EXCLUDES+=E3_CONFIG_FILE
configure/modules/CONFIG_E3_MAKEFILE
+ 1
− 2
View file @ 8d146dd2
...@@ -11,8 +11,7 @@ E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += BUILDCLASSES="Linux" ...@@ -11,8 +11,7 @@ E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += BUILDCLASSES="Linux"
E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += E3_SITEMODS_PATH="$(E3_SITEMODS_PATH)" E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += E3_SITEMODS_PATH="$(E3_SITEMODS_PATH)"
E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += E3_SITEAPPS_PATH="$(E3_SITEAPPS_PATH)" E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += E3_SITEAPPS_PATH="$(E3_SITEAPPS_PATH)"
E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += E3_SITELIBS_PATH="$(E3_SITELIBS_PATH)" E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += E3_SITELIBS_PATH="$(E3_SITELIBS_PATH)"
E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += E3_SEQUENCER_NAME="$(E3_SEQUENCER_NAME)"
E3_REQUIRE_MAKEFILE_INPUT_OPTIONS += E3_SEQUENCER_VERSION="$(E3_SEQUENCER_VERSION)"
E3_MODULE_MAKE_CMDS:=make $(E3_REQUIRE_MAKEFILE_INPUT_OPTIONS) E3_MODULE_MAKE_CMDS:=make $(E3_REQUIRE_MAKEFILE_INPUT_OPTIONS)
......
configure/modules/CONFIG_EXPORT
+ 0
− 2
View file @ 8d146dd2
...@@ -16,8 +16,6 @@ EXPORT_VARS+=E3_MODULE_VERSION ...@@ -16,8 +16,6 @@ EXPORT_VARS+=E3_MODULE_VERSION
EXPORT_VARS+=E3_SITEMODS_PATH EXPORT_VARS+=E3_SITEMODS_PATH
EXPORT_VARS+=E3_SITEAPPS_PATH EXPORT_VARS+=E3_SITEAPPS_PATH
EXPORT_VARS+=E3_SITELIBS_PATH EXPORT_VARS+=E3_SITELIBS_PATH
EXPORT_VARS+=E3_SEQUENCER_NAME
EXPORT_VARS+=E3_SEQUENCER_VERSION
EXPORT_VARS+=$(filter E3_REQUIRE_%,$(.VARIABLES)) EXPORT_VARS+=$(filter E3_REQUIRE_%,$(.VARIABLES))
EXPORT_VARS+=QUIET EXPORT_VARS+=QUIET
......
tools/excludeflag.mk deleted 100644 → 0
+ 0
− 83
View file @ d3d8f55f
iocStats_VERSION=
autosave_VERSION=
asyn_VERSION=
busy_VERSION=
modbus_VERSION=
ipmiComm_VERSION=
# Remove sequencer....due to "duplicated" VARIABLES
#sequencer_VERSION=
sscan_VERSION=
std_VERSION=
ip_VERSION=
calc_VERSION=
delaygen_VERSION=
pcre_VERSION=
stream_VERSION=
s7plc_VERSION=
recsync_VERSION=
MCoreUtils_VERSION=
devlib2_VERSION=
mrfioc2_VERSION=
exprtk_VERSION=
motor_VERSION=
ecmc_VERSION=
EthercatMC_VERSION=
ecmctraining_VERSION=
keypress_VERSION=
sysfs_VERSION=
symbolname_VERSION=
memDisplay_VERSION=
regdev_VERSION=
i2cDev_VERSION=
tosca_VERSION=
tsclib_VERSION=
ifcdaqdrv2_VERSION=
## The main issue is nds3, it is mandatory to disable it
##
nds3_VERSION=
nds3epics_VERSION=
ifc14edrv_VERSION=
ifcfastint_VERSION=
nds_VERSION=
loki_VERSION=
nds_VERSION=
sis8300drv_VERSION=
sis8300_VERSION=
sis8300llrfdrv_VERSION=
sis8300llrf_VERSION=
ADSupport_VERSION=
ADCore_VERSION=
ADSimDetector_VERSION=
ADAndor_VERSION=
ADAndor3_VERSION=
ADPointGrey_VERSION=
ADProsilica_VERSION=
amcpico8_VERSION=
adpico8_VERSION=
adsis8300_VERSION=
adsis8300bcm_VERSION=
adsis8300bpm_VERSION=
adsis8300fc_VERSION=
pvCommon_VERSION=
pvData_VERSION=
pvAccess_VERSION=
pva2pva_VERSION=
pvDatabase_VERSION=
normativeTypes_VERSION=
pvaClient_VERSION=
tools/excludeflags.mk deleted 100644 → 0
+ 0
− 83
View file @ d3d8f55f
iocStats_VERSION=
autosave_VERSION=
asyn_VERSION=
busy_VERSION=
modbus_VERSION=
ipmiComm_VERSION=
# Remove sequencer....due to "duplicated" VARIABLES
#sequencer_VERSION=
sscan_VERSION=
std_VERSION=
ip_VERSION=
calc_VERSION=
delaygen_VERSION=
pcre_VERSION=
stream_VERSION=
s7plc_VERSION=
recsync_VERSION=
MCoreUtils_VERSION=
devlib2_VERSION=
mrfioc2_VERSION=
exprtk_VERSION=
motor_VERSION=
ecmc_VERSION=
EthercatMC_VERSION=
ecmctraining_VERSION=
keypress_VERSION=
sysfs_VERSION=
symbolname_VERSION=
memDisplay_VERSION=
regdev_VERSION=
i2cDev_VERSION=
tosca_VERSION=
tsclib_VERSION=
ifcdaqdrv2_VERSION=
## The main issue is nds3, it is mandatory to disable it
##
nds3_VERSION=
nds3epics_VERSION=
ifc14edrv_VERSION=
ifcfastint_VERSION=
nds_VERSION=
loki_VERSION=
nds_VERSION=
sis8300drv_VERSION=
sis8300_VERSION=
sis8300llrfdrv_VERSION=
sis8300llrf_VERSION=
ADSupport_VERSION=
ADCore_VERSION=
ADSimDetector_VERSION=
ADAndor_VERSION=
ADAndor3_VERSION=
ADPointGrey_VERSION=
ADProsilica_VERSION=
amcpico8_VERSION=
adpico8_VERSION=
adsis8300_VERSION=
adsis8300bcm_VERSION=
adsis8300bpm_VERSION=
adsis8300fc_VERSION=
pvCommon_VERSION=
pvData_VERSION=
pvAccess_VERSION=
pva2pva_VERSION=
pvDatabase_VERSION=
normativeTypes_VERSION=
pvaClient_VERSION=
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment