epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

configure: Removed generation of xxxInclude.dbd files

Browse Source 
Rules now expand the source DBD files directly in to the target.
Also removed the makeIncludeDbd.pl script which is no longer needed.
This commit is contained in:
Andrew Johnson
2013-06-18 10:01:37 -05:00
parent c4d6e2a61e
commit 9d9f345278
3 changed files with 7 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
configure/RULES.Db
View File

@@ -199,14 +199,14 @@ menu%.h$(DEP): menu%.dbd
@$(DBTOMENUH) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
%.dbd$(DEP): $(COMMON_DIR)/%Include.dbd
%.dbd$(DEP): %Include.dbd
@$(RM) $@
@$(DBEXPAND) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
%.dbd$(DEP): %Include.dbd
%.dbd$(DEP):
@$(RM) $@
@$(DBEXPAND) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
@$(DBEXPAND) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $($*_DBD) > $@
@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
%.db$(RAW)$(DEP): %.substitutions
@@ -292,21 +292,16 @@ $(COMMON_DIR)/bpt%.dbd: bpt%.data
$(MAKEBPT) $< $(notdir $@)
@$(MV) $(notdir $@) $@
$(COMMON_DIR)/%.dbd: $(COMMON_DIR)/%Include.dbd
$(ECHO) "Expanding created dbd file $(notdir $<)"
@$(RM) $(notdir $@)
$(DBEXPAND) $(DBDFLAGS) -o $(notdir $@) $<
@$(MV) $(notdir $@) $@
$(COMMON_DIR)/%.dbd: %Include.dbd
$(COMMON_DIR)/%.dbd: %Include.dbd
$(ECHO) "Expanding dbd file $<"
@$(RM) $(notdir $@)
$(DBEXPAND) $(DBDFLAGS) -o $(notdir $@) $<
@$(MV) $(notdir $@) $@
$(COMMON_DIR)/%Include.dbd:
$(COMMON_DIR)/%.dbd:
$(ECHO) "Creating dbd file $(notdir $<)"
@$(RM) $(notdir $@)
$(PERL) $(TOOLS)/makeIncludeDbd.pl $($*_DBD) $(notdir $@)
$(DBEXPAND) $(DBDFLAGS) -o $(notdir $@) $($*_DBD)
@$(MV) $(notdir $@) $@
$(INSTALL_DBD)/%: $(COMMON_DIR)/%

1
src/tools/Makefile
View File

@@ -38,7 +38,6 @@ PERL_SCRIPTS += dos2unix.pl
PERL_SCRIPTS += expandVars.pl
PERL_SCRIPTS += fullPathName.pl
PERL_SCRIPTS += installEpics.pl
PERL_SCRIPTS += makeIncludeDbd.pl
PERL_SCRIPTS += makeMakefile.pl
PERL_SCRIPTS += makeTestfile.pl
PERL_SCRIPTS += mkmf.pl

43
src/tools/makeIncludeDbd.pl
View File

@@ -1,43 +0,0 @@
#!/usr/bin/env perl
#*************************************************************************
# Copyright (c) 2002 The University of Chicago, 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.
#*************************************************************************
#
# $Revision-Id$
use File::Basename;
sub Usage
{
my ($txt) = @_;
print "Usage:\n";
print "\tmakeIncludeDbd.pl infile1 [ infile2 infile3 ...] outfile\n";
print "\nError: $txt\n" if $txt;
exit 2;
}
# need at least two args: ARGV[0] and ARGV[1]
Usage("\"makeIncludeDbd.pl @ARGV\": No input files specified") if $#ARGV < 1;
$target=$ARGV[$#ARGV];
@sources=@ARGV[0..$#ARGV-1];
open(OUT, "> $target") or die "Cannot create $target\n";;
foreach $file ( @sources )
{
$base=basename($file);
print OUT "include \"$base\"\n";
}
close OUT;
# EOF makeIncludeDbd.pl