Merge lp:~jba-aps/epics-base/dbdcat into lp:~epics-core/epics-base/3.15

[Janet B. Anderson]

Added concatenation of database definition files with no database expansion.

[Andrew Johnson (anj)]

RULES.Db has a commented-out line in the rule for $(COMMON_DBDCATS):$(COMMON_DIR)/%.dbd which looks like you probably didn't mean to leave it there.

Should dbdExpand print an error message when it gets run with no input files to expand? I think we should try to make it as easy as we can for users to understand what they did wrong when this happens, even though the build will fail immediately afterwards anyway with this code. I would like dbdExpand to exit with an error status in this case as well (causing GNUmake to stop immediately), so instead of exit 0 I suggest using die with a suitable message string (that ends in a newline to suppress the line-number that Perl will append to it otherwise). The message should include the name of the DBD file it was being asked to create.

[lp:~jba-aps/epics-base/dbdcat]

12528. By Janet B. Anderson on 2014-09-11

Updated concatenated database definition files

[Andrew Johnson (anj)]

Documentation for this branch will be part of the major updating of the AppDevGuide's Build Facility chapter that Janet has started working on.

review: Approve

=== modified file 'configure/RULES.Db'
--- configure/RULES.Db	2014-03-13 20:04:31 +0000
+++ configure/RULES.Db	2014-09-11 20:22:09 +0000
@@ -47,6 +47,21 @@
 # DBD_solaris += abcSolaris.dbd
 #
 # ---------------------------------------------------
+# DBD concatination files
+
+COMMON_DBDCATS += $(addprefix $(COMMON_DIR)/,$(DBDCAT))
+DBDCAT_SOURCES += $(foreach file, $($*_DBD), $(DBDCAT_SOURCE) )
+DBDCAT_SOURCE = $(firstword $(wildcard $(file) $(foreach dir,  \
+    $(DBD_SEARCH_DIRS),$(addsuffix /$(file),$(dir)))) \
+    $(COMMON_DIR)/$(file))
+
+DBDCAT_COMMAND = $(if $(DBDCAT_SOURCES),\
+    $(CAT) $(DBDCAT_SOURCES) > $(notdir $@),\
+    @echo "No input files for $(notdir $@)")
+
+INSTALL_DBDS += $(addprefix $(INSTALL_DBD)/,$(DBDCAT))
+
+# ---------------------------------------------------
 
 DBDINC_NAME = $(patsubst %.h,%,$(patsubst %.dbd,%,$(DBDINC)))
 DBD += $(addsuffix .dbd,$(DBDINC_NAME))
@@ -173,7 +188,7 @@
 
 inc : $(COMMON_INC) $(INSTALL_INC)
 
-build : $(COMMON_DBDS) $(COMMON_DBS) \
+build : $(COMMON_DBDS) $(COMMON_DBS) $(COMMON_DBDCATS) \
 	$(INSTALL_DBDS) $(INSTALL_DBS) \
 	$(DBDDEPENDS_FILES) $(TARGETS) \
 	$(INSTALL_DB_INSTALLS) $(INSTALL_DBD_INSTALLS)
@@ -368,8 +383,20 @@
 	$(DBEXPAND) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
+# Make DBDCAT file x depend on x_DBD source files
+define  DBDCAT_template
+$$(COMMON_DIR)/$(1).dbd : ../Makefile $$(foreach file, $$($(1)_DBD),$$(DBDCAT_SOURCE) )
+endef
+$(foreach name,$(subst .dbd,,$(DBDCAT)), $(eval $(call DBDCAT_template,$(name))))
+
+$(COMMON_DBDCATS):$(COMMON_DIR)/%.dbd:
+	$(ECHO) "Creating dbd file $(notdir $@)"
+	@$(RM) $(notdir $@)
+	$(DBDCAT_COMMAND)
+	@$(MV) $(notdir $@) $@
+
 $(COMMON_DIR)/%.dbd:
-	$(ECHO) "Creating dbd file $(notdir $<)"
+	$(ECHO) "Creating dbd file $(notdir $@)"
 	@$(RM) $(notdir $@)
 	$(DBEXPAND) $(DBDFLAGS) -o $(notdir $@) $($*_DBD)
 	@$(MV) $(notdir $@) $@

=== modified file 'configure/os/CONFIG.UnixCommon.Common'
--- configure/os/CONFIG.UnixCommon.Common	2010-10-05 19:27:37 +0000
+++ configure/os/CONFIG.UnixCommon.Common	2014-09-11 20:22:09 +0000
@@ -13,6 +13,7 @@
 RM = rm -f
 MKDIR = mkdir
 RMDIR = rm -rf
