From 74859e21945c246789b998d7e960b8bcd2068899 Mon Sep 17 00:00:00 2001 From: zimoch Date: Wed, 27 Nov 2013 09:14:25 +0000 Subject: [PATCH] merge with 3.14.12.4-pre1 --- configure/RULES.Db | 34 +++++++++++++++------------------- configure/RULES.ioc | 27 +++++++++++---------------- configure/RULES_BUILD | 22 +++++++++++----------- configure/RULES_TARGET | 2 +- configure/RULES_TOP | 12 ++++++------ 5 files changed, 44 insertions(+), 53 deletions(-) diff --git a/configure/RULES.Db b/configure/RULES.Db index 13efe3541..9b8a7751c 100644 --- a/configure/RULES.Db +++ b/configure/RULES.Db @@ -21,11 +21,11 @@ vpath %.acs $(USR_VPATH) $(GENERIC_SRC_DIRS) $(COMMON_DIR) ##################################################### dbdflags -# dbExpand -INSTALL_DBDFLAGS += -I $(INSTALL_DBD) -INSTALL_DBFLAGS += -I $(INSTALL_DB) -DBDFLAGS = $(USR_DBDFLAGS) -I. -I.. -I$(COMMON_DIR) $(INSTALL_DBDFLAGS) $(RELEASE_DBDFLAGS) -DBFLAGS = $($*_DBFLAGS) $(USR_DBFLAGS) -I. -I.. -I$(COMMON_DIR) $(INSTALL_DBFLAGS) $(RELEASE_DBFLAGS) +DBD_SEARCH_DIRS = . .. $(COMMON_DIR) $(SRC_DIRS) $(INSTALL_DBD) $(RELEASE_DBD_DIRS) +DB_SEARCH_DIRS = . .. $(COMMON_DIR) $(SRC_DIRS) $(INSTALL_DB) $(RELEASE_DB_DIRS) + +DBDFLAGS = $(USR_DBDFLAGS) $(addprefix -I,$(DBD_SEARCH_DIRS)) +DBFLAGS = $($*_DBFLAGS) $(USR_DBFLAGS) $(addprefix -I,$(DB_SEARCH_DIRS)) ##################################################### # To allow os specific dbd files AND have the -j option work properly, @@ -100,7 +100,7 @@ ACF_CPPFLAGS = $(ACF_CPPFLAGS_$(GNU)) ACF_INCLUDES = -I. $(TARGET_INCLUDES) $(USR_INCLUDES)\ $(SRC_INCLUDES) -I$(INSTALL_DB) -ACFDEPENDS_CMD = -$(MKMF) -m $(notdir $@)$(DEP) $(subst -I,,$(ACF_INCLUDES)) $@ $< +ACFDEPENDS_CMD = -$(MKMF) -m $(notdir $@)$(DEP) $(ACF_INCLUDES) $@ $< ACF_CMD = $(CPP) $(ACF_CPPFLAGS) $(ACF_INCLUDES) $< > $@ ##################################################### dependancies @@ -112,11 +112,9 @@ DBDDEPENDS_FILES += $(addsuffix $(DEP),$(HINC) \ $(patsubst $(COMMON_DIR)/%,%,$(COMMON_DBS)) \ $(patsubst $(COMMON_DIR)/%,%,$(COMMON_DBDS))) -DBDDEPENDS_FLAGS = $(subst -I,,$(filter-out -S%,$(DBDFLAGS))) +DBDDEPENDS_FLAGS = $(filter-out -S%,$(DBDFLAGS)) DBDDEPENDS_CMD = -$(MKMF) -m $(notdir $@)$(DEP) $(DBDDEPENDS_FLAGS) $@ $< -MAKEDBDEPENDS = $(PERL) $(TOOLS)/makeDbDepends.pl - ##################################################### ifndef T_A @@ -230,7 +228,7 @@ $(COMMON_DIR)/%Record.h: $(COMMON_DIR)/%Record.dbd $(COMMON_DIR)/%Record.h: %Record.dbd @$(RM) $(notdir $@)$(DEP) @$(DBDDEPENDS_CMD) - echo "$< : ../Makefile" >> $(notdir $@)$(DEP) + echo "$@ : ../Makefile" >> $(notdir $@)$(DEP) @$(RM) $(notdir $@) $(DBTORECORDTYPEH) $(DBDFLAGS) $< $(notdir $@) @$(MV) $(notdir $@) $@ @@ -246,7 +244,7 @@ $(COMMON_DIR)/menu%.h: $(COMMON_DIR)/menu%.dbd $(COMMON_DIR)/menu%.h: menu%.dbd @$(RM) $(notdir $@)$(DEP) @$(DBDDEPENDS_CMD) - echo "$< : ../Makefile" >> $(notdir $@)$(DEP) + echo "$@ : ../Makefile" >> $(notdir $@)$(DEP) @$(RM) $(notdir $@) $(DBTOMENUH) $(DBDFLAGS) $< $(notdir $@) @$(MV) $(notdir $@) $@ @@ -271,7 +269,7 @@ $(COMMON_DIR)/%.dbd: $(COMMON_DIR)/%Include.dbd $(COMMON_DIR)/%.dbd: %Include.dbd @$(RM) $(notdir $@)$(DEP) @$(DBDDEPENDS_CMD) - echo "$< : ../Makefile" >> $(notdir $@)$(DEP) + echo "$@ : ../Makefile" >> $(notdir $@)$(DEP) $(ECHO) "Expanding dbd" @$(RM) $(notdir $@) $(DBEXPAND) $(DBDFLAGS) -o $(notdir $@) $< @@ -308,8 +306,9 @@ $(COMMON_DIR)/%.db$(RAW): $(COMMON_DIR)/%.edf $(COMMON_DIR)/%.db$(RAW): %.substitutions @$(RM) $(notdir $@)$(DEP) - @$(MAKEDBDEPENDS) $@ $< $(TEMPLATE_FILENAME) >> $(notdir $@)$(DEP) + @$(MKMF) -m$(notdir $@)$(DEP) $(DBFLAGS) $@ $< $(TEMPLATE_FILENAME) echo "$@ : $(TEMPLATE_FILENAME)" >> $(notdir $@)$(DEP) + echo "$(notdir $@)$(DEP): $(TEMPLATE_FILENAME)" >> $(notdir $@)$(DEP) $(ECHO) "Inflating database from $< $(TEMPLATE_FILENAME)" @$(RM) $@ $*.tmp $(MSI) $(DBFLAGS) -S$< $(TEMPLATE_FILENAME) > $*.tmp @@ -317,7 +316,7 @@ $(COMMON_DIR)/%.db$(RAW): %.substitutions $(COMMON_DIR)/%.db$(RAW): %.template @$(RM) $(notdir $@)$(DEP) - @$(MAKEDBDEPENDS) $@ $^ >> $(notdir $@)$(DEP) + @$(MKMF) -m$(notdir $@)$(DEP) $(DBFLAGS) $@ $< $(TEMPLATE_FILENAME) $(ECHO) "Inflating database from $<" @$(RM) $@ $*.tmp $(MSI) $(DBFLAGS) $< > $*.tmp @@ -369,17 +368,14 @@ $(foreach file, $(DB_INSTALLS), $(eval $(call DB_INSTALLS_template, $(file)))) ##################################################### register record,device,driver support -IOC_INST_TOP := $(firstword $(IOCS_APPL_TOP) \ - $(shell $(PERL) $(TOOLS)/fullPathName.pl $(INSTALL_LOCATION) ) ) - %_registerRecordDeviceDriver.cpp: $(COMMON_DIR)/%.dbd @$(RM) $@ $*.tmp - $(REGISTERRECORDDEVICEDRIVER) $< $(basename $@) $(IOC_INST_TOP) > $*.tmp + $(REGISTERRECORDDEVICEDRIVER) $< $(basename $@) $(IOCS_APPL_TOP) > $*.tmp $(MV) $*.tmp $@ %_registerRecordDeviceDriver.cpp: %.dbd @$(RM) $@ $*.tmp - $(REGISTERRECORDDEVICEDRIVER) $< $(basename $@) $(IOC_INST_TOP) > $*.tmp + $(REGISTERRECORDDEVICEDRIVER) $< $(basename $@) $(IOCS_APPL_TOP) > $*.tmp $(MV) $*.tmp $@ .PRECIOUS: %_registerRecordDeviceDriver.cpp diff --git a/configure/RULES.ioc b/configure/RULES.ioc index c661d54d5..6b2150fcb 100644 --- a/configure/RULES.ioc +++ b/configure/RULES.ioc @@ -1,13 +1,13 @@ #************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne +# Copyright (c) 2013 UChicago Argonne LLC, as Operator of Argonne # National Laboratory. # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. -# EPICS BASE Versions 3.13.7 -# and higher are distributed subject to a Software License Agreement found -# in file LICENSE that is included with this distribution. +# EPICS BASE is distributed subject to a Software License Agreement found +# in file LICENSE that is included with this distribution. #************************************************************************* #RULES.ioc + include $(CONFIG)/RULES_DIRS build$(DIVIDER)$(ARCH) build: buildInstall @@ -15,23 +15,18 @@ install$(DIVIDER)$(ARCH) install: buildInstall $(ARCH): buildInstall ifeq ($(filter $(ARCH),$(BUILD_ARCHS)),$(ARCH)) -buildInstall$(DIVIDER)$(ARCH) buildInstall: $(TARGETS) + buildInstall$(DIVIDER)$(ARCH) buildInstall: $(TARGETS) -clean$(DIVIDER)$(ARCH) clean: + clean$(DIVIDER)$(ARCH) clean: $(RM) cdCommands envPaths dllPath.bat - -else -buildInstall$(DIVIDER)$(ARCH) buildInstall: -clean$(DIVIDER)$(ARCH) clean: +else + buildInstall$(DIVIDER)$(ARCH) buildInstall: + clean$(DIVIDER)$(ARCH) clean: endif cdCommands envPaths dllPath.bat: $(wildcard $(TOP)/configure/RELEASE*) \ - $(TOP)/configure/CONFIG $(INSTALL_BIN) -ifeq ($(IOCS_APPL_TOP),) - $(PERL) $(TOOLS)/convertRelease.pl -a $(ARCH) $@ -else - $(PERL) $(TOOLS)/convertRelease.pl -a $(ARCH) -t $(IOCS_APPL_TOP) $@ -endif + $(wildcard $(TOP)/configure/CONFIG_SITE*) $(INSTALL_BIN) + $(CONVERTRELEASE) -a $(ARCH) -t $(IOCS_APPL_TOP) $@ realclean: $(RM) cdCommands envPaths dllPath.bat diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD index 9c5bcd405..f44b57c67 100644 --- a/configure/RULES_BUILD +++ b/configure/RULES_BUILD @@ -6,7 +6,7 @@ # EPICS BASE is distributed subject to a Software License Agreement found # in the file LICENSE that is included with this distribution. #************************************************************************* -# Revision-Id: anj@aps.anl.gov-20111202201024-6naufg256gbustg2 +# Revision-Id: jba@aps.anl.gov-20121205203418-15wux5bxnojrv6pn # # Rules for making things specified in Makefile # @@ -22,6 +22,7 @@ vpath %.cpp $(USR_VPATH) $(ALL_SRC_DIRS) vpath %.C $(USR_VPATH) $(ALL_SRC_DIRS) vpath %.rc $(USR_VPATH) $(ALL_SRC_DIRS) vpath %.h $(USR_VPATH) $(ALL_SRC_DIRS) +vpath %.H $(USR_VPATH) $(ALL_SRC_DIRS) vpath %.skel.static $(USR_VPATH) $(ALL_SRC_DIRS) vpath %.y $(USR_VPATH) $(ALL_SRC_DIRS) vpath %.l $(USR_VPATH) $(ALL_SRC_DIRS) @@ -321,10 +322,10 @@ $(OBJLIB_MUNCHNAME):%.munch : %_ctdt$(OBJ) %$(OBJ) @$(RM) $@ $(MUNCH_CMD) -runtests: $(TESTSCRIPTS_$(BUILD_CLASS)) +runtests: $(TESTSCRIPTS) -$(PERL) -MTest::Harness -e 'runtests @ARGV if @ARGV;' $^ -testspec: $(TESTSCRIPTS_$(BUILD_CLASS)) +testspec: $(TESTSCRIPTS) @$(RM) $@ @echo OS-class: $(OS_CLASS) > $@ @echo Target-arch: $(T_A) >> $@ @@ -383,13 +384,10 @@ $(INSTALL_LIB)/%.lib: %.lib $(INSTALL_SHRLIBS): $(INSTALL_SHRLIB)/%: % $(ECHO) "Installing shared library $@" @$(INSTALL_LIBRARY) -d -m $(SHRLIB_PERMISSIONS) $< $(INSTALL_SHRLIB) -ifneq ($(SHRLIB_SUFFIX),.dll) +ifneq ($(SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE)) ifneq (,$(strip $(SHRLIB_VERSION))) - @$(RM) $(subst .$(SHRLIB_VERSION),,$@) - ln -s $< $(subst .$(SHRLIB_VERSION),,$@) -else - @$(RM) $@.3.14 - ln -s $< $@.3.14 + @$(RM) $(subst $(SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@) + ln -s $< $(subst $(SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@) endif # SHRLIB_VERSION endif # SHRLIB_SUFFIX @@ -410,10 +408,12 @@ $(INSTALL_TCLLIB)/$(TCLINDEX): $(INSTALL_TCLLIBS) $(INSTALL_LOADABLE_SHRLIBS): $(INSTALL_SHRLIB)/%: % $(ECHO) "Installing loadable shared library $@" @$(INSTALL_LIBRARY) -d -m 555 $< $(INSTALL_SHRLIB) +ifneq ($(LOADABLE_SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE)) ifneq (,$(strip $(LOADABLE_SHRLIB_VERSION))) - @$(RM) $(subst .$(LOADABLE_SHRLIB_VERSION),,$@) - ln -s $< $(subst .$(LOADABLE_SHRLIB_VERSION),,$@) + @$(RM) $(subst $(LOADABLE_SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@) + ln -s $< $(subst $(LOADABLE_SHRLIB_SUFFIX),$(SHRLIB_SUFFIX_BASE),$@) endif # LOADABLE_SHRLIB_VERSION +endif # LOADABLE_SHRLIB_SUFFIX $(INSTALL_CONFIG)/%: % $(ECHO) "Installing config file $@" diff --git a/configure/RULES_TARGET b/configure/RULES_TARGET index 0637a782b..e8f2de276 100755 --- a/configure/RULES_TARGET +++ b/configure/RULES_TARGET @@ -8,7 +8,7 @@ # in file LICENSE that is included with this distribution. #************************************************************************* # -# Revision-Id: anj@aps.anl.gov-20101005192737-disfz3vs0f3fiixd +# Revision-Id: anj@aps.anl.gov-20130819183019-t6hxxq21q99wx109 # # RULES_TARGET # diff --git a/configure/RULES_TOP b/configure/RULES_TOP index 523ec33df..107bdc775 100644 --- a/configure/RULES_TOP +++ b/configure/RULES_TOP @@ -7,7 +7,7 @@ # in file LICENSE that is included with this distribution. #************************************************************************* # -# Revision-Id: anj@aps.anl.gov-20110610211741-4s0vjlkzhb73biml +# Revision-Id: anj@aps.anl.gov-20130401150338-vrfmimau4wu1h6xr # include $(CONFIG)/RULES_DIRS @@ -64,11 +64,11 @@ help: @echo " rebuild - Same as clean install" @echo " archclean - Removes O. dirs but not O.Common dir" @echo "\"Partial\" build targets supported by Makefiles:" - @echo " inc. - Installs only header files." - @echo " build. - Builds and installs only." - @echo " install. - Builds and installs only." - @echo " clean. - Cleans binaries in O. dirs only." - @echo " uninstall. - Remove bin & lib directories for only." + @echo " inc$(DIVIDER) - Installs only header files." + @echo " build$(DIVIDER) - Builds and installs only." + @echo " install$(DIVIDER) - Builds and installs only." + @echo " clean$(DIVIDER) - Cleans binaries in O. dirs only." + @echo " uninstall$(DIVIDER) - Remove bin & lib directories for only." @echo "Targets supported by top level Makefile:" @echo " archuninstall - Remove bin & lib directories created by this hostarch." @echo " uninstall - Remove install directories created by this hostarch."