From 3dea99d683e476c88991f64637f7ac0843b7d663 Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Wed, 27 Sep 2000 14:21:16 +0000 Subject: [PATCH] makeDbDepends.pl and makeIocCdCommands.pl moved to base/configure/tools. --- src/makeBaseApp/top/configure/RULES.ioc | 4 +- .../top/configure/makeDbDepends.pl | 23 ------- .../top/configure/makeIocCdCommands.pl | 69 ------------------- 3 files changed, 2 insertions(+), 94 deletions(-) delete mode 100644 src/makeBaseApp/top/configure/makeDbDepends.pl delete mode 100644 src/makeBaseApp/top/configure/makeIocCdCommands.pl diff --git a/src/makeBaseApp/top/configure/RULES.ioc b/src/makeBaseApp/top/configure/RULES.ioc index 37760dd3a..6e7c87cf6 100644 --- a/src/makeBaseApp/top/configure/RULES.ioc +++ b/src/makeBaseApp/top/configure/RULES.ioc @@ -2,8 +2,8 @@ include $(EPICS_BASE)/configure/RULES_DIRS buildInstall: cdCommands -cdCommands: Makefile $(TOP)/configure/makeIocCdCommands.pl $(TOP)/configure/CONFIG - $(PERL) $(TOP)/configure/makeIocCdCommands.pl $(ARCH) $(IOCS_APPL_TOP) +cdCommands: Makefile $(TOOLS)/makeIocCdCommands.pl $(TOP)/configure/CONFIG + $(PERL) $(TOOLS)/makeIocCdCommands.pl $(ARCH) $(IOCS_APPL_TOP) clean: @$(RM) cdCommands diff --git a/src/makeBaseApp/top/configure/makeDbDepends.pl b/src/makeBaseApp/top/configure/makeDbDepends.pl deleted file mode 100644 index bb8042bb8..000000000 --- a/src/makeBaseApp/top/configure/makeDbDepends.pl +++ /dev/null @@ -1,23 +0,0 @@ -eval 'exec perl -S $0 ${1+"$@"}' # -*- Mode: perl -*- - if $running_under_some_shell; # makeDbDepends.pl - -# Called from within the object directory. -# Searches the .substitutions files (from the command line) for -# "file xxx {" entries to create a DEPENDS file - -open(OUT, ">DEPENDS") or die "Cannot open DEPENDS: $!"; - -foreach $file (@ARGV) { - open(IN, "<$file") or die "Cannot open $file: $!"; - @substfile = ; - close IN or die "Cannot close $file: $!"; - - @depends = grep { s/^\s*file\s*(.*)\s*\{.*$/\1/ } @substfile; - chomp @depends; - - if (@depends) { - $file =~ s/\.substitutions/\.t.db.raw/; - print OUT "${file}:: @depends\n"; - } -} -close OUT or die "Cannot close $file: $!"; diff --git a/src/makeBaseApp/top/configure/makeIocCdCommands.pl b/src/makeBaseApp/top/configure/makeIocCdCommands.pl deleted file mode 100644 index 35940a681..000000000 --- a/src/makeBaseApp/top/configure/makeIocCdCommands.pl +++ /dev/null @@ -1,69 +0,0 @@ -eval 'exec perl -S $0 ${1+"$@"}' # -*- Mode: perl -*- - if $running_under_some_shell; # makeIocCdCommands.pl - -use Cwd; - -$cwd = cwd(); -#hack for sun4 -$cwd =~ s|/tmp_mnt||; -#hack for win32 -$cwd =~ s|\\|\/|g; -$arch = $ARGV[0]; -$iocsApplTop = $ARGV[1]; -#remove top parts of current working directory -#and add ioc's appl top alias (if supplied) -if ( $iocsApplTop ne "" ) { - $cwd =~ s|.*(/iocBoot.*)|$1|; - $cwd = $iocsApplTop . $cwd; -} - -unlink("cdCommands"); -open(OUT,">cdCommands") or die "$! opening cdCommands"; -print OUT "startup = \"$cwd\"\n"; - -#appbin is kept for compatibility with 3.13.1 -$appbin = $cwd; -$appbin =~ s/iocBoot.*//; -$appbin = $appbin . "/bin/${arch}"; -print OUT "appbin = \"$appbin\"\n"; - -$top = $cwd; -$top =~ s/\/iocBoot.*//; -print OUT "top = \"$top\"\n"; -$topbin = "${top}/bin/${arch}"; -#skip check that top/bin/${arch} exists; src may not have been builT -print OUT "topbin = \"$topbin\"\n"; -$release = "$top/config/RELEASE"; -if (-r "$release") { - open(IN, "$release") or die "Cannot open $release\n"; - while ($line = ) { - next if ( $line =~ /\s*#/ ); - chomp($line); - $_ = $line; - #the following looks for - # prefix = $(macro)post - ($prefix,$macro,$post) = /(.*)\s*=\s*\$\((.*)\)(.*)/; - if ($macro eq "") { # true if no macro is present - # the following looks for - # prefix = post - ($prefix,$post) = /(.*)\s*=\s*(.*)/; - } else { - $base = $applications{$macro}; - if ($base eq "") { - print "error: $macro was not previously defined\n"; - } else { - $post = $base . $post; - } - } - $applications{$prefix} = $post; - $app = lc($prefix); - if ( -d "$post") { #check that directory exists - print OUT "$app = \"$post\"\n"; - } - if ( -d "$post/bin/$arch") { #check that directory exists - print OUT "${app}bin = \"$post/bin/$arch\"\n"; - } - } - close IN; -} -close OUT;