+CAT = cat
 
 # Allow site overrides
 -include $(CONFIG)/os/CONFIG_SITE.UnixCommon.Common

=== modified file 'configure/os/CONFIG.win32-x86-mingw.Common'
--- configure/os/CONFIG.win32-x86-mingw.Common	2013-10-15 16:32:31 +0000
+++ configure/os/CONFIG.win32-x86-mingw.Common	2014-09-11 20:22:09 +0000
@@ -19,6 +19,7 @@
 MKDIR = $(PERL) -MExtUtils::Command -e mkpath
 RMDIR = $(PERL) -MExtUtils::Command -e rm_rf
 NOP = $(PERL) -e ''
+CAT = $(PERL) -MExtUtils::Command -e cat
 
 WIND_HOST_TYPE = x86-win32
 OSITHREAD_USE_DEFAULT_STACK = NO

=== modified file 'configure/os/CONFIG.win32-x86.Common'
--- configure/os/CONFIG.win32-x86.Common	2012-07-17 19:33:31 +0000
+++ configure/os/CONFIG.win32-x86.Common	2014-09-11 20:22:09 +0000
@@ -16,6 +16,7 @@
 MKDIR = $(PERL) -MExtUtils::Command -e mkpath
 RMDIR = $(PERL) -MExtUtils::Command -e rm_rf
 NOP = $(PERL) -e ''
+CAT = $(PERL) -MExtUtils::Command -e cat
 
 WIND_HOST_TYPE = x86-win32
 OSITHREAD_USE_DEFAULT_STACK = NO

=== modified file 'documentation/RELEASE_NOTES.html'
--- documentation/RELEASE_NOTES.html	2014-09-09 23:06:09 +0000
+++ documentation/RELEASE_NOTES.html	2014-09-11 20:22:09 +0000
@@ -15,6 +15,7 @@
 <h2 align="center">Changes between 3.15.0.1 and 3.15.0.2</h2>
 <!-- Insert new items immediately below here ... -->
 
+<<<<<<< TREE
 <h3>Posix: Drop SCHED_FIFO before exec() in child process</h3>
 
 <p>If Base is compiled with <tt>USE_POSIX_THREAD_PRIORITY_SCHEDULING = YES</tt>
@@ -33,6 +34,36 @@
 RAM if the process has the ability to run threads with different priorities. If
 unsuccessful, it prints an message to stderr and continues.</p>
 
+=======
+<h3>Concatenated database definition files</h3>
+
+<p>Database definition (dbd) files can now be concatenated during the EPICS build 
+into a created dbd file with the created dbd file then installed into 
+$(INSTALL_LOCATION)/dbd. The following lines in a Makefile will create a name.dbd 
+file containing a copy of lines from file1.dbd followed by lines from file2.dbd
+then file3.dbd and then install name.dbd into $(INSTALL_LOCATION)/dbd. NO dbd file 
+expansions will be done. 
+
+<blockquote> <pre>
+	DBDCAT += name.dbd
+	name_DBD += file1.dbd file2.dbd file3.dbd
+</pre></blockquote>
+
+The files file1.dbd, file2.dbd, and file3.dbd will be found if they exist in the 
+current directory, are created by the current Makefile, have fullpath name , exist
+in a directory of the currently defined SRC_DIRS list, exist in the install dbd 
+directory, or exist in a dbd directory of a current release module..</p>
+
+<h3>On POSIX, attempt to lock all memory when running with FIFO scheduler</h3>
+
+<p>On POSIX systems, an IOC application's ability to meet timing deadlines is often
+dependent on its ability to lock part or all of the process's virtual address space
+into RAM, preventing that memory from being paged to the swap area. This change will
+attempt to lock the process's virtual address space into RAM if the process has the
+ability to run threads with different priorities. If unsuccessful, it prints an
+message to stderr and continues.</p>
+ 
+>>>>>>> MERGE-SOURCE
 <p>On Linux, one can grant a process the ability to run threads with different
 priorities by using the command <code>ulimit -r unlimited</code>. To use the
 FIFO scheduler for an IOC, use a command like this:</p>

=== modified file 'src/tools/dbdExpand.pl'
--- src/tools/dbdExpand.pl	2013-10-14 17:43:26 +0000
+++ src/tools/dbdExpand.pl	2014-09-11 20:22:09 +0000
@@ -34,6 +34,8 @@
     $dep = "\$(COMMON_DIR)/$dep";
 }
 
+die "No input files for $opt_o" if (!@ARGV);
+
 while (@ARGV) {
     my $file = shift @ARGV;
     eval {