epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Remove ARCH from cdCommands and envPaths files

Browse Source 
Set it in iocshRegisterCommon() instead.
Remove ARCH from iocBoot/ioc/Makefile@Common templates.
This commit is contained in:
Andrew Johnson
2016-04-28 18:50:41 -05:00
parent 396ff3c484
commit 230603f4ac
5 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tools/convertRelease.pl
+1 -3
View File
@@ -134,6 +134,7 @@ sub relPaths {
}
sub binDirs {
die "Architecture not set (use -a option)\n" unless ($arch);
my @includes = grep !m/^ (RULES | TEMPLATE_TOP) $/x, @apps;
my @path;
foreach my $app (@includes) {
@@ -165,7 +166,6 @@ sub cdCommands {
my $ioc = $cwd;
$ioc =~ s/^.*\///; # iocname is last component of directory name
print OUT "putenv(\"ARCH=$arch\")\n";
print OUT "putenv(\"IOC=$ioc\")\n";
foreach my $app (@includes) {
@@ -188,7 +188,6 @@ sub cdCommands {
# Include parentheses anyway in case CEXP users want to use this.
#
sub envPaths {
die "Architecture not set (use -a option)" unless ($arch);
my @includes = grep !m/^ (RULES | TEMPLATE_TOP) $/x, @apps;
unlink($outfile);
@@ -197,7 +196,6 @@ sub envPaths {
my $ioc = $cwd;
$ioc =~ s/^.*\///; # iocname is last component of directory name
print OUT "epicsEnvSet(\"ARCH\",\"$arch\")\n";
print OUT "epicsEnvSet(\"IOC\",\"$ioc\")\n";
foreach my $app (@includes) {